getNoteMessages()):?>
diff --git a/app/code/Magento/Centinel/Block/Adminhtml/Validation/Form.php b/app/code/Magento/Centinel/Block/Adminhtml/Validation/Form.php
index 05e5e559976ba..0b196c3fbdbed 100644
--- a/app/code/Magento/Centinel/Block/Adminhtml/Validation/Form.php
+++ b/app/code/Magento/Centinel/Block/Adminhtml/Validation/Form.php
@@ -38,6 +38,8 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
/**
* Prepare validation and template parameters
+ *
+ * @return string
*/
protected function _toHtml()
{
diff --git a/app/code/Magento/Centinel/Block/Authentication.php b/app/code/Magento/Centinel/Block/Authentication.php
index 77a1a694f496b..4ca57bc93be5a 100644
--- a/app/code/Magento/Centinel/Block/Authentication.php
+++ b/app/code/Magento/Centinel/Block/Authentication.php
@@ -41,7 +41,7 @@ class Authentication extends \Magento\View\Element\Template
/**
* Strage for identifiers of related blocks
*
- * @var array
+ * @var string[]
*/
protected $_relatedBlocks = array();
@@ -83,7 +83,7 @@ public function addRelatedBlock($blockId)
/**
* Return identifiers of related blocks
*
- * @return array
+ * @return string[]
*/
public function getRelatedBlocks()
{
diff --git a/app/code/Magento/Centinel/Block/Logo.php b/app/code/Magento/Centinel/Block/Logo.php
index 7b7cb30ff5904..f969b3c16cb7e 100644
--- a/app/code/Magento/Centinel/Block/Logo.php
+++ b/app/code/Magento/Centinel/Block/Logo.php
@@ -32,6 +32,9 @@
class Logo extends \Magento\View\Element\Template
{
+ /**
+ * @var string
+ */
protected $_template = 'logo.phtml';
/**
diff --git a/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index.php b/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index.php
index 8a631383ddc2c..296bd60ceaaa1 100644
--- a/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index.php
+++ b/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index.php
@@ -57,6 +57,7 @@ public function __construct(
/**
* Process validate payment data action
*
+ * @return void
*/
public function validatePaymentDataAction()
{
@@ -82,6 +83,7 @@ public function validatePaymentDataAction()
/**
* Process autentication start action
*
+ * @return void
*/
public function authenticationStartAction()
{
@@ -95,6 +97,7 @@ public function authenticationStartAction()
/**
* Process autentication complete action
*
+ * @return void
*/
public function authenticationCompleteAction()
{
diff --git a/app/code/Magento/Centinel/Controller/Index.php b/app/code/Magento/Centinel/Controller/Index.php
index d386f0c26d354..60268cdc726b5 100644
--- a/app/code/Magento/Centinel/Controller/Index.php
+++ b/app/code/Magento/Centinel/Controller/Index.php
@@ -54,6 +54,7 @@ public function __construct(
/**
* Process autentication start action
*
+ * @return void
*/
public function authenticationStartAction()
{
@@ -67,6 +68,7 @@ public function authenticationStartAction()
/**
* Process autentication complete action
*
+ * @return void
*/
public function authenticationCompleteAction()
{
diff --git a/app/code/Magento/Centinel/Model/Api.php b/app/code/Magento/Centinel/Model/Api.php
index 3aca6952da4b7..301798e816fb3 100644
--- a/app/code/Magento/Centinel/Model/Api.php
+++ b/app/code/Magento/Centinel/Model/Api.php
@@ -39,10 +39,13 @@ class Api extends \Magento\Object
/**
* Fields that should be replaced in debug with '***'
*
- * @var array
+ * @var string[]
*/
protected $_debugReplacePrivateDataKeys = array('TransactionPwd', 'CardNumber', 'CardExpMonth', 'CardExpYear');
+ /**
+ * @var array
+ */
protected static $_iso4217Currencies = array(
'AED' => '784', 'AFN' => '971',
'ALL' => '008', 'AMD' => '051', 'ANG' => '532', 'AOA' => '973', 'ARS' => '032', 'AUD' => '036', 'AWG' => '533',
@@ -122,7 +125,7 @@ protected function _getVersion()
/**
* Return transaction type. according centinel documetation it should be "C"
*
- * @return "C"
+ * @return string
*/
protected function _getTransactionType()
{
@@ -152,10 +155,10 @@ protected function _getTimeoutRead()
/**
* Call centinel api methods by given method name and data
*
- * @param $method string
- * @param $data array
- *
+ * @param string $method
+ * @param array $data
* @return \CentinelClient
+ * @throws \Exception
*/
protected function _call($method, $data)
{
@@ -209,7 +212,8 @@ protected function _getApiEndpointUrl()
/**
* Call centinel api lookup method
*
- * @return \Magento\Centinel\Model\Api
+ * @param \Magento\Object $data
+ * @return \Magento\Object
*/
public function callLookup($data)
{
@@ -247,7 +251,8 @@ public function callLookup($data)
/**
* Call centinel api authentication method
*
- * @return \Magento\Centinel\Model\Api
+ * @param \Magento\Object $data
+ * @return \Magento\Object
*/
public function callAuthentication($data)
{
@@ -272,7 +277,7 @@ public function callAuthentication($data)
/**
* Log debug data to file
*
- * @param mixed $debugData
+ * @param array $debugData
*/
protected function _debug($debugData)
{
diff --git a/app/code/Magento/Centinel/Model/Config.php b/app/code/Magento/Centinel/Model/Config.php
index 260d9c1166c64..7a7b171ac97fe 100644
--- a/app/code/Magento/Centinel/Model/Config.php
+++ b/app/code/Magento/Centinel/Model/Config.php
@@ -53,7 +53,7 @@ class Config
protected $_coreStoreConfig;
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_coreConfig;
@@ -64,12 +64,12 @@ class Config
/**
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param \Magento\Encryption\EncryptorInterface $encryptor
*/
public function __construct(
\Magento\Core\Model\Store\Config $coreStoreConfig,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\Encryption\EncryptorInterface $encryptor
) {
$this->_coreStoreConfig = $coreStoreConfig;
diff --git a/app/code/Magento/Centinel/Model/Service.php b/app/code/Magento/Centinel/Model/Service.php
index 91489f2364343..03b3a7def324e 100644
--- a/app/code/Magento/Centinel/Model/Service.php
+++ b/app/code/Magento/Centinel/Model/Service.php
@@ -214,6 +214,7 @@ protected function _getValidationState($cardType = null)
/**
* Drop validation state model
*
+ * @return void
*/
protected function _resetValidationState()
{
@@ -243,6 +244,7 @@ protected function _initValidationState($cardType, $dataChecksum)
* Process lookup validation and init new validation state model
*
* @param \Magento\Object $data
+ * @return void
*/
public function lookup($data)
{
@@ -267,6 +269,8 @@ public function lookup($data)
* Process authenticate validation
*
* @param \Magento\Object $data
+ * @return void
+ * @throws \Exception
*/
public function authenticate($data)
{
@@ -290,6 +294,7 @@ public function authenticate($data)
* Workflow state is stored validation state model
*
* @param \Magento\Object $data
+ * @return void
* @throws \Magento\Core\Exception
*/
public function validate($data)
@@ -409,9 +414,9 @@ public function isAuthenticateSuccessful()
/**
* Export cmpi lookups and authentication information stored in session into array
*
- * @param mixed $to
- * @param array $map
- * @return mixed
+ * @param array|object $to
+ * @param array|bool $map
+ * @return array|object
*/
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 6a4521348d6a6..57f978e52aa8e 100644
--- a/app/code/Magento/Centinel/etc/adminhtml/di.xml
+++ b/app/code/Magento/Centinel/etc/adminhtml/di.xml
@@ -39,7 +39,7 @@
-
-
- Magento\Centinel\Model\State\Visa
- Magento\Centinel\Model\State\Mastercard
- Magento\Centinel\Model\State\Jcb
- Magento\Centinel\Model\State\Mastercard
-
+
+ Magento\Centinel\Model\State\Visa Magento\Centinel\Model\State\Mastercard Magento\Centinel\Model\State\Jcb Magento\Centinel\Model\State\Mastercard
diff --git a/app/code/Magento/Centinel/etc/frontend/di.xml b/app/code/Magento/Centinel/etc/frontend/di.xml
index 191d75eed8840..6a73a392867a4 100644
--- a/app/code/Magento/Centinel/etc/frontend/di.xml
+++ b/app/code/Magento/Centinel/etc/frontend/di.xml
@@ -39,9 +39,9 @@
-
- /centinel/
-
+
+ /centinel/
diff --git a/app/code/Magento/Checkout/Block/Adminhtml/Agreement/Grid.php b/app/code/Magento/Checkout/Block/Adminhtml/Agreement/Grid.php
index 7567cede176ce..3103a36713fa4 100644
--- a/app/code/Magento/Checkout/Block/Adminhtml/Agreement/Grid.php
+++ b/app/code/Magento/Checkout/Block/Adminhtml/Agreement/Grid.php
@@ -34,20 +34,18 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Checkout\Model\Resource\Agreement\CollectionFactory $collectionFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Checkout\Model\Resource\Agreement\CollectionFactory $collectionFactory,
array $data = array()
) {
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Checkout/Block/Cart/AbstractCart.php b/app/code/Magento/Checkout/Block/Cart/AbstractCart.php
index 969b1860d9ba8..4ab8b85cf33f3 100644
--- a/app/code/Magento/Checkout/Block/Cart/AbstractCart.php
+++ b/app/code/Magento/Checkout/Block/Cart/AbstractCart.php
@@ -84,38 +84,36 @@ public function __construct(
}
/**
- * Initialize default item renderer
+ * Retrieve renderer list
+ *
+ * @return \Magento\View\Element\RendererList
*/
- protected function _prepareLayout()
+ protected function _getRendererList()
{
- if (!$this->getChildBlock(self::DEFAULT_TYPE)) {
- $this->addChild(
- self::DEFAULT_TYPE,
- 'Magento\Checkout\Block\Cart\Item\Renderer',
- array('template' => 'cart/item/default.phtml')
- );
- }
- return parent::_prepareLayout();
+ return $this->getRendererListName()
+ ? $this->getLayout()->getBlock($this->getRendererListName())
+ : $this->getChildBlock('renderer.list');
}
/**
- * Get renderer block instance by product type code
+ * Retrieve item renderer block
*
- * @param string $type
+ * @param string $type
+ *
+ * @return \Magento\View\Element\Template
* @throws \RuntimeException
- * @return \Magento\View\Element\AbstractBlock
*/
public function getItemRenderer($type)
{
- $renderer = $this->getChildBlock($type) ?: $this->getChildBlock(self::DEFAULT_TYPE);
- if (!$renderer instanceof \Magento\View\Element\BlockInterface) {
- throw new \RuntimeException('Renderer for type "' . $type . '" does not exist.');
+ $rendererList = $this->_getRendererList();
+ if (!$rendererList) {
+ throw new \RuntimeException('Renderer list for block "' . $this->getNameInLayout() . '" is not defined');
}
- $renderer->setRenderedBlock($this);
- return $renderer;
+ $overriddenTemplates = $this->getOverriddenTemplates() ?: array();
+ $template = isset($overriddenTemplates[$type]) ? $overriddenTemplates[$type] : $this->getRendererTemplate();
+ return $rendererList->getRenderer($type, self::DEFAULT_TYPE, $template);
}
-
/**
* Get logged in customer
*
diff --git a/app/code/Magento/Checkout/Block/Cart/Coupon.php b/app/code/Magento/Checkout/Block/Cart/Coupon.php
index 275ce2099d313..49186d3a5bddb 100644
--- a/app/code/Magento/Checkout/Block/Cart/Coupon.php
+++ b/app/code/Magento/Checkout/Block/Cart/Coupon.php
@@ -24,7 +24,6 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-
namespace Magento\Checkout\Block\Cart;
class Coupon extends \Magento\Checkout\Block\Cart\AbstractCart
@@ -51,6 +50,4 @@ public function getCouponCode()
{
return $this->getQuote()->getCouponCode();
}
-
-
}
diff --git a/app/code/Magento/Checkout/Block/Cart/Crosssell.php b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
index b162fdd602f41..9690e80677b47 100644
--- a/app/code/Magento/Checkout/Block/Cart/Crosssell.php
+++ b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
@@ -62,6 +62,11 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
*/
protected $_productLinkFactory;
+ /**
+ * @var \Magento\Sales\Model\Quote\Item\RelatedProducts
+ */
+ protected $_itemRelationsList;
+
/**
* @param \Magento\View\Element\Template\Context $context
* @param \Magento\Catalog\Model\Config $catalogConfig
@@ -78,9 +83,10 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
* @param \Magento\Catalog\Model\Product\Visibility $productVisibility
* @param \Magento\CatalogInventory\Model\Stock $stock
* @param \Magento\Catalog\Model\Product\LinkFactory $productLinkFactory
+ * @param \Magento\Sales\Model\Quote\Item\RelatedProducts $itemRelationsList
* @param array $data
* @param array $priceBlockTypes
- *
+ *
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -99,6 +105,7 @@ public function __construct(
\Magento\Catalog\Model\Product\Visibility $productVisibility,
\Magento\CatalogInventory\Model\Stock $stock,
\Magento\Catalog\Model\Product\LinkFactory $productLinkFactory,
+ \Magento\Sales\Model\Quote\Item\RelatedProducts $itemRelationsList,
array $data = array(),
array $priceBlockTypes = array()
) {
@@ -106,6 +113,7 @@ public function __construct(
$this->_productVisibility = $productVisibility;
$this->_stock = $stock;
$this->_productLinkFactory = $productLinkFactory;
+ $this->_itemRelationsList = $itemRelationsList;
parent::__construct(
$context,
$catalogConfig,
@@ -152,7 +160,10 @@ public function getItems()
}
if (count($items) < $this->_maxItemCount) {
- $filterProductIds = array_merge($this->_getCartProductIds(), $this->_getCartProductIdsRel());
+ $filterProductIds = array_merge(
+ $this->_getCartProductIds(),
+ $this->_itemRelationsList->getRelatedProductIds($this->getQuote()->getAllItems())
+ );
$collection = $this->_getCollection()
->addProductFilter($filterProductIds)
->addExcludeProductFilter($ninProductIds)
@@ -164,7 +175,6 @@ public function getItems()
$items[] = $item;
}
}
-
}
$this->setData('items', $items);
@@ -203,28 +213,6 @@ protected function _getCartProductIds()
return $ids;
}
- /**
- * Retrieve Array of product ids which have special relation with products in Cart
- * For example simple product as part of Grouped product
- *
- * @return array
- */
- protected function _getCartProductIdsRel()
- {
- $productIds = array();
- foreach ($this->getQuote()->getAllItems() as $quoteItem) {
- $productTypeOpt = $quoteItem->getOptionByCode('product_type');
- if ($productTypeOpt instanceof \Magento\Sales\Model\Quote\Item\Option
- && $productTypeOpt->getValue() == \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
- && $productTypeOpt->getProductId()
- ) {
- $productIds[] = $productTypeOpt->getProductId();
- }
- }
-
- return $productIds;
- }
-
/**
* Get last product ID that was added to cart and remove this information from session
*
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index 68d3ada702d9a..6fb944ca95dbf 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -341,11 +341,11 @@ public function getCacheKeyInfo()
protected function _serializeRenders()
{
$result = array();
- foreach ($this->getLayout()->getChildBlocks($this->getNameInLayout()) as $block) {
+ foreach ($this->getLayout()->getChildBlocks($this->_getRendererList()->getNameInLayout()) as $alias => $block) {
/** @var $block \Magento\View\Element\Template */
$result[] = implode('|', array(
// skip $this->getNameInLayout() and '.'
- substr($block->getNameInLayout(), strlen($this->getNameInLayout()) + 1),
+ $alias,
get_class($block),
$block->getTemplate()
));
@@ -364,21 +364,21 @@ public function deserializeRenders($renders)
if (!is_string($renders)) {
return $this;
}
+ $rendererList = $this->addChild('renderer.list', 'Magento\View\Element\RendererList');
$renders = explode('|', $renders);
while (!empty($renders)) {
$template = array_pop($renders);
$block = array_pop($renders);
- $type = array_pop($renders);
- if (!$template || !$block || !$type) {
+ $alias = array_pop($renders);
+ if (!$template || !$block || !$alias) {
continue;
}
- if (!$this->getChildBlock($type)) {
- $this->addChild($type, $block, array('template' => $template));
- }
+ if (!$rendererList->getChildBlock($alias)) {
+ $rendererList->addChild($alias, $block, array('template' => $template));
+ }
}
-
return $this;
}
}
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index 127bf5f671666..cf51932dedc02 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -41,8 +41,8 @@ class Onepage extends \Magento\Checkout\Block\Onepage\AbstractOnepage
* @param \Magento\App\Cache\Type\Config $configCacheType
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Checkout\Model\Session $resourceSession
- * @param \Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollFactory
- * @param \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollFactory
+ * @param \Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollectionFactory
+ * @param \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory
* @param array $data
*/
public function __construct(
@@ -51,22 +51,17 @@ public function __construct(
\Magento\App\Cache\Type\Config $configCacheType,
\Magento\Customer\Model\Session $customerSession,
\Magento\Checkout\Model\Session $resourceSession,
- \Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollFactory,
- \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollFactory,
+ \Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollectionFactory,
+ \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory,
array $data = array()
) {
parent::__construct(
- $context,
- $coreData,
- $configCacheType,
- $customerSession,
- $resourceSession,
- $countryCollFactory,
- $regionCollFactory,
- $data
+ $context, $coreData, $configCacheType, $customerSession, $resourceSession,
+ $countryCollectionFactory, $regionCollectionFactory, $data
);
$this->_isScopePrivate = true;
}
+
/**
* Get 'one step checkout' step data
*
diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php
index 1ff7ccd423722..34c043e7c324d 100644
--- a/app/code/Magento/Checkout/Controller/Cart.php
+++ b/app/code/Magento/Checkout/Controller/Cart.php
@@ -621,7 +621,7 @@ protected function _isInternalUrl($url)
/** @var $store \Magento\Core\Model\Store */
$store = $this->_storeManager->getStore();
$unsecure = (strpos($url, $store->getBaseUrl()) === 0);
- $secure = (strpos($url, $store->getBaseUrl($store::URL_TYPE_LINK, true)) === 0);
+ $secure = (strpos($url, $store->getBaseUrl(\Magento\UrlInterface::URL_TYPE_LINK, true)) === 0);
return $unsecure || $secure;
}
}
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
index 1f6eafa82e2b3..a6c511ec72395 100644
--- a/app/code/Magento/Checkout/Helper/Cart.php
+++ b/app/code/Magento/Checkout/Helper/Cart.php
@@ -119,8 +119,8 @@ public function getAddUrl($product, $additional = array())
}
if ($product->hasUrlDataObject()) {
- $routeParams['_store'] = $product->getUrlDataObject()->getStoreId();
- $routeParams['_store_to_url'] = true;
+ $routeParams['_scope'] = $product->getUrlDataObject()->getStoreId();
+ $routeParams['_scope_to_url'] = true;
}
if ($this->_getRequest()->getRouteName() == 'checkout'
diff --git a/app/code/Magento/Checkout/etc/adminhtml/system.xml b/app/code/Magento/Checkout/etc/adminhtml/system.xml
index 9b8adff4ecceb..a7c26534f2838 100644
--- a/app/code/Magento/Checkout/etc/adminhtml/system.xml
+++ b/app/code/Magento/Checkout/etc/adminhtml/system.xml
@@ -62,10 +62,6 @@
Magento\Backend\Model\Config\Source\Yesno
-
-
- Magento\Catalog\Model\Config\Source\Product\Thumbnail
-
Magento\Catalog\Model\Config\Source\Product\Thumbnail
diff --git a/app/code/Magento/Checkout/etc/config.xml b/app/code/Magento/Checkout/etc/config.xml
index 95e76a8fa69d3..39c9bc9ff1c17 100644
--- a/app/code/Magento/Checkout/etc/config.xml
+++ b/app/code/Magento/Checkout/etc/config.xml
@@ -35,7 +35,6 @@
30
1
- itself
parent
diff --git a/app/code/Magento/Checkout/etc/di.xml b/app/code/Magento/Checkout/etc/di.xml
index bcbaa44374a1c..1a1f221654ee0 100644
--- a/app/code/Magento/Checkout/etc/di.xml
+++ b/app/code/Magento/Checkout/etc/di.xml
@@ -26,9 +26,9 @@
-
- Magento\Checkout\Model\Resource\Setup
-
+
+ Magento\Checkout\Model\Resource\Setup
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index dd1ef14930082..70de95507f1a5 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -31,16 +31,16 @@
-
- /checkout/onepage
-
+
+ /checkout/onepage
-
- add
-
+
+ add
diff --git a/app/code/Magento/Checkout/etc/module.xml b/app/code/Magento/Checkout/etc/module.xml
index 13abefbbf374a..9a0762091281d 100755
--- a/app/code/Magento/Checkout/etc/module.xml
+++ b/app/code/Magento/Checkout/etc/module.xml
@@ -28,7 +28,6 @@
-
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_item_renderers.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_item_renderers.xml
new file mode 100644
index 0000000000000..22ad3b4d1a26b
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_item_renderers.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/paypal_express_review_details.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml
similarity index 64%
rename from app/code/Magento/PaypalUk/view/frontend/layout/paypal_express_review_details.xml
rename to app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml
index 00380155449e7..831ddfef5535b 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/paypal_express_review_details.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml
@@ -24,14 +24,10 @@
*/
-->
-
-
+
+
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml
index 8fef618e8628d..c459e890eb70b 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml
@@ -24,10 +24,9 @@
*/
-->
+
-
+
+
+
+
diff --git a/app/code/Magento/Checkout/view/frontend/layout/default.xml b/app/code/Magento/Checkout/view/frontend/layout/default.xml
index 8bf1c13e3c78d..08e85caa94855 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/default.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/default.xml
@@ -24,15 +24,13 @@
*/
-->
+
-
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php
index 97523391c0dc8..70cb64aada152 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php
@@ -47,7 +47,6 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Cms\Model\BlockFactory $blockFactory
* @param \Magento\Cms\Model\Resource\Block\CollectionFactory $collectionFactory
@@ -55,7 +54,6 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Cms\Model\BlockFactory $blockFactory,
\Magento\Cms\Model\Resource\Block\CollectionFactory $collectionFactory,
@@ -63,7 +61,7 @@ public function __construct(
) {
$this->_blockFactory = $blockFactory;
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
index ee173f4ef506b..ecebc9ed2b1cd 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
@@ -52,7 +52,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Theme\Model\Layout\Source\Layout $pageLayout
* @param \Magento\Cms\Model\Page $cmsPage
@@ -61,7 +60,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Theme\Model\Layout\Source\Layout $pageLayout,
\Magento\Cms\Model\Page $cmsPage,
@@ -71,7 +69,7 @@ public function __construct(
$this->_collectionFactory = $collectionFactory;
$this->_cmsPage = $cmsPage;
$this->_pageLayout = $pageLayout;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action.php
index b40e692bb8ae8..e4b638a39e25a 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action.php
@@ -30,18 +30,18 @@ class Action
extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
/**
- * @var \Magento\Core\Model\UrlFactory
+ * @var \Magento\UrlFactory
*/
protected $_urlFactory;
/**
* @param \Magento\Backend\Block\Context $context
- * @param \Magento\Core\Model\UrlFactory $urlFactory
+ * @param \Magento\UrlFactory $urlFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Context $context,
- \Magento\Core\Model\UrlFactory $urlFactory,
+ \Magento\UrlFactory $urlFactory,
array $data = array()
) {
$this->_urlFactory = $urlFactory;
@@ -50,8 +50,8 @@ public function __construct(
public function render(\Magento\Object $row)
{
- /** @var \Magento\Core\Model\Url $urlModel */
- $urlModel = $this->_urlFactory->create()->setStore($row->getData('_first_store_id'));
+ /** @var \Magento\UrlInterface $urlModel */
+ $urlModel = $this->_urlFactory->create()->setScope($row->getData('_first_store_id'));
$href = $urlModel->getUrl(
$row->getIdentifier(), array(
'_current' => false,
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
index ed20e403eed66..b8a094d825a88 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
@@ -57,7 +57,6 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Theme\Model\Layout\Source\Layout $pageLayout
* @param \Magento\Cms\Model\Page $cmsPage
@@ -67,7 +66,6 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Theme\Model\Layout\Source\Layout $pageLayout,
\Magento\Cms\Model\Page $cmsPage,
@@ -79,7 +77,7 @@ public function __construct(
$this->_cmsPage = $cmsPage;
$this->_pageFactory = $pageFactory;
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/Cms/Controller/Router.php b/app/code/Magento/Cms/Controller/Router.php
index 7b5b327bfc801..13bc972725464 100644
--- a/app/code/Magento/Cms/Controller/Router.php
+++ b/app/code/Magento/Cms/Controller/Router.php
@@ -159,7 +159,7 @@ public function match(\Magento\App\RequestInterface $request)
->setActionName('view')
->setParam('page_id', $pageId);
$request->setAlias(
- \Magento\Core\Model\Url\Rewrite::REWRITE_REQUEST_PATH_ALIAS,
+ \Magento\Url::REWRITE_REQUEST_PATH_ALIAS,
$identifier
);
diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
index 6b7116a2fb966..8a7608e9dd62b 100644
--- a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
@@ -132,7 +132,7 @@ public function getStorageRoot()
*/
public function getBaseUrl()
{
- return $this->_storeManager->getStore()->getBaseUrl(\Magento\Core\Model\Store::URL_TYPE_MEDIA);
+ return $this->_storeManager->getStore()->getBaseUrl(\Magento\UrlInterface::URL_TYPE_MEDIA);
}
/**
@@ -198,7 +198,7 @@ public function isUsingStaticUrlsAllowed()
public function getImageHtmlDeclaration($filename, $renderAsTag = false)
{
$fileurl = $this->getCurrentUrl() . $filename;
- $mediaUrl = $this->_storeManager->getStore()->getBaseUrl(\Magento\Core\Model\Store::URL_TYPE_MEDIA);
+ $mediaUrl = $this->_storeManager->getStore()->getBaseUrl(\Magento\UrlInterface::URL_TYPE_MEDIA);
$mediaPath = str_replace($mediaUrl, '', $fileurl);
$directive = sprintf('{{media url="%s"}}', $mediaPath);
if ($renderAsTag) {
@@ -259,7 +259,7 @@ public function getCurrentUrl()
if (!$this->_currentUrl) {
$path = $this->getCurrentPath();
$mediaUrl = $this->_storeManager->getStore($this->_storeId)
- ->getBaseUrl(\Magento\Core\Model\Store::URL_TYPE_MEDIA);
+ ->getBaseUrl(\Magento\UrlInterface::URL_TYPE_MEDIA);
$this->_currentUrl = $mediaUrl . $this->_directory->getRelativePath($path) . '/';
}
return $this->_currentUrl;
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index b023234a70c33..2d4e04230c9df 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -90,12 +90,12 @@ class Config extends \Magento\Object
protected $_windowSize;
/**
- * @var \Magento\Backend\Model\Url
+ * @var \Magento\Backend\Model\UrlInterface
*/
protected $_backendUrl;
/**
- * @param \Magento\Backend\Model\Url $backendUrl
+ * @param \Magento\Backend\Model\UrlInterface $backendUrl
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Cms\Helper\Data $cmsData
* @param \Magento\AuthorizationInterface $authorization
@@ -107,7 +107,7 @@ class Config extends \Magento\Object
* @param array $data
*/
public function __construct(
- \Magento\Backend\Model\Url $backendUrl,
+ \Magento\Backend\Model\UrlInterface $backendUrl,
\Magento\Event\ManagerInterface $eventManager,
\Magento\Cms\Helper\Data $cmsData,
\Magento\AuthorizationInterface $authorization,
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index f8e67392d6769..26a90ca1136c2 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -96,7 +96,7 @@ class Storage extends \Magento\Object
protected $_dirs;
/**
- * @var \Magento\Backend\Model\Url
+ * @var \Magento\Backend\Model\UrlInterface
*/
protected $_backendUrl;
@@ -144,7 +144,7 @@ class Storage extends \Magento\Object
* Construct
*
* @param \Magento\Backend\Model\Session $session
- * @param \Magento\Backend\Model\Url $backendUrl
+ * @param \Magento\Backend\Model\UrlInterface $backendUrl
* @param \Magento\Cms\Helper\Wysiwyg\Images $cmsWysiwygImages
* @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDb
* @param \Magento\App\Filesystem $filesystem
@@ -164,7 +164,7 @@ class Storage extends \Magento\Object
*/
public function __construct(
\Magento\Backend\Model\Session $session,
- \Magento\Backend\Model\Url $backendUrl,
+ \Magento\Backend\Model\UrlInterface $backendUrl,
\Magento\Cms\Helper\Wysiwyg\Images $cmsWysiwygImages,
\Magento\Core\Helper\File\Storage\Database $coreFileStorageDb,
\Magento\App\Filesystem $filesystem,
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index 67651d6802f43..ae12fb9bf3903 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -26,55 +26,61 @@
-
- 600
- 1000
-
+
+ 600 1000
-
- 75
- 100
-
+
+ 75 100
-
-
- 1
- 1
- 1
- 1
-
-
- 1
- 1
- 1
- 1
-
-
- 1
- 1
- 1
- 1
- 1
- 1
-
-
+
+ -
+
+ 1 1 1 1
+
+ -
+
+ 1 1 1 1
+
+ -
+
+ 1 1 1 1 1 1
+
+
-
-
+
+
-
- Magento\Cms\Model\Resource\Setup
-
+
+ Magento\Cms\Model\Resource\Setup
diff --git a/app/code/Magento/Cms/etc/frontend/di.xml b/app/code/Magento/Cms/etc/frontend/di.xml
index 7c27aa5f50ec8..f361f75775f3e 100644
--- a/app/code/Magento/Cms/etc/frontend/di.xml
+++ b/app/code/Magento/Cms/etc/frontend/di.xml
@@ -26,13 +26,15 @@
-
-
- Magento\Cms\Controller\Router
- false
- 60
-
-
+
+ -
+
+ Magento\Cms\Controller\Router false 60
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php
index 8d196edc9bb68..6164f6121fc4a 100644
--- a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php
+++ b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php
@@ -44,20 +44,18 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Connect\Model\Extension\CollectionFactory $collectionFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Connect\Model\Extension\CollectionFactory $collectionFactory,
array $data = array()
) {
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/Contacts/Controller/Index.php b/app/code/Magento/Contacts/Controller/Index.php
index 295af1086e55a..e3fb5dc36f397 100644
--- a/app/code/Magento/Contacts/Controller/Index.php
+++ b/app/code/Magento/Contacts/Controller/Index.php
@@ -65,7 +65,7 @@ public function indexAction()
{
$this->_view->loadLayout();
$this->_view->getLayout()->getBlock('contactForm')
- ->setFormAction($this->_objectManager->create('Magento\Core\Model\Url')->getUrl('*/*/post'));
+ ->setFormAction($this->_objectManager->create('Magento\UrlInterface')->getUrl('*/*/post'));
$this->_view->getLayout()->initMessages();
$this->_view->renderLayout();
diff --git a/app/code/Magento/Contacts/etc/frontend/di.xml b/app/code/Magento/Contacts/etc/frontend/di.xml
index adc9e093fd51e..4047b3ff462e8 100644
--- a/app/code/Magento/Contacts/etc/frontend/di.xml
+++ b/app/code/Magento/Contacts/etc/frontend/di.xml
@@ -26,9 +26,9 @@
-
- /contacts/
-
+
+ /contacts/
diff --git a/app/code/Magento/Core/App/Action/Plugin/Install.php b/app/code/Magento/Core/App/Action/Plugin/Install.php
index 1543e6e1cc8b2..7b6f5c5de7d84 100644
--- a/app/code/Magento/Core/App/Action/Plugin/Install.php
+++ b/app/code/Magento/Core/App/Action/Plugin/Install.php
@@ -39,7 +39,7 @@ class Install
protected $_response;
/**
- * @var \Magento\Core\Model\Url
+ * @var \Magento\UrlInterface
*/
protected $_url;
@@ -51,13 +51,13 @@ class Install
/**
* @param \Magento\App\State $appState
* @param \Magento\App\ResponseInterface $response
- * @param \Magento\Core\Model\Url $url
+ * @param \Magento\UrlInterface $url
* @param \Magento\App\ActionFlag $actionFlag
*/
public function __construct(
\Magento\App\State $appState,
\Magento\App\ResponseInterface $response,
- \Magento\Core\Model\Url $url,
+ \Magento\UrlInterface $url,
\Magento\App\ActionFlag $actionFlag
) {
$this->_appState = $appState;
diff --git a/app/code/Magento/Core/App/Action/Plugin/LastUrl.php b/app/code/Magento/Core/App/Action/Plugin/LastUrl.php
index b841b3306ac08..c00533cb5477b 100644
--- a/app/code/Magento/Core/App/Action/Plugin/LastUrl.php
+++ b/app/code/Magento/Core/App/Action/Plugin/LastUrl.php
@@ -40,7 +40,7 @@ class LastUrl
protected $_session;
/**
- * @var \Magento\Core\Model\Url
+ * @var \Magento\UrlInterface
*/
protected $_url;
@@ -53,9 +53,9 @@ class LastUrl
/**
* @param \Magento\Core\Model\Session $session
- * @param \Magento\Core\Model\Url $url
+ * @param \Magento\UrlInterface $url
*/
- public function __construct(\Magento\Core\Model\Session $session, \Magento\Core\Model\Url $url)
+ public function __construct(\Magento\Core\Model\Session $session, \Magento\UrlInterface $url)
{
$this->_session = $session;
$this->_url = $url;
diff --git a/app/code/Magento/Core/App/Action/Plugin/Session.php b/app/code/Magento/Core/App/Action/Plugin/Session.php
index 62db5b00fb73e..e234583655f1f 100644
--- a/app/code/Magento/Core/App/Action/Plugin/Session.php
+++ b/app/code/Magento/Core/App/Action/Plugin/Session.php
@@ -47,7 +47,7 @@ class Session
protected $_cookieCheckActions;
/**
- * @var \Magento\Core\Model\Url
+ * @var \Magento\UrlInterface
*/
protected $_url;
@@ -76,7 +76,7 @@ class Session
* @param \Magento\App\ResponseInterface $response
* @param \Magento\Core\Model\Session $session
* @param \Magento\Stdlib\Cookie $cookie
- * @param \Magento\Core\Model\Url $url
+ * @param \Magento\UrlInterface $url
* @param \Magento\Core\Model\Store\Config $storeConfig
* @param \Magento\Session\SidResolverInterface $sidResolver
* @param string $sessionNamespace
@@ -87,7 +87,7 @@ public function __construct(
\Magento\App\ResponseInterface $response,
\Magento\Core\Model\Session $session,
\Magento\Stdlib\Cookie $cookie,
- \Magento\Core\Model\Url $url,
+ \Magento\UrlInterface $url,
\Magento\Core\Model\Store\Config $storeConfig,
\Magento\Session\SidResolverInterface $sidResolver,
$sessionNamespace = '',
diff --git a/app/code/Magento/Core/App/FrontController/Plugin/RequestPreprocessor.php b/app/code/Magento/Core/App/FrontController/Plugin/RequestPreprocessor.php
index 47a9c24e59cff..8ac6239e9a469 100644
--- a/app/code/Magento/Core/App/FrontController/Plugin/RequestPreprocessor.php
+++ b/app/code/Magento/Core/App/FrontController/Plugin/RequestPreprocessor.php
@@ -36,7 +36,7 @@ class RequestPreprocessor
protected $_responseFactory;
/**
- * @var \Magento\Core\Model\Url
+ * @var \Magento\UrlInterface
*/
protected $_url;
@@ -53,14 +53,14 @@ class RequestPreprocessor
/**
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\App\State $appState
- * @param \Magento\Core\Model\Url $url
+ * @param \Magento\UrlInterface $url
* @param \Magento\Core\Model\Store\Config $storeConfig
* @param \Magento\App\ResponseFactory $responseFactory
*/
public function __construct(
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\App\State $appState,
- \Magento\Core\Model\Url $url,
+ \Magento\UrlInterface $url,
\Magento\Core\Model\Store\Config $storeConfig,
\Magento\App\ResponseFactory $responseFactory
) {
@@ -84,7 +84,7 @@ public function aroundDispatch(array $arguments, \Magento\Code\Plugin\Invocation
$request = $arguments[0];
if ($this->_appState->isInstalled() && !$request->isPost() && $this->_isBaseUrlCheckEnabled()) {
$baseUrl = $this->_storeManager->getStore()->getBaseUrl(
- \Magento\Core\Model\Store::URL_TYPE_WEB,
+ \Magento\UrlInterface::URL_TYPE_WEB,
$this->_storeManager->getStore()->isCurrentlySecure()
);
if ($baseUrl) {
diff --git a/app/code/Magento/Core/App/Media.php b/app/code/Magento/Core/App/Media.php
index ca7b14d16c0ea..53d1958344aeb 100644
--- a/app/code/Magento/Core/App/Media.php
+++ b/app/code/Magento/Core/App/Media.php
@@ -26,12 +26,12 @@
namespace Magento\Core\App;
use Magento\App\State,
- Magento\AppInterface,
+ Magento\LauncherInterface,
Magento\ObjectManager,
Magento\Core\Model\File\Storage\Request,
Magento\Core\Model\File\Storage\Response;
-class Media implements AppInterface
+class Media implements LauncherInterface
{
/**
* @var \Magento\App\State
@@ -140,7 +140,7 @@ public function __construct(
*
* @return \Magento\App\ResponseInterface
*/
- public function execute()
+ public function launch()
{
try {
if (!$this->_applicationState->isInstalled()) {
diff --git a/app/code/Magento/Core/App/Request/RewriteService.php b/app/code/Magento/Core/App/Request/RewriteService.php
index 5706ad56ce3e7..2f8d98d36dac4 100644
--- a/app/code/Magento/Core/App/Request/RewriteService.php
+++ b/app/code/Magento/Core/App/Request/RewriteService.php
@@ -31,7 +31,7 @@ class RewriteService
protected $_rewriteFactory;
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -43,7 +43,7 @@ class RewriteService
public function __construct(
\Magento\App\RouterList $routerList,
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
- \Magento\Core\Model\Config $config
+ \Magento\App\ConfigInterface $config
) {
$this->_rewriteFactory = $rewriteFactory;
$this->_config = $config;
diff --git a/app/code/Magento/Core/App/Response/Redirect.php b/app/code/Magento/Core/App/Response/Redirect.php
index 14dae4a9478cb..ea4d99d313231 100644
--- a/app/code/Magento/Core/App/Response/Redirect.php
+++ b/app/code/Magento/Core/App/Response/Redirect.php
@@ -58,7 +58,7 @@ class Redirect implements \Magento\App\Response\RedirectInterface
protected $_canUseSessionIdInParam;
/**
- * @var \Magento\Core\Model\Url
+ * @var \Magento\UrlInterface
*/
protected $_urlBuilder;
@@ -68,7 +68,7 @@ class Redirect implements \Magento\App\Response\RedirectInterface
* @param \Magento\Encryption\UrlCoder $urlCoder
* @param \Magento\Session\SessionManagerInterface $session
* @param \Magento\Session\SidResolverInterface $sidResolver
- * @param \Magento\Core\Model\Url $urlBuilder
+ * @param \Magento\UrlInterface $urlBuilder
* @param bool $canUseSessionIdInParam
*/
public function __construct(
@@ -77,7 +77,7 @@ public function __construct(
\Magento\Encryption\UrlCoder $urlCoder,
\Magento\Session\SessionManagerInterface $session,
\Magento\Session\SidResolverInterface $sidResolver,
- \Magento\Core\Model\Url $urlBuilder,
+ \Magento\UrlInterface $urlBuilder,
$canUseSessionIdInParam = true
) {
$this->_canUseSessionIdInParam = $canUseSessionIdInParam;
@@ -209,7 +209,7 @@ protected function _isUrlInternal($url)
$unsecure = (strpos($url, $this->_storeManager->getStore()->getBaseUrl()) === 0);
$secure = strpos(
$url,
- $this->_storeManager->getStore()->getBaseUrl(\Magento\Core\Model\Store::URL_TYPE_LINK, true)
+ $this->_storeManager->getStore()->getBaseUrl(\Magento\UrlInterface::URL_TYPE_LINK, true)
) === 0;
return $unsecure || $secure;
}
diff --git a/app/code/Magento/Core/App/Router/Base.php b/app/code/Magento/Core/App/Router/Base.php
index 30784a1c84a2b..fc22783c3702f 100644
--- a/app/code/Magento/Core/App/Router/Base.php
+++ b/app/code/Magento/Core/App/Router/Base.php
@@ -56,7 +56,7 @@ class Base extends \Magento\App\Router\AbstractRouter
/**
* Url security information.
*
- * @var \Magento\Core\Model\Url\SecurityInfoInterface
+ * @var \Magento\Url\SecurityInfoInterface
*/
protected $_urlSecurityInfo;
@@ -67,13 +67,6 @@ class Base extends \Magento\App\Router\AbstractRouter
*/
protected $_storeConfig;
- /**
- * Core config
- *
- * @var \Magento\Core\Model\Config
- */
- protected $_config = null;
-
/**
* @var \Magento\UrlInterface
*/
@@ -108,7 +101,7 @@ class Base extends \Magento\App\Router\AbstractRouter
* @param \Magento\Core\Model\Url|\Magento\UrlInterface $url
* @param \Magento\Core\Model\StoreManagerInterface|\Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\Model\Store\Config $storeConfig
- * @param \Magento\Core\Model\Url\SecurityInfoInterface $urlSecurityInfo
+ * @param \Magento\Url\SecurityInfoInterface $urlSecurityInfo
* @param $routerId
* @throws \InvalidArgumentException
*/
@@ -121,7 +114,7 @@ public function __construct(
\Magento\UrlInterface $url,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Core\Model\Store\Config $storeConfig,
- \Magento\Core\Model\Url\SecurityInfoInterface $urlSecurityInfo,
+ \Magento\Url\SecurityInfoInterface $urlSecurityInfo,
$routerId
) {
parent::__construct($actionFactory);
@@ -188,7 +181,7 @@ protected function _matchModuleFrontName(\Magento\App\RequestInterface $request,
$moduleFrontName = $param;
} else {
$moduleFrontName = $this->_defaultPath->getPart('module');
- $request->setAlias(\Magento\Core\Model\Url\Rewrite::REWRITE_REQUEST_PATH_ALIAS, '');
+ $request->setAlias(\Magento\Url::REWRITE_REQUEST_PATH_ALIAS, '');
}
if (!$moduleFrontName) {
return null;
@@ -212,7 +205,7 @@ protected function _matchControllerName(\Magento\App\RequestInterface $request,
} else {
$controller = $this->_defaultPath->getPart('controller');
$request->setAlias(
- \Magento\Core\Model\Url\Rewrite::REWRITE_REQUEST_PATH_ALIAS,
+ \Magento\Url::REWRITE_REQUEST_PATH_ALIAS,
ltrim($request->getOriginalPathInfo(), '/')
);
}
@@ -412,7 +405,7 @@ protected function _shouldRedirectToSecure()
*/
protected function _getCurrentSecureUrl($request)
{
- $alias = $request->getAlias(\Magento\Core\Model\Url\Rewrite::REWRITE_REQUEST_PATH_ALIAS);
+ $alias = $request->getAlias(\Magento\Url::REWRITE_REQUEST_PATH_ALIAS);
if ($alias) {
return $this->_storeManager->getStore()->getBaseUrl('link', true) . ltrim($alias, '/');
}
diff --git a/app/code/Magento/Core/App/Router/NoRouteHandler.php b/app/code/Magento/Core/App/Router/NoRouteHandler.php
index 957be8213feca..e5b95a9a1aed2 100644
--- a/app/code/Magento/Core/App/Router/NoRouteHandler.php
+++ b/app/code/Magento/Core/App/Router/NoRouteHandler.php
@@ -29,14 +29,14 @@
class NoRouteHandler implements \Magento\App\Router\NoRouteHandlerInterface
{
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
/**
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
*/
- public function __construct(\Magento\Core\Model\Config $config)
+ public function __construct(\Magento\App\ConfigInterface $config)
{
$this->_config = $config;
}
diff --git a/app/code/Magento/Core/Helper/Data.php b/app/code/Magento/Core/Helper/Data.php
index af408e81b2666..b4ed7ae65a05f 100644
--- a/app/code/Magento/Core/Helper/Data.php
+++ b/app/code/Magento/Core/Helper/Data.php
@@ -133,7 +133,7 @@ public function currencyByStore($value, $store = null, $format = true, $includeC
{
try {
if (!($store instanceof \Magento\Core\Model\Store)) {
- $store = $this->_app->getStore($store);
+ $store = $this->_storeManager->getStore($store);
}
$value = $store->convertPrice($value, $format, $includeContainer);
diff --git a/app/code/Magento/Core/Helper/File/Storage.php b/app/code/Magento/Core/Helper/File/Storage.php
index 4cb961020464b..8fab67b1abf48 100644
--- a/app/code/Magento/Core/Helper/File/Storage.php
+++ b/app/code/Magento/Core/Helper/File/Storage.php
@@ -71,7 +71,7 @@ class Storage extends \Magento\App\Helper\AbstractHelper
protected $_filesystemStorage;
/**
- * @var \Magento\Core\Model\ConfigInterface
+ * @var \Magento\App\ConfigInterface
*/
protected $config;
@@ -80,14 +80,14 @@ class Storage extends \Magento\App\Helper\AbstractHelper
* @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDb
* @param \Magento\Core\Model\File\Storage $storage
* @param \Magento\Core\Model\File\Storage\File $filesystemStorage
- * @param \Magento\Core\Model\ConfigInterface $config
+ * @param \Magento\App\ConfigInterface $config
*/
public function __construct(
\Magento\App\Helper\Context $context,
\Magento\Core\Helper\File\Storage\Database $coreFileStorageDb,
\Magento\Core\Model\File\Storage $storage,
\Magento\Core\Model\File\Storage\File $filesystemStorage,
- \Magento\Core\Model\ConfigInterface $config
+ \Magento\App\ConfigInterface $config
) {
$this->_filesystemStorage = $filesystemStorage;
$this->_coreFileStorageDb = $coreFileStorageDb;
diff --git a/app/code/Magento/Core/Helper/File/Storage/Database.php b/app/code/Magento/Core/Helper/File/Storage/Database.php
index f66897ce72e07..78614853d751b 100644
--- a/app/code/Magento/Core/Helper/File/Storage/Database.php
+++ b/app/code/Magento/Core/Helper/File/Storage/Database.php
@@ -77,7 +77,7 @@ class Database extends \Magento\App\Helper\AbstractHelper
protected $_fileStorage;
/**
- * @var \Magento\Core\Model\ConfigInterface
+ * @var \Magento\App\ConfigInterface
*/
protected $config;
@@ -86,14 +86,14 @@ class Database extends \Magento\App\Helper\AbstractHelper
* @param \Magento\Core\Model\File\Storage\DatabaseFactory $dbStorageFactory
* @param \Magento\Core\Model\File\Storage\File $fileStorage
* @param \Magento\App\Filesystem $filesystem
- * @param \Magento\Core\Model\ConfigInterface $config
+ * @param \Magento\App\ConfigInterface $config
*/
public function __construct(
\Magento\App\Helper\Context $context,
\Magento\Core\Model\File\Storage\DatabaseFactory $dbStorageFactory,
\Magento\Core\Model\File\Storage\File $fileStorage,
\Magento\App\Filesystem $filesystem,
- \Magento\Core\Model\ConfigInterface $config
+ \Magento\App\ConfigInterface $config
) {
$this->_filesystem = $filesystem;
$this->_dbStorageFactory = $dbStorageFactory;
diff --git a/app/code/Magento/Core/Model/App.php b/app/code/Magento/Core/Model/App.php
index a3c9e3174cf33..dcac8a85672c3 100644
--- a/app/code/Magento/Core/Model/App.php
+++ b/app/code/Magento/Core/Model/App.php
@@ -33,7 +33,7 @@
use Magento\App\CacheInterface;
-class App implements \Magento\Core\Model\AppInterface
+class App implements \Magento\AppInterface
{
/**#@+
* Product edition labels
@@ -53,7 +53,7 @@ class App implements \Magento\Core\Model\AppInterface
/**
* Magento version
*/
- const VERSION = '2.0.0.0-dev62';
+ const VERSION = '2.0.0.0-dev63';
/**
@@ -77,9 +77,9 @@ class App implements \Magento\Core\Model\AppInterface
const PARAM_ALLOWED_MODULES = 'allowed_modules';
/**
- * Caching params
+ * Caching params, that applied for all cache frontends regardless of type
*/
- const PARAM_CACHE_OPTIONS = 'cache_options';
+ const PARAM_CACHE_FORCED_OPTIONS = 'cache_options';
/**
* Application loaded areas array
@@ -98,7 +98,7 @@ class App implements \Magento\Core\Model\AppInterface
/**
* Application configuration object
*
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -137,21 +137,6 @@ class App implements \Magento\Core\Model\AppInterface
*/
protected $_response;
- /**
- * Use session in URL flag
- *
- * @see \Magento\Core\Model\Url
- * @var bool
- */
- protected $_useSessionInUrl = true;
-
- /**
- * Use session var instead of SID for session in URL
- *
- * @var bool
- */
- protected $_useSessionVar = false;
-
/**
* Object manager
*
@@ -166,13 +151,6 @@ class App implements \Magento\Core\Model\AppInterface
*/
protected $_dbUpdater;
- /**
- * Store list manager
- *
- * @var \Magento\Core\Model\StoreManagerInterface
- */
- protected $_storeManager;
-
/**
* @var \Magento\App\State
*/
@@ -189,20 +167,18 @@ class App implements \Magento\Core\Model\AppInterface
protected $_configScope;
/**
- * @param Config $config
- * @param CacheInterface $cache
+ * @param \Magento\App\ConfigInterface $config
+ * @param \Magento\App\CacheInterface $cache
* @param \Magento\ObjectManager $objectManager
- * @param StoreManagerInterface $storeManager
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\App\State $appState
* @param \Magento\Config\Scope $configScope
* @param \Magento\App\FrontControllerInterface $frontController
*/
public function __construct(
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\App\CacheInterface $cache,
\Magento\ObjectManager $objectManager,
- \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Event\ManagerInterface $eventManager,
\Magento\App\State $appState,
\Magento\Config\Scope $configScope,
@@ -211,7 +187,6 @@ public function __construct(
$this->_config = $config;
$this->_cache = $cache;
$this->_objectManager = $objectManager;
- $this->_storeManager = $storeManager;
$this->_appState = $appState;
$this->_eventManager = $eventManager;
$this->_configScope = $configScope;
@@ -328,7 +303,7 @@ public function getBaseCurrencyCode()
/**
* Retrieve configuration object
*
- * @return \Magento\Core\Model\Config
+ * @return \Magento\App\ConfigInterface
*/
public function getConfig()
{
@@ -484,50 +459,6 @@ public function setResponse(\Magento\App\ResponseInterface $response)
return $this;
}
- /**
- * Set use session var instead of SID for URL
- *
- * @param bool $var
- * @return \Magento\Core\Model\App
- */
- public function setUseSessionVar($var)
- {
- $this->_useSessionVar = (bool)$var;
- return $this;
- }
-
- /**
- * Retrieve use flag session var instead of SID for URL
- *
- * @return bool
- */
- public function getUseSessionVar()
- {
- return $this->_useSessionVar;
- }
-
- /**
- * Set Use session in URL flag
- *
- * @param bool $flag
- * @return \Magento\Core\Model\App
- */
- public function setUseSessionInUrl($flag = true)
- {
- $this->_useSessionInUrl = (bool)$flag;
- return $this;
- }
-
- /**
- * Retrieve use session in URL flag
- *
- * @return bool
- */
- public function getUseSessionInUrl()
- {
- return $this->_useSessionInUrl;
- }
-
/**
* Check if developer mode is enabled
*
@@ -538,222 +469,6 @@ public function isDeveloperMode()
return $this->_appState->getMode() == \Magento\App\State::MODE_DEVELOPER;
}
- /**
- * Retrieve application store object without Store_Exception
- *
- * @param string|int|\Magento\Core\Model\Store $storeId
- * @return \Magento\Core\Model\Store
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::getSafeStore()
- */
- public function getSafeStore($storeId = null)
- {
- return $this->_storeManager->getSafeStore($storeId);
- }
-
- /**
- * Allow or disallow single store mode
- *
- * @param bool $value
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::setIsSingleStoreModeAllowed()
- */
- public function setIsSingleStoreModeAllowed($value)
- {
- $this->_storeManager->setIsSingleStoreModeAllowed($value);
- }
-
- /**
- * Check if store has only one store view
- *
- * @return bool
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::hasSingleStore()
- */
- public function hasSingleStore()
- {
- return $this->_storeManager->hasSingleStore();
- }
-
- /**
- * Check if system is run in the single store mode
- *
- * @return bool
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::isSingleStoreMode()
- */
- public function isSingleStoreMode()
- {
- return $this->_storeManager->isSingleStoreMode();
- }
-
- /**
- * @throws \Magento\Core\Model\Store\Exception
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::throwStoreException()
- */
- public function throwStoreException()
- {
- $this->_storeManager->throwStoreException();
- }
-
- /**
- * Retrieve application store object
- *
- * @param null|string|bool|int|\Magento\Core\Model\Store $storeId
- * @return \Magento\Core\Model\Store
- * @throws \Magento\Core\Model\Store\Exception
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::getStore()
- */
- public function getStore($storeId = null)
- {
- return $this->_storeManager->getStore($storeId);
- }
-
- /**
- * Retrieve stores array
- *
- * @param bool $withDefault
- * @param bool $codeKey
- * @return \Magento\Core\Model\Store[]
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::getStores()
- */
- public function getStores($withDefault = false, $codeKey = false)
- {
- return $this->_storeManager->getStores($withDefault, $codeKey);
- }
-
- /**
- * Retrieve application website object
- *
- * @param null|bool|int|string|\Magento\Core\Model\Website $websiteId
- * @return \Magento\Core\Model\Website
- * @throws \Magento\Core\Exception
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::getWebsite()
- */
- public function getWebsite($websiteId = null)
- {
- return $this->_storeManager->getWebsite($websiteId);
- }
-
- /**
- * Get loaded websites
- *
- * @param bool $withDefault
- * @param bool|string $codeKey
- * @return \Magento\Core\Model\Website[]
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::getWebsites()
- */
- public function getWebsites($withDefault = false, $codeKey = false)
- {
- return $this->_storeManager->getWebsites($withDefault, $codeKey);
- }
-
- /**
- * Reinitialize store list
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::reinitStores()
- */
- public function reinitStores()
- {
- $this->_storeManager->reinitStores();
- }
-
- /**
- * Set current default store
- *
- * @param string $store
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::setCurrentStore()
- */
- public function setCurrentStore($store)
- {
- $this->_storeManager->setCurrentStore($store);
- }
-
- /**
- * Get current store code
- *
- * @return string
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::getCurrentStore()
- */
- public function getCurrentStore()
- {
- return $this->_storeManager->getCurrentStore();
- }
-
-
- /**
- * Retrieve default store for default group and website
- *
- * @return \Magento\Core\Model\Store
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::getDefaultStoreView()
- */
- public function getDefaultStoreView()
- {
- return $this->_storeManager->getDefaultStoreView();
- }
-
- /**
- * Retrieve application store group object
- *
- * @param null|\Magento\Core\Model\Store\Group|string $groupId
- * @return \Magento\Core\Model\Store\Group
- * @throws \Magento\Core\Exception
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::getGroup()
- */
- public function getGroup($groupId = null)
- {
- return $this->_storeManager->getGroup($groupId);
- }
-
- /**
- * Prepare array of store groups
- * can be filtered to contain default store group or not by $withDefault flag
- * depending on flag $codeKey array keys can be group id or group code
- *
- * @param bool $withDefault
- * @param bool $codeKey
- * @return \Magento\Core\Model\Store\Group[]
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::getGroups()
- */
- public function getGroups($withDefault = false, $codeKey = false)
- {
- return $this->_storeManager->getGroups($withDefault, $codeKey);
- }
-
- /**
- * Unset website by id from app cache
- *
- * @param null|bool|int|string|\Magento\Core\Model\Website $websiteId
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::clearWebsiteCache()
- */
- public function clearWebsiteCache($websiteId = null)
- {
- $this->_storeManager->clearWebsiteCache($websiteId);
- }
-
- /**
- * Get either default or any store view
- *
- * @return \Magento\Core\Model\Store|null
- *
- * @deprecated use \Magento\Core\Model\StoreManagerInterface::getAnyStoreView()
- */
- public function getAnyStoreView()
- {
- return $this->_storeManager->getAnyStoreView();
- }
-
/**
* Get current Magento edition
*
@@ -775,7 +490,6 @@ public function setEdition($edition)
$this->_currentEdition = $edition;
}
-
/**
* Gets the current Magento version string
* @link http://www.magentocommerce.com/blog/new-community-edition-release-process/
@@ -804,7 +518,7 @@ public function getVersionInfo()
'revision' => '0',
'patch' => '0',
'stability' => 'dev',
- 'number' => '62',
+ 'number' => '63',
);
}
}
diff --git a/app/code/Magento/Core/Model/App/Area.php b/app/code/Magento/Core/Model/App/Area.php
index 4cfde19f9d973..f27ab68343562 100644
--- a/app/code/Magento/Core/Model/App/Area.php
+++ b/app/code/Magento/Core/Model/App/Area.php
@@ -77,7 +77,7 @@ class Area
/**
* Application config
*
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -122,7 +122,7 @@ class Area
* @param \Magento\Logger $logger
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Core\Model\Translate $translator
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\ObjectManager $objectManager
* @param \Magento\App\ObjectManager\ConfigLoader $diConfigLoader
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
@@ -134,7 +134,7 @@ public function __construct(
\Magento\Logger $logger,
\Magento\Event\ManagerInterface $eventManager,
\Magento\Core\Model\Translate $translator,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\ObjectManager $objectManager,
\Magento\App\ObjectManager\ConfigLoader $diConfigLoader,
\Magento\Core\Model\Store\Config $coreStoreConfig,
diff --git a/app/code/Magento/Core/Model/AppInterface.php b/app/code/Magento/Core/Model/AppInterface.php
deleted file mode 100644
index 79ff846d4f72c..0000000000000
--- a/app/code/Magento/Core/Model/AppInterface.php
+++ /dev/null
@@ -1,256 +0,0 @@
-_sectionPool->clean();
+ return (bool)$this->getValue($path, $scope, $scopeCode);
}
}
diff --git a/app/code/Magento/Core/Model/Config/Cache.php b/app/code/Magento/Core/Model/Config/Cache.php
index d194f8fff27f8..e93addc966aa3 100644
--- a/app/code/Magento/Core/Model/Config/Cache.php
+++ b/app/code/Magento/Core/Model/Config/Cache.php
@@ -92,7 +92,7 @@ public function getCacheLifeTime()
}
/**
- * @return \Magento\Core\Model\ConfigInterface|bool
+ * @return \Magento\App\ConfigInterface|bool
*/
public function load()
{
diff --git a/app/code/Magento/Core/Model/Config/FileResolver.php b/app/code/Magento/Core/Model/Config/FileResolver.php
index 5b9e320adb6dc..f2568be5d4186 100644
--- a/app/code/Magento/Core/Model/Config/FileResolver.php
+++ b/app/code/Magento/Core/Model/Config/FileResolver.php
@@ -35,6 +35,8 @@ class FileResolver implements \Magento\Config\FileResolverInterface
protected $_moduleReader;
/**
+ * File iterator factory
+ *
* @var \Magento\Config\FileIteratorFactory
*/
protected $iteratorFactory;
diff --git a/app/code/Magento/Core/Model/Config/Value.php b/app/code/Magento/Core/Model/Config/Value.php
index a0c247c7457ec..064a131e59547 100644
--- a/app/code/Magento/Core/Model/Config/Value.php
+++ b/app/code/Magento/Core/Model/Config/Value.php
@@ -32,19 +32,18 @@
* @method \Magento\Core\Model\Resource\Config\Data _getResource()
* @method \Magento\Core\Model\Resource\Config\Data getResource()
* @method string getScope()
- * @method \Magento\Core\Model\Config\Value setScope(string $value)
+ * @method \Magento\App\Config\ValueInterface setScope(string $value)
* @method int getScopeId()
- * @method \Magento\Core\Model\Config\Value setScopeId(int $value)
+ * @method \Magento\App\Config\ValueInterface setScopeId(int $value)
* @method string getPath()
- * @method \Magento\Core\Model\Config\Value setPath(string $value)
+ * @method \Magento\App\Config\ValueInterface setPath(string $value)
* @method string getValue()
- * @method \Magento\Core\Model\Config\Value setValue(string $value)
+ * @method \Magento\App\Config\ValueInterface setValue(string $value)
*
* @SuppressWarnings(PHPMD.NumberOfChildren)
*/
-class Value extends \Magento\Core\Model\AbstractModel
+class Value extends \Magento\Core\Model\AbstractModel implements \Magento\App\Config\ValueInterface
{
- const ENTITY = 'core_config_data';
/**
* Prefix of model events names
*
@@ -67,7 +66,7 @@ class Value extends \Magento\Core\Model\AbstractModel
protected $_storeManager;
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -75,7 +74,7 @@ class Value extends \Magento\Core\Model\AbstractModel
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\ConfigInterface $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
* @param array $data
@@ -84,7 +83,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\ConfigInterface $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
diff --git a/app/code/Magento/Core/Model/Config/ValueFactory.php b/app/code/Magento/Core/Model/Config/ValueFactory.php
new file mode 100644
index 0000000000000..9ea40ed8826c2
--- /dev/null
+++ b/app/code/Magento/Core/Model/Config/ValueFactory.php
@@ -0,0 +1,75 @@
+_objectManager = $objectManager;
+ $this->_instanceName = $instanceName;
+ }
+
+ /**
+ * Create class instance with specified parameters
+ *
+ * @param array $data
+ * @return \Magento\App\Config\ValueInterface
+ * @throws \InvalidArgumentException
+ */
+ public function create(array $data = array())
+ {
+ $model = $this->_objectManager->create($this->_instanceName, $data);
+ if (!$model instanceof \Magento\App\Config\ValueInterface) {
+ throw new \InvalidArgumentException('Invalid config field model: ' . $this->_instanceName);
+ }
+ return $model;
+ }
+}
diff --git a/app/code/Magento/Core/Model/Design/Backend/Exceptions.php b/app/code/Magento/Core/Model/Design/Backend/Exceptions.php
index 7259eeb041a6e..492d8d3ea714a 100644
--- a/app/code/Magento/Core/Model/Design/Backend/Exceptions.php
+++ b/app/code/Magento/Core/Model/Design/Backend/Exceptions.php
@@ -39,7 +39,7 @@ class Exceptions extends \Magento\Backend\Model\Config\Backend\Serialized\ArrayS
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\View\DesignInterface $design
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -49,7 +49,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\View\DesignInterface $design,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Core/Model/Design/Backend/Theme.php b/app/code/Magento/Core/Model/Design/Backend/Theme.php
index c45ef0e59665b..f94fe88bc44c0 100644
--- a/app/code/Magento/Core/Model/Design/Backend/Theme.php
+++ b/app/code/Magento/Core/Model/Design/Backend/Theme.php
@@ -39,7 +39,7 @@ class Theme extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\View\DesignInterface $design
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -49,7 +49,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\View\DesignInterface $design,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Core/Model/File/Storage.php b/app/code/Magento/Core/Model/File/Storage.php
index dc48841f18243..d0bed5f415505 100644
--- a/app/code/Magento/Core/Model/File/Storage.php
+++ b/app/code/Magento/Core/Model/File/Storage.php
@@ -70,7 +70,7 @@ class Storage extends \Magento\Core\Model\AbstractModel
protected $_coreStoreConfig;
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_coreConfig;
@@ -105,7 +105,7 @@ class Storage extends \Magento\Core\Model\AbstractModel
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Helper\File\Storage $coreFileStorage
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param \Magento\Core\Model\File\Storage\Flag $fileFlag
* @param \Magento\Core\Model\File\Storage\FileFactory $fileFactory
* @param \Magento\Core\Model\File\Storage\DatabaseFactory $databaseFactory
@@ -119,7 +119,7 @@ public function __construct(
\Magento\Core\Model\Registry $registry,
\Magento\Core\Helper\File\Storage $coreFileStorage,
\Magento\Core\Model\Store\Config $coreStoreConfig,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\Core\Model\File\Storage\Flag $fileFlag,
\Magento\Core\Model\File\Storage\FileFactory $fileFactory,
\Magento\Core\Model\File\Storage\DatabaseFactory $databaseFactory,
diff --git a/app/code/Magento/Core/Model/Image/Adapter/Config.php b/app/code/Magento/Core/Model/Image/Adapter/Config.php
index c3cf2c90ce5d9..b19d4d696a096 100644
--- a/app/code/Magento/Core/Model/Image/Adapter/Config.php
+++ b/app/code/Magento/Core/Model/Image/Adapter/Config.php
@@ -29,14 +29,14 @@ class Config implements \Magento\Image\Adapter\ConfigInterface
const XML_PATH_IMAGE_ADAPTERS = 'dev/image/adapters';
/**
- * @var \Magento\Core\Model\ConfigInterface
+ * @var \Magento\App\ConfigInterface
*/
protected $config;
/**
- * @param \Magento\Core\Model\ConfigInterface $config
+ * @param \Magento\App\ConfigInterface $config
*/
- public function __construct(\Magento\Core\Model\ConfigInterface $config)
+ public function __construct(\Magento\App\ConfigInterface $config)
{
$this->config = $config;
}
diff --git a/app/code/Magento/Core/Model/Layout.php b/app/code/Magento/Core/Model/Layout.php
index 2245462cc8660..92a3f5559376e 100644
--- a/app/code/Magento/Core/Model/Layout.php
+++ b/app/code/Magento/Core/Model/Layout.php
@@ -1569,7 +1569,7 @@ public function executeRenderer($namespace, $staticType, $dynamicType, $data = a
->setTemplate($options['template'])
->assign($data);
- echo $block->toHtml();
+ echo $this->_renderBlock($block->getNameInLayout());
}
}
@@ -1613,14 +1613,4 @@ public function isCacheable()
{
return !(boolean)count($this->_xml->xpath('//' . Element::TYPE_BLOCK . '[@cacheable="false"]'));
}
-
- /**
- * Check is current layout private
- *
- * @return bool
- */
- public function isPrivate()
- {
- return !(boolean)count($this->_xml->xpath('//' . Element::TYPE_BLOCK . '[@cache-control="private"]'));
- }
}
diff --git a/app/code/Magento/Core/Model/Layout/Merge.php b/app/code/Magento/Core/Model/Layout/Merge.php
index 71fa12c710282..8a2288d086ff8 100644
--- a/app/code/Magento/Core/Model/Layout/Merge.php
+++ b/app/code/Magento/Core/Model/Layout/Merge.php
@@ -494,7 +494,7 @@ protected function _substitutePlaceholders($xmlString)
if ($this->_subst === null) {
$placeholders = array(
'baseUrl' => $this->_store->getBaseUrl(),
- 'baseSecureUrl' => $this->_store->getBaseUrl(\Magento\Core\Model\Store::URL_TYPE_LINK, true),
+ 'baseSecureUrl' => $this->_store->getBaseUrl(\Magento\UrlInterface::URL_TYPE_LINK, true),
);
$this->_subst = array();
foreach ($placeholders as $key => $value) {
diff --git a/app/code/Magento/Core/Model/Module/Output/Config.php b/app/code/Magento/Core/Model/Module/Output/Config.php
index ff07c360caa28..84e7aec65593f 100644
--- a/app/code/Magento/Core/Model/Module/Output/Config.php
+++ b/app/code/Magento/Core/Model/Module/Output/Config.php
@@ -51,13 +51,13 @@ public function __construct(\Magento\Core\Model\Store\ConfigInterface $storeConf
*/
public function isEnabled($moduleName)
{
- return $this->getFlag(sprintf(self::XML_PATH_MODULE_OUTPUT_STATUS, $moduleName));
+ return $this->isSetFlag(sprintf(self::XML_PATH_MODULE_OUTPUT_STATUS, $moduleName));
}
/**
* @inheritdoc
*/
- public function getFlag($path)
+ public function isSetFlag($path)
{
return $this->_storeConfig->getConfigFlag($path);
}
diff --git a/app/code/Magento/Core/Model/Mview/View/State.php b/app/code/Magento/Core/Model/Mview/View/State.php
new file mode 100644
index 0000000000000..30fdf76b67d40
--- /dev/null
+++ b/app/code/Magento/Core/Model/Mview/View/State.php
@@ -0,0 +1,191 @@
+load($viewId, 'view_id');
+ if (!$this->getId()) {
+ $this->setViewId($viewId);
+ }
+ }
+
+ /**
+ * Processing object before save data
+ *
+ * @return \Magento\Core\Model\Mview\View\State
+ */
+ protected function _beforeSave()
+ {
+ $this->setUpdated(time());
+ return parent::_beforeSave();
+ }
+
+ /**
+ * Get state view ID
+ *
+ * @return string
+ */
+ public function getViewId()
+ {
+ return $this->getData('view_id');
+ }
+
+ /**
+ * Get state mode
+ *
+ * @return string
+ */
+ public function getMode()
+ {
+ return $this->getData('mode');
+ }
+
+ /**
+ * Set state mode
+ *
+ * @param string $mode
+ * @return \Magento\Mview\View\StateInterface
+ */
+ public function setMode($mode)
+ {
+ $this->setData('mode', $mode);
+ return $this;
+ }
+
+ /**
+ * Get state status
+ *
+ * @return string
+ */
+ public function getStatus()
+ {
+ return $this->getData('status');
+ }
+
+ /**
+ * Set state status
+ *
+ * @param string $status
+ * @return \Magento\Mview\View\StateInterface
+ */
+ public function setStatus($status)
+ {
+ $this->setData('status', $status);
+ return $this;
+ }
+
+ /**
+ * Get state updated time
+ *
+ * @return string
+ */
+ public function getUpdated()
+ {
+ return $this->getData('updated');
+ }
+
+ /**
+ * Set state updated time
+ *
+ * @param string|int|\Zend_Date $updated
+ * @return \Magento\Mview\View\StateInterface
+ */
+ public function setUpdated($updated)
+ {
+ $this->setData('updated', $updated);
+ return $this;
+ }
+
+ /**
+ * Get state version ID
+ *
+ * @return string
+ */
+ public function getVersionId()
+ {
+ return $this->getData('version_id');
+ }
+
+ /**
+ * Set state version ID
+ *
+ * @param int $versionId
+ * @return \Magento\Mview\View\StateInterface
+ */
+ public function setVersionId($versionId)
+ {
+ $this->setData('version_id', $versionId);
+ return $this;
+ }
+}
diff --git a/app/code/Magento/Core/Model/Observer.php b/app/code/Magento/Core/Model/Observer.php
index 867fda9b9db5d..cb9d4fd379113 100644
--- a/app/code/Magento/Core/Model/Observer.php
+++ b/app/code/Magento/Core/Model/Observer.php
@@ -49,7 +49,7 @@ class Observer
private $_pageAssets;
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ReinitableConfigInterface
*/
protected $_config;
@@ -72,7 +72,7 @@ class Observer
* @param \Magento\App\Cache\Frontend\Pool $cacheFrontendPool
* @param \Magento\View\DesignInterface $design
* @param \Magento\View\Asset\GroupedCollection $assets
- * @param \Magento\Core\Model\ConfigInterface $config
+ * @param \Magento\App\ReinitableConfigInterface $config
* @param \Magento\View\Asset\PublicFileFactory $assetFileFactory
* @param \Magento\Core\Model\Theme\Registration $registration
* @param \Magento\Logger $logger
@@ -81,7 +81,7 @@ public function __construct(
\Magento\App\Cache\Frontend\Pool $cacheFrontendPool,
\Magento\View\DesignInterface $design,
\Magento\View\Asset\GroupedCollection $assets,
- \Magento\Core\Model\ConfigInterface $config,
+ \Magento\App\ReinitableConfigInterface $config,
\Magento\View\Asset\PublicFileFactory $assetFileFactory,
\Magento\Core\Model\Theme\Registration $registration,
\Magento\Logger $logger
diff --git a/app/code/Magento/Core/Model/ReinitableConfig.php b/app/code/Magento/Core/Model/ReinitableConfig.php
new file mode 100644
index 0000000000000..03e3090276ffa
--- /dev/null
+++ b/app/code/Magento/Core/Model/ReinitableConfig.php
@@ -0,0 +1,39 @@
+_sectionPool->clean();
+ return $this;
+ }
+}
diff --git a/app/code/Magento/Core/Model/Resource/Config/Data.php b/app/code/Magento/Core/Model/Resource/Config/Data.php
index 1f2b6b4f7d175..1e2a2073648ce 100644
--- a/app/code/Magento/Core/Model/Resource/Config/Data.php
+++ b/app/code/Magento/Core/Model/Resource/Config/Data.php
@@ -67,7 +67,7 @@ protected function _beforeSave(\Magento\Core\Model\AbstractModel $object)
* Validate unique configuration data before save
* Set id to object if exists configuration instead of throw exception
*
- * @param \Magento\Core\Model\Config\Value $object
+ * @param \Magento\Core\Model\AbstractModel $object
* @return \Magento\Core\Model\Resource\Config\Data
*/
protected function _checkUnique(\Magento\Core\Model\AbstractModel $object)
diff --git a/app/code/Magento/Core/Model/Resource/Mview/View/State.php b/app/code/Magento/Core/Model/Resource/Mview/View/State.php
new file mode 100644
index 0000000000000..77d374c66a170
--- /dev/null
+++ b/app/code/Magento/Core/Model/Resource/Mview/View/State.php
@@ -0,0 +1,40 @@
+_init('mview_state', 'state_id');
+ $this->addUniqueField(array(
+ 'field' => array('view_id'),
+ 'title' => __('State for the same view')
+ ));
+ }
+}
diff --git a/app/code/Magento/Core/Model/Resource/Mview/View/State/Collection.php b/app/code/Magento/Core/Model/Resource/Mview/View/State/Collection.php
new file mode 100644
index 0000000000000..e949b1c116cc8
--- /dev/null
+++ b/app/code/Magento/Core/Model/Resource/Mview/View/State/Collection.php
@@ -0,0 +1,37 @@
+_init('Magento\Core\Model\Mview\View\State', 'Magento\Core\Model\Resource\Mview\View\State');
+ }
+}
diff --git a/app/code/Magento/Core/Model/Resource/Setup/Migration.php b/app/code/Magento/Core/Model/Resource/Setup/Migration.php
index 7614ecc76d96b..ec4c74e28e18d 100644
--- a/app/code/Magento/Core/Model/Resource/Setup/Migration.php
+++ b/app/code/Magento/Core/Model/Resource/Setup/Migration.php
@@ -693,7 +693,6 @@ public static function getCompositeModules()
'googlebase' => 'Magento_GoogleBase',
'googlecheckout' => 'Magento_GoogleCheckout',
'importexport' => 'Magento_ImportExport',
- 'paypaluk' => 'Magento_PaypalUk',
'productalert' => 'Magento_ProductAlert',
'salesrule' => 'Magento_SalesRule',
);
diff --git a/app/code/Magento/Core/Model/Resource/Store.php b/app/code/Magento/Core/Model/Resource/Store.php
index 37f5c12b757cd..8f4e1cf0d7711 100644
--- a/app/code/Magento/Core/Model/Resource/Store.php
+++ b/app/code/Magento/Core/Model/Resource/Store.php
@@ -101,7 +101,7 @@ protected function _afterSave(\Magento\Core\Model\AbstractModel $object)
protected function _afterDelete(\Magento\Core\Model\AbstractModel $model)
{
$where = array(
- 'scope = ?' => \Magento\Core\Model\Config::SCOPE_STORES,
+ 'scope = ?' => \Magento\Core\Model\ScopeInterface::SCOPE_STORES,
'scope_id = ?' => $model->getStoreId()
);
diff --git a/app/code/Magento/Core/Model/Resource/Website.php b/app/code/Magento/Core/Model/Resource/Website.php
index 201f52511f352..36ee0d6f63002 100644
--- a/app/code/Magento/Core/Model/Resource/Website.php
+++ b/app/code/Magento/Core/Model/Resource/Website.php
@@ -100,7 +100,7 @@ protected function _afterSave(\Magento\Core\Model\AbstractModel $object)
protected function _afterDelete(\Magento\Core\Model\AbstractModel $model)
{
$where = array(
- 'scope = ?' => \Magento\Core\Model\Config::SCOPE_WEBSITES,
+ 'scope = ?' => \Magento\Core\Model\ScopeInterface::SCOPE_WEBSITES,
'scope_id = ?' => $model->getWebsiteId()
);
diff --git a/app/code/Magento/Core/Model/ScopeInterface.php b/app/code/Magento/Core/Model/ScopeInterface.php
new file mode 100644
index 0000000000000..dbb7f94e56cfd
--- /dev/null
+++ b/app/code/Magento/Core/Model/ScopeInterface.php
@@ -0,0 +1,35 @@
+_useSessionVar = (bool)$var;
+ return $this;
+ }
+
+ /**
+ * Retrieve use flag session var instead of SID for URL
+ *
+ * @return bool
+ */
+ public function getUseSessionVar()
+ {
+ return $this->_useSessionVar;
+ }
+
+ /**
+ * Set Use session in URL flag
+ *
+ * @param bool $flag
+ * @return \Magento\Session\SidResolverInterface
+ */
+ public function setUseSessionInUrl($flag = true)
+ {
+ $this->_useSessionInUrl = (bool)$flag;
+ return $this;
+ }
+
+ /**
+ * Retrieve use session in URL flag
+ *
+ * @return bool
+ */
+ public function getUseSessionInUrl()
+ {
+ return $this->_useSessionInUrl;
+ }
}
diff --git a/app/code/Magento/Core/Model/Store.php b/app/code/Magento/Core/Model/Store.php
index 78b512335d47b..38fe3c23a677b 100644
--- a/app/code/Magento/Core/Model/Store.php
+++ b/app/code/Magento/Core/Model/Store.php
@@ -24,12 +24,11 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Core\Model;
+
/**
* Store model
*
- * @method \Magento\Core\Model\Resource\Store _getResource()
- * @method \Magento\Core\Model\Resource\Store getResource()
- * @method \Magento\Core\Model\Store setId(string $value)
* @method \Magento\Core\Model\Store setCode(string $value)
* @method \Magento\Core\Model\Store setWebsiteId(int $value)
* @method \Magento\Core\Model\Store setGroupId(int $value)
@@ -39,9 +38,7 @@
* @method \Magento\Core\Model\Store setSortOrder(int $value)
* @method \Magento\Core\Model\Store setIsActive(int $value)
*/
-namespace Magento\Core\Model;
-
-class Store extends \Magento\Core\Model\AbstractModel
+class Store extends AbstractModel implements \Magento\Url\ScopeInterface
{
/**
* Entity name
@@ -76,32 +73,21 @@ class Store extends \Magento\Core\Model\AbstractModel
const XML_PATH_UNSECURE_BASE_MEDIA_URL = 'web/unsecure/base_media_url';
const XML_PATH_OFFLOADER_HEADER = 'web/secure/offloader_header';
const XML_PATH_PRICE_SCOPE = 'catalog/price/scope';
- /**#@- */
+ /**#@-*/
- /**
+ /**#@+
* Price scope constants
*/
const PRICE_SCOPE_GLOBAL = 0;
const PRICE_SCOPE_WEBSITE = 1;
-
- /**#@+
- * Possible URL types
- */
- const URL_TYPE_LINK = 'link';
- const URL_TYPE_DIRECT_LINK = 'direct_link';
- const URL_TYPE_WEB = 'web';
- const URL_TYPE_LIB = 'lib';
- const URL_TYPE_MEDIA = 'media';
- const URL_TYPE_STATIC = 'static';
- const URL_TYPE_CACHE = 'cache';
- const URL_TYPE_JS = 'js';
/**#@-*/
- /**
+ /**#@+
* Code constants
*/
const DEFAULT_CODE = 'default';
const ADMIN_CODE = 'admin';
+ /**#@-*/
/**
* Cache tag
@@ -132,7 +118,12 @@ class Store extends \Magento\Core\Model\AbstractModel
* Identifier of default store
* used for loading data of default scope
*/
- const DEFAULT_STORE_ID = 0;
+ const DEFAULT_STORE_ID = 0;
+
+ /**
+ * Default store Id (for install)
+ */
+ const DISTRO_STORE_ID = 1;
/**
* @var \Magento\App\Cache\Type\Config
@@ -247,7 +238,7 @@ class Store extends \Magento\Core\Model\AbstractModel
/**
* Url model for current store
*
- * @var \Magento\Core\Model\Url
+ * @var \Magento\UrlInterface
*/
protected $_url;
@@ -288,7 +279,7 @@ class Store extends \Magento\Core\Model\AbstractModel
protected $_coreStoreConfig;
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ReinitableConfigInterface
*/
protected $_config;
@@ -309,12 +300,12 @@ class Store extends \Magento\Core\Model\AbstractModel
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase
* @param \Magento\App\Cache\Type\Config $configCacheType
- * @param \Magento\Core\Model\Url $url
+ * @param \Magento\UrlInterface $url
* @param \Magento\App\RequestInterface $request
* @param \Magento\Core\Model\Resource\Config\Data $configDataResource
* @param \Magento\App\Filesystem $filesystem
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ReinitableConfigInterface $coreConfig
* @param \Magento\Core\Model\Resource\Store $resource
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Session\SidResolverInterface $sidResolver
@@ -328,12 +319,12 @@ public function __construct(
\Magento\Core\Model\Registry $registry,
\Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase,
\Magento\App\Cache\Type\Config $configCacheType,
- \Magento\Core\Model\Url $url,
+ \Magento\UrlInterface $url,
\Magento\App\RequestInterface $request,
\Magento\Core\Model\Resource\Config\Data $configDataResource,
\Magento\App\Filesystem $filesystem,
\Magento\Core\Model\Store\Config $coreStoreConfig,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ReinitableConfigInterface $coreConfig,
\Magento\Core\Model\Resource\Store $resource,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Session\SidResolverInterface $sidResolver,
@@ -379,7 +370,7 @@ public function __wakeup()
$this->_coreStoreConfig = \Magento\App\ObjectManager::getInstance()
->get('Magento\Core\Model\Store\Config');
$this->_config = \Magento\App\ObjectManager::getInstance()
- ->get('Magento\Core\Model\Config');
+ ->get('Magento\App\ReinitableConfigInterface');
$this->_cookie = \Magento\App\ObjectManager::getInstance()
->get('Magento\Stdlib\Cookie');
}
@@ -521,11 +512,10 @@ public function getWebsite()
*/
public function getUrl($route = '', $params = array())
{
- /** @var $url \Magento\Core\Model\Url */
- $url = $this->getUrlModel()
- ->setStore($this);
+ /** @var $url \Magento\UrlInterface */
+ $url = $this->getUrlModel()->setScope($this);
if ($this->_storeManager->getStore()->getId() != $this->getId()) {
- $params['_store_to_url'] = true;
+ $params['_scope_to_url'] = true;
}
return $url->getUrl($route, $params);
@@ -539,64 +529,64 @@ public function getUrl($route = '', $params = array())
* @return string
* @throws \InvalidArgumentException
*/
- public function getBaseUrl($type = self::URL_TYPE_LINK, $secure = null)
+ public function getBaseUrl($type = \Magento\UrlInterface::URL_TYPE_LINK, $secure = null)
{
$cacheKey = $type . '/' . (is_null($secure) ? 'null' : ($secure ? 'true' : 'false'));
if (!isset($this->_baseUrlCache[$cacheKey])) {
$secure = is_null($secure) ? $this->isCurrentlySecure() : (bool)$secure;
switch ($type) {
- case self::URL_TYPE_WEB:
+ case \Magento\UrlInterface::URL_TYPE_WEB:
$path = $secure ? self::XML_PATH_SECURE_BASE_URL : self::XML_PATH_UNSECURE_BASE_URL;
$url = $this->getConfig($path);
break;
- case self::URL_TYPE_LINK:
+ case \Magento\UrlInterface::URL_TYPE_LINK:
$path = $secure ? self::XML_PATH_SECURE_BASE_LINK_URL : self::XML_PATH_UNSECURE_BASE_LINK_URL;
$url = $this->getConfig($path);
$url = $this->_updatePathUseRewrites($url);
$url = $this->_updatePathUseStoreView($url);
break;
- case self::URL_TYPE_DIRECT_LINK:
+ case \Magento\UrlInterface::URL_TYPE_DIRECT_LINK:
$path = $secure ? self::XML_PATH_SECURE_BASE_LINK_URL : self::XML_PATH_UNSECURE_BASE_LINK_URL;
$url = $this->getConfig($path);
$url = $this->_updatePathUseRewrites($url);
break;
- case self::URL_TYPE_LIB:
+ case \Magento\UrlInterface::URL_TYPE_LIB:
$path = $secure ? self::XML_PATH_SECURE_BASE_LIB_URL : self::XML_PATH_UNSECURE_BASE_LIB_URL;
$url = $this->getConfig($path);
if (!$url) {
- $url = $this->getBaseUrl(self::URL_TYPE_WEB, $secure)
+ $url = $this->getBaseUrl(\Magento\UrlInterface::URL_TYPE_WEB, $secure)
. $this->filesystem->getUri(\Magento\App\Filesystem::PUB_LIB_DIR);
}
break;
- case self::URL_TYPE_STATIC:
+ case \Magento\UrlInterface::URL_TYPE_STATIC:
$path = $secure ? self::XML_PATH_SECURE_BASE_STATIC_URL : self::XML_PATH_UNSECURE_BASE_STATIC_URL;
$url = $this->getConfig($path);
if (!$url) {
- $url = $this->getBaseUrl(self::URL_TYPE_WEB, $secure)
+ $url = $this->getBaseUrl(\Magento\UrlInterface::URL_TYPE_WEB, $secure)
. $this->filesystem->getUri(\Magento\App\Filesystem::STATIC_VIEW_DIR);
}
break;
- case self::URL_TYPE_CACHE:
+ case \Magento\UrlInterface::URL_TYPE_CACHE:
$path = $secure ? self::XML_PATH_SECURE_BASE_CACHE_URL : self::XML_PATH_UNSECURE_BASE_CACHE_URL;
$url = $this->getConfig($path);
if (!$url) {
- $url = $this->getBaseUrl(self::URL_TYPE_WEB, $secure)
+ $url = $this->getBaseUrl(\Magento\UrlInterface::URL_TYPE_WEB, $secure)
. $this->filesystem->getUri(\Magento\App\Filesystem::PUB_VIEW_CACHE_DIR);
}
break;
- case self::URL_TYPE_MEDIA:
+ case \Magento\UrlInterface::URL_TYPE_MEDIA:
$url = $this->_getMediaScriptUrl($this->filesystem, $secure);
if (!$url) {
$path = $secure ? self::XML_PATH_SECURE_BASE_MEDIA_URL : self::XML_PATH_UNSECURE_BASE_MEDIA_URL;
$url = $this->getConfig($path);
if (!$url) {
- $url = $this->getBaseUrl(self::URL_TYPE_WEB, $secure)
+ $url = $this->getBaseUrl(\Magento\UrlInterface::URL_TYPE_WEB, $secure)
. $this->filesystem->getUri(\Magento\App\Filesystem::MEDIA_DIR);
}
}
@@ -606,9 +596,9 @@ public function getBaseUrl($type = self::URL_TYPE_LINK, $secure = null)
throw new \InvalidArgumentException('Invalid base url type');
}
- if (false !== strpos($url, \Magento\Core\Model\Store::BASE_URL_PLACEHOLDER)) {
+ if (false !== strpos($url, self::BASE_URL_PLACEHOLDER)) {
$distroBaseUrl = $this->_request->getDistroBaseUrl();
- $url = str_replace(\Magento\Core\Model\Store::BASE_URL_PLACEHOLDER, $distroBaseUrl, $url);
+ $url = str_replace(self::BASE_URL_PLACEHOLDER, $distroBaseUrl, $url);
}
$this->_baseUrlCache[$cacheKey] = rtrim($url, '/') . '/';
@@ -664,8 +654,8 @@ protected function _getMediaScriptUrl(\Magento\App\Filesystem $filesystem, $secu
if (!$this->getConfig(self::XML_PATH_USE_REWRITES)
&& $this->_coreFileStorageDatabase->checkDbUsage()
) {
- return $this->getBaseUrl(self::URL_TYPE_WEB, $secure) . $filesystem->getUri(\Magento\App\Filesystem::PUB_DIR)
- . '/' . self::MEDIA_REWRITE_SCRIPT;
+ return $this->getBaseUrl(\Magento\UrlInterface::URL_TYPE_WEB, $secure)
+ . $filesystem->getUri(\Magento\App\Filesystem::PUB_DIR) . '/' . self::MEDIA_REWRITE_SCRIPT;
}
return false;
}
@@ -692,8 +682,8 @@ protected function _updatePathUseStoreView($url)
public function isUseStoreInUrl()
{
return !($this->hasDisableStoreInUrl() && $this->getDisableStoreInUrl())
- && $this->_appState->isInstalled()
- && $this->getConfig(self::XML_PATH_STORE_IN_URL);
+ && $this->_appState->isInstalled()
+ && $this->getConfig(self::XML_PATH_STORE_IN_URL);
}
/**
@@ -715,7 +705,7 @@ public function isFrontUrlSecure()
{
if ($this->_isFrontSecure === null) {
$this->_isFrontSecure = $this->_coreStoreConfig->getConfigFlag(
- \Magento\Core\Model\Url::XML_PATH_SECURE_IN_FRONT,
+ self::XML_PATH_SECURE_IN_FRONTEND,
$this->getId()
);
}
@@ -745,8 +735,8 @@ public function isCurrentlySecure()
}
if ($this->_appState->isInstalled()) {
- $secureBaseUrl = $this->_coreStoreConfig->getConfig(\Magento\Core\Model\Url::XML_PATH_SECURE_URL);
-
+ $secureBaseUrl = $this->_coreStoreConfig->getConfig(self::XML_PATH_SECURE_BASE_URL);
+
if (!$secureBaseUrl) {
return false;
}
@@ -774,8 +764,8 @@ public function isCurrentlySecure()
*/
public function getBaseCurrencyCode()
{
- $configValue = $this->getConfig(\Magento\Core\Model\Store::XML_PATH_PRICE_SCOPE);
- if ($configValue == \Magento\Core\Model\Store::PRICE_SCOPE_GLOBAL) {
+ $configValue = $this->getConfig(self::XML_PATH_PRICE_SCOPE);
+ if ($configValue == self::PRICE_SCOPE_GLOBAL) {
return \Magento\App\ObjectManager::getInstance()
->get('Magento\Core\Model\App')->getBaseCurrencyCode();
} else {
@@ -791,7 +781,7 @@ public function getBaseCurrencyCode()
public function getBaseCurrency()
{
$currency = $this->getData('base_currency');
- if (is_null($currency)) {
+ if (null === $currency) {
$currency = \Magento\App\ObjectManager::getInstance()->create('Magento\Directory\Model\Currency')
->load($this->getBaseCurrencyCode());
$this->setData('base_currency', $currency);
@@ -818,7 +808,7 @@ public function getDefaultCurrencyCode()
public function getDefaultCurrency()
{
$currency = $this->getData('default_currency');
- if (is_null($currency)) {
+ if (null === $currency) {
$currency = \Magento\App\ObjectManager::getInstance()->create('Magento\Directory\Model\Currency')
->load($this->getDefaultCurrencyCode());
$this->setData('default_currency', $currency);
@@ -884,7 +874,7 @@ public function getCurrentCurrencyCode()
public function getAvailableCurrencyCodes($skipBaseNotAllowed = false)
{
$codes = $this->getData('available_currency_codes');
- if (is_null($codes)) {
+ if (null === $codes) {
$codes = explode(',', $this->getConfig(\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW));
// add base currency, if it is not in allowed currencies
$baseCurrencyCode = $this->getBaseCurrencyCode();
@@ -1042,7 +1032,7 @@ public function setGroup($group)
*/
public function getGroup()
{
- if (is_null($this->getGroupId())) {
+ if (null === $this->getGroupId()) {
return false;
}
return $this->_storeManager->getGroup($this->getGroupId());
@@ -1101,11 +1091,7 @@ public function isCanDelete()
public function getCurrentUrl($fromStore = true)
{
$sidQueryParam = $this->_sidResolver->getSessionIdQueryParam($this->_getSession());
- $requestString = $this->getUrlModel()->escape(ltrim(
- \Magento\App\ObjectManager::getInstance()
- ->get('Magento\Core\Model\App')->getRequest()->getRequestString(),
- '/'
- ));
+ $requestString = $this->getUrlModel()->escape(ltrim($this->_request->getRequestString(), '/'));
$storeUrl = $this->_storeManager->getStore()->isCurrentlySecure()
? $this->getUrl('', array('_secure' => true))
@@ -1129,8 +1115,8 @@ public function getCurrentUrl($fromStore = true)
unset($currQuery[$sidQueryParam]);
}
- foreach ($currQuery as $k => $v) {
- $storeParsedQuery[$k] = $v;
+ foreach ($currQuery as $key => $value) {
+ $storeParsedQuery[$key] = $value;
}
if (!$this->isUseStoreInUrl()) {
@@ -1143,9 +1129,9 @@ public function getCurrentUrl($fromStore = true)
}
return $storeParsedUrl['scheme'] . '://' . $storeParsedUrl['host']
- . (isset($storeParsedUrl['port']) ? ':' . $storeParsedUrl['port'] : '')
- . $storeParsedUrl['path'] . $requestString
- . ($storeParsedQuery ? '?'.http_build_query($storeParsedQuery, '', '&') : '');
+ . (isset($storeParsedUrl['port']) ? ':' . $storeParsedUrl['port'] : '')
+ . $storeParsedUrl['path'] . $requestString
+ . ($storeParsedQuery ? '?'.http_build_query($storeParsedQuery, '', '&') : '');
}
/**
@@ -1245,7 +1231,7 @@ public function isReadOnly($value = null)
*/
public function getFrontendName()
{
- if (is_null($this->_frontendName)) {
+ if (null === $this->_frontendName) {
$storeGroupName = (string) $this->_coreStoreConfig->getConfig('general/store_information/name', $this);
$this->_frontendName = (!empty($storeGroupName)) ? $storeGroupName : $this->getGroup()->getName();
}
@@ -1255,7 +1241,7 @@ public function getFrontendName()
/**
* Set url model for current store
*
- * @param \Magento\Core\Model\Url $urlModel
+ * @param \Magento\UrlInterface $urlModel
* @return \Magento\Core\Model\Store
*/
public function setUrlModel($urlModel)
@@ -1267,7 +1253,7 @@ public function setUrlModel($urlModel)
/**
* Get url model by class name for current store
*
- * @return \Magento\Core\Model\Url
+ * @return \Magento\UrlInterface
*/
public function getUrlModel()
{
diff --git a/app/code/Magento/Core/Model/Store/Config.php b/app/code/Magento/Core/Model/Store/Config.php
index 9af1261021255..454921305060c 100644
--- a/app/code/Magento/Core/Model/Store/Config.php
+++ b/app/code/Magento/Core/Model/Store/Config.php
@@ -34,7 +34,7 @@ class Config implements \Magento\Core\Model\Store\ConfigInterface
protected $_storeManager;
/**
- * @var \Magento\Core\Model\ConfigInterface
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -50,12 +50,12 @@ class Config implements \Magento\Core\Model\Store\ConfigInterface
/**
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\ConfigInterface $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Core\Model\Resource\Store\CollectionFactory $factory
*/
public function __construct(
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\ConfigInterface $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Core\Model\Resource\Store\CollectionFactory $factory
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Core/Model/Store/Storage/Db.php b/app/code/Magento/Core/Model/Store/Storage/Db.php
index 188477a616571..9c7262ab3f919 100644
--- a/app/code/Magento/Core/Model/Store/Storage/Db.php
+++ b/app/code/Magento/Core/Model/Store/Storage/Db.php
@@ -25,11 +25,8 @@
*/
namespace Magento\Core\Model\Store\Storage;
-use Magento\Backend\Model\Url\Proxy;
use Magento\Core\Exception;
use Magento\App\State;
-use Magento\Core\Model\AppInterface;
-use Magento\Core\Model\Config;
use Magento\Core\Model\Store;
use Magento\Core\Model\Store\StorageInterface;
use Magento\Core\Model\Store\Group;
@@ -107,7 +104,7 @@ class Db implements StorageInterface
/**
* Config model
*
- * @var Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -142,7 +139,7 @@ class Db implements StorageInterface
/**
* Cookie model
*
- * @var Cookie
+ * @var \Magento\Stdlib\Cookie
*/
protected $_cookie;
@@ -154,7 +151,7 @@ class Db implements StorageInterface
protected $_appState;
/**
- * @var \Magento\Backend\Model\Url\Proxy
+ * @var \Magento\Backend\Model\UrlInterface
*/
protected $_url;
@@ -162,10 +159,10 @@ class Db implements StorageInterface
* @param StoreFactory $storeFactory
* @param Website\Factory $websiteFactory
* @param Group\Factory $groupFactory
- * @param Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Stdlib\Cookie $cookie
* @param State $appState
- * @param \Magento\Backend\Model\Url $url
+ * @param \Magento\Backend\Model\UrlInterface $url
* @param $isSingleStoreAllowed
* @param $scopeCode
* @param $scopeType
@@ -175,10 +172,10 @@ public function __construct(
\Magento\Core\Model\StoreFactory $storeFactory,
\Magento\Core\Model\Website\Factory $websiteFactory,
\Magento\Core\Model\Store\Group\Factory $groupFactory,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Stdlib\Cookie $cookie,
\Magento\App\State $appState,
- \Magento\Backend\Model\Url $url,
+ \Magento\Backend\Model\UrlInterface $url,
$isSingleStoreAllowed,
$scopeCode,
$scopeType,
@@ -208,8 +205,8 @@ protected function _getDefaultStore()
{
if (empty($this->_store)) {
$this->_store = $this->_storeFactory->create()
- ->setId(AppInterface::DISTRO_STORE_ID)
- ->setCode(AppInterface::DISTRO_STORE_CODE);
+ ->setId(\Magento\Core\Model\Store::DISTRO_STORE_ID)
+ ->setCode(\Magento\Core\Model\Store::DEFAULT_CODE);
}
return $this->_store;
}
diff --git a/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php b/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
index f850075349ab9..42aa7e06c52e6 100644
--- a/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
+++ b/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
@@ -60,8 +60,8 @@ public function __construct(
) {
$this->_store = $storeFactory->create();
- $this->_store->setId(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID);
- $this->_store->setCode(\Magento\Core\Model\AppInterface::DISTRO_STORE_CODE);
+ $this->_store->setId(\Magento\Core\Model\Store::DISTRO_STORE_ID);
+ $this->_store->setCode(\Magento\Core\Model\Store::DEFAULT_CODE);
$this->_website = $websiteFactory->create();
$this->_group = $groupFactory->create();
}
diff --git a/app/code/Magento/Core/Model/Store/StorageFactory.php b/app/code/Magento/Core/Model/Store/StorageFactory.php
index 0b601df16c6e5..3db1052481d77 100644
--- a/app/code/Magento/Core/Model/Store/StorageFactory.php
+++ b/app/code/Magento/Core/Model/Store/StorageFactory.php
@@ -60,9 +60,9 @@ class StorageFactory
protected $_log;
/**
- * @var \Magento\Core\Model\AppInterface
+ * @var \Magento\Session\SidResolverInterface
*/
- protected $_app;
+ protected $_sidResolver;
/**
* @var \Magento\App\State
@@ -78,7 +78,7 @@ class StorageFactory
* @param \Magento\ObjectManager $objectManager
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Logger $logger
- * @param \Magento\Core\Model\AppInterface $app
+ * @param \Magento\Session\SidResolverInterface $sidResolver
* @param \Magento\App\State $appState
* @param string $defaultStorageClassName
* @param string $installedStoreClassName
@@ -88,7 +88,7 @@ public function __construct(
\Magento\ObjectManager $objectManager,
\Magento\Event\ManagerInterface $eventManager,
\Magento\Logger $logger,
- \Magento\Core\Model\AppInterface $app,
+ \Magento\Session\SidResolverInterface $sidResolver,
\Magento\App\State $appState,
$defaultStorageClassName = 'Magento\Core\Model\Store\Storage\DefaultStorage',
$installedStoreClassName = 'Magento\Core\Model\Store\Storage\Db',
@@ -100,7 +100,7 @@ public function __construct(
$this->_eventManager = $eventManager;
$this->_log = $logger;
$this->_appState = $appState;
- $this->_app = $app;
+ $this->_sidResolver = $sidResolver;
$this->_writerModel = $writerModel;
}
@@ -131,7 +131,7 @@ public function get(array $arguments = array())
if ($className === $this->_installedStoreClassName) {
$useSid = $instance->getStore()
->getConfig(\Magento\Core\Model\Session\SidResolver::XML_PATH_USE_FRONTEND_SID);
- $this->_app->setUseSessionInUrl($useSid);
+ $this->_sidResolver->setUseSessionInUrl($useSid);
$this->_eventManager->dispatch('core_app_init_current_store_after');
diff --git a/app/code/Magento/Core/Model/Theme.php b/app/code/Magento/Core/Model/Theme.php
index 064adfabb7a64..e8344b9fca66b 100644
--- a/app/code/Magento/Core/Model/Theme.php
+++ b/app/code/Magento/Core/Model/Theme.php
@@ -26,10 +26,11 @@
namespace Magento\Core\Model;
+use Magento\View\Design\ThemeInterface;
+
/**
* Theme model class
*
- * @method \Magento\View\Design\ThemeInterface save()
* @method string getPackageCode()
* @method string getParentThemePath()
* @method string getParentId()
@@ -40,22 +41,20 @@
* @method int getThemeId()
* @method int getType()
* @method array getAssignedStores()
- * @method \Magento\Core\Model\Resource\Theme\Collection getCollection()
- * @method \Magento\View\Design\ThemeInterface setAssignedStores(array $stores)
- * @method \Magento\View\Design\ThemeInterface addData(array $data)
- * @method \Magento\View\Design\ThemeInterface setParentId(int $id)
- * @method \Magento\View\Design\ThemeInterface setParentTheme($parentTheme)
- * @method \Magento\View\Design\ThemeInterface setPackageCode(string $packageCode)
- * @method \Magento\View\Design\ThemeInterface setThemeCode(string $themeCode)
- * @method \Magento\View\Design\ThemeInterface setThemePath(string $themePath)
- * @method \Magento\View\Design\ThemeInterface setThemeVersion(string $themeVersion)
- * @method \Magento\View\Design\ThemeInterface setThemeTitle(string $themeTitle)
- * @method \Magento\View\Design\ThemeInterface setType(int $type)
- * @method \Magento\View\Design\ThemeInterface setCode(string $code)
+ * @method ThemeInterface setAssignedStores(array $stores)
+ * @method ThemeInterface setParentId(int $id)
+ * @method ThemeInterface setParentTheme($parentTheme)
+ * @method ThemeInterface setPackageCode(string $packageCode)
+ * @method ThemeInterface setThemeCode(string $themeCode)
+ * @method ThemeInterface setThemePath(string $themePath)
+ * @method ThemeInterface setThemeVersion(string $themeVersion)
+ * @method ThemeInterface setThemeTitle(string $themeTitle)
+ * @method ThemeInterface setType(int $type)
+ * @method ThemeInterface setCode(string $code)
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Theme extends \Magento\Core\Model\AbstractModel implements \Magento\View\Design\ThemeInterface
+class Theme extends \Magento\Core\Model\AbstractModel implements ThemeInterface
{
/**
* Filename of view configuration
@@ -106,6 +105,10 @@ class Theme extends \Magento\Core\Model\AbstractModel implements \Magento\View\D
*/
protected $_customFactory;
+ /**
+ * @var ThemeInterface[]
+ */
+ protected $inheritanceSequence;
/**
* Initialize dependencies
@@ -142,9 +145,7 @@ public function __construct(
$this->_validator = $validator;
$this->_customFactory = $customizationFactory;
- $this->addData(array(
- 'type' => self::TYPE_VIRTUAL
- ));
+ $this->addData(array('type' => self::TYPE_VIRTUAL));
}
/**
@@ -375,4 +376,23 @@ protected function _afterDelete()
$this->getCollection()->updateChildRelations($this);
return parent::_afterDelete();
}
+
+ /**
+ * Return the full theme inheritance sequence, from the root theme till a specified one
+ *
+ * @return ThemeInterface[] Format: array([, ..., ,] )
+ */
+ public function getInheritedThemes()
+ {
+ if (null === $this->inheritanceSequence) {
+ $theme = $this;
+ $result = array();
+ while ($theme) {
+ $result[] = $theme;
+ $theme = $theme->getParentTheme();
+ }
+ $this->inheritanceSequence = array_reverse($result);
+ }
+ return $this->inheritanceSequence;
+ }
}
diff --git a/app/code/Magento/Core/Model/Theme/Collection.php b/app/code/Magento/Core/Model/Theme/Collection.php
index dd2989605b48d..2b0f5a089ba31 100644
--- a/app/code/Magento/Core/Model/Theme/Collection.php
+++ b/app/code/Magento/Core/Model/Theme/Collection.php
@@ -24,11 +24,11 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Core\Model\Theme;
+
/**
* Theme filesystem collection
*/
-namespace Magento\Core\Model\Theme;
-
class Collection extends \Magento\Data\Collection implements \Magento\View\Design\Theme\ListInterface
{
/**
@@ -50,24 +50,16 @@ class Collection extends \Magento\Data\Collection implements \Magento\View\Desig
*/
protected $_targetDirs = array();
- /**
- * @var \Magento\Config\FileIteratorFactory
- */
- protected $fileIteratorFactory;
-
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\App\Filesystem $filesystem
- * @param \Magento\Config\FileIteratorFactory $fileIteratorFactory
+ * @param \Magento\Filesystem $filesystem
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\App\Filesystem $filesystem,
- \Magento\Config\FileIteratorFactory $fileIteratorFactory
+ \Magento\Filesystem $filesystem
) {
parent::__construct($entityFactory);
$this->_directory = $filesystem->getDirectoryRead(\Magento\App\Filesystem::THEMES_DIR);
- $this->fileIteratorFactory = $fileIteratorFactory;
}
/**
@@ -217,12 +209,7 @@ protected function _preparePathData($configPath)
public function _prepareConfigurationData($configPath)
{
- $themeConfig = $this->_getConfigModel(
- $this->fileIteratorFactory->create(
- $this->_directory,
- array($this->_directory->getRelativePath($configPath))
- )
- );
+ $themeConfig = $this->_getConfigModel($configPath);
$pathData = $this->_preparePathData($configPath);
$media = $themeConfig->getMedia();
@@ -289,12 +276,12 @@ protected function _clearFilters()
/**
* Return configuration model for themes
*
- * @param $configPaths
+ * @param $configPath
* @return \Magento\Config\Theme
*/
- protected function _getConfigModel($configPaths)
+ protected function _getConfigModel($configPath)
{
- return new \Magento\Config\Theme($configPaths);
+ return new \Magento\Config\Theme($this->_directory->readFile($this->_directory->getRelativePath($configPath)));
}
/**
diff --git a/app/code/Magento/Core/Model/Theme/Customization/Config.php b/app/code/Magento/Core/Model/Theme/Customization/Config.php
index 76f4f1c5b391f..a87a1e7d620e8 100644
--- a/app/code/Magento/Core/Model/Theme/Customization/Config.php
+++ b/app/code/Magento/Core/Model/Theme/Customization/Config.php
@@ -37,14 +37,14 @@ class Config implements \Magento\View\Design\Theme\Customization\ConfigInterface
const XML_PATH_CUSTOM_FILES = 'theme/customization';
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $config;
/**
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
*/
- public function __construct(\Magento\Core\Model\Config $config)
+ public function __construct(\Magento\App\ConfigInterface $config)
{
$this->config = $config;
}
diff --git a/app/code/Magento/Core/Model/Theme/Image/Path.php b/app/code/Magento/Core/Model/Theme/Image/Path.php
index 8e29888a36a9b..5c148acf9c0e1 100644
--- a/app/code/Magento/Core/Model/Theme/Image/Path.php
+++ b/app/code/Magento/Core/Model/Theme/Image/Path.php
@@ -75,7 +75,7 @@ public function __construct(
*/
public function getPreviewImageDirectoryUrl()
{
- return $this->_storeManager->getStore()->getBaseUrl(\Magento\Core\Model\Store::URL_TYPE_MEDIA)
+ return $this->_storeManager->getStore()->getBaseUrl(\Magento\UrlInterface::URL_TYPE_MEDIA)
. self::PREVIEW_DIRECTORY_PATH . '/';
}
diff --git a/app/code/Magento/Core/Model/Translate.php b/app/code/Magento/Core/Model/Translate.php
index 2ece5a27e6054..32d57d70d192c 100644
--- a/app/code/Magento/Core/Model/Translate.php
+++ b/app/code/Magento/Core/Model/Translate.php
@@ -215,7 +215,7 @@ class Translate implements TranslateInterface
* @param \Magento\Phrase\Renderer\Placeholder $placeholderRender
* @param \Magento\Module\ModuleList $moduleList
* @param \Magento\Module\Dir\Reader $modulesReader
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\Model\Resource\Translate $translate
* @param \Magento\Core\Model\App $app
@@ -233,7 +233,7 @@ public function __construct(
\Magento\Phrase\Renderer\Placeholder $placeholderRender,
\Magento\Module\ModuleList $moduleList,
\Magento\Module\Dir\Reader $modulesReader,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Core\Model\Resource\Translate $translate,
\Magento\Core\Model\App $app,
diff --git a/app/code/Magento/Core/Model/Translate/Inline.php b/app/code/Magento/Core/Model/Translate/Inline.php
index c4721b61adb56..cefcc7d6f4080 100644
--- a/app/code/Magento/Core/Model/Translate/Inline.php
+++ b/app/code/Magento/Core/Model/Translate/Inline.php
@@ -63,7 +63,7 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
protected $_isScriptInserted = false;
/**
- * @var \Magento\Core\Model\Url
+ * @var \Magento\UrlInterface
*/
protected $_url;
@@ -87,7 +87,7 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
*
* @param InlineParser $parser
* @param \Magento\Core\Model\Translate $translate
- * @param \Magento\Core\Model\Url $url
+ * @param \Magento\UrlInterface $url
* @param \Magento\View\LayoutInterface $layout
* @param \Magento\Core\Model\Translate\Inline\ConfigFactory $configFactory
* @param \Magento\App\State $appState
@@ -95,7 +95,7 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
public function __construct(
\Magento\Core\Model\Translate\InlineParser $parser,
\Magento\Core\Model\Translate $translate,
- \Magento\Core\Model\Url $url,
+ \Magento\UrlInterface $url,
\Magento\View\LayoutInterface $layout,
\Magento\Core\Model\Translate\Inline\ConfigFactory $configFactory,
\Magento\App\State $appState
diff --git a/app/code/Magento/Core/Model/Url/Rewrite.php b/app/code/Magento/Core/Model/Url/Rewrite.php
index 07da290d2a2e0..66fcaaafa24c0 100644
--- a/app/code/Magento/Core/Model/Url/Rewrite.php
+++ b/app/code/Magento/Core/Model/Url/Rewrite.php
@@ -59,7 +59,6 @@ class Rewrite extends \Magento\Core\Model\AbstractModel
const TYPE_CATEGORY = 1;
const TYPE_PRODUCT = 2;
const TYPE_CUSTOM = 3;
- const REWRITE_REQUEST_PATH_ALIAS = 'rewrite_request_path';
/**
* Cache tag for clear cache in after save and after delete
@@ -299,7 +298,7 @@ public function rewrite(\Magento\App\RequestInterface $request = null)
}
- $request->setAlias(self::REWRITE_REQUEST_PATH_ALIAS, $this->getRequestPath());
+ $request->setAlias(\Magento\Url::REWRITE_REQUEST_PATH_ALIAS, $this->getRequestPath());
$external = substr($this->getTargetPath(), 0, 6);
$isPermanentRedirectOption = $this->hasOption('RP');
if ($external === 'http:/' || $external === 'https:') {
diff --git a/app/code/Magento/Core/Model/Url/RouteParamsResolver.php b/app/code/Magento/Core/Model/Url/RouteParamsResolver.php
new file mode 100644
index 0000000000000..b9c59865fc864
--- /dev/null
+++ b/app/code/Magento/Core/Model/Url/RouteParamsResolver.php
@@ -0,0 +1,173 @@
+_request = $request;
+ $this->_storeConfig = $storeConfig;
+ $this->_storeManager = $storeManager;
+ $this->_queryParamsResolver = $queryParamsResolver;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setRouteParams(array $data, $unsetOldParams = true)
+ {
+ if (isset($data['_type'])) {
+ $this->setType($data['_type']);
+ unset($data['_type']);
+ }
+
+ if (isset($data['_scope'])) {
+ $this->setScope($data['_scope']);
+ unset($data['_scope']);
+ }
+
+ if (isset($data['_forced_secure'])) {
+ $this->setSecure((bool)$data['_forced_secure']);
+ $this->setSecureIsForced(true);
+ unset($data['_forced_secure']);
+ } elseif (isset($data['_secure'])) {
+ $this->setSecure((bool)$data['_secure']);
+ unset($data['_secure']);
+ }
+
+ if (isset($data['_absolute'])) {
+ unset($data['_absolute']);
+ }
+
+ if ($unsetOldParams) {
+ $this->unsetData('route_params');
+ }
+
+ if (isset($data['_current'])) {
+ if (is_array($data['_current'])) {
+ foreach ($data['_current'] as $key) {
+ if (array_key_exists($key, $data) || !$this->_request->getUserParam($key)) {
+ continue;
+ }
+ $data[$key] = $this->_request->getUserParam($key);
+ }
+ } elseif ($data['_current']) {
+ foreach ($this->_request->getUserParams() as $key => $value) {
+ if (array_key_exists($key, $data) || $this->getRouteParam($key)) {
+ continue;
+ }
+ $data[$key] = $value;
+ }
+ foreach ($this->_request->getQuery() as $key => $value) {
+ $this->_queryParamsResolver->setQueryParam($key, $value);
+ }
+ }
+ unset($data['_current']);
+ }
+
+ if (isset($data['_use_rewrite'])) {
+ unset($data['_use_rewrite']);
+ }
+
+ if (isset($data['_scope_to_url']) && (bool)$data['_scope_to_url'] === true) {
+ if (!$this->_storeConfig->getConfig(\Magento\Core\Model\Store::XML_PATH_STORE_IN_URL, $this->getScope())
+ && !$this->_storeManager->hasSingleStore()
+ ) {
+ $this->_queryParamsResolver->setQueryParam('___store', $this->getScope()->getCode());
+ }
+ }
+ unset($data['_scope_to_url']);
+
+ foreach ($data as $key => $value) {
+ $this->setRouteParam($key, $value);
+ }
+
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setRouteParam($key, $data)
+ {
+ $params = $this->_getData('route_params');
+ if (isset($params[$key]) && $params[$key] == $data) {
+ return $this;
+ }
+ $params[$key] = $data;
+ $this->unsetData('route_path');
+ return $this->setData('route_params', $params);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getRouteParams()
+ {
+ return $this->_getData('route_params');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getRouteParam($key)
+ {
+ return $this->getData('route_params', $key);
+ }
+}
diff --git a/app/code/Magento/Core/Model/Url/ScopeResolver.php b/app/code/Magento/Core/Model/Url/ScopeResolver.php
new file mode 100644
index 0000000000000..05ead4308a165
--- /dev/null
+++ b/app/code/Magento/Core/Model/Url/ScopeResolver.php
@@ -0,0 +1,79 @@
+_storeManager = $storeManager;
+ $this->_areaCode = $areaCode;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getScope($scopeId = null)
+ {
+ $scope = $this->_storeManager->getStore($scopeId);
+ if (!($scope instanceof \Magento\Url\ScopeInterface)) {
+ throw new \Magento\Exception('Invalid scope object');
+ }
+
+ return $scope;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getScopes()
+ {
+ return $this->_storeManager->getStores();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getAreaCode()
+ {
+ return $this->_areaCode;
+ }
+}
diff --git a/app/code/Magento/Core/Model/Url/SecurityInfo.php b/app/code/Magento/Core/Model/Url/SecurityInfo.php
index c3fd1df4219cd..eb87e17ac728c 100644
--- a/app/code/Magento/Core/Model/Url/SecurityInfo.php
+++ b/app/code/Magento/Core/Model/Url/SecurityInfo.php
@@ -25,7 +25,7 @@
*/
namespace Magento\Core\Model\Url;
-class SecurityInfo implements \Magento\Core\Model\Url\SecurityInfoInterface
+class SecurityInfo implements \Magento\Url\SecurityInfoInterface
{
/**
* Store manager
diff --git a/app/code/Magento/Core/Model/Variable/Config.php b/app/code/Magento/Core/Model/Variable/Config.php
index 7888563fc56c9..7b30dc760529e 100644
--- a/app/code/Magento/Core/Model/Variable/Config.php
+++ b/app/code/Magento/Core/Model/Variable/Config.php
@@ -41,15 +41,15 @@ class Config
protected $_viewUrl;
/**
- * @var \Magento\Backend\Model\Url
+ * @var \Magento\Backend\Model\UrlInterface
*/
protected $_url;
/**
* @param \Magento\View\Url $viewUrl
- * @param \Magento\Backend\Model\Url $url
+ * @param \Magento\Backend\Model\UrlInterface $url
*/
- public function __construct(\Magento\View\Url $viewUrl, \Magento\Backend\Model\Url $url)
+ public function __construct(\Magento\View\Url $viewUrl, \Magento\Backend\Model\UrlInterface $url)
{
$this->_viewUrl = $viewUrl;
$this->_url = $url;
diff --git a/app/code/Magento/Core/Model/View/Design.php b/app/code/Magento/Core/Model/View/Design.php
index 97eb9b1cab591..be1d006551e12 100644
--- a/app/code/Magento/Core/Model/View/Design.php
+++ b/app/code/Magento/Core/Model/View/Design.php
@@ -71,7 +71,7 @@ class Design implements \Magento\View\DesignInterface
protected $_themeFactory;
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -93,7 +93,7 @@ class Design implements \Magento\View\DesignInterface
/**
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\View\Design\Theme\FlyweightFactory $flyweightFactory
- * @param \Magento\Core\Model\ConfigInterface $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Core\Model\Store\ConfigInterface $storeConfig
* @param \Magento\Core\Model\ThemeFactory $themeFactory
* @param \Magento\Core\Model\App $app
@@ -103,7 +103,7 @@ class Design implements \Magento\View\DesignInterface
public function __construct(
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\View\Design\Theme\FlyweightFactory $flyweightFactory,
- \Magento\Core\Model\ConfigInterface $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Core\Model\Store\ConfigInterface $storeConfig,
\Magento\Core\Model\ThemeFactory $themeFactory,
\Magento\Core\Model\App $app,
diff --git a/app/code/Magento/Core/Model/Website.php b/app/code/Magento/Core/Model/Website.php
index ad989ed9176d5..cd404f36c567a 100644
--- a/app/code/Magento/Core/Model/Website.php
+++ b/app/code/Magento/Core/Model/Website.php
@@ -183,7 +183,7 @@ class Website extends \Magento\Core\Model\AbstractModel
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\Resource\Config\Data $configDataResource
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param \Magento\Core\Model\StoreFactory $storeFactory
* @param \Magento\Core\Model\Store\GroupFactory $storeGroupFactory
* @param \Magento\Core\Model\WebsiteFactory $websiteFactory
@@ -198,7 +198,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\Resource\Config\Data $configDataResource,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\Core\Model\StoreFactory $storeFactory,
\Magento\Core\Model\Store\GroupFactory $storeGroupFactory,
\Magento\Core\Model\WebsiteFactory $websiteFactory,
diff --git a/app/code/Magento/Core/etc/di.xml b/app/code/Magento/Core/etc/di.xml
index 2d878c8d39f60..6bbc5c1ce0898 100644
--- a/app/code/Magento/Core/etc/di.xml
+++ b/app/code/Magento/Core/etc/di.xml
@@ -32,8 +32,9 @@
-
- core
- index
- index
-
+
+ core index index
-
-
- standard
-
-
+
+ -
+
+ standard
+
+
frontend
@@ -97,7 +113,7 @@
Magento\Core\Model\Store::CUSTOM_ENTRY_POINT_PARAM
-
@@ -113,9 +129,9 @@
app_
-
- Magento\Core\Model\Website::CACHE_TAG
-
+
+ Magento\Core\Model\Website::CACHE_TAG
false
@@ -129,9 +145,9 @@
app_
-
- Magento\Core\Model\Store\Group::CACHE_TAG
-
+
+ Magento\Core\Model\Store\Group::CACHE_TAG
false
@@ -145,9 +161,9 @@
app_
-
- Magento\Core\Model\Store::CACHE_TAG
-
+
+ Magento\Core\Model\Store::CACHE_TAG
false
@@ -170,11 +186,6 @@
-
-
-
-
- Magento\Core\App\Router\NoRouteHandler
- 100
-
-
+
+ -
+
+ Magento\Core\App\Router\NoRouteHandler 100
+
+
-
- Shockwave Flash
-
+
+ Shockwave Flash
-
- magento_plushe
- magento_backend
- magento_basic
-
+
+ magento_plushe magento_backend magento_basic
@@ -389,7 +402,7 @@
-
- Magento\View\TemplateEngine\Php
-
+
+ Magento\View\TemplateEngine\Php
@@ -447,7 +460,7 @@
-
@@ -502,4 +515,41 @@
+
+
+ frontend
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+ Magento\Less\PreProcessor\Instruction\Import
+
+ -
+
+ Magento\Less\PreProcessor\Instruction\MagentoImport
+
+
+
+
diff --git a/app/code/Magento/Core/etc/frontend/di.xml b/app/code/Magento/Core/etc/frontend/di.xml
index 9522ee1b77dcf..9b1c51a156593 100644
--- a/app/code/Magento/Core/etc/frontend/di.xml
+++ b/app/code/Magento/Core/etc/frontend/di.xml
@@ -43,18 +43,22 @@
-
-
- Magento\Core\App\Router\Base
- false
- 20
-
-
- Magento\App\Router\DefaultRouter
- false
- 100
-
-
+
+ -
+
+ Magento\Core\App\Router\Base false 20
+
+ -
+
+ Magento\App\Router\DefaultRouter false 100
+
+
diff --git a/app/code/Magento/Core/etc/module.xml b/app/code/Magento/Core/etc/module.xml
index 2b5c4d33fbca6..abc28f2dcca2a 100755
--- a/app/code/Magento/Core/etc/module.xml
+++ b/app/code/Magento/Core/etc/module.xml
@@ -24,7 +24,7 @@
*/
-->
-
+
+ * @method int getSortOrder()
*/
-namespace Magento\Customer\Model;
-
class Attribute extends \Magento\Eav\Model\Attribute
{
/**
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
index 19f66864f8255..cf9ec68684b9b 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
@@ -25,7 +25,7 @@
*/
/**
- * Customer Address Street Model
+ * Line count config model for customer address street attribute
*
* @method string getWebsiteCode
*/
@@ -42,7 +42,7 @@ class Street extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -52,7 +52,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php b/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
index 336c40dd41139..e4d05453b940e 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
@@ -44,7 +44,7 @@ class Customer extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -54,7 +54,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Customer/Model/Config/Share.php b/app/code/Magento/Customer/Model/Config/Share.php
index 26db0e91e442e..c4f768c5e4fdc 100644
--- a/app/code/Magento/Customer/Model/Config/Share.php
+++ b/app/code/Magento/Customer/Model/Config/Share.php
@@ -67,7 +67,7 @@ class Share extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Customer\Model\Resource\Customer $customerResource
* @param \Magento\Core\Model\Resource\AbstractResource $resource
@@ -78,7 +78,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Customer\Model\Resource\Customer $customerResource,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Customer/Model/Metadata/Form.php b/app/code/Magento/Customer/Model/Metadata/Form.php
new file mode 100644
index 0000000000000..900372c0191a2
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Metadata/Form.php
@@ -0,0 +1,364 @@
+_eavMetadataService = $eavMetadataService;
+ $this->_elementFactory = $elementFactory;
+ $this->_attributeValues = $attributeValues;
+ $this->_entityType = $entityType;
+ $this->_formCode = $formCode;
+ $this->_ignoreInvisible = $ignoreInvisible;
+ $this->_filterAttributes = $filterAttributes;
+ $this->_isAjax = $isAjax;
+ $this->_httpRequest = $httpRequest;
+ $this->_modulesReader = $modulesReader;
+ $this->_validatorConfigFactory = $validatorConfigFactory;
+ }
+
+ /**
+ * Retrieve attributes metadata for the form
+ *
+ * @return \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata[]
+ */
+ public function getAttributes()
+ {
+ if (!isset($this->_attributes)) {
+ $this->_attributes = $this->_eavMetadataService
+ ->getAttributes($this->_entityType, $this->_formCode);
+ }
+ return $this->_attributes;
+ }
+
+ /**
+ * Retrieve user defined attributes
+ *
+ * @return \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata[]
+ */
+ public function getUserAttributes()
+ {
+ $result = [];
+ foreach ($this->getAttributes() as $attribute) {
+ if ($attribute->isUserDefined()) {
+ $result[$attribute->getAttributeCode()] = $attribute;
+ }
+ }
+ return $result;
+ }
+
+ /**
+ * Retrieve system required attributes
+ *
+ * @return \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata[]
+ */
+ public function getSystemAttributes()
+ {
+ $result = [];
+ foreach ($this->getAttributes() as $attribute) {
+ if (!$attribute->isUserDefined()) {
+ $result[$attribute->getAttributeCode()] = $attribute;
+ }
+ }
+ return $result;
+ }
+
+ /**
+ * Retrieve filtered attributes
+ *
+ * @return \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata[]
+ */
+ public function getAllowedAttributes()
+ {
+ $attributes = $this->_eavMetadataService->getAttributes($this->_entityType, $this->_formCode);
+ foreach ($attributes as $attributeCode => $attribute) {
+ if (
+ $this->_ignoreInvisible && !$attribute->isVisible()
+ || in_array($attribute->getAttributeCode(), $this->_filterAttributes)
+ ) {
+ unset($attributes[$attributeCode]);
+ }
+ }
+ return $attributes;
+ }
+
+ /**
+ * Extract data from request and return associative data array
+ *
+ * @param \Magento\App\RequestInterface $request
+ * @param string $scope the request scope
+ * @param boolean $scopeOnly search value only in scope or search value in global too
+ * @return array
+ */
+ public function extractData(\Magento\App\RequestInterface $request, $scope = null, $scopeOnly = true)
+ {
+ $data = array();
+ /** @var $attribute \Magento\Eav\Model\Attribute */
+ foreach ($this->getAllowedAttributes() as $attribute) {
+ $dataModel = $this->_getAttributeDataModel($attribute);
+ $dataModel->setRequestScope($scope);
+ $dataModel->setRequestScopeOnly($scopeOnly);
+ $data[$attribute->getAttributeCode()] = $dataModel->extractValue($request);
+ }
+ return $data;
+ }
+
+ /**
+ * Compact data array to current entity
+ *
+ * @param array $data
+ * @return array
+ */
+ public function compactData(array $data)
+ {
+ foreach ($this->getAllowedAttributes() as $attribute) {
+ $dataModel = $this->_getAttributeDataModel($attribute);
+ $dataModel->setExtractedData($data);
+ if (!isset($data[$attribute->getAttributeCode()])) {
+ $data[$attribute->getAttributeCode()] = false;
+ }
+ }
+
+ return $data;
+ }
+
+ /**
+ * Restore data array from SESSION to current entity
+ *
+ * @param array $data
+ * @return array
+ */
+ public function restoreData(array $data)
+ {
+ /** @var $attribute \Magento\Eav\Model\Attribute */
+ foreach ($this->getAllowedAttributes() as $attribute) {
+ $dataModel = $this->_getAttributeDataModel($attribute);
+ $dataModel->setExtractedData($data);
+ if (!isset($data[$attribute->getAttributeCode()])) {
+ $data[$attribute->getAttributeCode()] = false;
+ }
+ $dataModel->restoreValue($data[$attribute->getAttributeCode()]);
+ }
+ return $data;
+ }
+
+ /**
+ * Return attribute data model by attribute
+ *
+ * @param \Magento\Eav\Model\Entity\Attribute $attribute
+ * @return \Magento\Eav\Model\Attribute\Data\AbstractData
+ */
+ protected function _getAttributeDataModel($attribute)
+ {
+ $dataModel = $this->_elementFactory->create(
+ $attribute,
+ isset($this->_attributeValues[$attribute->getAttributeCode()])
+ ? $this->_attributeValues[$attribute->getAttributeCode()] : null,
+ $this->_entityType,
+ $this->_isAjax
+ );
+ return $dataModel;
+ }
+
+
+ /**
+ * Prepare request with data and returns it
+ *
+ * @param array $data
+ * @return \Magento\App\RequestInterface
+ */
+ public function prepareRequest(array $data)
+ {
+ $request = clone $this->_httpRequest;
+ $request->setParamSources();
+ $request->clearParams();
+ $request->setParams($data);
+
+ return $request;
+ }
+
+ /**
+ * Get validator
+ *
+ * @param array $data
+ * @return \Magento\Validator
+ */
+ protected function _getValidator(array $data)
+ {
+ if ($this->_validator !== null) {
+ return $this->_validator;
+ }
+
+ $configFiles = $this->_modulesReader->getConfigurationFiles('validation.xml');
+ $validatorFactory = $this->_validatorConfigFactory->create(array('configFiles' => $configFiles));
+ $builder = $validatorFactory->createValidatorBuilder('customer', 'form');
+
+ $builder->addConfiguration('metadata_data_validator', array(
+ 'method' => 'setAttributes',
+ 'arguments' => array($this->getAllowedAttributes())
+ ));
+ $builder->addConfiguration('metadata_data_validator', array(
+ 'method' => 'setData',
+ 'arguments' => array($data)
+ ));
+ $builder->addConfiguration('metadata_data_validator', array(
+ 'method' => 'setEntityType',
+ 'arguments' => array($this->_entityType)
+ ));
+ $this->_validator = $builder->createValidator();
+
+ return $this->_validator;
+ }
+
+ /**
+ * Validate data array and return true or array of errors
+ *
+ * @param array $data
+ * @return boolean|array
+ */
+ public function validateData(array $data)
+ {
+ $validator = $this->_getValidator($data);
+ if (!$validator->isValid(false)) {
+ $messages = array();
+ foreach ($validator->getMessages() as $errorMessages) {
+ $messages = array_merge($messages, (array)$errorMessages);
+ }
+ return $messages;
+ }
+ return true;
+ }
+
+ /**
+ * Return array of formatted allowed attributes values.
+ *
+ * @param string $format
+ * @return array
+ */
+ public function outputData($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
+ {
+ $result = array();
+ foreach ($this->getAllowedAttributes() as $attribute) {
+ $dataModel = $this->_getAttributeDataModel($attribute);
+ $result[$attribute->getAttributeCode()] = $dataModel->outputValue($format);
+ }
+ return $result;
+ }
+}
diff --git a/app/code/Magento/GroupedProduct/Model/ProductTypes/Config/Converter/Plugin/Grouped.php b/app/code/Magento/Customer/Model/Metadata/Form/Boolean.php
similarity index 62%
rename from app/code/Magento/GroupedProduct/Model/ProductTypes/Config/Converter/Plugin/Grouped.php
rename to app/code/Magento/Customer/Model/Metadata/Form/Boolean.php
index 1869b53a1f320..0893367eb47d0 100644
--- a/app/code/Magento/GroupedProduct/Model/ProductTypes/Config/Converter/Plugin/Grouped.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Boolean.php
@@ -1,6 +1,6 @@
_getRequestValue($request);
+ return $this->_applyInputFilter($value);
+ }
+
+ /**
+ * Validate data
+ * Return true or array of errors
+ *
+ * @param array|string $value
+ * @return boolean|array
+ */
+ public function validateValue($value)
+ {
+ $errors = array();
+ $attribute = $this->getAttribute();
+ $label = $attribute->getStoreLabel();
+
+ if ($value === false) {
+ // try to load original value and validate it
+ $value = $this->_value;
+ }
+
+ if ($attribute->isRequired() && empty($value)) {
+ $errors[] = __('"%1" is a required value.', $label);
+ }
+
+ if (!$errors && !$attribute->isRequired() && empty($value)) {
+ return true;
+ }
+
+ $result = $this->_validateInputRule($value);
+ if ($result !== true) {
+ $errors = array_merge($errors, $result);
+ }
+
+ //range validation
+ $validateRules = $attribute->getValidationRules();
+ if ((!empty($validateRules['date_range_min']) && (strtotime($value) < $validateRules['date_range_min']))
+ || (!empty($validateRules['date_range_max']) && (strtotime($value) > $validateRules['date_range_max']))
+ ) {
+ if (!empty($validateRules['date_range_min']) && !empty($validateRules['date_range_max'])) {
+ $errors[] = __('Please enter a valid date between %1 and %2 at %3.', date('d/m/Y', $validateRules['date_range_min']), date('d/m/Y', $validateRules['date_range_max']), $label);
+ } elseif (!empty($validateRules['date_range_min'])) {
+ $errors[] = __('Please enter a valid date equal to or greater than %1 at %2.', date('d/m/Y', $validateRules['date_range_min']), $label);
+ } elseif (!empty($validateRules['date_range_max'])) {
+ $errors[] = __('Please enter a valid date less than or equal to %1 at %2.', date('d/m/Y', $validateRules['date_range_max']), $label);
+ }
+ }
+
+ if (count($errors) == 0) {
+ return true;
+ }
+
+ return $errors;
+ }
+
+ /**
+ * Export attribute value to entity model
+ *
+ * @param array|string $value
+ * @return string
+ */
+ public function compactValue($value)
+ {
+ if ($value !== false) {
+ if (empty($value)) {
+ $value = null;
+ }
+ return $value;
+ }
+ return false;
+ }
+
+
+ /**
+ * Restore attribute value from SESSION to entity model
+ *
+ * @param array|string $value
+ * @return \Magento\Eav\Model\Attribute\Data\Date
+ */
+ public function restoreValue($value)
+ {
+ return $this->compactValue($value);
+ }
+
+ /**
+ * Return formated attribute value from entity model
+ *
+ * @param string $format
+ * @return string|array
+ */
+ public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
+ {
+ $value = $this->_value;
+ if ($value) {
+ switch ($format) {
+ case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT:
+ case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_HTML:
+ case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_PDF:
+ $this->_dateFilterFormat(\Magento\Core\Model\LocaleInterface::FORMAT_TYPE_MEDIUM);
+ break;
+ }
+ $value = $this->_applyOutputFilter($value);
+ }
+
+ $this->_dateFilterFormat(\Magento\Core\Model\LocaleInterface::FORMAT_TYPE_SHORT);
+
+ return $value;
+ }
+}
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/File.php b/app/code/Magento/Customer/Model/Metadata/Form/File.php
new file mode 100644
index 0000000000000..a3ee74acedb38
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Metadata/Form/File.php
@@ -0,0 +1,320 @@
+_coreData = $coreData;
+ $this->_fileValidator = $fileValidator;
+ $this->_fileSystem = $fileSystem;
+ }
+
+ /**
+ * Extract data from request and return value
+ *
+ * @param \Magento\App\RequestInterface $request
+ * @return array|string
+ */
+ public function extractValue(\Magento\App\RequestInterface $request)
+ {
+ if ($this->getIsAjaxRequest()) {
+ return false;
+ }
+
+ $extend = $this->_getRequestValue($request);
+
+ $attrCode = $this->getAttribute()->getAttributeCode();
+ if ($this->_requestScope) {
+ $value = array();
+ if (strpos($this->_requestScope, '/') !== false) {
+ $scopes = explode('/', $this->_requestScope);
+ $mainScope = array_shift($scopes);
+ } else {
+ $mainScope = $this->_requestScope;
+ $scopes = array();
+ }
+
+ if (!empty($_FILES[$mainScope])) {
+ foreach ($_FILES[$mainScope] as $fileKey => $scopeData) {
+ foreach ($scopes as $scopeName) {
+ if (isset($scopeData[$scopeName])) {
+ $scopeData = $scopeData[$scopeName];
+ } else {
+ $scopeData[$scopeName] = array();
+ }
+ }
+
+ if (isset($scopeData[$attrCode])) {
+ $value[$fileKey] = $scopeData[$attrCode];
+ }
+ }
+ } else {
+ $value = array();
+ }
+ } else {
+ if (isset($_FILES[$attrCode])) {
+ $value = $_FILES[$attrCode];
+ } else {
+ $value = array();
+ }
+ }
+
+ if (!empty($extend['delete'])) {
+ $value['delete'] = true;
+ }
+
+ return $value;
+ }
+
+ /**
+ * Validate file by attribute validate rules
+ * Return array of errors
+ *
+ * @param array $value
+ * @return array
+ */
+ protected function _validateByRules($value)
+ {
+ $label = $this->getAttribute()->getStoreLabel();
+ $rules = $this->getAttribute()->getValidationRules();
+ $extension = pathinfo($value['name'], PATHINFO_EXTENSION);
+
+ if (!empty($rules['file_extensions'])) {
+ $extensions = explode(',', $rules['file_extensions']);
+ $extensions = array_map('trim', $extensions);
+ if (!in_array($extension, $extensions)) {
+ return array(
+ __('"%1" is not a valid file extension.', $label)
+ );
+ }
+ }
+
+ /**
+ * Check protected file extension
+ */
+ if (!$this->_fileValidator->isValid($extension)) {
+ return $this->_fileValidator->getMessages();
+ }
+
+ if (!is_uploaded_file($value['tmp_name'])) {
+ return array(
+ __('"%1" is not a valid file.', $label)
+ );
+ }
+
+ if (!empty($rules['max_file_size'])) {
+ $size = $value['size'];
+ if ($rules['max_file_size'] < $size) {
+ return array(
+ __('"%1" exceeds the allowed file size.', $label)
+ );
+ };
+ }
+
+ return array();
+ }
+
+ /**
+ * Validate data
+ *
+ * @param array|string $value
+ * @throws \Magento\Core\Exception
+ * @return boolean
+ */
+ public function validateValue($value)
+ {
+ if ($this->getIsAjaxRequest()) {
+ return true;
+ }
+
+ $errors = array();
+ $attribute = $this->getAttribute();
+ $label = $attribute->getStoreLabel();
+
+ $toDelete = !empty($value['delete']) ? true : false;
+ $toUpload = !empty($value['tmp_name']) ? true : false;
+
+ if (!$toUpload && !$toDelete && $this->_value) {
+ return true;
+ }
+
+ if (!$attribute->isRequired() && !$toUpload) {
+ return true;
+ }
+
+ if ($attribute->isRequired() && !$toUpload) {
+ $errors[] = __('"%1" is a required value.', $label);
+ }
+
+ if ($toUpload) {
+ $errors = array_merge($errors, $this->_validateByRules($value));
+ }
+
+ if (count($errors) == 0) {
+ return true;
+ }
+
+ return $errors;
+ }
+
+ /**
+ * Export attribute value to entity model
+ *
+ * @param \Magento\Core\Model\AbstractModel $entity
+ * @param array|string $value
+ * @return string
+ */
+ public function compactValue($value)
+ {
+ if ($this->getIsAjaxRequest()) {
+ return $this;
+ }
+
+ $attribute = $this->getAttribute();
+ $original = $this->_value;
+ $toDelete = false;
+ if ($original) {
+ if (!$attribute->isRequired() && !empty($value['delete'])) {
+ $toDelete = true;
+ }
+ if (!empty($value['tmp_name'])) {
+ $toDelete = true;
+ }
+ }
+
+ $path = $this->_fileSystem->getPath(\Magento\App\Filesystem::MEDIA_DIR) . '/' . $this->_entityTypeCode;
+
+ $result = $original;
+ // unlink entity file
+ if ($toDelete) {
+ $result = '';
+ $file = $path . $original;
+ $ioFile = new \Magento\Io\File();
+ if ($ioFile->fileExists($file)) {
+ $ioFile->rm($file);
+ }
+ }
+
+ if (!empty($value['tmp_name'])) {
+ try {
+ $uploader = new \Magento\File\Uploader($value);
+ $uploader->setFilesDispersion(true);
+ $uploader->setFilenamesCaseSensitivity(false);
+ $uploader->setAllowRenameFiles(true);
+ $uploader->save($path, $value['name']);
+ $fileName = $uploader->getUploadedFileName();
+ $result = $fileName;
+ } catch (\Exception $e) {
+ $this->_logger->logException($e);
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Restore attribute value from SESSION to entity model
+ *
+ * @param array|string $value
+ * @return \Magento\Customer\Model\Metadata\Form\File
+ */
+ public function restoreValue($value)
+ {
+ return $this;
+ }
+
+ /**
+ * Return formated attribute value from entity model
+ *
+ * @return string|array
+ */
+ public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
+ {
+ $output = '';
+ if ($this->_value) {
+ switch ($format) {
+ case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON:
+ $output = array(
+ 'value' => $this->_value,
+ 'url_key' => $this->_coreData->urlEncode($this->_value)
+ );
+ break;
+ }
+ }
+
+ return $output;
+ }
+}
diff --git a/app/code/Magento/PaypalUk/Helper/Data.php b/app/code/Magento/Customer/Model/Metadata/Form/Hidden.php
similarity index 85%
rename from app/code/Magento/PaypalUk/Helper/Data.php
rename to app/code/Magento/Customer/Model/Metadata/Form/Hidden.php
index d0febfab84883..381f35bef4edc 100644
--- a/app/code/Magento/PaypalUk/Helper/Data.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Hidden.php
@@ -1,5 +1,7 @@
getAttribute()->getStoreLabel());
+ $rules = $this->getAttribute()->getValidationRules();
+
+ $imageProp = @getimagesize($value['tmp_name']);
+
+ if (!is_uploaded_file($value['tmp_name']) || !$imageProp) {
+ return array(
+ __('"%1" is not a valid file', $label)
+ );
+ }
+
+ $allowImageTypes = array(
+ 1 => 'gif',
+ 2 => 'jpg',
+ 3 => 'png',
+ );
+
+ if (!isset($allowImageTypes[$imageProp[2]])) {
+ return array(
+ __('"%1" is not a valid image format', $label)
+ );
+ }
+
+ // modify image name
+ $extension = pathinfo($value['name'], PATHINFO_EXTENSION);
+ if ($extension != $allowImageTypes[$imageProp[2]]) {
+ $value['name'] = pathinfo($value['name'], PATHINFO_FILENAME) . '.' . $allowImageTypes[$imageProp[2]];
+ }
+
+ $errors = array();
+ if (!empty($rules['max_file_size'])) {
+ $size = $value['size'];
+ if ($rules['max_file_size'] < $size) {
+ $errors[] = __('"%1" exceeds the allowed file size.', $label);
+ };
+ }
+
+ if (!empty($rules['max_image_width'])) {
+ if ($rules['max_image_width'] < $imageProp[0]) {
+ $r = $rules['max_image_width'];
+ $errors[] = __('"%1" width exceeds allowed value of %2 px.', $label, $r);
+ };
+ }
+ if (!empty($rules['max_image_heght'])) {
+ if ($rules['max_image_heght'] < $imageProp[1]) {
+ $r = $rules['max_image_heght'];
+ $errors[] = __('"%1" height exceeds allowed value of %2 px.', $label, $r);
+ };
+ }
+
+ return $errors;
+ }
+}
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Multiline.php b/app/code/Magento/Customer/Model/Metadata/Form/Multiline.php
new file mode 100644
index 0000000000000..035b9d6a106dd
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Multiline.php
@@ -0,0 +1,153 @@
+_getRequestValue($request);
+ if (!is_array($value)) {
+ $value = false;
+ } else {
+ $value = array_map(array($this, '_applyInputFilter'), $value);
+ }
+ return $value;
+ }
+
+ /**
+ * Validate data
+ * Return true or array of errors
+ *
+ * @param array|string $value
+ * @return boolean|array
+ */
+ public function validateValue($value)
+ {
+ $errors = array();
+ $attribute = $this->getAttribute();
+
+ if ($value === false) {
+ // try to load original value and validate it
+ $value = $this->_value;
+ if (!is_array($value)) {
+ $value = explode("\n", $value);
+ }
+ }
+
+ if (!is_array($value)) {
+ $value = array($value);
+ }
+ for ($i = 0; $i < $attribute->getMultilineCount(); $i ++) {
+ if (!isset($value[$i])) {
+ $value[$i] = null;
+ }
+ // validate first line
+ if ($i == 0) {
+ $result = parent::validateValue($value[$i]);
+ if ($result !== true) {
+ $errors = $result;
+ }
+ } else {
+ if (!empty($value[$i])) {
+ $result = parent::validateValue($value[$i]);
+ if ($result !== true) {
+ $errors = array_merge($errors, $result);
+ }
+ }
+ }
+ }
+
+ if (count($errors) == 0) {
+ return true;
+ }
+ return $errors;
+ }
+
+ /**
+ * Export attribute value to entity model
+ *
+ * @param array|string $value
+ * @return \Magento\Customer\Model\Metadata\Form\Multiline
+ */
+ public function compactValue($value)
+ {
+ if (is_array($value)) {
+ $value = trim(implode("\n", $value));
+ }
+ return parent::compactValue($value);
+ }
+
+ /**
+ * Restore attribute value from SESSION to entity model
+ *
+ * @param array|string $value
+ * @return \Magento\Customer\Model\Metadata\Form\Multiline
+ */
+ public function restoreValue($value)
+ {
+ return $this->compactValue($value);
+ }
+
+ /**
+ * Return formated attribute value from entity model
+ *
+ * @param string $format
+ * @return array|string
+ */
+ public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
+ {
+ $values = $this->_value;
+ if (!is_array($values)) {
+ $values = explode("\n", $values);
+ }
+ $values = array_map(array($this, '_applyOutputFilter'), $values);
+ switch ($format) {
+ case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_ARRAY:
+ $output = $values;
+ break;
+ case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_HTML:
+ $output = implode("
", $values); + break; + case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_ONELINE: + $output = implode(" ", $values); + break; + default: + $output = implode("\n", $values); + break; + } + return $output; + } +} diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Multiselect.php b/app/code/Magento/Customer/Model/Metadata/Form/Multiselect.php new file mode 100644 index 0000000000000..586bedfbd7f11 --- /dev/null +++ b/app/code/Magento/Customer/Model/Metadata/Form/Multiselect.php @@ -0,0 +1,99 @@ +_getRequestValue($request); + if ($values !== false && !is_array($values)) { + $values = array($values); + } + return $values; + } + + /** + * Export attribute value to entity model + * + * @param array|string $value + * @return \Magento\Customer\Model\Metadata\Form\Multiselect + */ + public function compactValue($value) + { + if (is_array($value)) { + $value = implode(',', $value); + } + return parent::compactValue($value); + } + + /** + * Return formated attribute value from entity model + * + * @param string $format + * @return array|string + */ + public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT) + { + $values = $this->_value; + if (!is_array($values)) { + $values = explode(',', $values); + } + + switch ($format) { + case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON: + case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_ARRAY: + $output = $values; + default: + $output = array(); + foreach ($values as $value) { + if (!$value) { + continue; + } + $optionText = false; + foreach ($this->getAttribute()->getOptions() as $optionKey => $optionValue) { + if ($optionValue == $value) { + $optionText = $optionKey; + } + } + $output[] = $optionText; + } + $output = implode(', ', $output); + break; + } + + return $output; + } +} diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Select.php b/app/code/Magento/Customer/Model/Metadata/Form/Select.php new file mode 100644 index 0000000000000..8ee81142130d2 --- /dev/null +++ b/app/code/Magento/Customer/Model/Metadata/Form/Select.php @@ -0,0 +1,142 @@ +_getRequestValue($request); + } + + /** + * Validate data + * Return true or array of errors + * + * @param array|string $value + * @return boolean|array + */ + public function validateValue($value) + { + $errors = array(); + $attribute = $this->getAttribute(); + $label = __($attribute->getStoreLabel()); + + if ($value === false) { + // try to load original value and validate it + $value = $this->_value; + } + + if ($attribute->isRequired() && empty($value) && $value != '0') { + $errors[] = __('"%1" is a required value.', $label); + } + + if (!$errors && !$attribute->isRequired() && empty($value)) { + return true; + } + + if (count($errors) == 0) { + return true; + } + + return $errors; + } + + /** + * Export attribute value to entity model + * + * @param array|string $value + * @return string + */ + public function compactValue($value) + { + if ($value !== false) { + $value; + } + return false; + } + + /** + * Restore attribute value from SESSION to entity model + * + * @param array|string $value + * @return string + */ + public function restoreValue($value) + { + return $this->compactValue($value); + } + + /** + * Return a text for option value + * + * @param int $value + * @return string + */ + protected function _getOptionText($value) + { + $optionText = false; + foreach ($this->getAttribute()->getOptions() as $optionKey => $optionValue) { + if ($optionValue == $value) { + $optionText = $optionKey; + } + } + $output[] = $optionText; + } + + /** + * Return formated attribute value from entity model + * + * @return string|array + */ + public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT) + { + $value = $this->_value; + switch ($format) { + case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON: + $output = $value; + break; + default: + if ($value != '') { + $output = $this->_getOptionText($value); + } else { + $output = ''; + } + break; + } + + return $output; + } +} diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Text.php b/app/code/Magento/Customer/Model/Metadata/Form/Text.php new file mode 100644 index 0000000000000..59bc406fce491 --- /dev/null +++ b/app/code/Magento/Customer/Model/Metadata/Form/Text.php @@ -0,0 +1,168 @@ + + */ +namespace Magento\Customer\Model\Metadata\Form; + +class Text extends AbstractData +{ + /** + * @var \Magento\Core\Helper\String + */ + protected $_string; + + /** + * @param \Magento\Core\Model\LocaleInterface $locale + * @param \Magento\Logger $logger + * @param \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata $attribute + * @param null $value + * @param $entityTypeCode + * @param bool $isAjax + * @param \Magento\Stdlib\String $stringHelper + */ + public function __construct( + \Magento\Core\Model\LocaleInterface $locale, + \Magento\Logger $logger, + \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata $attribute, + $value = null, + $entityTypeCode, + $isAjax = false, + \Magento\Stdlib\String $stringHelper + ) { + parent::__construct($locale, $logger, $attribute, $value, $entityTypeCode, $isAjax); + $this->_string = $stringHelper; + } + + /** + * Extract data from request and return value + * + * @param \Magento\App\RequestInterface $request + * @return array|string + */ + public function extractValue(\Magento\App\RequestInterface $request) + { + $value = $this->_getRequestValue($request); + return $this->_applyInputFilter($value); + } + + /** + * Validate data + * Return true or array of errors + * + * @param array|string $value + * @return boolean|array + */ + public function validateValue($value) + { + $errors = array(); + $attribute = $this->getAttribute(); + $label = __($attribute->getStoreLabel()); + + if ($value === false) { + // try to load original value and validate it + $value = $this->_value; + } + + if ($attribute->isRequired() && empty($value) && $value !== '0') { + $errors[] = __('"%1" is a required value.', $label); + } + + if (!$errors && !$attribute->isRequired() && empty($value)) { + return true; + } + + // validate length + $length = $this->_string->strlen(trim($value)); + + $validateRules = $attribute->getValidationRules(); + if (!empty($validateRules['min_text_length']) && $length < $validateRules['min_text_length']) { + $v = $validateRules['min_text_length']; + $errors[] = __('"%1" length must be equal or greater than %2 characters.', $label, $v); + } + if (!empty($validateRules['max_text_length']) && $length > $validateRules['max_text_length']) { + $v = $validateRules['max_text_length']; + $errors[] = __('"%1" length must be equal or less than %2 characters.', $label, $v); + } + + $result = $this->_validateInputRule($value); + if ($result !== true) { + $errors = array_merge($errors, $result); + } + if (count($errors) == 0) { + return true; + } + + return $errors; + } + + /** + * Export attribute value to entity model + * + * @param array|string $value + * @return string|value + */ + public function compactValue($value) + { + if ($value !== false) { + $value; + } + return false; + } + + /** + * Restore attribute value from SESSION to entity model + * + * @param array|string $value + * @return string|value + */ + public function restoreValue($value) + { + return $this->compactValue($value); + } + + /** + * Return formated attribute value from entity model + * + * @param string $format + * @return string|array + */ + public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT) + { + $value = $this->_value; + $value = $this->_applyOutputFilter($value); + + return $value; + } +} diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Grouped.php b/app/code/Magento/Customer/Model/Metadata/Form/Textarea.php similarity index 71% rename from app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Grouped.php rename to app/code/Magento/Customer/Model/Metadata/Form/Textarea.php index 0f1b4a5d3f764..eeb7bec0d8366 100644 --- a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Grouped.php +++ b/app/code/Magento/Customer/Model/Metadata/Form/Textarea.php @@ -1,5 +1,7 @@ - */ -namespace Magento\ImportExport\Model\Export\Entity\Product\Type; +namespace Magento\Customer\Model\Metadata\Form; -class Grouped - extends \Magento\ImportExport\Model\Export\Entity\Product\Type\AbstractType +class Textarea extends \Magento\Eav\Model\Attribute\Data\Text { } diff --git a/app/code/Magento/Customer/Model/Metadata/FormFactory.php b/app/code/Magento/Customer/Model/Metadata/FormFactory.php new file mode 100644 index 0000000000000..7a4984c1cbfb8 --- /dev/null +++ b/app/code/Magento/Customer/Model/Metadata/FormFactory.php @@ -0,0 +1,70 @@ +_objectManager = $objectManager; + } + + + /** + * Create Form + * + * @param string $entityType + * @param string $formCode + * @param array $attributeValues + * @param bool $isAjax + * @return \Magento\Customer\Model\Metadata\Form + */ + public function create( + $entityType, + $formCode, + $attributeValues = [], + $isAjax = false + ) { + $params = [ + 'entityType' => $entityType, + 'formCode' => $formCode, + 'attributeValues' => $attributeValues, + 'isAjax' => $isAjax, + ]; + return $this->_objectManager->create('Magento\Customer\Model\Metadata\Form', $params); + } +} \ No newline at end of file diff --git a/app/code/Magento/Customer/Model/Resource/Form/Attribute/CollectionFactory.php b/app/code/Magento/Customer/Model/Resource/Form/Attribute/CollectionFactory.php new file mode 100644 index 0000000000000..410a6ff9d0005 --- /dev/null +++ b/app/code/Magento/Customer/Model/Resource/Form/Attribute/CollectionFactory.php @@ -0,0 +1,54 @@ +_objectManager = $objectManager; + } + + + /** + * Create Collection + * + * @return \Magento\Customer\Model\Resource\Form\Attribute\Collection + */ + public function create() + { + return $this->_objectManager->create('Magento\Customer\Model\Resource\Form\Attribute\Collection'); + } +} \ No newline at end of file diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php index 6c971a51859f4..133fa1f2b1fd6 100644 --- a/app/code/Magento/Customer/Model/Session.php +++ b/app/code/Magento/Customer/Model/Session.php @@ -80,7 +80,7 @@ class Session extends \Magento\Session\SessionManager protected $_customerFactory; /** - * @var \Magento\Core\Model\UrlFactory + * @var \Magento\UrlFactory */ protected $_urlFactory; @@ -106,7 +106,7 @@ class Session extends \Magento\Session\SessionManager * @param \Magento\Customer\Helper\Data $customerData * @param Resource\Customer $customerResource * @param CustomerFactory $customerFactory - * @param \Magento\Core\Model\UrlFactory $urlFactory + * @param \Magento\UrlFactory $urlFactory * @param \Magento\Core\Model\Session $session * @param \Magento\Event\ManagerInterface $eventManager * @param \Magento\Core\Model\StoreManagerInterface $storeManager @@ -125,7 +125,7 @@ public function __construct( \Magento\Customer\Helper\Data $customerData, \Magento\Customer\Model\Resource\Customer $customerResource, \Magento\Customer\Model\CustomerFactory $customerFactory, - \Magento\Core\Model\UrlFactory $urlFactory, + \Magento\UrlFactory $urlFactory, \Magento\Core\Model\Session $session, \Magento\Event\ManagerInterface $eventManager, \Magento\Core\Model\StoreManagerInterface $storeManager, @@ -441,7 +441,7 @@ protected function _createCustomer() } /** - * @return \Magento\Core\Model\Url + * @return \Magento\UrlInterface */ protected function _createUrl() { diff --git a/app/code/Magento/Customer/Service/Customer.php b/app/code/Magento/Customer/Service/Customer.php deleted file mode 100644 index ff922d06d93cd..0000000000000 --- a/app/code/Magento/Customer/Service/Customer.php +++ /dev/null @@ -1,416 +0,0 @@ -_dataHelper = $helper; - $this->_customerFactory = $customerFactory; - $this->_addressFactory = $addressFactory; - $this->_isAdminStore = $isAdminStore; - } - - /** - * Set is admin store flag. - * - * @param bool $isAdminStore - * @return \Magento\Customer\Service\Customer - */ - public function setIsAdminStore($isAdminStore) - { - $this->_isAdminStore = $isAdminStore; - return $this; - } - - /** - * Set flag if send remainder email - * - * @param bool $flag - * @return \Magento\Customer\Service\Customer - */ - public function setSendRemainderEmail($flag) - { - // todo: drop next string as soon as front controller of webapi will be able to return routers - $this->_sendRemainderEmail = (bool)$flag; - return $this; - } - - /** - * Set before save callback. - * - * @param callable $callback - * @return \Magento\Customer\Service\Customer - */ - public function setBeforeSaveCallback($callback) - { - $this->_beforeSaveCallback = $callback; - return $this; - } - - /** - * Set after save callback. - * - * @param callable $callback - * @return \Magento\Customer\Service\Customer - */ - public function setAfterSaveCallback($callback) - { - $this->_afterSaveCallback = $callback; - return $this; - } - - /** - * Create customer with optional ability of adding addresses. - * - * @param array $customerData - * @param array|null $addressesData array of addresses - * @return \Magento\Customer\Model\Customer - */ - public function create(array $customerData, array $addressesData = null) - { - $customer = $this->_customerFactory->create(); - $this->_preparePasswordForSave($customer, $customerData); - $this->_save($customer, $customerData, $addressesData); - - return $customer; - } - - /** - * Update customer entity. - * - * Update customer with optional ability to update customer addresses. - * Addresses that are not in $addressesData array but present in customer addresses collection will be removed. - * New address is created in case when no entity_id is present, otherwise corresponding address will be updated - * with data provided. - * - * @param string|int $customerId - * @param array $customerData - * @param array|null $addressesData array of addresses - * @return \Magento\Customer\Model\Customer - */ - public function update($customerId, array $customerData, array $addressesData = null) - { - /** @var \Magento\Customer\Model\Customer $customer */ - $customer = $this->_loadCustomerById($customerId); - - $this->_save($customer, $customerData, $addressesData); - if ($customerData) { - $this->_changePassword($customer, $customerData); - } - - return $customer; - } - - /** - * Save customer entity. Perform supplementary business workflow actions - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @param array|null $addressesData - * @return \Magento\Customer\Service\Customer - */ - protected function _save($customer, array $customerData, array $addressesData = null) - { - if ($customerData) { - $this->_setDataUsingMethods($customer, $customerData); - } - $this->_beforeSave($customer, $customerData, $addressesData); - $customer->save(); - $this->_afterSave($customer, $customerData, $addressesData); - - return $this; - } - - /** - * Sets each value from data to entity \Magento\Object using setter method. - * - * @param \Magento\Object $entity - * @param array $data - */ - protected function _setDataUsingMethods($entity, array $data) - { - foreach ($data as $property => $value) { - $entity->setDataUsingMethod($property, $value); - } - } - - /** - * Trigger before save logic - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @param array $addressesData - */ - protected function _beforeSave($customer, array $customerData, array $addressesData = null) - { - if (!is_null($addressesData)) { - $this->_prepareCustomerAddressesForSave($customer, $addressesData); - } - if (is_callable($this->_beforeSaveCallback)) { - call_user_func_array($this->_beforeSaveCallback, array($customer, $customerData, $addressesData)); - } - } - - /** - * Trigger before save logic - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @param array $addressesData - */ - protected function _afterSave($customer, array $customerData, array $addressesData = null) - { - if (is_callable($this->_afterSaveCallback)) { - call_user_func_array($this->_afterSaveCallback, array($customer, $customerData, $addressesData)); - } - $this->_sendWelcomeEmail($customer, $customerData); - } - - /** - * Set customer password - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - */ - protected function _preparePasswordForSave($customer, array $customerData) - { - $password = $this->_getCustomerPassword($customer, $customerData); - if (!is_null($password)) { - // 'force_confirmed' should be set in admin area only - if ($this->_isAdminStore) { - $customer->setForceConfirmed(true); - } - $customer->setPassword($password); - } - } - - /** - * Get customer password - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @return string|null - */ - protected function _getCustomerPassword($customer, array $customerData) - { - $password = null; - - if ($this->_isAutogeneratePassword($customerData)) { - $password = $customer->generatePassword(); - } elseif (isset($customerData['password'])) { - $password = $customerData['password']; - } - - return $password; - } - - /** - * Change customer password - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @return \Magento\Customer\Service\Customer - */ - protected function _changePassword($customer, array $customerData) - { - if (!empty($customerData['password']) || $this->_isAutogeneratePassword($customerData)) { - $newPassword = $this->_getCustomerPassword($customer, $customerData); - $customer->changePassword($newPassword); - if ($this->_sendRemainderEmail) { - $customer->sendPasswordReminderEmail(); - } - } - - return $this; - } - - /** - * Check if password should be generated automatically - * - * @param array $customerData - * @return bool - */ - protected function _isAutogeneratePassword(array $customerData) - { - return isset($customerData['autogenerate_password']) && $customerData['autogenerate_password']; - } - - /** - * Retrieve send email flag - * - * @param array $customerData - * @return bool - */ - protected function _isSendEmail(array $customerData) - { - return isset($customerData['sendemail']) && $customerData['sendemail']; - } - - /** - * Send welcome email to customer - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @return \Magento\Customer\Service\Customer - */ - protected function _sendWelcomeEmail($customer, array $customerData) - { - if ($customer->getWebsiteId() - && ($this->_isSendEmail($customerData) || $this->_isAutogeneratePassword($customerData)) - ) { - $isNewCustomer = !(bool)$customer->getOrigData($customer->getIdFieldName()); - $storeId = $customer->getSendemailStoreId(); - - if ($isNewCustomer) { - $newLinkToken = $this->_dataHelper->generateResetPasswordLinkToken(); - $customer->changeResetPasswordLinkToken($newLinkToken); - $customer->sendNewAccountEmail('registered', '', $storeId); - } elseif (!$customer->getConfirmation()) { - // Confirm not confirmed customer - $customer->sendNewAccountEmail('confirmed', '', $storeId); - } - } - return $this; - } - - /** - * Load customer by its ID - * - * @param int|string $customerId - * @return \Magento\Customer\Model\Customer - * @throws \Magento\Core\Exception - */ - protected function _loadCustomerById($customerId) - { - $customer = $this->_customerFactory->create(); - $customer->load($customerId); - if (!$customer->getId()) { - throw new \Magento\Core\Exception(__("The customer with the specified ID not found.")); - } - - return $customer; - } - - /** - * Save customer addresses. - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $addressesData - * @throws \Magento\Core\Exception - */ - protected function _prepareCustomerAddressesForSave($customer, array $addressesData) - { - $hasChanges = $customer->hasDataChanges(); - $actualAddressesIds = array(); - foreach ($addressesData as $addressData) { - $addressId = null; - if (array_key_exists('entity_id', $addressData)) { - $addressId = $addressData['entity_id']; - unset($addressData['entity_id']); - } - - if (null !== $addressId) { - $address = $customer->getAddressItemById($addressId); - if (!$address || !$address->getId()) { - throw new \Magento\Core\Exception( - __('The address with the specified ID not found.') - ); - } - } else { - $address = $this->_addressFactory->create(); - $address->setCustomerId($customer->getId()); - // Add customer address into addresses collection - $customer->addAddress($address); - } - $address->addData($addressData); - $hasChanges = $hasChanges || $address->hasDataChanges(); - - // Set post_index for detect default billing and shipping addresses - $address->setPostIndex($addressId); - - $actualAddressesIds[] = $address->getId(); - } - - /** @var \Magento\Customer\Model\Address $address */ - foreach ($customer->getAddressesCollection() as $address) { - if (!in_array($address->getId(), $actualAddressesIds)) { - $address->setData('_deleted', true); - $hasChanges = true; - } - } - $customer->setDataChanges($hasChanges); - } -} diff --git a/app/code/Magento/Customer/Service/V1/CustomerMetadataService.php b/app/code/Magento/Customer/Service/V1/CustomerMetadataService.php index 695b5cf701b62..a9e9cd5d702dc 100644 --- a/app/code/Magento/Customer/Service/V1/CustomerMetadataService.php +++ b/app/code/Magento/Customer/Service/V1/CustomerMetadataService.php @@ -25,9 +25,7 @@ */ namespace Magento\Customer\Service\V1; -use Magento\Customer\Service\V1\CustomerMetadataServiceInterface; use Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata; -use Magento\Customer\Service\V1\Dto\Eav\OptionBuilder; class CustomerMetadataService implements CustomerMetadataServiceInterface { @@ -40,9 +38,9 @@ class CustomerMetadataService implements CustomerMetadataServiceInterface private $_cache; /** - * @var \Magento\Customer\Model\Resource\Form\Attribute\Collection + * @var \Magento\Customer\Model\Resource\Form\Attribute\CollectionFactory */ - private $_attrFormCollection; + private $_attrFormCollectionFactory; /** * @var \Magento\Core\Model\StoreManager @@ -61,21 +59,21 @@ class CustomerMetadataService implements CustomerMetadataServiceInterface /** * @param \Magento\Eav\Model\Config $eavConfig - * @param \Magento\Customer\Model\Resource\Form\Attribute\Collection $attrFormCollection + * @param \Magento\Customer\Model\Resource\Form\Attribute\CollectionFactory $attrFormCollectionFactory * @param \Magento\Core\Model\StoreManager $storeManager * @param \Magento\Customer\Service\V1\Dto\Eav\OptionBuilder $optionBuilder * @param \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadataBuilder $attributeMetadataBuilder */ public function __construct( \Magento\Eav\Model\Config $eavConfig, - \Magento\Customer\Model\Resource\Form\Attribute\Collection $attrFormCollection, + \Magento\Customer\Model\Resource\Form\Attribute\CollectionFactory $attrFormCollectionFactory, \Magento\Core\Model\StoreManager $storeManager, \Magento\Customer\Service\V1\Dto\Eav\OptionBuilder $optionBuilder, \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadataBuilder $attributeMetadataBuilder ) { $this->_eavConfig = $eavConfig; $this->_cache = []; - $this->_attrFormCollection = $attrFormCollection; + $this->_attrFormCollectionFactory = $attrFormCollectionFactory; $this->_storeManager = $storeManager; $this->_optionBuilder = $optionBuilder; $this->_attributeMetadataBuilder = $attributeMetadataBuilder; @@ -138,8 +136,8 @@ public function getAllAttributeSetMetadata($entityType, $attributeSetId = 0, $st public function getAttributes($entityType, $formCode) { $attributes = []; - $this->_loadAttributesCollection($entityType, $formCode); - foreach ($this->_attrFormCollection as $attribute) { + $attributesFormCollection = $this->_loadAttributesCollection($entityType, $formCode); + foreach ($attributesFormCollection as $attribute) { $attributes[$attribute->getAttributeCode()] = $this->_createMetadataAttribute($attribute); } return $attributes; @@ -150,34 +148,34 @@ public function getAttributes($entityType, $formCode) * * @param $entityType * @param $formCode - * @return null + * @return \Magento\Customer\Model\Resource\Form\Attribute\Collection */ private function _loadAttributesCollection($entityType, $formCode) { - $this->_attrFormCollection - ->setStore($this->_storeManager->getStore()) + $attributesFormCollection = $this->_attrFormCollectionFactory->create(); + $attributesFormCollection->setStore($this->_storeManager->getStore()) ->setEntityType($entityType) ->addFormCodeFilter($formCode) - ->setSortOrder() - ->load(); + ->setSortOrder(); + + return $attributesFormCollection; } /** - * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute + * @param \Magento\Customer\Model\Attribute $attribute * @return AttributeMetadata */ private function _createMetadataAttribute($attribute) { $options = []; - try { + if ($attribute->usesSource()) { foreach ($attribute->getSource()->getAllOptions() as $option) { $options[$option['label']] = $this->_optionBuilder->setLabel($option['label']) ->setValue($option['value']) ->create(); } - } catch (\Exception $e) { - // There is no source for this attribute } + $this->_attributeMetadataBuilder->setAttributeCode($attribute->getAttributeCode()) ->setFrontendInput($attribute->getFrontendInput()) ->setInputFilter($attribute->getInputFilter()) @@ -187,7 +185,12 @@ private function _createMetadataAttribute($attribute) ->setIsRequired($attribute->getIsRequired()) ->setMultilineCount($attribute->getMultilineCount()) ->setDataModel($attribute->getDataModel()) - ->setOptions($options); + ->setOptions($options) + ->setFrontendClass($attribute->getFrontend()->getClass()) + ->setFrontendLabel($attribute->getFrontendLabel()) + ->setIsSystem($attribute->getIsSystem()) + ->setIsUserDefined($attribute->getIsUserDefined()) + ->setSortOrder($attribute->getSortOrder()); return $this->_attributeMetadataBuilder->create(); } diff --git a/app/code/Magento/Customer/Service/V1/Dto/Address.php b/app/code/Magento/Customer/Service/V1/Dto/Address.php index 771209452dc0c..9c0905ef8bf75 100644 --- a/app/code/Magento/Customer/Service/V1/Dto/Address.php +++ b/app/code/Magento/Customer/Service/V1/Dto/Address.php @@ -29,6 +29,9 @@ class Address extends \Magento\Service\Entity\AbstractDto implements Eav\EntityInterface { + + const KEY_COUNTRY_ID = 'country_id'; + /** * @var array */ @@ -105,7 +108,7 @@ public function getRegion() */ public function getCountryId() { - return $this->_get('country_id'); + return $this->_get(self::KEY_COUNTRY_ID); } /** diff --git a/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadata.php b/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadata.php index 7c1c05328af52..eeb75e9466a5e 100644 --- a/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadata.php +++ b/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadata.php @@ -25,11 +25,9 @@ */ namespace Magento\Customer\Service\V1\Dto\Eav; -use Magento\Customer\Service\V1\Dto\Eav\Option; - class AttributeMetadata extends \Magento\Service\Entity\AbstractDto { - /** + /**#@+ * Constants used as keys into $_data */ const ATTRIBUTE_CODE = 'attribute_code'; @@ -42,8 +40,16 @@ class AttributeMetadata extends \Magento\Service\Entity\AbstractDto const REQUIRED = 'is_required'; const MULTILINE_COUNT = 'multiline_count'; const DATA_MODEL = 'data_model'; + const IS_USER_DEFINED = 'is_user_defined'; + const FRONTEND_CLASS = 'front_end_class'; + const SORT_ORDER = 'sort_order'; + const FRONTEND_LABEL = 'frontend_label'; + const IS_SYSTEM = 'is_system'; + /**#@-*/ /** + * Retrieve code of the attribute. + * * @return string */ public function getAttributeCode() @@ -52,6 +58,8 @@ public function getAttributeCode() } /** + * Frontend HTML for input element. + * * @return string */ public function getFrontendInput() @@ -60,6 +68,8 @@ public function getFrontendInput() } /** + * Get template used for input (e.g. "date") + * * @return string */ public function getInputFilter() @@ -68,6 +78,8 @@ public function getInputFilter() } /** + * Get label of the store. + * * @return string */ public function getStoreLabel() @@ -76,6 +88,8 @@ public function getStoreLabel() } /** + * Retrieve validation rules. + * * @return string */ public function getValidationRules() @@ -84,6 +98,8 @@ public function getValidationRules() } /** + * Number of lines of the attribute value. + * * @return int */ public function getMultilineCount() @@ -92,22 +108,28 @@ public function getMultilineCount() } /** + * Whether attribute is visible on frontend. + * * @return boolean */ - public function getIsVisible() + public function isVisible() { return $this->_get(self::VISIBLE); } /** + * Whether attribute is required. + * * @return boolean */ - public function getIsRequired() + public function isRequired() { return $this->_get(self::REQUIRED); } /** + * Get data model for attribute. + * * @return string */ public function getDataModel() @@ -116,10 +138,62 @@ public function getDataModel() } /** + * Return options of the attribute (key => value pairs for select) + * * @return Option[] */ public function getOptions() { return $this->_get(self::OPTIONS); } + + /** + * Get class which is used to display the attribute on frontend. + * + * @return string + */ + public function getFrontendClass() + { + return $this->_get(self::FRONTEND_CLASS); + } + + /** + * Whether current attribute has been defined by a user. + * + * @return bool + */ + public function isUserDefined() + { + return $this->_get(self::IS_USER_DEFINED); + } + + /** + * Get attributes sort order. + * + * @return int + */ + public function getSortOrder() + { + return $this->_get(self::SORT_ORDER); + } + + /** + * Get label which supposed to be displayed on frontend. + * + * @return string + */ + public function getFrontendLabel() + { + return $this->_get(self::FRONTEND_LABEL); + } + + /** + * Whether this is a system attribute. + * + * @return bool + */ + public function isSystem() + { + return $this->_get(self::IS_SYSTEM); + } } diff --git a/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadataBuilder.php b/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadataBuilder.php index 72792c4292fd7..acbf32174ccdb 100644 --- a/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadataBuilder.php +++ b/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadataBuilder.php @@ -25,8 +25,6 @@ */ namespace Magento\Customer\Service\V1\Dto\Eav; -use Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata; - class AttributeMetadataBuilder extends \Magento\Service\Entity\AbstractDtoBuilder { /** @@ -89,7 +87,7 @@ public function setValidationRules($validationRules) */ public function setOptions($options) { - $this->_set(AttributeMetadata::OPTIONS, $options); + return $this->_set(AttributeMetadata::OPTIONS, $options); } /** @@ -121,11 +119,56 @@ public function setMultilineCount($count) } /** - * @param string + * @param string $dataModel * @return AttributeMetadataBuilder */ public function setDataModel($dataModel) { return $this->_set(AttributeMetadata::DATA_MODEL, $dataModel); } + + /** + * @param $frontendClass + * @return AttributeMetadataBuilder + */ + public function setFrontendClass($frontendClass) + { + return $this->_set(AttributeMetadata::FRONTEND_CLASS, $frontendClass); + } + + /** + * @param bool $isUserDefined + * @return AttributeMetadataBuilder + */ + public function setIsUserDefined($isUserDefined) + { + return $this->_set(AttributeMetadata::IS_USER_DEFINED, $isUserDefined); + } + + /** + * @param int $sortOrder + * @return AttributeMetadataBuilder + */ + public function setSortOrder($sortOrder) + { + return $this->_set(AttributeMetadata::SORT_ORDER, $sortOrder); + } + + /** + * @param string $frontendLabel + * @return AttributeMetadataBuilder + */ + public function setFrontendLabel($frontendLabel) + { + return $this->_set(AttributeMetadata::FRONTEND_LABEL, $frontendLabel); + } + + /** + * @param bool $isSystem + * @return AttributeMetadataBuilder + */ + public function setIsSystem($isSystem) + { + return $this->_set(AttributeMetadata::IS_SYSTEM, $isSystem); + } } diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml index dfb7026534a0e..486515cdbc3f2 100644 --- a/app/code/Magento/Customer/etc/di.xml +++ b/app/code/Magento/Customer/etc/di.xml @@ -50,9 +50,9 @@
-
- Magento\Customer\Model\Resource\Setup
-
+
+ Magento\Customer\Model\Resource\Setup
diff --git a/app/code/Magento/Customer/etc/frontend/di.xml b/app/code/Magento/Customer/etc/frontend/di.xml
index bb634792fbef0..c74382804f423 100644
--- a/app/code/Magento/Customer/etc/frontend/di.xml
+++ b/app/code/Magento/Customer/etc/frontend/di.xml
@@ -31,17 +31,17 @@
-
- /customer/
-
+
+ /customer/
-
- loginPost
- createpost
-
+
+ loginPost createpost
diff --git a/app/code/Magento/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php b/app/code/Magento/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php
index 7eef3c482d1b5..041acc582af2c 100644
--- a/app/code/Magento/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php
+++ b/app/code/Magento/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/* @var $installer \Magento\Customer\Model\Entity\Setup */
+/* @var $installer \Magento\Customer\Model\Resource\Setup */
$installer = $this;
$disableAGCAttributeCode = 'disable_auto_group_change';
diff --git a/app/code/Magento/Customer/view/frontend/account/link/authorization.phtml b/app/code/Magento/Customer/view/frontend/account/link/authorization.phtml
new file mode 100644
index 0000000000000..b40d300c45abb
--- /dev/null
+++ b/app/code/Magento/Customer/view/frontend/account/link/authorization.phtml
@@ -0,0 +1,31 @@
+
+
+
+ isLoggedIn()) {echo "data-post='" . $this->getPostParams(); } ?>' getLinkAttributes(); ?> >
+ escapeHtml($this->getLabel()); ?>
+
+
diff --git a/app/code/Magento/Customer/view/frontend/layout/default.xml b/app/code/Magento/Customer/view/frontend/layout/default.xml
index c0cf556c60480..0154cacb206de 100644
--- a/app/code/Magento/Customer/view/frontend/layout/default.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/default.xml
@@ -35,6 +35,6 @@
Register
-
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools.php
index df1e847f9b2be..e65165e2770ff 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools.php
@@ -429,12 +429,12 @@ public function saveQuickStylesAction()
/**
* Re-init system configuration
*
- * @return \Magento\Core\Model\Config
+ * @return \Magento\App\ReinitableConfigInterface
*/
protected function _reinitSystemConfiguration()
{
- /** @var $configModel \Magento\Core\Model\Config */
- $configModel = $this->_objectManager->get('Magento\Core\Model\Config');
+ /** @var $configModel \Magento\App\ReinitableConfigInterface */
+ $configModel = $this->_objectManager->get('Magento\App\ReinitableConfigInterface');
return $configModel->reinit();
}
}
diff --git a/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php b/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
index 10b2dc97b8808..26901fcc47202 100644
--- a/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
+++ b/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
@@ -62,7 +62,7 @@ class Standard extends \Magento\Core\App\Router\Base
* @param \Magento\UrlInterface $url
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\Model\Store\Config $storeConfig
- * @param \Magento\Core\Model\Url\SecurityInfoInterface $urlSecurityInfo
+ * @param \Magento\Url\SecurityInfoInterface $urlSecurityInfo
* @param string $routerId
* @param \Magento\App\RouterListInterface $routerList
* @param \Magento\ObjectManager $objectManager
@@ -79,7 +79,7 @@ public function __construct(
\Magento\UrlInterface $url,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Core\Model\Store\Config $storeConfig,
- \Magento\Core\Model\Url\SecurityInfoInterface $urlSecurityInfo,
+ \Magento\Url\SecurityInfoInterface $urlSecurityInfo,
$routerId,
\Magento\App\RouterListInterface $routerList,
\Magento\ObjectManager $objectManager,
diff --git a/app/code/Magento/DesignEditor/Model/State.php b/app/code/Magento/DesignEditor/Model/State.php
index a6d883b93c71f..99c1e2d0a5eb6 100644
--- a/app/code/Magento/DesignEditor/Model/State.php
+++ b/app/code/Magento/DesignEditor/Model/State.php
@@ -37,7 +37,7 @@ class State
const LAYOUT_NAVIGATION_CLASS_NAME = 'Magento\Core\Model\Layout';
/**
- * Url model classes that will be used instead of \Magento\Core\Model\Url in navigation vde modes
+ * Url model classes that will be used instead of \Magento\UrlInterface in navigation vde modes
*/
const URL_MODEL_NAVIGATION_MODE_CLASS_NAME = 'Magento\DesignEditor\Model\Url\NavigationMode';
@@ -90,6 +90,13 @@ class State
*/
protected $_application;
+ /**
+ * Store list manager
+ *
+ * @var \Magento\Core\Model\StoreManagerInterface
+ */
+ protected $_storeManager;
+
/**
* @param \Magento\Backend\Model\Session $backendSession
* @param \Magento\Core\Model\Layout\Factory $layoutFactory
@@ -99,6 +106,7 @@ class State
* @param \Magento\ObjectManager $objectManager
* @param \Magento\Core\Model\App $application
* @param \Magento\DesignEditor\Model\Theme\Context $themeContext
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Backend\Model\Session $backendSession,
@@ -108,7 +116,8 @@ public function __construct(
\Magento\DesignEditor\Helper\Data $dataHelper,
\Magento\ObjectManager $objectManager,
\Magento\Core\Model\App $application,
- \Magento\DesignEditor\Model\Theme\Context $themeContext
+ \Magento\DesignEditor\Model\Theme\Context $themeContext,
+ \Magento\Core\Model\StoreManagerInterface $storeManager
) {
$this->_backendSession = $backendSession;
$this->_layoutFactory = $layoutFactory;
@@ -118,6 +127,7 @@ public function __construct(
$this->_objectManager = $objectManager;
$this->_application = $application;
$this->_themeContext = $themeContext;
+ $this->_storeManager = $storeManager;
}
/**
@@ -171,7 +181,7 @@ protected function _injectLayout($mode, $areaCode)
}
/**
- * Create url model instance that will be used instead of \Magento\Core\Model\Url in navigation mode
+ * Create url model instance that will be used instead of \Magento\UrlInterface in navigation mode
*/
protected function _injectUrlModel($mode)
{
@@ -190,7 +200,7 @@ protected function _setTheme()
{
if ($this->_themeContext->getEditableTheme()) {
$themeId = $this->_themeContext->getVisibleTheme()->getId();
- $this->_application->getStore()->setConfig(
+ $this->_storeManager->getStore()->setConfig(
\Magento\View\DesignInterface::XML_PATH_THEME_ID,
$themeId
);
diff --git a/app/code/Magento/DesignEditor/Model/Translate/InlineVde.php b/app/code/Magento/DesignEditor/Model/Translate/InlineVde.php
index c88c00de8e781..d6c6a07108939 100644
--- a/app/code/Magento/DesignEditor/Model/Translate/InlineVde.php
+++ b/app/code/Magento/DesignEditor/Model/Translate/InlineVde.php
@@ -71,7 +71,7 @@ class InlineVde implements \Magento\Core\Model\Translate\InlineInterface
protected $_parser;
/**
- * @var \Magento\Core\Model\Url
+ * @var \Magento\UrlInterface
*/
protected $_url;
@@ -92,13 +92,13 @@ class InlineVde implements \Magento\Core\Model\Translate\InlineInterface
*
* @param \Magento\Core\Model\Translate\InlineParser $parser
* @param \Magento\DesignEditor\Helper\Data $helper
- * @param \Magento\Core\Model\Url $url
+ * @param \Magento\UrlInterface $url
* @param \Magento\ObjectManager $objectManager
*/
public function __construct(
\Magento\Core\Model\Translate\InlineParser $parser,
\Magento\DesignEditor\Helper\Data $helper,
- \Magento\Core\Model\Url $url,
+ \Magento\UrlInterface $url,
\Magento\ObjectManager $objectManager
) {
$this->_parser = $parser;
diff --git a/app/code/Magento/DesignEditor/Model/Url/Factory.php b/app/code/Magento/DesignEditor/Model/Url/Factory.php
index f84c98d5723d7..8fcfd89fe4428 100644
--- a/app/code/Magento/DesignEditor/Model/Url/Factory.php
+++ b/app/code/Magento/DesignEditor/Model/Url/Factory.php
@@ -31,7 +31,7 @@ class Factory
/**
* Default url model class name
*/
- const CLASS_NAME = 'Magento\Core\Model\Url';
+ const CLASS_NAME = 'Magento\UrlInterface';
/**
* @var \Magento\ObjectManager
@@ -63,7 +63,7 @@ public function replaceClassName($className)
* Create url model new instance
*
* @param array $arguments
- * @return \Magento\Core\Model\Url
+ * @return \Magento\UrlInterface
*/
public function create(array $arguments = array())
{
diff --git a/app/code/Magento/DesignEditor/Model/Url/NavigationMode.php b/app/code/Magento/DesignEditor/Model/Url/NavigationMode.php
index c6859d0ffe871..13840b5d30335 100644
--- a/app/code/Magento/DesignEditor/Model/Url/NavigationMode.php
+++ b/app/code/Magento/DesignEditor/Model/Url/NavigationMode.php
@@ -29,7 +29,7 @@
*/
namespace Magento\DesignEditor\Model\Url;
-class NavigationMode extends \Magento\Core\Model\Url
+class NavigationMode extends \Magento\Url
{
/**
* VDE helper
@@ -55,29 +55,25 @@ class NavigationMode extends \Magento\Core\Model\Url
/**
* @param \Magento\App\Route\ConfigInterface $routeConfig
* @param \Magento\App\RequestInterface $request
- * @param \Magento\Core\Model\Url\SecurityInfoInterface $urlSecurityInfo
- * @param \Magento\Core\Model\Store\Config $coreStoreConfig
- * @param \Magento\Core\Model\App $app
- * @param \Magento\Core\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Url\SecurityInfoInterface $urlSecurityInfo
+ * @param \Magento\Url\ScopeResolverInterface $scopeResolver
* @param \Magento\Core\Model\Session $session
* @param \Magento\Session\SidResolverInterface $sidResolver
+ * @param \Magento\Url\RouteParamsResolverFactory $routeParamsResolver
+ * @param \Magento\Url\QueryParamsResolverInterface $queryParamsResolver
* @param \Magento\DesignEditor\Helper\Data $helper
- * @param string $areaCode
* @param array $data
- *
- * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\App\Route\ConfigInterface $routeConfig,
\Magento\App\RequestInterface $request,
- \Magento\Core\Model\Url\SecurityInfoInterface $urlSecurityInfo,
- \Magento\Core\Model\Store\Config $coreStoreConfig,
- \Magento\Core\Model\App $app,
- \Magento\Core\Model\StoreManagerInterface $storeManager,
+ \Magento\Url\SecurityInfoInterface $urlSecurityInfo,
+ \Magento\Url\ScopeResolverInterface $scopeResolver,
\Magento\Core\Model\Session $session,
\Magento\Session\SidResolverInterface $sidResolver,
+ \Magento\Url\RouteParamsResolverFactory $routeParamsResolver,
+ \Magento\Url\QueryParamsResolverInterface $queryParamsResolver,
\Magento\DesignEditor\Helper\Data $helper,
- $areaCode,
array $data = array()
) {
$this->_helper = $helper;
@@ -92,12 +88,11 @@ public function __construct(
$routeConfig,
$request,
$urlSecurityInfo,
- $coreStoreConfig,
- $app,
- $storeManager,
+ $scopeResolver,
$session,
$sidResolver,
- $areaCode,
+ $routeParamsResolver,
+ $queryParamsResolver,
$data
);
}
@@ -133,11 +128,11 @@ public function getRouteUrl($routePath = null, $routeParams = null)
protected function _hasThemeAndMode()
{
if (!$this->_mode) {
- $this->_mode = $this->getRequest()->getAlias('editorMode');
+ $this->_mode = $this->_getRequest()->getAlias('editorMode');
}
if (!$this->_themeId) {
- $this->_themeId = $this->getRequest()->getAlias('themeId');
+ $this->_themeId = $this->_getRequest()->getAlias('themeId');
}
return $this;
}
diff --git a/app/code/Magento/DesignEditor/etc/di.xml b/app/code/Magento/DesignEditor/etc/di.xml
index beffc0dab7730..b60f4b20bdd75 100644
--- a/app/code/Magento/DesignEditor/etc/di.xml
+++ b/app/code/Magento/DesignEditor/etc/di.xml
@@ -37,10 +37,10 @@
vde
-
- block_html
- config
-
+
+ block_html config
diff --git a/app/code/Magento/DesignEditor/etc/frontend/di.xml b/app/code/Magento/DesignEditor/etc/frontend/di.xml
index 641cb3e08599a..fe9b602f0935e 100644
--- a/app/code/Magento/DesignEditor/etc/frontend/di.xml
+++ b/app/code/Magento/DesignEditor/etc/frontend/di.xml
@@ -26,13 +26,15 @@
-
-
- Magento\DesignEditor\Controller\Varien\Router\Standard
- false
- 40
-
-
+
+ -
+
+ Magento\DesignEditor\Controller\Varien\Router\Standard false 40
+
+
diff --git a/app/code/Magento/Directory/Helper/Data.php b/app/code/Magento/Directory/Helper/Data.php
index 6ed3b6ffec17a..042485121aa8d 100644
--- a/app/code/Magento/Directory/Helper/Data.php
+++ b/app/code/Magento/Directory/Helper/Data.php
@@ -107,7 +107,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
protected $_currencyFactory;
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -119,7 +119,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
* @param \Magento\Core\Helper\Data $coreHelper
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
*/
public function __construct(
\Magento\App\Helper\Context $context,
@@ -129,7 +129,7 @@ public function __construct(
\Magento\Core\Helper\Data $coreHelper,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Core\Model\Config $config
+ \Magento\App\ConfigInterface $config
) {
parent::__construct($context);
$this->_configCacheType = $configCacheType;
diff --git a/app/code/Magento/Directory/Model/Currency/DefaultLocator.php b/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
index c7293304413c9..761a1b0086627 100644
--- a/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
+++ b/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
@@ -35,14 +35,25 @@ class DefaultLocator
*/
protected $_app;
+ /**
+ * Store manager
+ *
+ * @var \Magento\Core\Model\StoreManagerInterface
+ */
+ protected $_storeManager;
+
/**
* Constructor
*
* @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Core\Model\App $app)
- {
+ public function __construct(
+ \Magento\Core\Model\App $app,
+ \Magento\Core\Model\StoreManagerInterface $storeManager
+ ) {
$this->_app = $app;
+ $this->_storeManager = $storeManager;
}
/**
@@ -55,13 +66,13 @@ public function getDefaultCurrency(\Magento\App\RequestInterface $request)
{
if ($request->getParam('store')) {
$store = $request->getParam('store');
- $currencyCode = $this->_app->getStore($store)->getBaseCurrencyCode();
+ $currencyCode = $this->_storeManager->getStore($store)->getBaseCurrencyCode();
} else if ($request->getParam('website')) {
$website = $request->getParam('website');
- $currencyCode = $this->_app->getWebsite($website)->getBaseCurrencyCode();
+ $currencyCode = $this->_storeManager->getWebsite($website)->getBaseCurrencyCode();
} else if ($request->getParam('group')) {
$group = $request->getParam('group');
- $currencyCode = $this->_app->getGroup($group)->getWebsite()->getBaseCurrencyCode();
+ $currencyCode = $this->_storeManager->getGroup($group)->getWebsite()->getBaseCurrencyCode();
} else {
$currencyCode = $this->_app->getBaseCurrencyCode();
}
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php b/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php
index daf3e01e6d1f7..b7a08d86ec459 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php
@@ -26,7 +26,7 @@
class Service implements \Magento\Core\Model\Option\ArrayInterface
{
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\Directory\Model\Currency\Import\Config
*/
private $_importConfig;
diff --git a/app/code/Magento/Directory/etc/di.xml b/app/code/Magento/Directory/etc/di.xml
index 9831615741a88..dd708713e14ee 100644
--- a/app/code/Magento/Directory/etc/di.xml
+++ b/app/code/Magento/Directory/etc/di.xml
@@ -27,19 +27,21 @@
-
-
-
- Magento\Directory\Model\Currency\Import\Webservicex
-
-
+
+ -
+
+ Webservicex Magento\Directory\Model\Currency\Import\Webservicex
+
+
-
- Magento\Directory\Model\Resource\Setup
-
+
+ Magento\Directory\Model\Resource\Setup
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
index 9fe0b479947cb..aa114f820f9b5 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
@@ -52,7 +52,7 @@ class Downloadable extends \Magento\Sales\Block\Order\Email\Items\DefaultItems
protected $_itemsFactory;
/**
- * @var \Magento\Core\Model\Url
+ * @var \Magento\UrlInterface
*/
protected $urlGenerator;
@@ -60,19 +60,16 @@ class Downloadable extends \Magento\Sales\Block\Order\Email\Items\DefaultItems
* @param \Magento\View\Element\Template\Context $context
* @param \Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory
* @param \Magento\Downloadable\Model\Resource\Link\Purchased\Item\CollectionFactory $itemsFactory
- * @param \Magento\Core\Model\Url $urlGenerator
* @param array $data
*/
public function __construct(
\Magento\View\Element\Template\Context $context,
\Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory,
\Magento\Downloadable\Model\Resource\Link\Purchased\Item\CollectionFactory $itemsFactory,
- \Magento\Core\Model\Url $urlGenerator,
array $data = array()
) {
$this->_purchasedFactory = $purchasedFactory;
$this->_itemsFactory = $itemsFactory;
- $this->urlGenerator = $urlGenerator;
parent::__construct($context, $data);
}
@@ -102,9 +99,9 @@ public function getLinksTitle()
public function getPurchasedLinkUrl($item)
{
- return $this->urlGenerator->getUrl('downloadable/download/link', array(
+ return $this->_urlBuilder->getUrl('downloadable/download/link', array(
'id' => $item->getLinkHash(),
- '_store' => $this->getOrder()->getStore(),
+ '_scope' => $this->getOrder()->getStore(),
'_secure' => true,
'_nosid' => true
));
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
index 74f543e17185b..6b5b3eecbbd64 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
@@ -94,7 +94,7 @@ public function getPurchasedLinkUrl($item)
{
return $this->getUrl('downloadable/download/link', array(
'id' => $item->getLinkHash(),
- '_store' => $this->getOrder()->getStore(),
+ '_scope' => $this->getOrder()->getStore(),
'_secure' => true,
'_nosid' => true
));
diff --git a/app/code/Magento/Downloadable/Controller/Download.php b/app/code/Magento/Downloadable/Controller/Download.php
index f70274b57be2a..0ba410eac4f60 100644
--- a/app/code/Magento/Downloadable/Controller/Download.php
+++ b/app/code/Magento/Downloadable/Controller/Download.php
@@ -196,7 +196,7 @@ public function linkAction()
$this->messageManager->addNotice($notice);
$session->authenticate($this);
$session->setBeforeAuthUrl(
- $this->_objectManager->create('Magento\Core\Model\Url')->getUrl(
+ $this->_objectManager->create('Magento\UrlInterface')->getUrl(
'downloadable/customer/products/',
array('_secure' => true)
)
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy/AnyComplexType.php b/app/code/Magento/Downloadable/Model/Product/CartConfiguration/Plugin/Downloadable.php
similarity index 55%
rename from app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy/AnyComplexType.php
rename to app/code/Magento/Downloadable/Model/Product/CartConfiguration/Plugin/Downloadable.php
index 4a0bf93ec52c8..adf2ca713e1cf 100644
--- a/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy/AnyComplexType.php
+++ b/app/code/Magento/Downloadable/Model/Product/CartConfiguration/Plugin/Downloadable.php
@@ -1,6 +1,6 @@
getContext()->toDomDocument()->importNode($complexTypeNode, true);
- $this->getContext()->getSchema()->appendChild($complexType);
- return $this->scanRegisteredTypes($complexTypeNode->nodeName);
+ /** @var $product \Magento\Catalog\Model\Product */
+ list($product, $config) = $arguments;
+
+ if ($product->getTypeId() == \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
+ return isset($config['links']);
+ }
+
+ return $invocationChain->proceed($arguments);
}
-}
+}
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
index 026763a80bce5..45722f1720bb8 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -24,11 +24,11 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Downloadable\Model\Sales\Order\Pdf\Items;
+
/**
* Order Downloadable Pdf Items renderer
*/
-namespace Magento\Downloadable\Model\Sales\Order\Pdf\Items;
-
abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
{
/**
@@ -60,6 +60,7 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\App\Filesystem $filesystem
+ * @param \Magento\Filter\FilterManager $filterManager
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory
* @param \Magento\Downloadable\Model\Resource\Link\Purchased\Item\CollectionFactory $itemsFactory
@@ -72,6 +73,7 @@ public function __construct(
\Magento\Core\Model\Registry $registry,
\Magento\Tax\Helper\Data $taxData,
\Magento\App\Filesystem $filesystem,
+ \Magento\Filter\FilterManager $filterManager,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory,
\Magento\Downloadable\Model\Resource\Link\Purchased\Item\CollectionFactory $itemsFactory,
@@ -82,7 +84,16 @@ public function __construct(
$this->_coreStoreConfig = $coreStoreConfig;
$this->_purchasedFactory = $purchasedFactory;
$this->_itemsFactory = $itemsFactory;
- parent::__construct($context, $registry, $taxData, $filesystem, $resource, $resourceCollection, $data);
+ parent::__construct(
+ $context,
+ $registry,
+ $taxData,
+ $filesystem,
+ $filterManager,
+ $resource,
+ $resourceCollection,
+ $data
+ );
}
/**
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
index 9247d08ef7324..10e3a85e91fe5 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -24,13 +24,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Downloadable\Model\Sales\Order\Pdf\Items;
+
/**
* Order Creditmemo Downloadable Pdf Items renderer
*/
-namespace Magento\Downloadable\Model\Sales\Order\Pdf\Items;
-
-class Creditmemo
- extends \Magento\Downloadable\Model\Sales\Order\Pdf\Items\AbstractItems
+class Creditmemo extends \Magento\Downloadable\Model\Sales\Order\Pdf\Items\AbstractItems
{
/**
* @var \Magento\Stdlib\String
@@ -42,6 +41,7 @@ class Creditmemo
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\App\Filesystem $filesystem
+ * @param \Magento\Filter\FilterManager $filterManager
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory
* @param \Magento\Downloadable\Model\Resource\Link\Purchased\Item\CollectionFactory $itemsFactory
@@ -55,6 +55,7 @@ public function __construct(
\Magento\Core\Model\Registry $registry,
\Magento\Tax\Helper\Data $taxData,
\Magento\App\Filesystem $filesystem,
+ \Magento\Filter\FilterManager $filterManager,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory,
\Magento\Downloadable\Model\Resource\Link\Purchased\Item\CollectionFactory $itemsFactory,
@@ -69,6 +70,7 @@ public function __construct(
$registry,
$taxData,
$filesystem,
+ $filterManager,
$coreStoreConfig,
$purchasedFactory,
$itemsFactory,
@@ -80,7 +82,6 @@ public function __construct(
/**
* Draw item line
- *
*/
public function draw()
{
@@ -151,22 +152,24 @@ public function draw()
foreach ($options as $option) {
// draw options label
$lines[][] = array(
- 'text' => $this->string->split(strip_tags($option['label']), 40, true, true),
+ 'text' => $this->string->split($this->filterManager->stripTags($option['label']), 40, true, true),
'font' => 'italic',
'feed' => 35
);
// draw options value
- $_printValue = isset($option['print_value']) ? $option['print_value'] : strip_tags($option['value']);
+ $printValue = isset($option['print_value'])
+ ? $option['print_value']
+ : $this->filterManager->stripTags($option['value']);
$lines[][] = array(
- 'text' => $this->string->split($_printValue, 30, true, true),
+ 'text' => $this->string->split($printValue, 30, true, true),
'feed' => 40
);
}
}
// downloadable Items
- $_purchasedItems = $this->getLinks()->getPurchasedItems();
+ $purchasedItems = $this->getLinks()->getPurchasedItems();
// draw Links title
$lines[][] = array(
@@ -176,9 +179,9 @@ public function draw()
);
// draw Links
- foreach ($_purchasedItems as $_link) {
+ foreach ($purchasedItems as $link) {
$lines[][] = array(
- 'text' => $this->string->split($_link->getLinkTitle(), 50, true, true),
+ 'text' => $this->string->split($link->getLinkTitle(), 50, true, true),
'feed' => 40
);
}
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
index 0b515c173fa99..72c4f8b1172ac 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -24,18 +24,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Downloadable\Model\Sales\Order\Pdf\Items;
/**
* Order Invoice Downloadable Pdf Items renderer
- *
- * @category Magento
- * @package Magento_Downloadable
- * @author Magento Core Team
*/
-namespace Magento\Downloadable\Model\Sales\Order\Pdf\Items;
-
-class Invoice
- extends \Magento\Downloadable\Model\Sales\Order\Pdf\Items\AbstractItems
+class Invoice extends \Magento\Downloadable\Model\Sales\Order\Pdf\Items\AbstractItems
{
/**
* @var \Magento\Stdlib\String
@@ -47,6 +41,7 @@ class Invoice
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\App\Filesystem $filesystem
+ * @param \Magento\Filter\FilterManager $filterManager
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory
* @param \Magento\Downloadable\Model\Resource\Link\Purchased\Item\CollectionFactory $itemsFactory
@@ -60,6 +55,7 @@ public function __construct(
\Magento\Core\Model\Registry $registry,
\Magento\Tax\Helper\Data $taxData,
\Magento\App\Filesystem $filesystem,
+ \Magento\Filter\FilterManager $filterManager,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory,
\Magento\Downloadable\Model\Resource\Link\Purchased\Item\CollectionFactory $itemsFactory,
@@ -74,6 +70,7 @@ public function __construct(
$registry,
$taxData,
$filesystem,
+ $filterManager,
$coreStoreConfig,
$purchasedFactory,
$itemsFactory,
@@ -85,7 +82,6 @@ public function __construct(
/**
* Draw item line
- *
*/
public function draw()
{
@@ -167,18 +163,18 @@ public function draw()
foreach ($options as $option) {
// draw options label
$lines[][] = array(
- 'text' => $this->string->split(strip_tags($option['label']), 40, true, true),
+ 'text' => $this->string->split($this->filterManager->stripTags($option['label']), 40, true, true),
'font' => 'italic',
'feed' => 35
);
if ($option['value']) {
if (isset($option['print_value'])) {
- $_printValue = $option['print_value'];
+ $printValue = $option['print_value'];
} else {
- $_printValue = strip_tags($option['value']);
+ $printValue = $this->filterManager->stripTags($option['value']);
}
- $values = explode(', ', $_printValue);
+ $values = explode(', ', $printValue);
foreach ($values as $value) {
$lines[][] = array(
'text' => $this->string->split($value, 30, true, true),
@@ -190,7 +186,7 @@ public function draw()
}
// downloadable Items
- $_purchasedItems = $this->getLinks()->getPurchasedItems();
+ $purchasedItems = $this->getLinks()->getPurchasedItems();
// draw Links title
$lines[][] = array(
@@ -200,9 +196,9 @@ public function draw()
);
// draw Links
- foreach ($_purchasedItems as $_link) {
+ foreach ($purchasedItems as $link) {
$lines[][] = array(
- 'text' => $this->string->split($_link->getLinkTitle(), 50, true, true),
+ 'text' => $this->string->split($link->getLinkTitle(), 50, true, true),
'feed' => 40
);
}
diff --git a/app/code/Magento/Downloadable/etc/adminhtml/di.xml b/app/code/Magento/Downloadable/etc/adminhtml/di.xml
index 8e4ced5f6abcf..9b7e3391548d6 100644
--- a/app/code/Magento/Downloadable/etc/adminhtml/di.xml
+++ b/app/code/Magento/Downloadable/etc/adminhtml/di.xml
@@ -29,9 +29,9 @@
-
- Magento\Downloadable\Model\Product\CopyConstructor\Downloadable
-
+
+ Magento\Downloadable\Model\Product\CopyConstructor\Downloadable
diff --git a/app/code/Magento/Downloadable/etc/di.xml b/app/code/Magento/Downloadable/etc/di.xml
index 22cfc4027596e..51067a60ba89c 100644
--- a/app/code/Magento/Downloadable/etc/di.xml
+++ b/app/code/Magento/Downloadable/etc/di.xml
@@ -36,14 +36,12 @@
-
- Magento\Catalog\Model\Resource\Setup
-
+
+ Magento\Catalog\Model\Resource\Setup
-
-
-
+
diff --git a/app/code/Magento/Downloadable/etc/frontend/di.xml b/app/code/Magento/Downloadable/etc/frontend/di.xml
index 24702d4b66d92..5bfe97b568685 100644
--- a/app/code/Magento/Downloadable/etc/frontend/di.xml
+++ b/app/code/Magento/Downloadable/etc/frontend/di.xml
@@ -26,10 +26,10 @@
-
- /downloadable/customer/
- /downloadable/download/
-
+
+ /downloadable/customer/ /downloadable/download/
diff --git a/app/code/Magento/Downloadable/etc/module.xml b/app/code/Magento/Downloadable/etc/module.xml
index 617c9b1f864f8..1de608ef7d90c 100755
--- a/app/code/Magento/Downloadable/etc/module.xml
+++ b/app/code/Magento/Downloadable/etc/module.xml
@@ -27,7 +27,6 @@
+
-
-
-
-
-
-
-
-
+
+
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 ce8deef606a35..28bbf52834180 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
@@ -64,17 +64,6 @@ $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_ite
-
- getLinks()): ?>
-
-
- getChildHtml('item_extra'); ?>
-
getMessages()): ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/checkout/links.phtml b/app/code/Magento/Downloadable/view/frontend/checkout/links.phtml
new file mode 100644
index 0000000000000..58eabed22d447
--- /dev/null
+++ b/app/code/Magento/Downloadable/view/frontend/checkout/links.phtml
@@ -0,0 +1,32 @@
+
+getLinks()): ?>
+
+
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
deleted file mode 100644
index 11eb12f78bbad..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/checkout/multishipping/item/downloadable.phtml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
- escapeHtml($this->getProductName()) ?>
- getOptionList()):?>
-
-
- getLinks()): ?>
-
-
-
- getProductAdditionalInformationBlock()):?>
- setItem($_item)->toHtml() ?>
-
-
-helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-
-
-
-
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
-
- helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-
-
-
- helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-
-
-helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-
- helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-
-
-
-
-
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-
- helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
-
-
-
- helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-
-
- getQty() ?>
-helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-
-
-
-
-
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
-
- helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
-
-
- helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-
-
-helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-
- helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-
-
-
-
-
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-
- helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
-
-
-
- helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-
- helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-
-
-
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_item_renderers.xml
similarity index 77%
rename from app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_review.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_item_renderers.xml
index ab6538942c70d..b26ad99378e8d 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_review.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_item_renderers.xml
@@ -24,7 +24,10 @@
*/
-->
-
-
+
+
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/default.xml b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml
similarity index 94%
rename from app/code/Magento/Downloadable/view/frontend/layout/default.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml
index 15f0dc4dc845c..ccb0d1216faf2 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/default.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_review_item_renderers.xml
similarity index 87%
rename from app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_index.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_review_item_renderers.xml
index f267c7de20a4e..8fecfaf5e1362 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_review_item_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_addresses.xml b/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_addresses.xml
deleted file mode 100644
index e401e426a733a..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_addresses.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_overview.xml
deleted file mode 100644
index 7b08b20a92395..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_overview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_shipping.xml b/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_shipping.xml
deleted file mode 100644
index e8e2dc9a759e3..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_shipping.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/paypal_express_review.xml b/app/code/Magento/Downloadable/view/frontend/layout/paypal_express_review.xml
deleted file mode 100644
index d3599c1181fb1..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/layout/paypal_express_review.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/paypal_express_review_details.xml b/app/code/Magento/Downloadable/view/frontend/layout/paypal_express_review_details.xml
deleted file mode 100644
index d3599c1181fb1..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/layout/paypal_express_review_details.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/paypaluk_express_review.xml b/app/code/Magento/Downloadable/view/frontend/layout/paypaluk_express_review.xml
deleted file mode 100644
index d3599c1181fb1..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/layout/paypaluk_express_review.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/paypaluk_express_review_details.xml b/app/code/Magento/Downloadable/view/frontend/layout/paypaluk_express_review_details.xml
deleted file mode 100644
index ab6538942c70d..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/layout/paypaluk_express_review_details.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_creditmemo_items.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_creditmemo_renderers.xml
similarity index 94%
rename from app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_creditmemo_items.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_creditmemo_renderers.xml
index dc32941feb8e2..038cf80bec80e 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_creditmemo_items.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_creditmemo_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_invoice_items.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_invoice_renderers.xml
similarity index 94%
rename from app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_invoice_items.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_invoice_renderers.xml
index d51f31dfccd38..9fabb69a64c76 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_invoice_items.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_invoice_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_items.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_renderers.xml
similarity index 95%
rename from app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_items.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_renderers.xml
index 21d4f882cb09b..dc0773310b03b 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_items.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_printorder.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_printorder.xml
deleted file mode 100644
index 50a54a5123747..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_printorder.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_printordercreditmemo.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_printordercreditmemo.xml
deleted file mode 100644
index 054e60b11581a..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_printordercreditmemo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_creditmemo.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_creditmemo_renderers.xml
similarity index 95%
rename from app/code/Magento/Downloadable/view/frontend/layout/sales_guest_creditmemo.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/sales_order_creditmemo_renderers.xml
index ea2e341ef9881..56943f3f0aba7 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_creditmemo.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_creditmemo_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_invoice.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_invoice_renderers.xml
similarity index 95%
rename from app/code/Magento/Downloadable/view/frontend/layout/sales_order_invoice.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/sales_order_invoice_renderers.xml
index e5bee2ceebf05..e435688621ba8 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_invoice.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_invoice_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_printorder.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_item_renderers.xml
similarity index 95%
rename from app/code/Magento/Downloadable/view/frontend/layout/sales_order_printorder.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/sales_order_item_renderers.xml
index 50a54a5123747..02b665bca1fc8 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_printorder.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_item_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_creditmemo.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_creditmemo_renderers.xml
similarity index 94%
rename from app/code/Magento/Downloadable/view/frontend/layout/sales_order_creditmemo.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_creditmemo_renderers.xml
index ea2e341ef9881..1509b5bf43438 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_creditmemo.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_creditmemo_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_printorderinvoice.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_invoice_renderers.xml
similarity index 94%
rename from app/code/Magento/Downloadable/view/frontend/layout/sales_guest_printorderinvoice.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_invoice_renderers.xml
index 7f017145d1ee2..8f9b77ec9002f 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_printorderinvoice.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_invoice_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_view.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_renderers.xml
similarity index 95%
rename from app/code/Magento/Downloadable/view/frontend/layout/sales_order_view.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_renderers.xml
index f0dff79e19763..6d0f8ae6eeccd 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_view.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_printordercreditmemo.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_printordercreditmemo.xml
deleted file mode 100644
index 054e60b11581a..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_printordercreditmemo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_printorderinvoice.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_printorderinvoice.xml
deleted file mode 100644
index 7f017145d1ee2..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_printorderinvoice.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
index ebe588fdf4018..b4ea1b770a641 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
@@ -101,7 +101,7 @@ abstract class AbstractData
*
* @param \Magento\Core\Model\LocaleInterface $locale
* @param \Magento\Logger $logger
- */
+ */
public function __construct(
\Magento\Core\Model\LocaleInterface $locale,
\Magento\Logger $logger
@@ -583,7 +583,7 @@ abstract public function compactValue($value);
abstract public function restoreValue($value);
/**
- * Return formated attribute value from entity model
+ * Return formatted attribute value from entity model
*
* @param string $format
* @return string|array
diff --git a/app/code/Magento/Eav/Model/Entity/Setup.php b/app/code/Magento/Eav/Model/Entity/Setup.php
index be3acbc6c2509..d9dff25f0579c 100644
--- a/app/code/Magento/Eav/Model/Entity/Setup.php
+++ b/app/code/Magento/Eav/Model/Entity/Setup.php
@@ -1267,184 +1267,6 @@ public function installEntities($entities = null)
return $this;
}
-
-/****************************** CREATE ENTITY TABLES ***********************************/
-
- /**
- * Create entity tables
- *
- * @param string $baseName
- * @param array $options
- * - no-main
- * - no-default-types
- * - types
- * @return unknown
- */
- public function createEntityTables($baseTableName, array $options = array())
- {
- $isNoCreateMainTable = $this->_getValue($options, 'no-main', false);
- $isNoDefaultTypes = $this->_getValue($options, 'no-default-types', false);
- $customTypes = $this->_getValue($options, 'types', array());
- $tables = array();
-
- if (!$isNoCreateMainTable) {
- /**
- * Create table main eav table
- */
- $connection = $this->getConnection();
- $mainTable = $connection
- ->newTable($this->getTable($baseTableName))
- ->addColumn('entity_id', \Magento\DB\Ddl\Table::TYPE_INTEGER, null, array(
- 'identity' => true,
- 'nullable' => false,
- 'primary' => true,
- ), 'Entity Id')
- ->addColumn('entity_type_id', \Magento\DB\Ddl\Table::TYPE_SMALLINT, null, array(
- 'unsigned' => true,
- 'nullable' => false,
- 'default' => '0',
- ), 'Entity Type Id')
- ->addColumn('attribute_set_id', \Magento\DB\Ddl\Table::TYPE_SMALLINT, null, array(
- 'unsigned' => true,
- 'nullable' => false,
- 'default' => '0',
- ), 'Attribute Set Id')
- ->addColumn('increment_id', \Magento\DB\Ddl\Table::TYPE_TEXT, 50, array(
- 'nullable' => false,
- 'default' => '',
- ), 'Increment Id')
- ->addColumn('store_id', \Magento\DB\Ddl\Table::TYPE_SMALLINT, null, array(
- 'unsigned' => true,
- 'nullable' => false,
- 'default' => '0',
- ), 'Store Id')
- ->addColumn('created_at', \Magento\DB\Ddl\Table::TYPE_TIMESTAMP, null, array(
- 'nullable' => false,
- ), 'Created At')
- ->addColumn('updated_at', \Magento\DB\Ddl\Table::TYPE_TIMESTAMP, null, array(
- 'nullable' => false,
- ), 'Updated At')
- ->addColumn('is_active', \Magento\DB\Ddl\Table::TYPE_SMALLINT, null, array(
- 'unsigned' => true,
- 'nullable' => false,
- 'default' => '1',
- ), 'Defines Is Entity Active')
- ->addIndex($this->getIdxName($baseTableName, array('entity_type_id')),
- array('entity_type_id'))
- ->addIndex($this->getIdxName($baseTableName, array('store_id')),
- array('store_id'))
- ->addForeignKey($this->getFkName($baseTableName, 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
- 'entity_type_id', $this->getTable('eav_entity_type'), 'entity_type_id',
- \Magento\DB\Ddl\Table::ACTION_CASCADE, \Magento\DB\Ddl\Table::ACTION_CASCADE)
- ->addForeignKey($this->getFkName($baseTableName, 'store_id', 'core_store', 'store_id'),
- 'store_id', $this->getTable('core_store'), 'store_id',
- \Magento\DB\Ddl\Table::ACTION_CASCADE, \Magento\DB\Ddl\Table::ACTION_CASCADE)
- ->setComment('Eav Entity Main Table');
-
- $tables[$this->getTable($baseTableName)] = $mainTable;
- }
-
- $types = array();
- if (!$isNoDefaultTypes) {
- $types = array(
- 'datetime' => array(\Magento\DB\Ddl\Table::TYPE_DATETIME, null),
- 'decimal' => array(\Magento\DB\Ddl\Table::TYPE_DECIMAL, '12,4'),
- 'int' => array(\Magento\DB\Ddl\Table::TYPE_INTEGER, null),
- 'text' => array(\Magento\DB\Ddl\Table::TYPE_TEXT, '64k'),
- 'varchar' => array(\Magento\DB\Ddl\Table::TYPE_TEXT, '255'),
- 'char' => array(\Magento\DB\Ddl\Table::TYPE_TEXT, '255')
- );
- }
-
- if (!empty($customTypes)) {
- foreach ($customTypes as $type => $fieldType) {
- if (count($fieldType) != 2) {
- throw new \Magento\Eav\Exception(__('Wrong type definition for %1', $type));
- }
- $types[$type] = $fieldType;
- }
- }
-
- /**
- * Create table array($baseTableName, $type)
- */
- foreach ($types as $type => $fieldType) {
- $eavTableName = array($baseTableName, $type);
-
- $eavTable = $connection->newTable($this->getTable($eavTableName));
- $eavTable
- ->addColumn('value_id', \Magento\DB\Ddl\Table::TYPE_INTEGER, null, array(
- 'identity' => true,
- 'nullable' => false,
- 'primary' => true,
- ), 'Value Id')
- ->addColumn('entity_type_id', \Magento\DB\Ddl\Table::TYPE_SMALLINT, null, array(
- 'unsigned' => true,
- 'nullable' => false,
- 'default' => '0',
- ), 'Entity Type Id')
- ->addColumn('attribute_id', \Magento\DB\Ddl\Table::TYPE_SMALLINT, null, array(
- 'unsigned' => true,
- 'nullable' => false,
- 'default' => '0',
- ), 'Attribute Id')
- ->addColumn('store_id', \Magento\DB\Ddl\Table::TYPE_SMALLINT, null, array(
- 'unsigned' => true,
- 'nullable' => false,
- 'default' => '0',
- ), 'Store Id')
- ->addColumn('entity_id', \Magento\DB\Ddl\Table::TYPE_INTEGER, null, array(
- 'unsigned' => true,
- 'nullable' => false,
- 'default' => '0',
- ), 'Entity Id')
- ->addColumn('value', $fieldType[0], $fieldType[1], array(
- 'nullable' => false,
- ), 'Attribute Value')
- ->addIndex($this->getIdxName($eavTableName, array('entity_type_id')),
- array('entity_type_id'))
- ->addIndex($this->getIdxName($eavTableName, array('attribute_id')),
- array('attribute_id'))
- ->addIndex($this->getIdxName($eavTableName, array('store_id')),
- array('store_id'))
- ->addIndex($this->getIdxName($eavTableName, array('entity_id')),
- array('entity_id'));
- if ($type !== 'text') {
- $eavTable->addIndex($this->getIdxName($eavTableName, array('attribute_id', 'value')),
- array('attribute_id', 'value'));
- $eavTable->addIndex($this->getIdxName($eavTableName, array('entity_type_id', 'value')),
- array('entity_type_id', 'value'));
- }
-
- $eavTable
- ->addForeignKey($this->getFkName($eavTableName, 'entity_id', $baseTableName, 'entity_id'),
- 'entity_id', $this->getTable($baseTableName), 'entity_id',
- \Magento\DB\Ddl\Table::ACTION_CASCADE, \Magento\DB\Ddl\Table::ACTION_CASCADE)
- ->addForeignKey($this->getFkName($eavTableName, 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
- 'entity_type_id', $this->getTable('eav_entity_type'), 'entity_type_id',
- \Magento\DB\Ddl\Table::ACTION_CASCADE, \Magento\DB\Ddl\Table::ACTION_CASCADE)
- ->addForeignKey($this->getFkName($eavTableName, 'store_id', 'core_store', 'store_id'),
- 'store_id', $this->getTable('core_store'), 'store_id',
- \Magento\DB\Ddl\Table::ACTION_CASCADE, \Magento\DB\Ddl\Table::ACTION_CASCADE)
- ->setComment('Eav Entity Value Table');
-
- $tables[$this->getTable($eavTableName)] = $eavTable;
- }
-
- $connection->beginTransaction();
- try {
- foreach ($tables as $tableName => $table) {
- $connection->createTable($table);
- }
- $connection->commit();
- } catch (\Exception $e) {
- $connection->rollBack();
- throw new \Magento\Eav\Exception(__('Can\'t create table: %1', $tableName));
- }
-
- return $this;
- }
-
/**
* Retrieve attribute table fields
*
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
index cfce611d86e38..f9dc99292734c 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
@@ -51,9 +51,9 @@ class Attribute extends \Magento\Core\Model\Resource\Db\AbstractDb
protected $_application;
/**
- * @var \Magento\Core\Model\App
+ * @var \Magento\Core\Model\StoreManagerInterface
*/
- protected $_app;
+ protected $_storeManager;
/**
* @var \Magento\Eav\Model\Resource\Entity\Type
@@ -64,21 +64,15 @@ class Attribute extends \Magento\Core\Model\Resource\Db\AbstractDb
* Class constructor
*
* @param \Magento\App\Resource $resource
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Resource\Entity\Type $eavEntityType
- * @param array $arguments
*/
public function __construct(
\Magento\App\Resource $resource,
- \Magento\Core\Model\App $app,
- \Magento\Eav\Model\Resource\Entity\Type $eavEntityType,
- array $arguments = array()
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
+ \Magento\Eav\Model\Resource\Entity\Type $eavEntityType
) {
- if (isset($arguments['application']) && $arguments['application'] instanceof \Magento\Core\Model\App) {
- $this->_application = $arguments['application'];
- unset($arguments['application']);
- }
- $this->_app = $app;
+ $this->_storeManager = $storeManager;
$this->_eavEntityType = $eavEntityType;
parent::__construct($resource);
}
@@ -92,16 +86,6 @@ protected function _construct()
$this->_init('eav_attribute', 'attribute_id');
}
- /**
- * Retrieve application instance
- *
- * @return \Magento\Core\Model\App
- */
- protected function _getApplication()
- {
- return $this->_application ?: $this->_app;
- }
-
/**
* Initialize unique fields
*
@@ -493,7 +477,7 @@ protected function _updateAttributeOptionValues($optionId, $values)
$adapter->delete($table, array('option_id = ?' => $optionId));
- $stores = $this->_getApplication()->getStores(true);
+ $stores = $this->_storeManager->getStores(true);
foreach ($stores as $store) {
$storeId = $store->getId();
if (!empty($values[$storeId]) || isset($values[$storeId]) && $values[$storeId] == '0') {
diff --git a/app/code/Magento/Eav/etc/di.xml b/app/code/Magento/Eav/etc/di.xml
index 09580286d8239..8bc8259daaac2 100644
--- a/app/code/Magento/Eav/etc/di.xml
+++ b/app/code/Magento/Eav/etc/di.xml
@@ -31,9 +31,9 @@
-
- Magento\Eav\Model\Entity\Setup
-
+
+ Magento\Eav\Model\Entity\Setup
diff --git a/app/code/Magento/Email/Model/BackendTemplate.php b/app/code/Magento/Email/Model/BackendTemplate.php
index e5bb5f40689f9..a1252d2520a92 100644
--- a/app/code/Magento/Email/Model/BackendTemplate.php
+++ b/app/code/Magento/Email/Model/BackendTemplate.php
@@ -32,7 +32,7 @@
class BackendTemplate extends Template
{
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_coreConfig;
@@ -51,7 +51,7 @@ class BackendTemplate extends Template
* @param \Magento\View\Url $viewUrl
* @param \Magento\View\FileSystem $viewFileSystem
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param \Magento\Email\Model\Template\FilterFactory $emailFilterFactory
* @param \Magento\Email\Model\Template\Config $emailConfig
* @param \Magento\Backend\Model\Config\Structure $structure
@@ -69,7 +69,7 @@ public function __construct(
\Magento\View\Url $viewUrl,
\Magento\View\FileSystem $viewFileSystem,
\Magento\Core\Model\Store\Config $coreStoreConfig,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\Email\Model\Template\FilterFactory $emailFilterFactory,
\Magento\Email\Model\Template\Config $emailConfig,
\Magento\Backend\Model\Config\Structure $structure,
diff --git a/app/code/Magento/Email/Model/Source/Variables.php b/app/code/Magento/Email/Model/Source/Variables.php
index 1b5db5fc64d45..7883218e43b4c 100644
--- a/app/code/Magento/Email/Model/Source/Variables.php
+++ b/app/code/Magento/Email/Model/Source/Variables.php
@@ -51,11 +51,11 @@ public function __construct()
{
$this->_configVariables = array(
array(
- 'value' => \Magento\Core\Model\Url::XML_PATH_UNSECURE_URL,
+ 'value' => \Magento\Core\Model\Store::XML_PATH_UNSECURE_BASE_URL,
'label' => __('Base Unsecure URL')
),
array(
- 'value' => \Magento\Core\Model\Url::XML_PATH_SECURE_URL,
+ 'value' => \Magento\Core\Model\Store::XML_PATH_SECURE_BASE_URL,
'label' => __('Base Secure URL')
),
array(
diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
index 21138b2d6e48f..253424a039b08 100644
--- a/app/code/Magento/Email/Model/Template.php
+++ b/app/code/Magento/Email/Model/Template.php
@@ -145,7 +145,7 @@ class Template extends \Magento\Core\Model\Template
* @param \Magento\View\Url $viewUrl
* @param \Magento\View\FileSystem $viewFileSystem
* @param \Magento\Core\Model\Store\ConfigInterface $coreStoreConfig
- * @param \Magento\Core\Model\ConfigInterface $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param \Magento\Email\Model\Template\FilterFactory $emailFilterFactory
* @param \Magento\Email\Model\Template\Config $emailConfig
* @param array $data
@@ -162,7 +162,7 @@ public function __construct(
\Magento\View\Url $viewUrl,
\Magento\View\FileSystem $viewFileSystem,
\Magento\Core\Model\Store\ConfigInterface $coreStoreConfig,
- \Magento\Core\Model\ConfigInterface $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\Email\Model\Template\FilterFactory $emailFilterFactory,
\Magento\Email\Model\Template\Config $emailConfig,
array $data = array()
@@ -200,10 +200,24 @@ protected function _getLogoUrl($store)
$uploadDir = \Magento\Backend\Model\Config\Backend\Email\Logo::UPLOAD_DIR;
$mediaDirectory = $this->_filesystem->getDirectoryRead(\Magento\App\Filesystem::MEDIA_DIR);
if ($mediaDirectory->isFile($uploadDir . '/' . $fileName)) {
- return $this->_storeManager->getStore()->getBaseUrl('media') . $uploadDir . '/' . $fileName;
+ return $this->_storeManager->getStore()
+ ->getBaseUrl(\Magento\UrlInterface::URL_TYPE_MEDIA) . $uploadDir . '/' . $fileName;
}
}
- return $this->_viewUrl->getViewFileUrl('Magento_Core::logo_email.gif');
+ return $this->getDefaultEmailLogo();
+ }
+
+ /**
+ * Get default email logo image
+ *
+ * @return string
+ */
+ public function getDefaultEmailLogo()
+ {
+ return $this->_viewUrl->getViewFileUrl(
+ 'Magento_Email::logo_email.gif',
+ array('area' => \Magento\Core\Model\App\Area::AREA_FRONTEND)
+ );
}
/**
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index ebb04b0d5ae77..8e98c28d013a7 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -370,7 +370,8 @@ public function viewDirective($construction)
public function mediaDirective($construction)
{
$params = $this->_getIncludeParameters($construction[2]);
- return $this->_storeManager->getStore()->getBaseUrl('media') . $params['url'];
+ return $this->_storeManager->getStore()
+ ->getBaseUrl(\Magento\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
}
/**
diff --git a/app/code/Magento/Core/view/adminhtml/logo_email.gif b/app/code/Magento/Email/view/frontend/logo_email.gif
similarity index 100%
rename from app/code/Magento/Core/view/adminhtml/logo_email.gif
rename to app/code/Magento/Email/view/frontend/logo_email.gif
diff --git a/app/code/Magento/GiftMessage/Model/Resource/Setup.php b/app/code/Magento/GiftMessage/Model/Resource/Setup.php
index 7257cdae6937e..9f320c800a02f 100644
--- a/app/code/Magento/GiftMessage/Model/Resource/Setup.php
+++ b/app/code/Magento/GiftMessage/Model/Resource/Setup.php
@@ -41,7 +41,7 @@ class Setup extends \Magento\Sales\Model\Resource\Setup
* @param string $resourceName
* @param \Magento\App\CacheInterface $cache
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $attrGroupCollectionFactory
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Catalog\Model\Resource\SetupFactory $catalogSetupFactory
* @param string $moduleName
* @param string $connectionName
@@ -51,7 +51,7 @@ public function __construct(
$resourceName,
\Magento\App\CacheInterface $cache,
\Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $attrGroupCollectionFactory,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Catalog\Model\Resource\SetupFactory $catalogSetupFactory,
$moduleName = 'Magento_GiftMessage',
$connectionName = ''
diff --git a/app/code/Magento/GiftMessage/etc/di.xml b/app/code/Magento/GiftMessage/etc/di.xml
index 7b1bdd30e3fcd..a8f808469b9aa 100644
--- a/app/code/Magento/GiftMessage/etc/di.xml
+++ b/app/code/Magento/GiftMessage/etc/di.xml
@@ -26,9 +26,9 @@
-
- Magento\GiftMessage\Model\Resource\Setup
-
+
+ Magento\GiftMessage\Model\Resource\Setup
diff --git a/app/code/Magento/GoogleAdwords/Helper/Data.php b/app/code/Magento/GoogleAdwords/Helper/Data.php
index 78fcf8b38e5a9..1e591c6df9521 100644
--- a/app/code/Magento/GoogleAdwords/Helper/Data.php
+++ b/app/code/Magento/GoogleAdwords/Helper/Data.php
@@ -72,7 +72,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
/**#@-*/
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -88,13 +88,13 @@ class Data extends \Magento\App\Helper\AbstractHelper
/**
* @param \Magento\App\Helper\Context $context
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Core\Model\Store\ConfigInterface $storeConfig
* @param \Magento\Core\Model\Registry $registry
*/
public function __construct(
\Magento\App\Helper\Context $context,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Core\Model\Store\ConfigInterface $storeConfig,
\Magento\Core\Model\Registry $registry
) {
diff --git a/app/code/Magento/GoogleAdwords/Model/Config/Backend/AbstractConversion.php b/app/code/Magento/GoogleAdwords/Model/Config/Backend/AbstractConversion.php
index 26fe4614f296e..b2c1fca711dcf 100644
--- a/app/code/Magento/GoogleAdwords/Model/Config/Backend/AbstractConversion.php
+++ b/app/code/Magento/GoogleAdwords/Model/Config/Backend/AbstractConversion.php
@@ -44,7 +44,7 @@ abstract class AbstractConversion extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Validator\Composite\VarienObjectFactory $validatorCompositeFactory
* @param \Magento\GoogleAdwords\Model\Validator\Factory $validatorFactory
* @param \Magento\Core\Model\Resource\AbstractResource $resource
@@ -55,7 +55,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Validator\Composite\VarienObjectFactory $validatorCompositeFactory,
\Magento\GoogleAdwords\Model\Validator\Factory $validatorFactory,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/GoogleCheckout/Controller/Redirect.php b/app/code/Magento/GoogleCheckout/Controller/Redirect.php
index c84cbaaa5133f..bd89956fd35ea 100644
--- a/app/code/Magento/GoogleCheckout/Controller/Redirect.php
+++ b/app/code/Magento/GoogleCheckout/Controller/Redirect.php
@@ -47,7 +47,7 @@ protected function _getApi ()
if (!$quote->hasItems()) {
$this->getResponse()->setRedirect(
- $this->_objectManager->create('Magento\Core\Model\Url')->getUrl('checkout/cart')
+ $this->_objectManager->create('Magento\UrlInterface')->getUrl('checkout/cart')
);
$api->setError(true);
}
@@ -103,7 +103,7 @@ public function checkoutAction()
$api = $this->_getApi();
if ($api->getError()) {
- $url = $this->_objectManager->create('Magento\Core\Model\Url')->getUrl('checkout/cart');
+ $url = $this->_objectManager->create('Magento\UrlInterface')->getUrl('checkout/cart');
} else {
$url = $api->getRedirectUrl();
}
@@ -120,7 +120,7 @@ public function redirectAction()
if ($api->getError()) {
$this->getResponse()->setRedirect(
- $this->_objectManager->create('Magento\Core\Model\Url')->getUrl('checkout/cart')
+ $this->_objectManager->create('Magento\UrlInterface')->getUrl('checkout/cart')
);
return;
} else {
diff --git a/app/code/Magento/GoogleCheckout/Model/Api/Xml/AbstractXml.php b/app/code/Magento/GoogleCheckout/Model/Api/Xml/AbstractXml.php
index db17bf393c6da..47e7542bcca61 100644
--- a/app/code/Magento/GoogleCheckout/Model/Api/Xml/AbstractXml.php
+++ b/app/code/Magento/GoogleCheckout/Model/Api/Xml/AbstractXml.php
@@ -240,7 +240,7 @@ public function _call($xml)
protected function _getCallbackUrl()
{
- return $this->objectManager->create('Magento\Core\Model\Url')->getUrl(
+ return $this->objectManager->create('Magento\UrlInterface')->getUrl(
'googlecheckout/api',
array('_forced_secure'=>$this->_coreStoreConfig->getConfig('google/checkout/use_secure_callback_url',$this->getStoreId()))
);
diff --git a/app/code/Magento/GoogleCheckout/Model/Api/Xml/Checkout.php b/app/code/Magento/GoogleCheckout/Model/Api/Xml/Checkout.php
index c3fd8c39b3ec7..645726b737d0b 100644
--- a/app/code/Magento/GoogleCheckout/Model/Api/Xml/Checkout.php
+++ b/app/code/Magento/GoogleCheckout/Model/Api/Xml/Checkout.php
@@ -1135,7 +1135,7 @@ protected function _getAnalyticsDataXml()
*/
protected function _getEditCartUrl()
{
- return $this->objectManager->create('Magento\Core\Model\Url')->getUrl('googlecheckout/redirect/cart');
+ return $this->objectManager->create('Magento\UrlInterface')->getUrl('googlecheckout/redirect/cart');
}
/**
@@ -1145,7 +1145,7 @@ protected function _getEditCartUrl()
*/
protected function _getContinueShoppingUrl()
{
- return $this->objectManager->create('Magento\Core\Model\Url')->getUrl('googlecheckout/redirect/continue');
+ return $this->objectManager->create('Magento\UrlInterface')->getUrl('googlecheckout/redirect/continue');
}
/**
@@ -1175,7 +1175,7 @@ protected function _getCalculationsUrl()
*/
protected function _getParameterizedUrl()
{
- return $this->objectManager->create('Magento\Core\Model\Url')->getUrl('googlecheckout/api/beacon');
+ return $this->objectManager->create('Magento\UrlInterface')->getUrl('googlecheckout/api/beacon');
}
/**
diff --git a/app/code/Magento/GoogleCheckout/Model/Payment.php b/app/code/Magento/GoogleCheckout/Model/Payment.php
index f98d64eb1aa1f..399b289958151 100644
--- a/app/code/Magento/GoogleCheckout/Model/Payment.php
+++ b/app/code/Magento/GoogleCheckout/Model/Payment.php
@@ -54,7 +54,7 @@ class Payment extends \Magento\Payment\Model\Method\AbstractMethod
protected $apiFactory;
/**
- * @var \Magento\Core\Model\UrlFactory
+ * @var \Magento\UrlFactory
*/
protected $urlFactory;
@@ -69,7 +69,7 @@ public function __construct(
\Magento\Core\Model\Store\ConfigInterface $coreStoreConfig,
\Magento\Core\Model\Log\AdapterFactory $logAdapterFactory,
\Magento\Core\Model\DateFactory $dateFactory,
- \Magento\Core\Model\UrlFactory $urlFactory,
+ \Magento\UrlFactory $urlFactory,
\Magento\GoogleCheckout\Model\ApiFactory $apiFactory,
array $data = array()
) {
diff --git a/app/code/Magento/GoogleCheckout/etc/di.xml b/app/code/Magento/GoogleCheckout/etc/di.xml
index cfafe870a6bbd..c88a94d607bcc 100644
--- a/app/code/Magento/GoogleCheckout/etc/di.xml
+++ b/app/code/Magento/GoogleCheckout/etc/di.xml
@@ -26,9 +26,9 @@
-
- Magento\Catalog\Model\Resource\Setup
-
+
+ Magento\Catalog\Model\Resource\Setup
diff --git a/app/code/Magento/GoogleCheckout/etc/frontend/di.xml b/app/code/Magento/GoogleCheckout/etc/frontend/di.xml
index 1b6cdc0479f4d..2f41f0a33190e 100644
--- a/app/code/Magento/GoogleCheckout/etc/frontend/di.xml
+++ b/app/code/Magento/GoogleCheckout/etc/frontend/di.xml
@@ -26,11 +26,11 @@
-
- /googlecheckout/redirect/
- /googlecheckout/api/beacon/
- /googlecheckout/api/
-
+
+ /googlecheckout/redirect/ /googlecheckout/api/beacon/ /googlecheckout/api/
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php
index b6fb85e0401e5..c8f0cf7b9441e 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php
@@ -44,20 +44,18 @@ class Item extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\GoogleShopping\Model\Resource\Item\CollectionFactory $collectionFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\GoogleShopping\Model\Resource\Item\CollectionFactory $collectionFactory,
array $data = array()
) {
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Product.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Product.php
index 79db04cd402b0..f181435a6486c 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Product.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Product.php
@@ -65,7 +65,6 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\GoogleShopping\Model\Resource\Item\CollectionFactory $itemCollectionFactory
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory $eavCollectionFactory
@@ -75,7 +74,6 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\GoogleShopping\Model\Resource\Item\CollectionFactory $itemCollectionFactory,
\Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory $eavCollectionFactory,
@@ -87,7 +85,7 @@ public function __construct(
$this->_eavCollectionFactory = $eavCollectionFactory;
$this->_productType = $productType;
$this->_productFactory = $productFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/GoogleShopping/Helper/Price.php b/app/code/Magento/GoogleShopping/Helper/Price.php
deleted file mode 100644
index 9796713956bcb..0000000000000
--- a/app/code/Magento/GoogleShopping/Helper/Price.php
+++ /dev/null
@@ -1,148 +0,0 @@
-
- */
-namespace Magento\GoogleShopping\Helper;
-
-class Price
-{
- /**
- * Core registry
- *
- * @var \Magento\Core\Model\Registry
- */
- protected $_coreRegistry = null;
-
- /**
- * Store manager
- *
- * @var \Magento\Core\Model\StoreManagerInterface
- */
- protected $_storeManager;
-
- /**
- * @param \Magento\Core\Model\Registry $coreRegistry
- * @param \Magento\Core\Model\StoreManagerInterface $storeManager
- */
- public function __construct(
- \Magento\Core\Model\Registry $coreRegistry,
- \Magento\Core\Model\StoreManagerInterface $storeManager
- ) {
- $this->_coreRegistry = $coreRegistry;
- $this->_storeManager = $storeManager;
- }
-
- /**
- * Tries to return price that looks like price in catalog
- *
- * @param \Magento\Catalog\Model\Product $product
- * @param null|\Magento\Core\Model\Store $store Store view
- * @return null|float Price
- */
- public function getCatalogPrice(\Magento\Catalog\Model\Product $product, $store = null, $inclTax = null)
- {
- switch ($product->getTypeId()) {
- case \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE:
- // Workaround to avoid loading stock status by admin's website
- if ($store instanceof \Magento\Core\Model\Store) {
- $oldStore = $this->_storeManager->getStore();
- $this->_storeManager->setCurrentStore($store);
- }
- $subProducts = $product->getTypeInstance()->getAssociatedProducts($product);
- if ($store instanceof \Magento\Core\Model\Store) {
- $this->_storeManager->setCurrentStore($oldStore);
- }
- if (!count($subProducts)) {
- return null;
- }
- $minPrice = null;
- foreach ($subProducts as $subProduct) {
- $subProduct->setWebsiteId($product->getWebsiteId())
- ->setCustomerGroupId($product->getCustomerGroupId());
- if ($subProduct->isSalable()) {
- if ($this->getCatalogPrice($subProduct) < $minPrice || $minPrice === null) {
- $minPrice = $this->getCatalogPrice($subProduct);
- $product->setTaxClassId($subProduct->getTaxClassId());
- }
- }
- }
- return $minPrice;
-
- case \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE:
- if ($store instanceof \Magento\Core\Model\Store) {
- $oldStore = $this->_storeManager->getStore();
- $this->_storeManager->setCurrentStore($store);
- }
-
- $this->_coreRegistry->unregister('rule_data');
- $this->_coreRegistry->register('rule_data', new \Magento\Object(array(
- 'store_id' => $product->getStoreId(),
- 'website_id' => $product->getWebsiteId(),
- 'customer_group_id' => $product->getCustomerGroupId())));
-
- $minPrice = $product->getPriceModel()->getTotalPrices($product, 'min', $inclTax);
-
- if ($store instanceof \Magento\Core\Model\Store) {
- $this->_storeManager->setCurrentStore($oldStore);
- }
- return $minPrice;
-
- case 'giftcard':
- return $product->getPriceModel()->getMinAmount($product);
-
- default:
- return $product->getFinalPrice();
- }
- }
-
- /**
- * Tries calculate price without discount; if can't returns nul
- *
- * @param \Magento\Catalog\Model\Product $product
- * @param mixed $store
- */
- public function getCatalogRegularPrice(\Magento\Catalog\Model\Product $product, $store = null)
- {
- switch ($product->getTypeId()) {
- case \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE:
- case \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE:
- case 'giftcard':
- return null;
-
- default:
- return $product->getPrice();
- }
- }
-}
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute.php b/app/code/Magento/GoogleShopping/Model/Attribute.php
index bd2f27df0ee12..76f050ff02523 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute.php
@@ -80,9 +80,9 @@ class Attribute extends \Magento\Core\Model\AbstractModel
protected $_gsProduct = null;
/**
- * @var \Magento\GoogleShopping\Helper\Price|null
+ * @var \Magento\Catalog\Model\Product\CatalogPrice
*/
- protected $_gsPrice = null;
+ protected $catalogPrice;
/**
* Product factory
@@ -97,7 +97,7 @@ class Attribute extends \Magento\Core\Model\AbstractModel
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\GoogleShopping\Helper\Data $gsData
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
- * @param \Magento\GoogleShopping\Helper\Price $gsPrice
+ * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
* @param \Magento\Data\Collection\Db $resourceCollection
* @param array $data
@@ -108,7 +108,7 @@ public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\GoogleShopping\Helper\Data $gsData,
\Magento\GoogleShopping\Helper\Product $gsProduct,
- \Magento\GoogleShopping\Helper\Price $gsPrice,
+ \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
@@ -116,7 +116,7 @@ public function __construct(
$this->_productFactory = $productFactory;
$this->_gsData = $gsData;
$this->_gsProduct = $gsProduct;
- $this->_gsPrice = $gsPrice;
+ $this->catalogPrice = $catalogPrice;
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
}
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/ContentLanguage.php b/app/code/Magento/GoogleShopping/Model/Attribute/ContentLanguage.php
index b173c64d81c78..79f0efcaab0f2 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/ContentLanguage.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/ContentLanguage.php
@@ -48,7 +48,7 @@ class ContentLanguage extends \Magento\GoogleShopping\Model\Attribute\DefaultAtt
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\GoogleShopping\Helper\Data $gsData
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
- * @param \Magento\GoogleShopping\Helper\Price $gsPrice
+ * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
* @param \Magento\GoogleShopping\Model\Config $config
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -60,7 +60,7 @@ public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\GoogleShopping\Helper\Data $gsData,
\Magento\GoogleShopping\Helper\Product $gsProduct,
- \Magento\GoogleShopping\Helper\Price $gsPrice,
+ \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
\Magento\GoogleShopping\Model\Config $config,
\Magento\Data\Collection\Db $resourceCollection = null,
@@ -73,7 +73,7 @@ public function __construct(
$productFactory,
$gsData,
$gsProduct,
- $gsPrice,
+ $catalogPrice,
$resource,
$resourceCollection,
$data
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Destinations.php b/app/code/Magento/GoogleShopping/Model/Attribute/Destinations.php
index 4f43b61d6a003..3e6b35ced1e16 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Destinations.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Destinations.php
@@ -48,7 +48,7 @@ class Destinations extends \Magento\GoogleShopping\Model\Attribute\DefaultAttrib
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\GoogleShopping\Helper\Data $gsData
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
- * @param \Magento\GoogleShopping\Helper\Price $gsPrice
+ * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
* @param \Magento\GoogleShopping\Model\Config $config
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -60,7 +60,7 @@ public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\GoogleShopping\Helper\Data $gsData,
\Magento\GoogleShopping\Helper\Product $gsProduct,
- \Magento\GoogleShopping\Helper\Price $gsPrice,
+ \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
\Magento\GoogleShopping\Model\Config $config,
\Magento\Data\Collection\Db $resourceCollection = null,
@@ -73,7 +73,7 @@ public function __construct(
$productFactory,
$gsData,
$gsProduct,
- $gsPrice,
+ $catalogPrice,
$resource,
$resourceCollection,
$data
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/GoogleProductCategory.php b/app/code/Magento/GoogleShopping/Model/Attribute/GoogleProductCategory.php
index 861338af62d01..0150b87380a6b 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/GoogleProductCategory.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/GoogleProductCategory.php
@@ -55,7 +55,7 @@ class GoogleProductCategory extends \Magento\GoogleShopping\Model\Attribute\Defa
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\GoogleShopping\Helper\Data $gsData
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
- * @param \Magento\GoogleShopping\Helper\Price $gsPrice
+ * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
* @param \Magento\GoogleShopping\Model\TypeFactory $typeFactory
* @param \Magento\GoogleShopping\Model\Config $config
@@ -68,7 +68,7 @@ public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\GoogleShopping\Helper\Data $gsData,
\Magento\GoogleShopping\Helper\Product $gsProduct,
- \Magento\GoogleShopping\Helper\Price $gsPrice,
+ \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
\Magento\GoogleShopping\Model\TypeFactory $typeFactory,
\Magento\GoogleShopping\Model\Config $config,
@@ -83,7 +83,7 @@ public function __construct(
$productFactory,
$gsData,
$gsProduct,
- $gsPrice,
+ $catalogPrice,
$resource,
$resourceCollection,
$data
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/ImageLink.php b/app/code/Magento/GoogleShopping/Model/Attribute/ImageLink.php
index 1df531adb83e5..317b7152f714a 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/ImageLink.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/ImageLink.php
@@ -46,7 +46,7 @@ class ImageLink extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribute
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\GoogleShopping\Helper\Data $gsData
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
- * @param \Magento\GoogleShopping\Helper\Price $gsPrice
+ * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
* @param \Magento\Catalog\Helper\Product $catalogProduct
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -58,7 +58,7 @@ public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\GoogleShopping\Helper\Data $gsData,
\Magento\GoogleShopping\Helper\Product $gsProduct,
- \Magento\GoogleShopping\Helper\Price $gsPrice,
+ \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
\Magento\Catalog\Helper\Product $catalogProduct,
\Magento\Data\Collection\Db $resourceCollection = null,
@@ -71,7 +71,7 @@ public function __construct(
$productFactory,
$gsData,
$gsProduct,
- $gsPrice,
+ $catalogPrice,
$resource,
$resourceCollection,
$data
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
index 88e1331748d4d..397ab5fb10f00 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
@@ -48,7 +48,7 @@ class Link extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribute
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\GoogleShopping\Helper\Data $gsData
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
- * @param \Magento\GoogleShopping\Helper\Price $gsPrice
+ * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -60,7 +60,7 @@ public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\GoogleShopping\Helper\Data $gsData,
\Magento\GoogleShopping\Helper\Product $gsProduct,
- \Magento\GoogleShopping\Helper\Price $gsPrice,
+ \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Data\Collection\Db $resourceCollection = null,
@@ -73,7 +73,7 @@ public function __construct(
$productFactory,
$gsData,
$gsProduct,
- $gsPrice,
+ $catalogPrice,
$resource,
$resourceCollection,
$data
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Price.php b/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
index 31b166c47dffe..6c698d44e61f9 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
@@ -61,18 +61,24 @@ class Price extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribute
*/
protected $_storeManager;
+ /**
+ * @var \Magento\Catalog\Model\Product\CatalogPrice
+ */
+ protected $catalogPrice;
+
/**
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\GoogleShopping\Helper\Data $gsData
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
- * @param \Magento\GoogleShopping\Helper\Price $gsPrice
+ * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\GoogleShopping\Model\Config $config
+ * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\Data\Collection\Db $resourceCollection
* @param array $data
*/
@@ -82,7 +88,7 @@ public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\GoogleShopping\Helper\Data $gsData,
\Magento\GoogleShopping\Helper\Product $gsProduct,
- \Magento\GoogleShopping\Helper\Price $gsPrice,
+ \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Tax\Helper\Data $taxData,
@@ -95,13 +101,14 @@ public function __construct(
$this->_config = $config;
$this->_taxData = $taxData;
$this->_coreStoreConfig = $coreStoreConfig;
+ $this->catalogPrice = $catalogPrice;
parent::__construct(
$context,
$registry,
$productFactory,
$gsData,
$gsProduct,
- $gsPrice,
+ $catalogPrice,
$resource,
$resourceCollection,
$data
@@ -141,7 +148,7 @@ public function convertAttribute($product, $entry)
if (!is_null($salePriceMapValue) && floatval($salePriceMapValue) > .0001) {
$finalPrice = $salePriceMapValue;
} else if ($isSalePriceAllowed) {
- $finalPrice = $this->_gsPrice->getCatalogPrice($product, $store, $inclTax);
+ $finalPrice = $this->catalogPrice->getCatalogPrice($product, $store, $inclTax);
}
if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
$finalPrice = $taxHelp->getPrice($product, $finalPrice, $inclTax, null, null, null, $product->getStoreId());
@@ -153,10 +160,10 @@ public function convertAttribute($product, $entry)
if (!is_null($priceMapValue) && floatval($priceMapValue) > .0001) {
$price = $priceMapValue;
} else if ($isSalePriceAllowed) {
- $price = $this->_gsPrice->getCatalogRegularPrice($product, $store);
+ $price = $this->catalogPrice->getCatalogRegularPrice($product, $store);
} else {
$inclTax = ($priceDisplayType != \Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX);
- $price = $this->_gsPrice->getCatalogPrice($product, $store, $inclTax);
+ $price = $this->catalogPrice->getCatalogPrice($product, $store, $inclTax);
}
if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
$price = $taxHelp->getPrice($product, $price, $inclTax, null, null, null, $product->getStoreId());
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/ProductType.php b/app/code/Magento/GoogleShopping/Model/Attribute/ProductType.php
index b692a7094ed80..ce24e44f5c5cc 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/ProductType.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/ProductType.php
@@ -48,7 +48,7 @@ class ProductType extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribu
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\GoogleShopping\Helper\Data $gsData
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
- * @param \Magento\GoogleShopping\Helper\Price $gsPrice
+ * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -60,7 +60,7 @@ public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\GoogleShopping\Helper\Data $gsData,
\Magento\GoogleShopping\Helper\Product $gsProduct,
- \Magento\GoogleShopping\Helper\Price $gsPrice,
+ \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
\Magento\Data\Collection\Db $resourceCollection = null,
@@ -73,7 +73,7 @@ public function __construct(
$productFactory,
$gsData,
$gsProduct,
- $gsPrice,
+ $catalogPrice,
$resource,
$resourceCollection,
$data
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/TargetCountry.php b/app/code/Magento/GoogleShopping/Model/Attribute/TargetCountry.php
index b9900cb7d3288..d013b8bafa41d 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/TargetCountry.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/TargetCountry.php
@@ -48,7 +48,7 @@ class TargetCountry extends \Magento\GoogleShopping\Model\Attribute\DefaultAttri
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\GoogleShopping\Helper\Data $gsData
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
- * @param \Magento\GoogleShopping\Helper\Price $gsPrice
+ * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
* @param \Magento\GoogleShopping\Model\Config $config
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -60,7 +60,7 @@ public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\GoogleShopping\Helper\Data $gsData,
\Magento\GoogleShopping\Helper\Product $gsProduct,
- \Magento\GoogleShopping\Helper\Price $gsPrice,
+ \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
\Magento\GoogleShopping\Model\Config $config,
\Magento\Data\Collection\Db $resourceCollection = null,
@@ -73,7 +73,7 @@ public function __construct(
$productFactory,
$gsData,
$gsProduct,
- $gsPrice,
+ $catalogPrice,
$resource,
$resourceCollection,
$data
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Tax.php b/app/code/Magento/GoogleShopping/Model/Attribute/Tax.php
index 8ac8325d4b6fe..9d35aa31adcb4 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Tax.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Tax.php
@@ -61,7 +61,7 @@ class Tax extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribute
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\GoogleShopping\Helper\Data $gsData
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
- * @param \Magento\GoogleShopping\Helper\Price $gsPrice
+ * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
* @param \Magento\GoogleCheckout\Helper\Data $checkoutDataHelper
* @param \Magento\GoogleShopping\Model\Config $config
@@ -75,7 +75,7 @@ public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\GoogleShopping\Helper\Data $gsData,
\Magento\GoogleShopping\Helper\Product $gsProduct,
- \Magento\GoogleShopping\Helper\Price $gsPrice,
+ \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
\Magento\GoogleCheckout\Helper\Data $checkoutDataHelper,
\Magento\GoogleShopping\Model\Config $config,
@@ -92,7 +92,7 @@ public function __construct(
$productFactory,
$gsData,
$gsProduct,
- $gsPrice,
+ $catalogPrice,
$resource,
$resourceCollection,
$data
diff --git a/app/code/Magento/GoogleShopping/etc/di.xml b/app/code/Magento/GoogleShopping/etc/di.xml
index fd19292252593..89f94b870f94e 100644
--- a/app/code/Magento/GoogleShopping/etc/di.xml
+++ b/app/code/Magento/GoogleShopping/etc/di.xml
@@ -36,9 +36,9 @@
-
- Magento\GoogleShopping\Model\Resource\Setup
-
+
+ Magento\GoogleShopping\Model\Resource\Setup
diff --git a/app/code/Magento/GoogleShopping/etc/module.xml b/app/code/Magento/GoogleShopping/etc/module.xml
index 397874cb81e16..9916215e0d041 100755
--- a/app/code/Magento/GoogleShopping/etc/module.xml
+++ b/app/code/Magento/GoogleShopping/etc/module.xml
@@ -38,7 +38,6 @@
*/
-namespace Magento\CatalogInventory\Model\Resource\Indexer\Stock;
+namespace Magento\GroupedProduct\Model\Resource\Indexer\Stock;
class Grouped
extends \Magento\CatalogInventory\Model\Resource\Indexer\Stock\DefaultStock
@@ -41,7 +41,7 @@ class Grouped
* Reindex stock data for defined configurable product ids
*
* @param int|array $entityIds
- * @return \Magento\CatalogInventory\Model\Resource\Indexer\Stock\Grouped
+ * @return \Magento\GroupedProduct\Model\Resource\Indexer\Stock\Grouped
*/
public function reindexEntity($entityIds)
{
diff --git a/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php b/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
index e6a4f07bba84a..e9a0ceaa3497b 100644
--- a/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
+++ b/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
@@ -137,15 +137,12 @@ protected function _getProduct()
public function _initSelect()
{
parent::_initSelect();
-
- $configData = $this->_config->getType('grouped');
- $allowProductTypes = isset($configData['allow_product_types']) ? $configData['allow_product_types'] : array();
$this->setProduct($this->_getProduct())
->addAttributeToSelect('name')
->addAttributeToSelect('price')
->addAttributeToSelect('sku')
->addFilterByRequiredOptions()
- ->addAttributeToFilter('type_id', $allowProductTypes);
+ ->addAttributeToFilter('type_id', $this->_config->getComposableTypes());
return $this;
}
diff --git a/app/code/Magento/GroupedProduct/Model/Sales/AdminOrder/Product/Quote/Plugin/Initializer.php b/app/code/Magento/GroupedProduct/Model/Sales/AdminOrder/Product/Quote/Plugin/Initializer.php
new file mode 100644
index 0000000000000..1b1138dc5027b
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Model/Sales/AdminOrder/Product/Quote/Plugin/Initializer.php
@@ -0,0 +1,63 @@
+
+ *
+ */
+namespace Magento\GroupedProduct\Model\Sales\AdminOrder\Product\Quote\Plugin;
+
+
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
+
+class Initializer
+{
+ /**
+ * @param array $arguments
+ * @param \Magento\Code\Plugin\InvocationChain $invocationChain
+ * @return \Magento\Sales\Model\Quote\Item|string
+ */
+ public function aroundInit(array $arguments, \Magento\Code\Plugin\InvocationChain $invocationChain)
+ {
+ /** @var \Magento\Sales\Model\Quote $quote */
+ $quote = $arguments[0];
+ /** @var \Magento\Catalog\Model\Product $product */
+ $product = $arguments[1];
+ /** @var \Magento\Object $config */
+ $config = $arguments[2];
+
+ $item = $invocationChain->proceed($arguments);
+
+ if (is_string($item) && $product->getTypeId() != Grouped::TYPE_CODE) {
+ $item = $quote->addProductAdvanced(
+ $product,
+ $config,
+ \Magento\Catalog\Model\Product\Type\AbstractType::PROCESS_MODE_LITE
+ );
+ }
+ return $item;
+ }
+}
diff --git a/app/code/Magento/GroupedProduct/etc/adminhtml/di.xml b/app/code/Magento/GroupedProduct/etc/adminhtml/di.xml
index 5ee459ff6b1fa..c55b86bc6d9cf 100644
--- a/app/code/Magento/GroupedProduct/etc/adminhtml/di.xml
+++ b/app/code/Magento/GroupedProduct/etc/adminhtml/di.xml
@@ -28,11 +28,24 @@
+
+
-
- Magento\GroupedProduct\Model\Product\CopyConstructor\Grouped
-
+
+ Magento\GroupedProduct\Model\Product\CopyConstructor\Grouped
+
+
+
+
+
+
+
+ Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
diff --git a/app/code/Magento/GroupedProduct/etc/adminhtml/system.xml b/app/code/Magento/GroupedProduct/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..566fbee485778
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/etc/adminhtml/system.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+ Magento\Catalog\Model\Config\Source\Product\Thumbnail
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/etc/config.xml b/app/code/Magento/GroupedProduct/etc/config.xml
new file mode 100644
index 0000000000000..c63e0dfc55c5b
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/etc/config.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+ itself
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/etc/di.xml b/app/code/Magento/GroupedProduct/etc/di.xml
index 87eca94a6e5e3..9d1b6014d6132 100644
--- a/app/code/Magento/GroupedProduct/etc/di.xml
+++ b/app/code/Magento/GroupedProduct/etc/di.xml
@@ -24,16 +24,47 @@
*/
-->
-
-
-
- Magento\Catalog\Model\Resource\Setup
-
+
+ Magento\Catalog\Model\Resource\Setup
+
+
+
+
+
+ \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
+
+
+
+ Magento\GroupedProduct\Model\Resource\Product\Link::LINK_TYPE_GROUPED
+
+
+
+
+
+ \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
+
+
+
+
+
+ Magento\GroupedProduct\Model\Product\CatalogPrice
+
+
+
+
+
+
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/catalog_product_compare_index.xml b/app/code/Magento/GroupedProduct/etc/export.xml
similarity index 88%
rename from app/code/Magento/PaypalUk/view/frontend/layout/catalog_product_compare_index.xml
rename to app/code/Magento/GroupedProduct/etc/export.xml
index 40668f6fc4bdb..d1108514b25f4 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/catalog_product_compare_index.xml
+++ b/app/code/Magento/GroupedProduct/etc/export.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-
-
+
+
diff --git a/app/code/Magento/GroupedProduct/etc/frontend/di.xml b/app/code/Magento/GroupedProduct/etc/frontend/di.xml
index 4e79f98ef09f7..ff50a6003c662 100644
--- a/app/code/Magento/GroupedProduct/etc/frontend/di.xml
+++ b/app/code/Magento/GroupedProduct/etc/frontend/di.xml
@@ -26,22 +26,26 @@
-
-
- Magento\Catalog\Block\Product\Price
- Magento_GroupedProduct::product/price.phtml
-
-
+
+ -
+
+ Magento\Catalog\Block\Product\Price Magento_GroupedProduct::product/price.phtml
+
+
-
-
- Magento\Catalog\Block\Product\Price
- Magento_GroupedProduct::product/price.phtml
-
-
+
+ -
+
+ Magento\Catalog\Block\Product\Price Magento_GroupedProduct::product/price.phtml
+
+
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/GroupedProduct/etc/import.xml
similarity index 88%
rename from app/code/Magento/PaypalUk/view/frontend/layout/catalog_category_view.xml
rename to app/code/Magento/GroupedProduct/etc/import.xml
index 40668f6fc4bdb..b2b2ee88928c3 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/catalog_category_view.xml
+++ b/app/code/Magento/GroupedProduct/etc/import.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-
-
+
+
diff --git a/app/code/Magento/GroupedProduct/etc/module.xml b/app/code/Magento/GroupedProduct/etc/module.xml
index dc97cb059543f..a3f1b5f00c9d6 100644
--- a/app/code/Magento/GroupedProduct/etc/module.xml
+++ b/app/code/Magento/GroupedProduct/etc/module.xml
@@ -28,9 +28,12 @@
diff --git a/app/code/Magento/PaypalUk/etc/config.xml b/app/code/Magento/GroupedProduct/etc/pdf.xml
similarity index 72%
rename from app/code/Magento/PaypalUk/etc/config.xml
rename to app/code/Magento/GroupedProduct/etc/pdf.xml
index bbccb18be2111..9cea4c73c6985 100644
--- a/app/code/Magento/PaypalUk/etc/config.xml
+++ b/app/code/Magento/GroupedProduct/etc/pdf.xml
@@ -19,21 +19,17 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_PaypalUk
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-
-
-
- Magento\PaypalUk\Model\Express
-
-
- Magento\PaypalUk\Model\Direct
-
-
-
+
+
+ Magento\GroupedProduct\Model\Order\Pdf\Items\Invoice\Grouped
+
+
+ Magento\GroupedProduct\Model\Order\Pdf\Items\Creditmemo\Grouped
+
+
diff --git a/app/code/Magento/GroupedProduct/etc/product_types.xml b/app/code/Magento/GroupedProduct/etc/product_types.xml
index b5620233e5c9b..997fd427cfc3b 100644
--- a/app/code/Magento/GroupedProduct/etc/product_types.xml
+++ b/app/code/Magento/GroupedProduct/etc/product_types.xml
@@ -27,10 +27,11 @@
-
+
+
diff --git a/app/code/Magento/PaypalUk/etc/frontend/page_types.xml b/app/code/Magento/GroupedProduct/etc/sales.xml
similarity index 89%
rename from app/code/Magento/PaypalUk/etc/frontend/page_types.xml
rename to app/code/Magento/GroupedProduct/etc/sales.xml
index cf479fa3f74fb..ee061e2962f1a 100644
--- a/app/code/Magento/PaypalUk/etc/frontend/page_types.xml
+++ b/app/code/Magento/GroupedProduct/etc/sales.xml
@@ -23,6 +23,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-
-
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/i18n/de_DE.csv b/app/code/Magento/GroupedProduct/i18n/de_DE.csv
index c7768a0a21dcb..42bd011f7b376 100644
--- a/app/code/Magento/GroupedProduct/i18n/de_DE.csv
+++ b/app/code/Magento/GroupedProduct/i18n/de_DE.csv
@@ -1,2 +1,4 @@
"Catalog Product View (Grouped)","Produktansicht des Katalogs (in Gruppen)"
"Grouped Product","Gruppiertes Produkt"
+"Grouped Product Image","Gruppiertes Produktbild"
+
diff --git a/app/code/Magento/GroupedProduct/i18n/en_US.csv b/app/code/Magento/GroupedProduct/i18n/en_US.csv
index f0c636a3c8e7e..f2f1873e0abd8 100644
--- a/app/code/Magento/GroupedProduct/i18n/en_US.csv
+++ b/app/code/Magento/GroupedProduct/i18n/en_US.csv
@@ -1,2 +1,4 @@
"Catalog Product View (Grouped)","Catalog Product View (Grouped)"
"Grouped Product","Grouped Product"
+"Grouped Product Image","Grouped Product Image"
+
diff --git a/app/code/Magento/GroupedProduct/i18n/es_ES.csv b/app/code/Magento/GroupedProduct/i18n/es_ES.csv
index 3ee3ba2a1f54c..7ca2042a10d79 100644
--- a/app/code/Magento/GroupedProduct/i18n/es_ES.csv
+++ b/app/code/Magento/GroupedProduct/i18n/es_ES.csv
@@ -1,2 +1,3 @@
"Catalog Product View (Grouped)","Vista del Catálogo de Producto (Agrupada)"
"Grouped Product","Producto agrupado"
+"Grouped Product Image","Imagen de productos agrupados"
diff --git a/app/code/Magento/GroupedProduct/i18n/fr_FR.csv b/app/code/Magento/GroupedProduct/i18n/fr_FR.csv
index b0d1941b9785f..32a3ed558155c 100644
--- a/app/code/Magento/GroupedProduct/i18n/fr_FR.csv
+++ b/app/code/Magento/GroupedProduct/i18n/fr_FR.csv
@@ -1,2 +1,4 @@
"Catalog Product View (Grouped)","Affichage du Produit Catalogue (Groupé)"
"Grouped Product","Produits groupés"
+"Grouped Product Image","Image groupée du produit"
+
diff --git a/app/code/Magento/GroupedProduct/i18n/nl_NL.csv b/app/code/Magento/GroupedProduct/i18n/nl_NL.csv
index 410a26f014212..ddd7672f35d96 100644
--- a/app/code/Magento/GroupedProduct/i18n/nl_NL.csv
+++ b/app/code/Magento/GroupedProduct/i18n/nl_NL.csv
@@ -1,2 +1,3 @@
"Catalog Product View (Grouped)","Catalogus Product Bezichtiging (Gegroepeerd)"
"Grouped Product","Gegroepeerd Product"
+"Grouped Product Image","Gegroepeerde productafbeelding"
diff --git a/app/code/Magento/GroupedProduct/i18n/pt_BR.csv b/app/code/Magento/GroupedProduct/i18n/pt_BR.csv
index d4585d81ed46d..ff5786c4444b9 100644
--- a/app/code/Magento/GroupedProduct/i18n/pt_BR.csv
+++ b/app/code/Magento/GroupedProduct/i18n/pt_BR.csv
@@ -1,2 +1,3 @@
"Catalog Product View (Grouped)","Visualizar Produto de Catálogo (Agrupado)"
"Grouped Product","Produto Agrupado"
+"Grouped Product Image","Imagem de Produto Agrupado"
diff --git a/app/code/Magento/GroupedProduct/i18n/zh_CN.csv b/app/code/Magento/GroupedProduct/i18n/zh_CN.csv
index 416c91d018620..2c3135bb038d0 100644
--- a/app/code/Magento/GroupedProduct/i18n/zh_CN.csv
+++ b/app/code/Magento/GroupedProduct/i18n/zh_CN.csv
@@ -1,2 +1,4 @@
"Catalog Product View (Grouped)","分类产品视图（分组）"
"Grouped Product","分组产品"
+"Grouped Product Image","已分组的产品图片"
+
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml
index c3a2e591ba829..0d05a628194fc 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml
@@ -35,8 +35,7 @@
-
-
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_view.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_new.xml
similarity index 85%
rename from app/code/Magento/Downloadable/view/frontend/layout/sales_guest_view.xml
rename to app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_new.xml
index f0dff79e19763..c575d01b1d7de 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_view.xml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_new.xml
@@ -25,6 +25,6 @@
-->
-
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
new file mode 100644
index 0000000000000..c575d01b1d7de
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_view.xml
similarity index 85%
rename from app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo.xml
rename to app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_view.xml
index 0de2252d1d8d4..4d96222ba99ec 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo.xml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_view.xml
@@ -25,6 +25,6 @@
-->
-
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_new.xml
new file mode 100644
index 0000000000000..c575d01b1d7de
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_new.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_updateqty.xml
new file mode 100644
index 0000000000000..c575d01b1d7de
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_updateqty.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_view.xml
new file mode 100644
index 0000000000000..14a9dc3e2f73e
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_view.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_view.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_view.xml
similarity index 85%
rename from app/code/Magento/Bundle/view/frontend/layout/sales_order_view.xml
rename to app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_view.xml
index 22abd2c96402d..c575d01b1d7de 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_view.xml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_view.xml
@@ -25,6 +25,6 @@
-->
-
diff --git a/app/code/Magento/Bundle/view/frontend/layout/paypaluk_express_review_details.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_rss_feed_renderer_list.xml
similarity index 83%
rename from app/code/Magento/Bundle/view/frontend/layout/paypaluk_express_review_details.xml
rename to app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_rss_feed_renderer_list.xml
index 10b6e9f7103f5..1bd021a1f6cb9 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/paypaluk_express_review_details.xml
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_rss_feed_renderer_list.xml
@@ -24,7 +24,7 @@
*/
-->
-
-
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml
index 1b3d0eb71b277..ad6d1683b7ec0 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml
@@ -28,4 +28,7 @@
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_item_renderers.xml
new file mode 100644
index 0000000000000..f65500e24889d
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_item_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml
new file mode 100644
index 0000000000000..db5296ad4dbf8
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml
new file mode 100644
index 0000000000000..9a0eac833d504
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/rss_catalog_category.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/rss_catalog_category.xml
deleted file mode 100644
index efd78c1b381cc..0000000000000
--- a/app/code/Magento/GroupedProduct/view/frontend/layout/rss_catalog_category.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- grouped
- Magento\Catalog\Block\Product\Price
- Magento_GroupedProduct::rss/product/price.phtml
-
-
-
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/rss_catalog_new.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/rss_catalog_new.xml
deleted file mode 100644
index 974fd752c71ab..0000000000000
--- a/app/code/Magento/GroupedProduct/view/frontend/layout/rss_catalog_new.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- grouped
- Magento\Catalog\Block\Product\Price
- Magento_GroupedProduct::rss/product/price.phtml
-
-
-
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_creditmemo_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_creditmemo_renderers.xml
new file mode 100644
index 0000000000000..449b29d3cf1bb
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_creditmemo_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_invoice_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_invoice_renderers.xml
new file mode 100644
index 0000000000000..0a47a69e55a1b
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_invoice_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_renderers.xml
new file mode 100644
index 0000000000000..b11706f13972b
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_invoice.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_guest_invoice.xml
similarity index 82%
rename from app/code/Magento/Downloadable/view/frontend/layout/sales_guest_invoice.xml
rename to app/code/Magento/GroupedProduct/view/frontend/layout/sales_guest_invoice.xml
index e5bee2ceebf05..ad2791ef86dde 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/sales_guest_invoice.xml
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_guest_invoice.xml
@@ -24,7 +24,7 @@
*/
-->
-
-
+
diff --git a/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_creditmemo_renderers.xml
similarity index 84%
rename from app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view_type_grouped.xml
rename to app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_creditmemo_renderers.xml
index 7466e2e754d79..aaabc0c6c863c 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view_type_grouped.xml
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_creditmemo_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
-
+
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_invoice_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_invoice_renderers.xml
new file mode 100644
index 0000000000000..ad2791ef86dde
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_invoice_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_item_renderers.xml
new file mode 100644
index 0000000000000..999c5574e19e6
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_item_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_creditmemo_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_creditmemo_renderers.xml
new file mode 100644
index 0000000000000..23da873001dba
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_creditmemo_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_invoice_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_invoice_renderers.xml
new file mode 100644
index 0000000000000..91c4de2cb88f8
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_invoice_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_renderers.xml
new file mode 100644
index 0000000000000..bb89dbbf4dbf5
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index 99b0080fb956d..45c3c075d5e82 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -51,20 +51,18 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\ImportExport\Helper\Data $importExportData
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\ImportExport\Helper\Data $importExportData,
array $data = array()
) {
$this->_importExportData = $importExportData;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
index 1f7cbf7cb180d..1df32a9cb7b62 100644
--- a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
@@ -48,16 +48,9 @@ abstract class AbstractEntity
/**#@-*/
/**
- * Website manager (currently \Magento\Core\Model\App works as website manager)
+ * Store manager
*
- * @var \Magento\Core\Model\App
- */
- protected $_websiteManager;
-
- /**
- * Store manager (currently \Magento\Core\Model\App works as store manager)
- *
- * @var \Magento\Core\Model\App
+ * @var \Magento\Core\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -182,21 +175,20 @@ abstract class AbstractEntity
/**
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param array $data
*/
public function __construct(
\Magento\Core\Model\Store\Config $coreStoreConfig,
- \Magento\Core\Model\App $app,
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
array $data = array()
) {
$this->_coreStoreConfig = $coreStoreConfig;
- $this->_websiteManager = isset($data['website_manager']) ? $data['website_manager'] : $app;
- $this->_storeManager = isset($data['store_manager']) ? $data['store_manager'] : $app;
+ $this->_storeManager = $storeManager;
$this->_attributeCollection = isset($data['attribute_collection']) ? $data['attribute_collection']
: $collectionFactory->create(static::ATTRIBUTE_COLLECTION_NAME);
$this->_pageSize = isset($data['page_size']) ? $data['page_size']
@@ -230,7 +222,7 @@ protected function _initStores()
protected function _initWebsites($withDefault = false)
{
/** @var $website \Magento\Core\Model\Website */
- foreach ($this->_websiteManager->getWebsites($withDefault) as $website) {
+ foreach ($this->_storeManager->getWebsites($withDefault) as $website) {
$this->_websiteIdToCode[$website->getId()] = $website->getCode();
}
return $this;
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
index 766a5aabb8e77..503a148518ea2 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
@@ -78,7 +78,7 @@ abstract class AbstractEav
/**
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param \Magento\Core\Model\LocaleInterface $locale
@@ -87,7 +87,7 @@ abstract class AbstractEav
*/
public function __construct(
\Magento\Core\Model\Store\Config $coreStoreConfig,
- \Magento\Core\Model\App $app,
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
\Magento\Core\Model\LocaleInterface $locale,
@@ -95,7 +95,7 @@ public function __construct(
array $data = array()
) {
$this->_locale = $locale;
- parent::__construct($coreStoreConfig, $app, $collectionFactory, $resourceColFactory, $data);
+ parent::__construct($coreStoreConfig, $storeManager, $collectionFactory, $resourceColFactory, $data);
if (isset($data['entity_type_id'])) {
$this->_entityTypeId = $data['entity_type_id'];
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 eb81286855fe3..3741754b58037 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer.php
@@ -102,7 +102,7 @@ class Customer
/**
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param \Magento\Core\Model\LocaleInterface $locale
@@ -112,7 +112,7 @@ class Customer
*/
public function __construct(
\Magento\Core\Model\Store\Config $coreStoreConfig,
- \Magento\Core\Model\App $app,
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
\Magento\Core\Model\LocaleInterface $locale,
@@ -121,7 +121,7 @@ public function __construct(
array $data = array()
) {
parent::__construct(
- $coreStoreConfig, $app, $collectionFactory, $resourceColFactory, $locale, $eavConfig, $data
+ $coreStoreConfig, $storeManager, $collectionFactory, $resourceColFactory, $locale, $eavConfig, $data
);
$this->_customerCollection = isset($data['customer_collection']) ? $data['customer_collection']
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer/Address.php b/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer/Address.php
index b33bf17c27e6c..4123d5bdc3c73 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer/Address.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer/Address.php
@@ -123,7 +123,7 @@ class Address
/**
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param \Magento\Core\Model\LocaleInterface $locale
@@ -135,7 +135,7 @@ class Address
*/
public function __construct(
\Magento\Core\Model\Store\Config $coreStoreConfig,
- \Magento\Core\Model\App $app,
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
\Magento\Core\Model\LocaleInterface $locale,
@@ -145,8 +145,15 @@ public function __construct(
\Magento\Customer\Model\Resource\Address\CollectionFactory $addressColFactory,
array $data = array()
) {
- parent::__construct($coreStoreConfig, $app, $collectionFactory, $resourceColFactory, $locale, $eavConfig,
- $data);
+ parent::__construct(
+ $coreStoreConfig,
+ $storeManager,
+ $collectionFactory,
+ $resourceColFactory,
+ $locale,
+ $eavConfig,
+ $data
+ );
$this->_customerCollection = isset($data['customer_collection']) ? $data['customer_collection']
: $customerColFactory->create();
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Product.php b/app/code/Magento/ImportExport/Model/Export/Entity/Product.php
index af6a748089c29..faa47c20c42fd 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Product.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Product.php
@@ -196,6 +196,13 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
*/
protected $_typeFactory;
+ /**
+ * Provider of product link types
+ *
+ * @var \Magento\Catalog\Model\Product\LinkTypeProvider
+ */
+ protected $_linkTypeProvider;
+
/**
* @param \Magento\Core\Model\LocaleInterface $locale
* @param \Magento\Eav\Model\Config $config
@@ -211,6 +218,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
* @param \Magento\Catalog\Model\Resource\Product\Option\CollectionFactory $optionColFactory
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeColFactory
* @param \Magento\ImportExport\Model\Export\Entity\Product\Type\Factory $_typeFactory
+ * @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
*/
public function __construct(
\Magento\Core\Model\LocaleInterface $locale,
@@ -226,7 +234,8 @@ public function __construct(
\Magento\CatalogInventory\Model\Resource\Stock\ItemFactory $itemFactory,
\Magento\Catalog\Model\Resource\Product\Option\CollectionFactory $optionColFactory,
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeColFactory,
- \Magento\ImportExport\Model\Export\Entity\Product\Type\Factory $_typeFactory
+ \Magento\ImportExport\Model\Export\Entity\Product\Type\Factory $_typeFactory,
+ \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
) {
$this->_entityCollection = $collection;
$this->_exportConfig = $exportConfig;
@@ -239,6 +248,8 @@ public function __construct(
$this->_optionColFactory = $optionColFactory;
$this->_attributeColFactory = $attributeColFactory;
$this->_typeFactory = $_typeFactory;
+ $this->_linkTypeProvider = $linkTypeProvider;
+
parent::__construct($locale, $config, $resource, $storeManager);
@@ -523,12 +534,7 @@ protected function _prepareLinks(array $productIds)
'(cplad.link_id = cpl.link_id AND cplad.product_link_attribute_id = cplaq.product_link_attribute_id)',
array()
)
- ->where('cpl.link_type_id IN (?)', array(
- \Magento\Catalog\Model\Product\Link::LINK_TYPE_RELATED,
- \Magento\Catalog\Model\Product\Link::LINK_TYPE_UPSELL,
- \Magento\Catalog\Model\Product\Link::LINK_TYPE_CROSSSELL,
- \Magento\GroupedProduct\Model\Resource\Product\Link::LINK_TYPE_GROUPED,
- ))
+ ->where('cpl.link_type_id IN (?)', array_values($this->_linkTypeProvider->getLinkTypes()))
->where('cpl.product_id IN (?)', $productIds);
$stmt = $adapter->query($select);
@@ -821,12 +827,11 @@ protected function _getExportData()
// prepare links information
$linksRows = $this->_prepareLinks($productIds);
- $linkIdColPrefix = array(
- \Magento\Catalog\Model\Product\Link::LINK_TYPE_RELATED => '_links_related_',
- \Magento\Catalog\Model\Product\Link::LINK_TYPE_UPSELL => '_links_upsell_',
- \Magento\Catalog\Model\Product\Link::LINK_TYPE_CROSSSELL => '_links_crosssell_',
- \Magento\GroupedProduct\Model\Resource\Product\Link::LINK_TYPE_GROUPED => '_associated_'
- );
+ $linkIdColPrefix = array();
+ foreach ($this->_linkTypeProvider->getLinkTypes() as $linkTypeName => $linkTypeId) {
+ $linkIdColPrefix[$linkTypeId] = '_' . $linkTypeName . '_';
+ }
+
$configurableProductsCollection = $this->_entityCollection;
$configurableProductsCollection->addAttributeToFilter(
'entity_id',
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 0d8dd9299f059..b021dade7e615 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -142,7 +142,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
* @param \Magento\App\Filesystem $filesystem
* @param \Magento\Core\Model\Log\AdapterFactory $adapterFactory
* @param \Magento\ImportExport\Helper\Data $importExportData
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param Import\ConfigInterface $importConfig
* @param Import\Entity\Factory $entityFactory
* @param Resource\Import\Data $importData
@@ -158,7 +158,7 @@ public function __construct(
\Magento\App\Filesystem $filesystem,
\Magento\Core\Model\Log\AdapterFactory $adapterFactory,
\Magento\ImportExport\Helper\Data $importExportData,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\ImportExport\Model\Import\ConfigInterface $importConfig,
\Magento\ImportExport\Model\Import\Entity\Factory $entityFactory,
\Magento\ImportExport\Model\Resource\Import\Data $importData,
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
index 03f70693467f6..5aa348c3386c9 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
@@ -38,16 +38,9 @@ abstract class AbstractEav
const ATTRIBUTE_COLLECTION_NAME = 'Magento\Data\Collection';
/**
- * Website manager (currently \Magento\Core\Model\App works as website manager)
+ * Store manager
*
- * @var \Magento\Core\Model\App
- */
- protected $_websiteManager;
-
- /**
- * Store manager (currently \Magento\Core\Model\App works as store manager)
- *
- * @var \Magento\Core\Model\App
+ * @var \Magento\Core\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -107,7 +100,7 @@ abstract class AbstractEav
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\App\Resource $resource
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param array $data
@@ -119,7 +112,7 @@ public function __construct(
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\App\Resource $resource,
- \Magento\Core\Model\App $app,
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
array $data = array()
@@ -128,8 +121,7 @@ public function __construct(
$coreData, $string, $coreStoreConfig, $importFactory, $resourceHelper, $resource, $data
);
- $this->_websiteManager = isset($data['website_manager']) ? $data['website_manager'] : $app;
- $this->_storeManager = isset($data['store_manager']) ? $data['store_manager'] : $app;
+ $this->_storeManager = $storeManager;
$this->_attributeCollection = isset($data['attribute_collection']) ? $data['attribute_collection']
: $collectionFactory->create(static::ATTRIBUTE_COLLECTION_NAME);
@@ -164,7 +156,7 @@ public function getWebsiteId($websiteCode)
protected function _initWebsites($withDefault = false)
{
/** @var $website \Magento\Core\Model\Website */
- foreach ($this->_websiteManager->getWebsites($withDefault) as $website) {
+ foreach ($this->_storeManager->getWebsites($withDefault) as $website) {
$this->_websiteCodeToId[$website->getCode()] = $website->getId();
}
return $this;
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Eav/AbstractCustomer.php b/app/code/Magento/ImportExport/Model/Import/Entity/Eav/AbstractCustomer.php
index f9eeb40bd8c75..dd1a0524a87d2 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Eav/AbstractCustomer.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Eav/AbstractCustomer.php
@@ -80,7 +80,7 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\App\Resource $resource
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\ImportExport\Model\Resource\Customer\StorageFactory $storageFactory
@@ -93,7 +93,7 @@ public function __construct(
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\App\Resource $resource,
- \Magento\Core\Model\App $app,
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
\Magento\ImportExport\Model\Resource\Customer\StorageFactory $storageFactory,
@@ -101,7 +101,7 @@ public function __construct(
) {
$this->_storageFactory = $storageFactory;
parent::__construct(
- $coreData, $string, $coreStoreConfig, $importFactory, $resourceHelper, $resource, $app,
+ $coreData, $string, $coreStoreConfig, $importFactory, $resourceHelper, $resource, $storeManager,
$collectionFactory, $eavConfig, $data
);
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Eav/Customer.php b/app/code/Magento/ImportExport/Model/Import/Entity/Eav/Customer.php
index 3f92f1f14fb75..be33c95473474 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Eav/Customer.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Eav/Customer.php
@@ -138,7 +138,7 @@ class Customer
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\App\Resource $resource
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\ImportExport\Model\Resource\Customer\StorageFactory $storageFactory
@@ -153,7 +153,7 @@ public function __construct(
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\App\Resource $resource,
- \Magento\Core\Model\App $app,
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
\Magento\ImportExport\Model\Resource\Customer\StorageFactory $storageFactory,
@@ -173,7 +173,7 @@ public function __construct(
}
parent::__construct($coreData, $string, $coreStoreConfig, $importFactory, $resourceHelper, $resource,
- $app, $collectionFactory, $eavConfig, $storageFactory, $data);
+ $storeManager, $collectionFactory, $eavConfig, $storageFactory, $data);
$this->_specialAttributes[] = self::COLUMN_WEBSITE;
$this->_specialAttributes[] = self::COLUMN_STORE;
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Eav/Customer/Address.php b/app/code/Magento/ImportExport/Model/Import/Entity/Eav/Customer/Address.php
index 4793c20d53604..b454acc2ff43c 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Eav/Customer/Address.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Eav/Customer/Address.php
@@ -232,7 +232,7 @@ class Address
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\App\Resource $resource
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\ImportExport\Model\Resource\Customer\StorageFactory $storageFactory
@@ -251,7 +251,7 @@ public function __construct(
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\App\Resource $resource,
- \Magento\Core\Model\App $app,
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
\Magento\ImportExport\Model\Resource\Customer\StorageFactory $storageFactory,
@@ -277,7 +277,7 @@ public function __construct(
$data['attribute_collection'] = $attributeCollection;
}
parent::__construct(
- $coreData, $string, $coreStoreConfig, $importFactory, $resourceHelper, $resource, $app,
+ $coreData, $string, $coreStoreConfig, $importFactory, $resourceHelper, $resource, $storeManager,
$collectionFactory, $eavConfig, $storageFactory, $data
);
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Configurable.php b/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Configurable.php
index 0c1f3f54c676c..bb35aec1770e9 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Configurable.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Configurable.php
@@ -271,11 +271,8 @@ protected function _loadSkuSuperAttributeValues()
{
if ($this->_superAttributes) {
$attrSetIdToName = $this->_entityModel->getAttrSetIdToName();
-
- $configData = $this->_productTypesConfig->getType('configurable');
- $allowProductTypes = isset($configData['allow_product_types']) ? $configData['allow_product_types'] : array();
foreach ($this->_productColFac->create()
- ->addFieldToFilter('type_id', $allowProductTypes)
+ ->addFieldToFilter('type_id', $this->_productTypesConfig->getComposableTypes())
->addAttributeToSelect(array_keys($this->_superAttributes)) as $product) {
$attrSetName = $attrSetIdToName[$product->getAttributeSetId()];
diff --git a/app/code/Magento/ImportExport/etc/export.xml b/app/code/Magento/ImportExport/etc/export.xml
index 4aea7426c9381..e00dbe365669f 100644
--- a/app/code/Magento/ImportExport/etc/export.xml
+++ b/app/code/Magento/ImportExport/etc/export.xml
@@ -30,6 +30,5 @@
-
- Magento\Index\Model\System\Message\IndexOutdated
-
+
+ Magento\Index\Model\System\Message\IndexOutdated
diff --git a/app/code/Magento/Index/etc/di.xml b/app/code/Magento/Index/etc/di.xml
index c0a9fc08d1034..97736214cee7a 100644
--- a/app/code/Magento/Index/etc/di.xml
+++ b/app/code/Magento/Index/etc/di.xml
@@ -27,9 +27,9 @@
-
- Magento\Index\Model\Resource\Setup
-
+
+ Magento\Index\Model\Resource\Setup
diff --git a/app/code/Magento/Indexer/App/Indexer.php b/app/code/Magento/Indexer/App/Indexer.php
new file mode 100644
index 0000000000000..478e64549794c
--- /dev/null
+++ b/app/code/Magento/Indexer/App/Indexer.php
@@ -0,0 +1,84 @@
+reportDir = $reportDir;
+ $this->filesystem = $filesystem;
+ $this->processor = $processor;
+ $this->response = $response;
+ }
+
+ /**
+ * Run application
+ *
+ * @return \Magento\App\ResponseInterface
+ */
+ public function launch()
+ {
+ /* Clean reports */
+ $directory = $this->filesystem->getDirectoryWrite(\Magento\App\Filesystem::ROOT_DIR);
+ $path = $directory->getRelativePath($this->reportDir);
+ if ($directory->isExist($path)) {
+ $directory->delete($path);
+ }
+
+ /* Regenerate all indexers */
+ $this->processor->reindexAll();
+ $this->response->setCode(0);
+
+ return $this->response;
+ }
+}
diff --git a/app/code/Magento/Indexer/App/Shell.php b/app/code/Magento/Indexer/App/Shell.php
new file mode 100644
index 0000000000000..a11aa601de97e
--- /dev/null
+++ b/app/code/Magento/Indexer/App/Shell.php
@@ -0,0 +1,78 @@
+entryFileName = $entryFileName;
+ $this->shellFactory = $shellFactory;
+ $this->response = $response;
+ }
+
+ /**
+ * Run application
+ *
+ * @return \Magento\App\ResponseInterface
+ */
+ public function launch()
+ {
+ /** @var $shell \Magento\Indexer\Model\Shell */
+ $shell = $this->shellFactory->create(array('entryPoint' => $this->entryFileName));
+ $shell->run();
+ if ($shell->hasErrors()) {
+ $this->response->setCode(-1);
+ } else {
+ $this->response->setCode(0);
+ }
+ return $this->response;
+ }
+}
diff --git a/app/code/Magento/Indexer/Block/Backend/Container.php b/app/code/Magento/Indexer/Block/Backend/Container.php
new file mode 100644
index 0000000000000..520a1e08f1ab9
--- /dev/null
+++ b/app/code/Magento/Indexer/Block/Backend/Container.php
@@ -0,0 +1,51 @@
+_controller = 'indexer';
+ $this->_blockGroup = 'Magento_Indexer';
+ $this->_headerText = __('New Indexer Management');
+ parent::_construct();
+ }
+
+ /**
+ * Prepare layout, remove button
+ *
+ * @return $this|\Magento\View\Element\AbstractBlock
+ */
+ protected function _prepareLayout()
+ {
+ parent::_prepareLayout();
+ $this->_removeButton('add');
+ return $this;
+ }
+}
diff --git a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Mode.php b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Mode.php
new file mode 100644
index 0000000000000..55814d9decdab
--- /dev/null
+++ b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Mode.php
@@ -0,0 +1,51 @@
+_getValue($row)) {
+ case \Magento\Mview\View\StateInterface::MODE_DISABLED:
+ $class = 'grid-severity-notice';
+ $text = __('Update on Save');
+ break;
+ case \Magento\Mview\View\StateInterface::MODE_ENABLED:
+ $class = 'grid-severity-major';
+ $text = __('Update by Schedule');
+ break;
+ }
+ return '' . $text . '';
+ }
+}
diff --git a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Status.php b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Status.php
new file mode 100644
index 0000000000000..5c3cac4e1c0ee
--- /dev/null
+++ b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Status.php
@@ -0,0 +1,55 @@
+_getValue($row)) {
+ case \Magento\Indexer\Model\Indexer\State::STATUS_INVALID:
+ $class = 'grid-severity-critical';
+ $text = __('Reindex required');
+ break;
+ case \Magento\Indexer\Model\Indexer\State::STATUS_VALID:
+ $class = 'grid-severity-notice';
+ $text = __('Ready');
+ break;
+ case \Magento\Indexer\Model\Indexer\State::STATUS_WORKING:
+ $class = 'grid-severity-major';
+ $text = __('Processing');
+ break;
+ }
+ return '' . $text . '';
+ }
+}
diff --git a/lib/Magento/Acl/Resource/Config/Dom.php b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
similarity index 67%
rename from lib/Magento/Acl/Resource/Config/Dom.php
rename to app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
index 1238ace8113f1..7a7b88995b972 100644
--- a/lib/Magento/Acl/Resource/Config/Dom.php
+++ b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
@@ -19,21 +19,25 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)\Magento\Acl\Loader\Resource
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Acl\Resource\Config;
-class Dom extends \Magento\Config\Dom
+namespace Magento\Indexer\Block\Backend\Grid\Column\Renderer;
+
+class Updated extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Datetime
{
/**
- * Return attribute for resource node that identify it as unique
+ * Render indexer updated time
*
- * @param string $xPath
- * @return bool|string
+ * @param \Magento\Object $row
+ * @return string
*/
- protected function _findIdAttribute($xPath)
+ public function render(\Magento\Object $row)
{
- $needle = 'resource';
- return substr($xPath, -strlen($needle)) === $needle ? 'id' : false;
+ $value = parent::render($row);
+ if (!$value) {
+ return __('Never');
+ }
+ return $value;
}
}
diff --git a/app/code/Magento/Indexer/Block/Backend/Grid/ItemsUpdater.php b/app/code/Magento/Indexer/Block/Backend/Grid/ItemsUpdater.php
new file mode 100644
index 0000000000000..1f47d7e64e797
--- /dev/null
+++ b/app/code/Magento/Indexer/Block/Backend/Grid/ItemsUpdater.php
@@ -0,0 +1,55 @@
+authorization = $authorization;
+ }
+
+ /**
+ * Remove massaction items in case they disallowed for user
+ * @param mixed $argument
+ * @return mixed
+ */
+ public function update($argument)
+ {
+ if (false === $this->authorization->isAllowed('Magento_Indexer::changeMode')) {
+ unset($argument['change_mode_onthefly']);
+ unset($argument['change_mode_changelog']);
+ }
+ return $argument;
+ }
+}
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer.php
new file mode 100644
index 0000000000000..ba2e376c6aa1b
--- /dev/null
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer.php
@@ -0,0 +1,120 @@
+_title->add(__('New Index Management'));
+
+ $this->_view->loadLayout();
+ $this->_setActiveMenu('Magento_Indexer::system_index');
+ $this->_view->renderLayout();
+ }
+
+ /**
+ * Turn mview off for the given indexers
+ */
+ public function massOnTheFlyAction()
+ {
+ $indexerIds = $this->getRequest()->getParam('indexer_ids');
+ if (!is_array($indexerIds)) {
+ $this->messageManager->addError(__('Please select indexers.'));
+ } else {
+ try {
+ foreach ($indexerIds as $indexer_id) {
+ /** @var \Magento\Indexer\Model\Indexer $model */
+ $model = $this->_objectManager->create('Magento\Indexer\Model\Indexer')
+ ->load($indexer_id);
+ $model->turnViewOff();
+ }
+ $this->messageManager->addSuccess(
+ __('A total of %1 indexer(s) have been turned Update on Save mode on.', count($indexerIds))
+ );
+ } catch (\Magento\Core\Exception $e) {
+ $this->messageManager->addError($e->getMessage());
+ } catch (\Exception $e) {
+ $this->messageManager->addException(
+ $e,
+ __("We couldn't change indexer(s)' mode because of an error.")
+ );
+ }
+ }
+ $this->_redirect('*/*/list');
+ }
+
+ /**
+ * Turn mview on for the given indexers
+ */
+ public function massChangelogAction()
+ {
+ $indexerIds = $this->getRequest()->getParam('indexer_ids');
+ if (!is_array($indexerIds)) {
+ $this->messageManager->addError(__('Please select indexers.'));
+ } else {
+ try {
+ foreach ($indexerIds as $indexer_id) {
+ /** @var \Magento\Indexer\Model\Indexer $model */
+ $model = $this->_objectManager->create('Magento\Indexer\Model\Indexer')
+ ->load($indexer_id);
+ $model->turnViewOn();
+ }
+ $this->messageManager->addSuccess(
+ __('A total of %1 indexer(s) have been turned Update by Schedule mode on.', count($indexerIds))
+ );
+ } catch (\Magento\Core\Exception $e) {
+ $this->messageManager->addError($e->getMessage());
+ } catch (\Exception $e) {
+ $this->messageManager->addException(
+ $e,
+ __("We couldn't change indexer(s)' mode because of an error.")
+ );
+ }
+ }
+ $this->_redirect('*/*/list');
+ }
+
+ /**
+ * Check ACL permissions
+ *
+ * @return bool
+ */
+ protected function _isAllowed()
+ {
+ switch ($this->_request->getActionName()) {
+ case 'list':
+ return $this->_authorization->isAllowed('Magento_Indexer::index');
+ case 'massOnTheFly':
+ case 'massChangelog':
+ return $this->_authorization->isAllowed('Magento_Indexer::changeMode');
+ }
+ return false;
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/ActionFactory.php b/app/code/Magento/Indexer/Model/ActionFactory.php
new file mode 100644
index 0000000000000..e994e6680d19d
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/ActionFactory.php
@@ -0,0 +1,60 @@
+objectManager = $objectManager;
+ }
+
+ /**
+ * Get action class instance by class name
+ *
+ * @param string $className
+ * @throws \InvalidArgumentException
+ * @return ActionInterface
+ */
+ public function get($className)
+ {
+ $action = $this->objectManager->get($className);
+ if (!($action instanceof ActionInterface)) {
+ throw new \InvalidArgumentException(
+ $className . ' doesn\'t implement \Magento\Indexer\Model\ActionInterface'
+ );
+ }
+
+ return $action;
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/ActionInterface.php b/app/code/Magento/Indexer/Model/ActionInterface.php
new file mode 100644
index 0000000000000..a9c2cb67dc9b4
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/ActionInterface.php
@@ -0,0 +1,47 @@
+get();
+ }
+
+ /**
+ * @return array
+ */
+ public function getIndexerIds()
+ {
+ return array_keys($this->get());
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/Config/Converter.php b/app/code/Magento/Indexer/Model/Config/Converter.php
new file mode 100644
index 0000000000000..f8feccfd07732
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/Config/Converter.php
@@ -0,0 +1,111 @@
+evaluate('/config/indexer');
+ /** @var $typeNode \DOMNode */
+ foreach ($indexers as $indexerNode) {
+ $data = array();
+ $indexerId = $this->getAttributeValue($indexerNode, 'id');
+ $data['indexer_id'] = $indexerId;
+ $data['view_id'] = $this->getAttributeValue($indexerNode, 'view_id');
+ $data['action_class'] = $this->getAttributeValue($indexerNode, 'class');
+ $data['title'] = '';
+ $data['description'] = '';
+
+ /** @var $childNode \DOMNode */
+ foreach ($indexerNode->childNodes as $childNode) {
+ if ($childNode->nodeType != XML_ELEMENT_NODE) {
+ continue;
+ }
+
+ $data = $this->convertChild($childNode, $data);
+ }
+ $output[$indexerId] = $data;
+ }
+ return $output;
+ }
+
+ /**
+ * Get attribute value
+ *
+ * @param \DOMNode $input
+ * @param string $attributeName
+ * @param mixed $default
+ * @return null|string
+ */
+ protected function getAttributeValue(\DOMNode $input, $attributeName, $default = null)
+ {
+ $node = $input->attributes->getNamedItem($attributeName);
+ return $node ? $node->nodeValue : $default;
+ }
+
+ /**
+ * Convert child from dom to array
+ *
+ * @param \DOMNode $childNode
+ * @param array $data
+ * @return array
+ */
+ protected function convertChild(\DOMNode $childNode, $data)
+ {
+ switch ($childNode->nodeName) {
+ case 'title':
+ $data['title'] = $this->getTranslatedNodeValue($childNode);
+ break;
+ case 'description':
+ $data['description'] = $this->getTranslatedNodeValue($childNode);
+ break;
+ }
+ return $data;
+ }
+
+ /**
+ * Return node value translated if applicable
+ *
+ * @param \DOMNode $node
+ * @return string
+ */
+ protected function getTranslatedNodeValue(\DOMNode $node)
+ {
+ $value = $node->nodeValue;
+ if ($this->getAttributeValue($node, 'translate') == 'true') {
+ $value = __($value);
+ }
+ return $value;
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/Config/Reader.php b/app/code/Magento/Indexer/Model/Config/Reader.php
new file mode 100644
index 0000000000000..03cd2591d1d3f
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/Config/Reader.php
@@ -0,0 +1,69 @@
+ 'id',
+ );
+
+ /**
+ * @param \Magento\Config\FileResolverInterface $fileResolver
+ * @param Converter $converter
+ * @param SchemaLocator $schemaLocator
+ * @param \Magento\Config\ValidationStateInterface $validationState
+ * @param string $fileName
+ * @param array $idAttributes
+ * @param string $domDocumentClass
+ * @param string $defaultScope
+ */
+ public function __construct(
+ \Magento\Config\FileResolverInterface $fileResolver,
+ \Magento\Indexer\Model\Config\Converter $converter,
+ \Magento\Indexer\Model\Config\SchemaLocator $schemaLocator,
+ \Magento\Config\ValidationStateInterface $validationState,
+ $fileName = 'indexer.xml',
+ $idAttributes = array(),
+ $domDocumentClass = 'Magento\Config\Dom',
+ $defaultScope = 'global'
+ ) {
+ parent::__construct(
+ $fileResolver,
+ $converter,
+ $schemaLocator,
+ $validationState,
+ $fileName,
+ $idAttributes,
+ $domDocumentClass,
+ $defaultScope
+ );
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/Config/SchemaLocator.php b/app/code/Magento/Indexer/Model/Config/SchemaLocator.php
new file mode 100644
index 0000000000000..719ac0880a1ff
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/Config/SchemaLocator.php
@@ -0,0 +1,71 @@
+getModuleDir('etc', 'Magento_Indexer');
+ $this->_schema = $etcDir . '/indexer.xsd';
+ $this->_perFileSchema = $etcDir . '/indexer.xsd';
+ }
+
+ /**
+ * Get path to merged config schema
+ *
+ * @return string|null
+ */
+ public function getSchema()
+ {
+ return $this->_schema;
+ }
+
+ /**
+ * Get path to pre file validation schema
+ *
+ * @return string|null
+ */
+ public function getPerFileSchema()
+ {
+ return $this->_perFileSchema;
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/ConfigInterface.php b/app/code/Magento/Indexer/Model/ConfigInterface.php
new file mode 100644
index 0000000000000..258219ee9c8b2
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/ConfigInterface.php
@@ -0,0 +1,51 @@
+config = $config;
+ $this->actionFactory = $actionFactory;
+ $this->view = $view;
+ $this->stateFactory = $stateFactory;
+ $this->indexersFactory = $indexersFactory;
+ parent::__construct($data);
+ }
+
+ /**
+ * Fill indexer data from config
+ *
+ * @param string $indexerId
+ * @return \Magento\Indexer\Model\Indexer
+ * @throws \InvalidArgumentException
+ */
+ public function load($indexerId)
+ {
+ $indexer = $this->config->get($indexerId);
+ if (empty($indexer) || empty($indexer['indexer_id']) || $indexer['indexer_id'] != $indexerId) {
+ throw new \InvalidArgumentException("{$indexerId} indexer does not exist.");
+ }
+
+ $this->setId($indexerId);
+ $this->setData($indexer);
+
+ return $this;
+ }
+
+ /**
+ * Return related view object
+ *
+ * @return \Magento\Mview\View
+ */
+ public function getView()
+ {
+ if (!$this->view->getId()) {
+ $this->view->load($this->getViewId());
+ }
+ return $this->view;
+ }
+
+ /**
+ * Return related state object
+ *
+ * @return Indexer\State
+ */
+ public function getState()
+ {
+ if (!$this->state) {
+ $this->state = $this->stateFactory->create();
+ $this->state->load($this->getId(), 'indexer_id');
+ if (!$this->state->getId()) {
+ $this->state->setIndexerId($this->getId());
+ }
+ }
+ return $this->state;
+ }
+
+ /**
+ * Set indexer state object
+ *
+ * @param Indexer\State $state
+ * @return Indexer
+ */
+ public function setState(Indexer\State $state)
+ {
+ $this->state = $state;
+ return $this;
+ }
+
+ /**
+ * Return indexer mode
+ *
+ * @return string
+ */
+ public function getMode()
+ {
+ return $this->getView()->getMode();
+ }
+
+ /**
+ * Turn changelog mode of
+ *
+ * @return string
+ */
+ public function turnViewOff()
+ {
+ $this->getView()->unsubscribe();
+ $this->getState()->save();
+ }
+
+ /**
+ * Turn changelog mode on
+ *
+ * @return string
+ */
+ public function turnViewOn()
+ {
+ $this->getView()->subscribe();
+ $this->getState()->save();
+ }
+
+ /**
+ * Return indexer status
+ *
+ * @return string
+ */
+ public function getStatus()
+ {
+ if ($this->getView()->getMode() == \Magento\Mview\View\StateInterface::MODE_ENABLED
+ && $this->getView()->getStatus() == \Magento\Mview\View\StateInterface::STATUS_WORKING
+ ) {
+ return \Magento\Indexer\Model\Indexer\State::STATUS_WORKING;
+ }
+ return $this->getState()->getStatus();
+ }
+
+ /**
+ * Return indexer updated time
+ *
+ * @return string
+ */
+ public function getUpdated()
+ {
+ if ($this->getView()->getMode() == \Magento\Mview\View\StateInterface::MODE_ENABLED
+ && $this->getView()->getUpdated()
+ ) {
+ if (!$this->getState()->getUpdated()) {
+ return $this->getView()->getUpdated();
+ }
+ $indexerUpdatedDate = new \Zend_Date($this->getState()->getUpdated());
+ $viewUpdatedDate = new \Zend_Date($this->getView()->getUpdated());
+ if ($viewUpdatedDate->compare($indexerUpdatedDate) == 1) {
+ return $this->getView()->getUpdated();
+ }
+ }
+ return $this->getState()->getUpdated();
+ }
+
+ /**
+ * Return indexer action instance
+ *
+ * @return ActionInterface
+ */
+ protected function getActionInstance()
+ {
+ return $this->actionFactory->get($this->getActionClass());
+ }
+
+ /**
+ * Regenerate full index
+ *
+ * @throws \Exception
+ */
+ public function reindexAll()
+ {
+ if ($this->getState()->getStatus() != Indexer\State::STATUS_WORKING) {
+ $this->getState()
+ ->setStatus(Indexer\State::STATUS_WORKING)
+ ->save();
+ try {
+ $this->getActionInstance()->executeFull();
+ $this->getState()
+ ->setStatus(Indexer\State::STATUS_VALID)
+ ->save();
+ } catch (\Exception $exception) {
+ $this->getState()
+ ->setStatus(Indexer\State::STATUS_INVALID)
+ ->save();
+ throw $exception;
+ }
+ }
+ }
+
+ /**
+ * Regenerate one row in index by ID
+ *
+ * @param int $id
+ */
+ public function reindexRow($id)
+ {
+ $this->getActionInstance()->executeRow($id);
+ }
+
+ /**
+ * Regenerate rows in index by ID list
+ *
+ * @param int[] $ids
+ */
+ public function reindexList($ids)
+ {
+ $this->getActionInstance()->executeList($ids);
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/Indexer/Collection.php b/app/code/Magento/Indexer/Model/Indexer/Collection.php
new file mode 100644
index 0000000000000..ac1582b80f486
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/Indexer/Collection.php
@@ -0,0 +1,111 @@
+config = $config;
+ $this->statesFactory = $statesFactory;
+ parent::__construct($entityFactory);
+ }
+
+ /**
+ * Load data
+ *
+ * @param bool $printQuery
+ * @param bool $logQuery
+ * @return \Magento\Indexer\Model\Indexer\Collection
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function loadData($printQuery = false, $logQuery = false)
+ {
+ if (!$this->isLoaded()) {
+ $states = $this->statesFactory->create();
+ foreach ($this->config->getIndexerIds() as $indexerId) {
+ /** @var \Magento\Indexer\Model\Indexer $indexer */
+ $indexer = $this->getNewEmptyItem();
+ $indexer->load($indexerId);
+ foreach ($states->getItems() as $state) {
+ /** @var \Magento\Indexer\Model\Indexer\State $state */
+ if ($state->getIndexerId() == $indexerId) {
+ $indexer->setState($state);
+ break;
+ }
+ }
+ $this->_addItem($indexer);
+ }
+ $this->_setIsLoaded(true);
+ }
+ return $this;
+ }
+
+ /**
+ * Return indexers by given state status
+ *
+ * @param string $status
+ * @return \Magento\Indexer\Model\Indexer[]
+ */
+ public function getIndexersByStateStatus($status)
+ {
+ $this->load();
+
+ $result = array();
+ foreach ($this as $indexer) {
+ /** @var \Magento\Indexer\Model\Indexer $indexer */
+ if ($indexer->getState()->getStatus() == $status) {
+ $result[] = $indexer;
+ }
+ }
+ return $result;
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/Indexer/State.php b/app/code/Magento/Indexer/Model/Indexer/State.php
new file mode 100644
index 0000000000000..bcee2f9b957c2
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/Indexer/State.php
@@ -0,0 +1,83 @@
+setUpdated(time());
+ return parent::_beforeSave();
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/Processor.php b/app/code/Magento/Indexer/Model/Processor.php
new file mode 100644
index 0000000000000..f152c82a1e4de
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/Processor.php
@@ -0,0 +1,108 @@
+config = $config;
+ $this->indexerFactory = $indexerFactory;
+ $this->indexersFactory = $indexersFactory;
+ $this->mviewProcessor = $mviewProcessor;
+ }
+
+ /**
+ * Regenerate indexes for all invalid indexers
+ */
+ public function reindexAllInvalid()
+ {
+ foreach ($this->config->getIndexerIds() as $indexerId) {
+ $indexer = $this->indexerFactory->create();
+ $indexer->load($indexerId);
+ if ($indexer->getState()->getStatus() == Indexer\State::STATUS_INVALID) {
+ $indexer->reindexAll();
+ }
+ }
+ }
+
+ /**
+ * Regenerate indexes for all indexers
+ */
+ public function reindexAll()
+ {
+ /** @var Indexer[] $indexers */
+ $indexers = $this->indexersFactory->create()->getItems();
+ foreach ($indexers as $indexer) {
+ $indexer->reindexAll();
+ }
+ }
+
+ /**
+ * Update indexer views
+ */
+ public function updateMview()
+ {
+ $this->mviewProcessor->update('indexer');
+ }
+
+ /**
+ * Clean indexer view changelogs
+ */
+ public function clearChangelog()
+ {
+ $this->mviewProcessor->clearChangelog('indexer');
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/Resource/Indexer/State.php b/app/code/Magento/Indexer/Model/Resource/Indexer/State.php
new file mode 100644
index 0000000000000..e0840f57781aa
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/Resource/Indexer/State.php
@@ -0,0 +1,40 @@
+_init('indexer_state', 'state_id');
+ $this->addUniqueField(array(
+ 'field' => array('indexer_id'),
+ 'title' => __('State for the same indexer')
+ ));
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/Resource/Indexer/State/Collection.php b/app/code/Magento/Indexer/Model/Resource/Indexer/State/Collection.php
new file mode 100644
index 0000000000000..93d62cb3076e7
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/Resource/Indexer/State/Collection.php
@@ -0,0 +1,36 @@
+_init('Magento\Indexer\Model\Indexer\State', 'Magento\Indexer\Model\Resource\Indexer\State');
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/Shell.php b/app/code/Magento/Indexer/Model/Shell.php
new file mode 100644
index 0000000000000..c94cf987b40f3
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/Shell.php
@@ -0,0 +1,271 @@
+indexersFactory = $indexersFactory;
+ $this->indexerFactory = $indexerFactory;
+ parent::__construct($filesystem, $entryPoint);
+ }
+
+ /**
+ * Run this model, assumed to be run by command-line
+ *
+ * @return \Magento\Indexer\Model\Shell
+ */
+ public function run()
+ {
+ if ($this->_showHelp()) {
+ return $this;
+ }
+
+ if ($this->getArg('info')) {
+ $this->runShowInfo();
+ } else if ($this->getArg('status') || $this->getArg('mode')) {
+ $this->runShowStatusOrMode();
+ } else if ($this->getArg('mode-realtime') || $this->getArg('mode-schedule')) {
+ $this->runSetMode();
+ } else if ($this->getArg('reindex') || $this->getArg('reindexall')) {
+ $this->runReindex();
+ } else {
+ echo $this->getUsageHelp();
+ }
+
+ return $this;
+ }
+
+ /**
+ * Show information about indexes
+ *
+ * @return \Magento\Indexer\Model\Shell
+ */
+ protected function runShowInfo()
+ {
+ $indexers = $this->parseIndexerString('all');
+ foreach ($indexers as $indexer) {
+ echo sprintf('%-40s', $indexer->getId());
+ echo $indexer->getTitle() . PHP_EOL;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Show information about statuses or modes
+ *
+ * @return \Magento\Indexer\Model\Shell
+ */
+ protected function runShowStatusOrMode()
+ {
+ if ($this->getArg('status')) {
+ $indexers = $this->parseIndexerString($this->getArg('status'));
+ } else {
+ $indexers = $this->parseIndexerString($this->getArg('mode'));
+ }
+
+ foreach ($indexers as $indexer) {
+ $status = 'unknown';
+ if ($this->getArg('status')) {
+ switch ($indexer->getStatus()) {
+ case \Magento\Indexer\Model\Indexer\State::STATUS_VALID:
+ $status = 'Ready';
+ break;
+ case \Magento\Indexer\Model\Indexer\State::STATUS_INVALID:
+ $status = 'Reindex required';
+ break;
+
+ case \Magento\Indexer\Model\Indexer\State::STATUS_WORKING:
+ $status = 'Processing';
+ break;
+ }
+ } else {
+ switch ($indexer->getMode()) {
+ case \Magento\Mview\View\StateInterface::MODE_DISABLED:
+ $status = 'Update on Save';
+ break;
+ case \Magento\Mview\View\StateInterface::MODE_ENABLED:
+ $status = 'Update by Schedule';
+ break;
+ }
+ }
+ echo sprintf('%-50s ', $indexer->getTitle() . ':') . $status . PHP_EOL;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Set new mode for indexers
+ *
+ * @return \Magento\Indexer\Model\Shell
+ */
+ protected function runSetMode()
+ {
+ if ($this->getArg('mode-realtime')) {
+ $method = 'turnViewOff';
+ $indexers = $this->parseIndexerString($this->getArg('mode-realtime'));
+ } else {
+ $method = 'turnViewOn';
+ $indexers = $this->parseIndexerString($this->getArg('mode-schedule'));
+ }
+
+ foreach ($indexers as $indexer) {
+ try {
+ $indexer->$method();
+ echo $indexer->getTitle() . " indexer was successfully changed index mode" . PHP_EOL;
+ } catch (\Magento\Core\Exception $e) {
+ echo $e->getMessage() . PHP_EOL;
+ $this->hasErrors = true;
+ } catch (\Exception $e) {
+ echo $indexer->getTitle() . " indexer process unknown error:" . PHP_EOL;
+ echo $e . PHP_EOL;
+ $this->hasErrors = true;
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Reindex indexer(s)
+ *
+ * @return \Magento\Indexer\Model\Shell
+ */
+ protected function runReindex()
+ {
+ if ($this->getArg('reindex')) {
+ $indexers = $this->parseIndexerString($this->getArg('reindex'));
+ } else {
+ $indexers = $this->parseIndexerString('all');
+ }
+
+ foreach ($indexers as $indexer) {
+ try {
+ $indexer->reindexAll();
+ echo $indexer->getTitle() . " index has been rebuilt successfully" . PHP_EOL;
+ } catch (\Magento\Core\Exception $e) {
+ echo $e->getMessage() . PHP_EOL;
+ $this->hasErrors = true;
+ } catch (\Exception $e) {
+ echo $indexer->getTitle() . " indexer process unknown error:" . PHP_EOL;
+ echo $e . PHP_EOL;
+ $this->hasErrors = true;
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Parses string with indexers and return array of indexer instances
+ *
+ * @param string $string
+ * @return Indexer[]
+ */
+ protected function parseIndexerString($string)
+ {
+ $indexers = array();
+ if ($string == 'all') {
+ /** @var Indexer[] $indexers */
+ $indexers = $this->indexersFactory->create()->getItems();
+ } else if (!empty($string)) {
+ $codes = explode(',', $string);
+ foreach ($codes as $code) {
+ $indexer = $this->indexerFactory->create();
+ try {
+ $indexer->load($code);
+ $indexers[] = $indexer;
+ } catch (\Exception $e) {
+ echo 'Warning: Unknown indexer with code ' . trim($code) . PHP_EOL;
+ $this->hasErrors = true;
+ }
+ }
+ }
+ return $indexers;
+ }
+
+ /**
+ * Return whether there errors have happened
+ *
+ * @return bool
+ */
+ public function hasErrors()
+ {
+ return $this->hasErrors;
+ }
+
+ /**
+ * Retrieves usage help message
+ *
+ * @return string
+ */
+ public function getUsageHelp()
+ {
+ return <<_entryPoint} -- [options]
+
+ --status Show Indexer(s) Status
+ --mode Show Indexer(s) Index Mode
+ --mode-realtime Set index mode type "Update on Save"
+ --mode-schedule Set index mode type "Update by Schedule"
+ --reindex Reindex Data
+ info Show allowed indexers
+ reindexall Reindex Data by all indexers
+ help This help
+
+ Comma separated indexer codes or value "all" for all indexers
+USAGE;
+ }
+}
diff --git a/app/code/Magento/PaypalUk/etc/adminhtml/di.xml b/app/code/Magento/Indexer/etc/adminhtml/acl.xml
similarity index 64%
rename from app/code/Magento/PaypalUk/etc/adminhtml/di.xml
rename to app/code/Magento/Indexer/etc/adminhtml/acl.xml
index f406f6730c0e4..24ab4689680e1 100644
--- a/app/code/Magento/PaypalUk/etc/adminhtml/di.xml
+++ b/app/code/Magento/Indexer/etc/adminhtml/acl.xml
@@ -24,17 +24,16 @@
*/
-->
-
-
- paypaluk
-
-
-
-
- adminhtml
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Indexer/etc/adminhtml/menu.xml b/app/code/Magento/Indexer/etc/adminhtml/menu.xml
new file mode 100644
index 0000000000000..eae28eb605f21
--- /dev/null
+++ b/app/code/Magento/Indexer/etc/adminhtml/menu.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
diff --git a/app/code/Magento/Indexer/etc/adminhtml/routes.xml b/app/code/Magento/Indexer/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..ee871b2e37034
--- /dev/null
+++ b/app/code/Magento/Indexer/etc/adminhtml/routes.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Indexer/etc/crontab.xml b/app/code/Magento/Indexer/etc/crontab.xml
new file mode 100644
index 0000000000000..55aece105ca41
--- /dev/null
+++ b/app/code/Magento/Indexer/etc/crontab.xml
@@ -0,0 +1,36 @@
+
+
+
+
+ * * * * *
+
+
+ * * * * *
+
+
+ 0 * * * *
+
+
diff --git a/app/code/Magento/Indexer/etc/di.xml b/app/code/Magento/Indexer/etc/di.xml
new file mode 100644
index 0000000000000..01003bc4b1d5e
--- /dev/null
+++ b/app/code/Magento/Indexer/etc/di.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Indexer/etc/indexer.xsd b/app/code/Magento/Indexer/etc/indexer.xsd
new file mode 100644
index 0000000000000..29bdac34f384e
--- /dev/null
+++ b/app/code/Magento/Indexer/etc/indexer.xsd
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+ Indexer Id must be unique.
+
+
+
+
+
+
+ Indexer Id must be unique.
+
+
+
+
+
+
+
+
+ Indexer declaration.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ View ID can contain only [a-zA-Z0-9_].
+
+
+
+
+
+
+
+
+
+ Class name can contain only [a-zA-Z\].
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Indexer/etc/module.xml b/app/code/Magento/Indexer/etc/module.xml
new file mode 100644
index 0000000000000..5906d1b2aeb6f
--- /dev/null
+++ b/app/code/Magento/Indexer/etc/module.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Indexer/sql/indexer_setup/install-1.0.0.0.php b/app/code/Magento/Indexer/sql/indexer_setup/install-1.0.0.0.php
new file mode 100644
index 0000000000000..e15f16222763a
--- /dev/null
+++ b/app/code/Magento/Indexer/sql/indexer_setup/install-1.0.0.0.php
@@ -0,0 +1,53 @@
+startSetup();
+
+/**
+ * Create table 'indexer_state'
+ */
+$table = $installer->getConnection()
+ ->newTable($installer->getTable('indexer_state'))
+ ->addColumn('state_id', \Magento\DB\Ddl\Table::TYPE_INTEGER, null, array(
+ 'identity' => true,
+ 'unsigned' => true,
+ 'nullable' => false,
+ 'primary' => true,
+ ), 'Indexer State Id')
+ ->addColumn('indexer_id', \Magento\DB\Ddl\Table::TYPE_TEXT, 255, array(
+ ), 'Indexer Id')
+ ->addColumn('status', \Magento\DB\Ddl\Table::TYPE_TEXT, 16, array(
+ 'default' => \Magento\Indexer\Model\Indexer\State::STATUS_INVALID,
+ ), 'Indexer Status')
+ ->addColumn('updated', \Magento\DB\Ddl\Table::TYPE_DATETIME, null, array(
+ ), 'Indexer Status')
+ ->addIndex($installer->getIdxName('indexer_state', array('indexer_id')),
+ array('indexer_id'))
+ ->setComment('Indexer State');
+$installer->getConnection()->createTable($table);
+
+$installer->endSetup();
diff --git a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list.xml b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list.xml
new file mode 100644
index 0000000000000..f5ceab83e0b36
--- /dev/null
+++ b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml
new file mode 100644
index 0000000000000..ee5b6db133add
--- /dev/null
+++ b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+ 0
+ 0
+ gridIndexer
+ Magento\Indexer\Model\Indexer\Collection
+
+
+
+ indexer_id
+ indexer_ids
+ 1
+
+ Magento\Indexer\Block\Backend\Grid\ItemsUpdater
+ -
+
- Update on Save
+ - */indexer/massOnTheFly
+
+ -
+
- Update by Schedule
+ - */indexer/massChangelog
+
+
+
+
+
+
+ indexer_grid
+ 0
+
+
+
+ Indexer
+ 180
+ left
+ title
+ 0
+ indexer-title
+
+
+
+
+ Description
+ left
+ description
+ 0
+ indexer-description
+
+
+
+
+ Mode
+ 150
+ left
+ getMode
+ \Magento\Indexer\Block\Backend\Grid\Column\Renderer\Mode
+ 0
+ indexer-mode
+
+
+
+
+ Status
+ 120
+ left
+ getStatus
+ \Magento\Indexer\Block\Backend\Grid\Column\Renderer\Status
+ 0
+ indexer-status
+
+
+
+
+ Updated
+ 180
+ left
+ updated
+ datetime
+ getUpdated
+ \Magento\Indexer\Block\Backend\Grid\Column\Renderer\Updated
+ 0
+ indexer-updated
+
+
+
+
+
+
diff --git a/app/code/Magento/Install/App/Console.php b/app/code/Magento/Install/App/Console.php
index e35f749168132..233df7afc90f9 100644
--- a/app/code/Magento/Install/App/Console.php
+++ b/app/code/Magento/Install/App/Console.php
@@ -27,7 +27,7 @@
use Magento\App\Console\Response;
-class Console implements \Magento\AppInterface
+class Console implements \Magento\LauncherInterface
{
/**
* @var \Magento\Install\Model\Installer\ConsoleFactory
@@ -155,7 +155,7 @@ protected function _handleInstall(\Magento\Install\Model\Installer\Console $inst
*
* @return \Magento\App\ResponseInterface
*/
- public function execute()
+ public function launch()
{
$areaCode = 'install';
$this->_state->setAreaCode($areaCode);
diff --git a/app/code/Magento/Install/Block/End.php b/app/code/Magento/Install/Block/End.php
index 8c9f7254c8ffd..0d427c0d60cd5 100644
--- a/app/code/Magento/Install/Block/End.php
+++ b/app/code/Magento/Install/Block/End.php
@@ -39,7 +39,7 @@ class End extends \Magento\Install\Block\AbstractBlock
protected $_template = 'end.phtml';
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_coreConfig;
@@ -60,7 +60,7 @@ class End extends \Magento\Install\Block\AbstractBlock
* @param \Magento\Install\Model\Installer $installer
* @param \Magento\Install\Model\Wizard $installWizard
* @param \Magento\Session\Generic $session
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param \Magento\AdminNotification\Model\Survey $survey
* @param $cryptKey
* @param array $data
@@ -70,7 +70,7 @@ public function __construct(
\Magento\Install\Model\Installer $installer,
\Magento\Install\Model\Wizard $installWizard,
\Magento\Session\Generic $session,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\AdminNotification\Model\Survey $survey,
$cryptKey,
array $data = array()
diff --git a/app/code/Magento/Install/Model/Installer.php b/app/code/Magento/Install/Model/Installer.php
index 3cda1fc26d64c..b3cc7b69e6aba 100644
--- a/app/code/Magento/Install/Model/Installer.php
+++ b/app/code/Magento/Install/Model/Installer.php
@@ -56,7 +56,7 @@ class Installer extends \Magento\Object
/**
* Application config model
*
- * @var \Magento\Core\Model\ConfigInterface
+ * @var \Magento\App\ReinitableConfigInterface
*/
protected $_config;
@@ -159,13 +159,20 @@ class Installer extends \Magento\Object
protected $mathRandom;
/**
- * @param \Magento\Core\Model\ConfigInterface $config
+ * Configuration arguments
+ *
+ * @var \Magento\App\Arguments
+ */
+ protected $_arguments;
+
+ /**
+ * @param \Magento\App\ReinitableConfigInterface $config
* @param \Magento\Module\UpdaterInterface $dbUpdater
* @param \Magento\App\CacheInterface $cache
* @param \Magento\App\Cache\TypeListInterface $cacheTypeList
* @param \Magento\App\Cache\StateInterface $cacheState
* @param \Magento\Module\Updater\SetupFactory $setupFactory
- * @param \Magento\App\Config $localConfig
+ * @param \Magento\App\Arguments $arguments
* @param \Magento\Core\Model\App $app
* @param \Magento\App\State $appState
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
@@ -181,13 +188,13 @@ class Installer extends \Magento\Object
* @param array $data
*/
public function __construct(
- \Magento\Core\Model\ConfigInterface $config,
+ \Magento\App\ReinitableConfigInterface $config,
\Magento\Module\UpdaterInterface $dbUpdater,
\Magento\App\CacheInterface $cache,
\Magento\App\Cache\TypeListInterface $cacheTypeList,
\Magento\App\Cache\StateInterface $cacheState,
\Magento\Module\Updater\SetupFactory $setupFactory,
- \Magento\App\Config $localConfig,
+ \Magento\App\Arguments $arguments,
\Magento\Core\Model\App $app,
\Magento\App\State $appState,
\Magento\Core\Model\StoreManagerInterface $storeManager,
@@ -211,7 +218,7 @@ public function __construct(
$this->_encryptor = $encryptor;
$this->mathRandom = $mathRandom;
parent::__construct($data);
- $this->_localConfig = $localConfig;
+ $this->_arguments = $arguments;
$this->_app = $app;
$this->_appState = $appState;
$this->_storeManager = $storeManager;
@@ -323,7 +330,7 @@ public function installConfig($data)
->setConfigData($data)
->install();
- $this->_localConfig->reload();
+ $this->_arguments->reload();
$this->_resource->setTablePrefix($data['db_prefix']);
$this->_config->reinit();
diff --git a/app/code/Magento/Install/Model/Installer/Db/AbstractDb.php b/app/code/Magento/Install/Model/Installer/Db/AbstractDb.php
index f74d53aa7fff4..f6581c2561226 100644
--- a/app/code/Magento/Install/Model/Installer/Db/AbstractDb.php
+++ b/app/code/Magento/Install/Model/Installer/Db/AbstractDb.php
@@ -70,20 +70,26 @@ abstract class AbstractDb
*/
protected $_configData;
+ /**
+ * Configuration arguments
+ *
+ * @var \Magento\App\Arguments
+ */
+ protected $_arguments;
/**
* @param \Magento\Core\Model\Resource\Type\Db\Pdo\MysqlFactory $adapterFactory
- * @param \Magento\App\Config $localConfig
+ * @param \Magento\App\Arguments $arguments
* @param array $dbExtensions
*/
public function __construct(
\Magento\Core\Model\Resource\Type\Db\Pdo\MysqlFactory $adapterFactory,
- \Magento\App\Config $localConfig,
+ \Magento\App\Arguments $arguments,
array $dbExtensions = array()
) {
$this->_adapterFactory = $adapterFactory;
$this->_dbExtensions = $dbExtensions;
- $this->_localConfig = $localConfig;
+ $this->_arguments = $arguments;
}
/**
@@ -134,7 +140,7 @@ public function getConnectionData()
'pdoType' => $this->getPdoType()
);
} else {
- $default = $this->_localConfig->getConnection('default');
+ $default = $this->_arguments->getConnection('default');
$connectionData = array(
'host' => $default['host'],
'username' => $default['username'],
diff --git a/app/code/Magento/Install/etc/di.xml b/app/code/Magento/Install/etc/di.xml
index 94470d83d9df2..e9504dd992f76 100644
--- a/app/code/Magento/Install/etc/di.xml
+++ b/app/code/Magento/Install/etc/di.xml
@@ -53,22 +53,26 @@
-
-
- pdo_mysql
- SET NAMES utf8
- 4.1.20
-
-
+
+ -
+
+ pdo_mysql SET NAMES utf8 4.1.20
+
+
-
-
- pdo_mysql
-
-
+
+ -
+
+ pdo_mysql
+
+
@@ -137,15 +141,17 @@
-
-
- install
- install
-
-
+
+ -
+
+ install install
+
+
-
+
adminhtml
diff --git a/app/code/Magento/Install/etc/frontend/di.xml b/app/code/Magento/Install/etc/frontend/di.xml
index 14ed2d04e343f..08ed9dee82e33 100644
--- a/app/code/Magento/Install/etc/frontend/di.xml
+++ b/app/code/Magento/Install/etc/frontend/di.xml
@@ -26,9 +26,9 @@
-
- /install/wizard/checkSecureHost
-
+
+ /install/wizard/checkSecureHost
diff --git a/app/code/Magento/Install/etc/install/di.xml b/app/code/Magento/Install/etc/install/di.xml
index 18b28f198f733..fdd72048ef3ea 100644
--- a/app/code/Magento/Install/etc/install/di.xml
+++ b/app/code/Magento/Install/etc/install/di.xml
@@ -27,13 +27,15 @@
-
-
- Magento\Core\App\Router\Base
- false
- 20
-
-
+
+ -
+
+ Magento\Core\App\Router\Base false 20
+
+
diff --git a/app/code/Magento/Log/App/Shell.php b/app/code/Magento/Log/App/Shell.php
index fb56d6e8004cd..1d9a5688bf3a6 100644
--- a/app/code/Magento/Log/App/Shell.php
+++ b/app/code/Magento/Log/App/Shell.php
@@ -26,9 +26,9 @@
namespace Magento\Log\App;
use Magento\App\Console\Response;
-use Magento\AppInterface;
+use Magento\LauncherInterface;
-class Shell implements AppInterface
+class Shell implements LauncherInterface
{
/**
* Filename of the entry point script
@@ -68,7 +68,7 @@ public function __construct(
*
* @return \Magento\App\ResponseInterface
*/
- public function execute()
+ public function launch()
{
/** @var $shell \Magento\Log\Model\Shell */
$shell = $this->_shellFactory->create(array('entryPoint' => $this->_entryFileName));
diff --git a/app/code/Magento/Log/Model/Aggregation.php b/app/code/Magento/Log/Model/Aggregation.php
index db6dc90e6ceee..ba257b5f6faf0 100644
--- a/app/code/Magento/Log/Model/Aggregation.php
+++ b/app/code/Magento/Log/Model/Aggregation.php
@@ -80,6 +80,7 @@ protected function _construct()
/**
* Run action
+ * @return void
*/
public function run()
{
@@ -104,7 +105,7 @@ private function _removeEmpty($lastDate)
* Process
*
* @param int $store
- * @return mixed
+ * @return null|array
*/
private function _process($store)
{
@@ -136,9 +137,10 @@ private function _process($store)
/**
* Save log data
*
- * @param array $data
- * @param string $from
- * @param string $to
+ * @param array $data
+ * @param string $from
+ * @param string $to
+ * @return void
*/
private function _save($data, $from, $to)
{
@@ -150,21 +152,45 @@ private function _save($data, $from, $to)
}
}
+ /**
+ * Update log data
+ *
+ * @param int $id
+ * @param array $data
+ * @return mixed
+ */
private function _update($id, $data)
{
return $this->_getResource()->saveLog($data, $id);
}
+ /**
+ * Insert log data
+ *
+ * @param array $data
+ * @return mixed
+ */
private function _insert($data)
{
return $this->_getResource()->saveLog($data);
}
+ /**
+ * @param string $from
+ * @param string $to
+ * @param int $store
+ * @return array
+ */
private function _getCounts($from, $to, $store)
{
return $this->_getResource()->getCounts($from, $to, $store);
}
+ /**
+ * Get last recorded date
+ *
+ * @return bool|string
+ */
public function getLastRecordDate()
{
$result = $this->_getResource()->getLastRecordDate();
@@ -174,6 +200,13 @@ public function getLastRecordDate()
return $result;
}
+ /**
+ * Get date
+ *
+ * @param int|string $in
+ * @param null $offset
+ * @return bool|string
+ */
private function _date($in, $offset = null)
{
$out = $in;
@@ -183,6 +216,13 @@ private function _date($in, $offset = null)
return $out;
}
+ /**
+ * Get timestamp
+ *
+ * @param int|string $in
+ * @param null $offset
+ * @return int
+ */
private function _timestamp($in, $offset = null)
{
$out = $in;
@@ -193,7 +233,7 @@ private function _timestamp($in, $offset = null)
}
/**
- * @param $in
+ * @param int|string $in
* @return string
*/
private function _round($in)
diff --git a/app/code/Magento/Log/Model/Log.php b/app/code/Magento/Log/Model/Log.php
index a3f4c3e818d40..b16efc3fa5c61 100644
--- a/app/code/Magento/Log/Model/Log.php
+++ b/app/code/Magento/Log/Model/Log.php
@@ -87,6 +87,10 @@ protected function _construct()
$this->_init('Magento\Log\Model\Resource\Log');
}
+ /**
+ * Return log clean time in seconds
+ * @return null|string
+ */
public function getLogCleanTime()
{
return $this->_coreStoreConfig->getConfig(self::XML_LOG_CLEAN_DAYS) * 60 * 60 * 24;
diff --git a/app/code/Magento/Log/Model/Resource/Aggregation.php b/app/code/Magento/Log/Model/Resource/Aggregation.php
index 62a7084078455..bf7a9748ae7f2 100644
--- a/app/code/Magento/Log/Model/Resource/Aggregation.php
+++ b/app/code/Magento/Log/Model/Resource/Aggregation.php
@@ -123,6 +123,7 @@ public function saveLog($data, $id = null)
* Remove empty records
*
* @param string $date
+ * @return void
*/
public function removeEmpty($date)
{
diff --git a/app/code/Magento/Log/Model/Resource/Shell.php b/app/code/Magento/Log/Model/Resource/Shell.php
index 8a09b9b654837..d119d9bfde0bb 100644
--- a/app/code/Magento/Log/Model/Resource/Shell.php
+++ b/app/code/Magento/Log/Model/Resource/Shell.php
@@ -60,7 +60,7 @@ public function __construct(
/**
* Retrieves information about log tables
*
- * @return array
+ * @return string[]
*/
public function getTablesInfo()
{
diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Collection.php b/app/code/Magento/Log/Model/Resource/Visitor/Collection.php
index e8345ee82d9b5..9453c6dbee4b3 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor/Collection.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor/Collection.php
@@ -148,7 +148,7 @@ public function showCustomersOnly()
*
* @param string $fieldName
* @param array $condition
- * @return \Magento\Log\Model\Resource\Visitor\Collection
+ * @return $this
*/
public function addFieldToFilter($fieldName, $condition = null)
{
@@ -207,7 +207,8 @@ public function getIsOnlineFilterUsed()
/**
* Filter visitors by specified store ids
*
- * @param array|int $storeIds
+ * @param int[]|int $storeIds
+ * @return void
*/
public function addVisitorStoreFilter($storeIds)
{
diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php b/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php
index 5994a3884e2eb..82575aef75a92 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php
@@ -134,8 +134,8 @@ public function addCustomerData()
/**
* Filter collection by specified website(s)
*
- * @param int|array $websiteIds
- * @return \Magento\Log\Model\Resource\Visitor\Online\Collection
+ * @param int|int[] $websiteIds
+ * @return $this
*/
public function addWebsiteFilter($websiteIds)
{
diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php b/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php
index d5872c8a43e57..9c784e931fa0c 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php
@@ -65,7 +65,7 @@ public function __construct(
}
/**
- * @return \Magento\Log\Model\Resource\Visitor\Online\Grid\Collection
+ * @return $this
*/
protected function _initSelect()
{
diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Row/UrlGenerator.php b/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Row/UrlGenerator.php
index cad7d4bb0dc62..4363ad68c6451 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Row/UrlGenerator.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Row/UrlGenerator.php
@@ -35,12 +35,12 @@ class UrlGenerator
protected $_authorization;
/**
- * @param \Magento\Backend\Model\Url $backendUrl
+ * @param \Magento\Backend\Model\UrlInterface $backendUrl
* @param \Magento\AuthorizationInterface $authorization
* @param array $args
*/
public function __construct(
- \Magento\Backend\Model\Url $backendUrl,
+ \Magento\Backend\Model\UrlInterface $backendUrl,
\Magento\AuthorizationInterface $authorization,
array $args = array()
) {
diff --git a/app/code/Magento/Log/Model/Shell/Command/Clean.php b/app/code/Magento/Log/Model/Shell/Command/Clean.php
index bff4ad28152a0..86c8b0e489bb9 100644
--- a/app/code/Magento/Log/Model/Shell/Command/Clean.php
+++ b/app/code/Magento/Log/Model/Shell/Command/Clean.php
@@ -23,15 +23,18 @@
*/
namespace Magento\Log\Model\Shell\Command;
+use Magento\Core\Model\StoreManagerInterface;
+use Magento\Log\Model\LogFactory;
+
class Clean implements \Magento\Log\Model\Shell\CommandInterface
{
/**
- * @var \Magento\Core\Model\StoreManagerInterface
+ * @var StoreManagerInterface
*/
protected $_storeManager;
/**
- * @var \Magento\Log\Model\LogFactory
+ * @var LogFactory
*/
protected $_logFactory;
@@ -42,9 +45,14 @@ class Clean implements \Magento\Log\Model\Shell\CommandInterface
*/
protected $_days;
+ /**
+ * @param StoreManagerInterface $storeManager
+ * @param LogFactory $logFactory
+ * @param int $days
+ */
public function __construct(
- \Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Log\Model\LogFactory $logFactory,
+ StoreManagerInterface $storeManager,
+ LogFactory $logFactory,
$days
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Log/Model/Shell/Command/Status.php b/app/code/Magento/Log/Model/Shell/Command/Status.php
index ab7e6a5b48775..98cb58ea2750f 100644
--- a/app/code/Magento/Log/Model/Shell/Command/Status.php
+++ b/app/code/Magento/Log/Model/Shell/Command/Status.php
@@ -49,6 +49,7 @@ public function __construct(\Magento\Log\Model\Resource\ShellFactory $resourceFa
* Add output data
*
* @param string $output
+ * @return void
*/
protected function _addOutput($output)
{
@@ -105,6 +106,8 @@ protected function _humanSize($number)
/**
* Add row delimiter
+ *
+ * @return void
*/
protected function _addRowDelimiter()
{
diff --git a/app/code/Magento/Log/Model/Visitor.php b/app/code/Magento/Log/Model/Visitor.php
index 8a6d85e7c4500..f0f1823868962 100644
--- a/app/code/Magento/Log/Model/Visitor.php
+++ b/app/code/Magento/Log/Model/Visitor.php
@@ -50,7 +50,7 @@ class Visitor extends \Magento\Core\Model\AbstractModel
protected $_skipRequestLogging = false;
/**
- * @var array
+ * @var string[]
*/
protected $_ignoredUserAgents;
@@ -62,7 +62,7 @@ class Visitor extends \Magento\Core\Model\AbstractModel
protected $_coreStoreConfig;
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_coreConfig;
@@ -73,7 +73,7 @@ class Visitor extends \Magento\Core\Model\AbstractModel
*/
protected $_ignores;
- /*
+ /**
* @var \Magento\Core\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -121,14 +121,14 @@ class Visitor extends \Magento\Core\Model\AbstractModel
* @param \Magento\Sales\Model\QuoteFactory $quoteFactory
* @param \Magento\Session\SessionManagerInterface $session
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param \Magento\HTTP\Header $httpHeader
* @param \Magento\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
* @param \Magento\HTTP\PhpEnvironment\ServerAddress $serverAddress
* @param \Magento\Stdlib\DateTime $dateTime
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
- * @param array $ignoredUserAgents
+ * @param string[] $ignoredUserAgents
* @param array $ignores
* @param array $data
*/
@@ -140,7 +140,7 @@ public function __construct(
\Magento\Sales\Model\QuoteFactory $quoteFactory,
\Magento\Session\SessionManagerInterface $session,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\HTTP\Header $httpHeader,
\Magento\HTTP\PhpEnvironment\RemoteAddress $remoteAddress,
\Magento\HTTP\PhpEnvironment\ServerAddress $serverAddress,
@@ -240,6 +240,11 @@ public function getUrl()
return $url;
}
+ /**
+ * Return First Visit data in internal format.
+ *
+ * @return string
+ */
public function getFirstVisitAt()
{
if (!$this->hasData('first_visit_at')) {
@@ -248,6 +253,11 @@ public function getFirstVisitAt()
return $this->getData('first_visit_at');
}
+ /**
+ * Return Last Visit data in internal format.
+ *
+ * @return string
+ */
public function getLastVisitAt()
{
if (!$this->hasData('last_visit_at')) {
@@ -341,6 +351,8 @@ public function bindCustomerLogout($observer)
}
/**
+ * Create binding of checkout quote
+ *
* @param \Magento\Event\Observer $observer
* @return $this
*/
@@ -357,6 +369,7 @@ public function bindQuoteCreate($observer)
}
/**
+ * Destroy binding of checkout quote
* @param \Magento\Event\Observer $observer
* @return $this
*/
@@ -371,6 +384,9 @@ public function bindQuoteDestroy($observer)
/**
* Methods for research (depends from customer online admin section)
+ *
+ * @param array $data
+ * @return $this
*/
public function addIpData($data)
{
@@ -380,6 +396,8 @@ public function addIpData($data)
}
/**
+ * Load customer data into $data
+ *
* @param object $data
* @return $this
*/
@@ -400,6 +418,8 @@ public function addCustomerData($data)
}
/**
+ * Load quote data into $data
+ *
* @param object $data
* @return $this
*/
@@ -414,6 +434,8 @@ public function addQuoteData($data)
}
/**
+ * Returns true if the module is required
+ *
* @param \Magento\Event\Observer $observer
* @return bool
*/
diff --git a/app/code/Magento/Log/etc/di.xml b/app/code/Magento/Log/etc/di.xml
index 56de1c1c01670..6fa6f57f52d9a 100644
--- a/app/code/Magento/Log/etc/di.xml
+++ b/app/code/Magento/Log/etc/di.xml
@@ -31,11 +31,11 @@
-
- Googlebot/1.0 (googlebot@googlebot.com http://googlebot.com/)
- Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)
- Googlebot/2.1 (+http://www.googlebot.com/bot.html)
-
+
+ Googlebot/1.0 (googlebot@googlebot.com http://googlebot.com/) Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html) Googlebot/2.1 (+http://www.googlebot.com/bot.html)
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index 9e1caad669920..be417ca7f58aa 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -73,14 +73,6 @@ public function __construct(
*/
protected function _prepareLayout()
{
- $rowItemType = $this->_getRowItemType(self::DEFAULT_TYPE);
- if (!$this->getChildBlock($rowItemType)) {
- $this->addChild(
- $rowItemType,
- 'Magento\Checkout\Block\Cart\Item\Renderer',
- array('template' => 'Magento_Multishipping::checkout/overview/item.phtml')
- );
- }
$headBlock = $this->getLayout()->getBlock('head');
if ($headBlock) {
$headBlock->setTitle(
@@ -373,22 +365,10 @@ public function getRowItemHtml(\Magento\Object $item)
*/
protected function _getRowItemRenderer($type)
{
- $renderer = $this->getChildBlock($this->_getRowItemType($type));
- if ($renderer instanceof \Magento\View\Element\BlockInterface) {
- $renderer->setRenderedBlock($this);
- return $renderer;
+ $renderer = $this->getItemRenderer($type);
+ if ($renderer !== $this->getItemRenderer(self::DEFAULT_TYPE)) {
+ $renderer->setTemplate($this->getRowRendererTemplate());
}
- return parent::getItemRenderer($this->_getRowItemType(self::DEFAULT_TYPE));
- }
-
- /**
- * Wrap row renderers into namespace by adding 'row-' prefix
- *
- * @param string $type Product type
- * @return string
- */
- protected function _getRowItemType($type)
- {
- return 'row-' . $type;
+ return $renderer;
}
}
diff --git a/app/code/Magento/Multishipping/Controller/Checkout.php b/app/code/Magento/Multishipping/Controller/Checkout.php
index b63b4d91fe425..9b1642fd76ca3 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout.php
@@ -77,24 +77,15 @@ protected function _getCheckoutSession()
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
+ \Magento\Customer\Model\Session $customerSession
) {
parent::__construct($context, $customerSession);
- $this->_urlBuilder = $urlBuilder;
}
/**
@@ -217,7 +208,7 @@ public function registerAction()
$registerForm->setShowAddressFields(true)
->setBackUrl($this->_getHelper()->getMSLoginUrl())
->setSuccessUrl($this->_getHelper()->getMSShippingAddressSavedUrl())
- ->setErrorUrl($this->_urlBuilder->getCurrentUrl());
+ ->setErrorUrl($this->_url->getCurrentUrl());
}
$this->_view->renderLayout();
diff --git a/app/code/Magento/Multishipping/etc/frontend/di.xml b/app/code/Magento/Multishipping/etc/frontend/di.xml
index b8ee929ff009a..1aafdd30e2f9a 100644
--- a/app/code/Magento/Multishipping/etc/frontend/di.xml
+++ b/app/code/Magento/Multishipping/etc/frontend/di.xml
@@ -26,9 +26,9 @@
-
- /multishipping/checkout
-
+
+ /multishipping/checkout
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml
index 1169fa4cb3afe..ca2b0b54bfe14 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml
@@ -25,6 +25,7 @@
-->
Ship to Multiple Addresses
@@ -32,9 +33,10 @@
-
+ Magento_Multishipping::checkout/item/default.phtml
+
+
Review Order
@@ -32,11 +33,11 @@
-
+ Magento_Multishipping::checkout/item/default.phtml
+ Magento_Multishipping::checkout/overview/item.phtml
+
+
Shipping Information
@@ -32,13 +33,15 @@
-
+ Magento_Multishipping::checkout/item/default.phtml
+
+
-
+ Magento_Multishipping::checkout/item/default.phtml
+ checkout.cart.item.renderers
+
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
index 7e31654e47eb3..44979e66fe841 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
@@ -33,9 +33,14 @@
*/
namespace Magento\Newsletter\Block\Adminhtml;
+use Magento\Newsletter\Model\Resource\Problem\Collection;
+
class Problem extends \Magento\Backend\Block\Template
{
+ /**
+ * @var string
+ */
protected $_template = 'problem/list.phtml';
/**
@@ -45,12 +50,12 @@ class Problem extends \Magento\Backend\Block\Template
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Newsletter\Model\Resource\Problem\Collection $problemCollection
+ * @param Collection $problemCollection
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Newsletter\Model\Resource\Problem\Collection $problemCollection,
+ Collection $problemCollection,
array $data = array()
) {
$this->_problemCollection = $problemCollection;
@@ -65,6 +70,11 @@ protected function _construct()
->addQueueInfo();
}
+ /**
+ * Prepare for the newsletter block layout
+ *
+ * @return $this
+ */
protected function _prepareLayout()
{
$this->setChild('deleteButton',
@@ -89,16 +99,31 @@ protected function _prepareLayout()
return parent::_prepareLayout();
}
+ /**
+ * Get the html element for unsubscribe button
+ *
+ * @return $string
+ */
public function getUnsubscribeButtonHtml()
{
return $this->getChildHtml('unsubscribeButton');
}
+ /**
+ * Get the html element for delete button
+ *
+ * @return $string
+ */
public function getDeleteButtonHtml()
{
return $this->getChildHtml('deleteButton');
}
+ /**
+ * Return true if the size is greater than 0
+ *
+ * @return bool
+ */
public function getShowButtons()
{
return $this->_problemCollection->getSize() > 0;
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
index 7700dc0e11d6b..13f7d257e238c 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
@@ -36,11 +36,21 @@
class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
{
+ /**
+ * Get the condition of grid filter checkbox
+ *
+ * @return array
+ */
public function getCondition()
{
return array();
}
+ /**
+ * Get html code for grid filter checkbox
+ *
+ * @return string
+ */
public function getHtml()
{
return '';
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
index 4dc371cbe7807..a60fe76a15582 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
@@ -29,8 +29,14 @@
*/
namespace Magento\Newsletter\Block\Adminhtml\Queue;
+use Magento\View\Element\AbstractBlock;
+use Magento\Newsletter\Model\Queue as ModelQueue;
+
class Edit extends \Magento\Backend\Block\Template
{
+ /**
+ * @var string
+ */
protected $_template = 'queue/edit.phtml';
/**
@@ -74,13 +80,18 @@ protected function _construct()
/**
* Retrieve current Newsletter Queue Object
*
- * @return \Magento\Newsletter\Model\Queue
+ * @return ModelQueue
*/
public function getQueue()
{
return $this->_coreRegistry->registry('current_queue');
}
+ /**
+ * Before rendering html, but after trying to load cache
+ *
+ * @return AbstractBlock
+ */
protected function _beforeToHtml()
{
$this->setChild('form',
@@ -89,6 +100,11 @@ protected function _beforeToHtml()
return parent::_beforeToHtml();
}
+ /**
+ * Get the url for save
+ *
+ * @return string
+ */
public function getSaveUrl()
{
if ($this->getTemplateId()) {
@@ -99,6 +115,11 @@ public function getSaveUrl()
return $this->getUrl('*/*/save', $params);
}
+ /**
+ * Prepare for the layout
+ *
+ * @return AbstractBlock
+ */
protected function _prepareLayout()
{
// Load Wysiwyg on demand and Prepare layout
@@ -218,20 +239,20 @@ public function getResumeButtonHtml()
/**
* Getter for availability preview mode
*
- * @return boolean
+ * @return bool
*/
public function getIsPreview()
{
return !in_array($this->getQueue()->getQueueStatus(), array(
- \Magento\Newsletter\Model\Queue::STATUS_NEVER,
- \Magento\Newsletter\Model\Queue::STATUS_PAUSE
+ ModelQueue::STATUS_NEVER,
+ ModelQueue::STATUS_PAUSE
));
}
/**
* Getter for single store mode check
*
- * @return boolean
+ * @return bool
*/
protected function isSingleStoreMode()
{
@@ -241,7 +262,7 @@ protected function isSingleStoreMode()
/**
* Getter for id of current store (the only one in single-store mode and current in multi-stores mode)
*
- * @return boolean
+ * @return bool
*/
protected function getStoreId()
{
@@ -251,7 +272,7 @@ protected function getStoreId()
/**
* Getter for check is this newsletter the plain text.
*
- * @return boolean
+ * @return bool
*/
public function getIsTextType()
{
@@ -261,19 +282,19 @@ public function getIsTextType()
/**
* Getter for availability resume action
*
- * @return boolean
+ * @return bool
*/
public function getCanResume()
{
return in_array($this->getQueue()->getQueueStatus(), array(
- \Magento\Newsletter\Model\Queue::STATUS_PAUSE
+ ModelQueue::STATUS_PAUSE
));
}
/**
* Getter for header text
*
- * @return boolean
+ * @return bool
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
index 91a3596f5c023..20ee5b3979afe 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
@@ -36,6 +36,12 @@
class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
{
+ /**
+ * Renders column
+ *
+ * @param \Magento\Object $row
+ * @return string
+ */
public function render(\Magento\Object $row)
{
$actions = array();
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
index dfeccef6f9fcf..3b953e5f61c34 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
@@ -70,6 +70,11 @@ public function __construct(
parent::__construct($context, $data);
}
+ /**
+ * Get html code
+ *
+ * @return string
+ */
protected function _toHtml()
{
/* @var $template \Magento\Newsletter\Model\Template */
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
index 76565e213e15d..d7fd522ff77eb 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
@@ -34,15 +34,20 @@
namespace Magento\Newsletter\Block\Adminhtml;
+use Magento\Newsletter\Model\Resource\Queue\Collection;
+
class Subscriber extends \Magento\Backend\Block\Template
{
/**
* Queue collection
*
- * @var \Magento\Newsletter\Model\Resource\Queue\Collection
+ * @var Collection
*/
protected $_queueCollection = null;
+ /**
+ * @var string
+ */
protected $_template = 'subscriber/list.phtml';
/**
@@ -67,7 +72,7 @@ public function __construct(
/**
* Prepares block to render
*
- * @return \Magento\Newsletter\Block\Adminhtml\Subscriber
+ * @return $this
*/
protected function _beforeToHtml()
{
@@ -77,7 +82,7 @@ protected function _beforeToHtml()
/**
* Return queue collection with loaded neversent queues
*
- * @return \Magento\Newsletter\Model\Resource\Queue\Collection
+ * @return Collection
*/
public function getQueueCollection()
{
@@ -92,6 +97,11 @@ public function getQueueCollection()
return $this->_queueCollection;
}
+ /**
+ * Get add option for queue
+ *
+ * @return mixed
+ */
public function getShowQueueAdd()
{
return $this->getChildBlock('grid')->getShowQueueAdd();
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
index f5a1508aa5123..7a3ab8b064c83 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
@@ -42,20 +42,18 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Newsletter\Model\QueueFactory $queueFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Newsletter\Model\QueueFactory $queueFactory,
array $data = array()
) {
$this->_queueFactory = $queueFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
index 3f69b9d73ded2..9fbbb798be3da 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
@@ -36,11 +36,21 @@
class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
{
+ /**
+ * Get the condition of grid filter checkbox
+ *
+ * @return array
+ */
public function getCondition()
{
return array();
}
+ /**
+ * Get html code for grid filter checkbox
+ *
+ * @return string
+ */
public function getHtml()
{
return '';
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
index d42a3997cb651..5a02cb98f3a9b 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
@@ -29,9 +29,16 @@
*/
namespace Magento\Newsletter\Block\Adminhtml\Subscriber\Grid\Filter;
+use Magento\Core\Model\Resource\Website\Collection;
+
class Website
extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
{
+ /**
+ * Website collection
+ *
+ * @var Collection
+ */
protected $_websiteCollection = null;
/**
@@ -73,6 +80,11 @@ public function __construct(
parent::__construct($context, $resourceHelper, $data);
}
+ /**
+ * Get options for grid filter
+ *
+ * @return array
+ */
protected function _getOptions()
{
$result = $this->getCollection()->toOptionArray();
@@ -81,7 +93,7 @@ protected function _getOptions()
}
/**
- * @return \Magento\Core\Model\Resource\Website\Collection|null
+ * @return Collection|null
*/
public function getCollection()
{
@@ -94,6 +106,11 @@ public function getCollection()
return $this->_websiteCollection;
}
+ /**
+ * Get options for grid filter
+ *
+ * @return null|array
+ */
public function getCondition()
{
$id = $this->getValue();
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
index d424806a1b860..bdad7a4bcb613 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
@@ -36,8 +36,14 @@
class Template extends \Magento\Backend\Block\Template
{
+ /**
+ * @var string
+ */
protected $_template = 'template/list.phtml';
+ /**
+ * @return $this
+ */
protected function _prepareLayout()
{
$this->setChild(
@@ -47,11 +53,21 @@ protected function _prepareLayout()
return parent::_prepareLayout();
}
+ /**
+ * Get the url for create
+ *
+ * @return string
+ */
public function getCreateUrl()
{
return $this->getUrl('*/*/new');
}
+ /**
+ * Get header text
+ *
+ * @return string
+ */
public function getHeaderText()
{
return __('Newsletter Templates');
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
index 8e3e1ba4f14ef..43291107d4d17 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
@@ -33,6 +33,8 @@
*/
namespace Magento\Newsletter\Block\Adminhtml\Template;
+use Magento\Backend\Block\Widget\Grid as WidgetGrid;
+
class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
{
/**
@@ -42,23 +44,26 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Newsletter\Model\Resource\Template\Collection $templateCollection
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Newsletter\Model\Resource\Template\Collection $templateCollection,
array $data = array()
) {
$this->_templateCollection = $templateCollection;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
$this->setEmptyText(__('No Templates Found'));
}
+ /**
+ * Apply sorting and filtering to collection
+ *
+ * @return WidgetGrid
+ */
protected function _prepareCollection()
{
$this->setCollection($this->_templateCollection->useOnlyActual());
@@ -66,6 +71,11 @@ protected function _prepareCollection()
return parent::_prepareCollection();
}
+ /**
+ * Prepare grid columns
+ *
+ * @return $this
+ */
protected function _prepareColumns()
{
$this->addColumn('template_code',
@@ -148,6 +158,12 @@ protected function _prepareColumns()
return $this;
}
+ /**
+ * Get row url
+ *
+ * @param \Magento\Object $row
+ * @return string
+ */
public function getRowUrl($row)
{
return $this->getUrl('*/*/edit', array('id'=>$row->getId()));
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
index 14832c5229782..917b4ca7c07c1 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
@@ -39,7 +39,7 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
/**
* Renderer for "Action" column in Newsletter templates grid
*
- * @var \Magento\Newsletter\Model\Template $row
+ * @param \Magento\Object $row
* @return string
*/
public function render(\Magento\Object $row)
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
index 89e27750ed8eb..e9c0f430d2cf9 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
@@ -36,6 +36,12 @@
class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
+ /**
+ * Renderer for "Action" column in Newsletter templates grid
+ *
+ * @param \Magento\Object $row
+ * @return string
+ */
public function render(\Magento\Object $row)
{
$str = '';
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
index 8f7368bd3faba..a16b17680a8a5 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
@@ -62,6 +62,11 @@ public function __construct(
parent::__construct($context, $data);
}
+ /**
+ * Get html code
+ *
+ * @return string
+ */
protected function _toHtml()
{
/* @var $template \Magento\Newsletter\Model\Template */
diff --git a/app/code/Magento/Newsletter/Block/Subscribe.php b/app/code/Magento/Newsletter/Block/Subscribe.php
index 4451b423089f3..b163f3c9bdc44 100644
--- a/app/code/Magento/Newsletter/Block/Subscribe.php
+++ b/app/code/Magento/Newsletter/Block/Subscribe.php
@@ -58,11 +58,21 @@ public function __construct(
$this->_isScopePrivate = true;
}
+ /**
+ * Get success message
+ *
+ * @return string
+ */
public function getSuccessMessage()
{
return $this->_newsletterSession->getSuccess();
}
+ /**
+ * Get error message
+ *
+ * @return string
+ */
public function getErrorMessage()
{
return $this->_newsletterSession->getError();
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
index baa854011515e..ede8459ebc6e1 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
@@ -31,6 +31,11 @@
*/
class Problem extends \Magento\Backend\App\Action
{
+ /**
+ * Newsletter problems report page
+ *
+ * @return void
+ */
public function indexAction()
{
$this->_title->add(__('Newsletter Problems Report'));
@@ -49,6 +54,11 @@ public function indexAction()
$this->_view->renderLayout();
}
+ /**
+ * Newsletter problems grid
+ *
+ * @return void
+ */
public function gridAction()
{
if ($this->getRequest()->getParam('_unsubscribe')) {
@@ -85,6 +95,11 @@ public function gridAction()
$this->_view->renderLayout();
}
+ /**
+ * Check if user has enough privileges
+ *
+ * @return bool
+ */
protected function _isAllowed()
{
return $this->_authorization->isAllowed('Magento_Newsletter::problem');
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
index 1b98f1dd9d452..c9aac04b51ed7 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
@@ -56,6 +56,8 @@ public function __construct(
/**
* Queue list action
+ *
+ * @return void
*/
public function indexAction()
{
@@ -78,6 +80,8 @@ public function indexAction()
/**
* Drop Newsletter queue template
+ *
+ * @return void
*/
public function dropAction()
{
@@ -87,6 +91,8 @@ public function dropAction()
/**
* Preview Newsletter queue template
+ *
+ * @return void
*/
public function previewAction()
{
@@ -107,6 +113,8 @@ public function previewAction()
/**
* Queue list Ajax action
+ *
+ * @return void
*/
public function gridAction()
{
@@ -114,6 +122,11 @@ public function gridAction()
$this->_view->renderLayout();
}
+ /**
+ * Start Newsletter queue
+ *
+ * @return void
+ */
public function startAction()
{
$queue = $this->_objectManager->create('Magento\Newsletter\Model\Queue')
@@ -134,6 +147,11 @@ public function startAction()
$this->_redirect('*/*');
}
+ /**
+ * Pause Newsletter queue
+ *
+ * @return void
+ */
public function pauseAction()
{
$queue = $this->_objectManager->get('Magento\Newsletter\Model\Queue')
@@ -151,6 +169,11 @@ public function pauseAction()
$this->_redirect('*/*');
}
+ /**
+ * Resume Newsletter queue
+ *
+ * @return void
+ */
public function resumeAction()
{
$queue = $this->_objectManager->get('Magento\Newsletter\Model\Queue')
@@ -168,6 +191,11 @@ public function resumeAction()
$this->_redirect('*/*');
}
+ /**
+ * Cancel Newsletter queue
+ *
+ * @return void
+ */
public function cancelAction()
{
$queue = $this->_objectManager->get('Magento\Newsletter\Model\Queue')
@@ -185,6 +213,11 @@ public function cancelAction()
$this->_redirect('*/*');
}
+ /**
+ * Send Newsletter queue
+ *
+ * @return void
+ */
public function sendingAction()
{
// Todo: put it somewhere in config!
@@ -200,6 +233,11 @@ public function sendingAction()
$collection->walk('sendPerSubscriber', array($countOfSubscritions));
}
+ /**
+ * Edit Newsletter queue
+ *
+ * @return void
+ */
public function editAction()
{
$this->_title->add(__('Newsletter Queue'));
@@ -232,6 +270,12 @@ public function editAction()
$this->_view->renderLayout();
}
+ /**
+ * Save Newsletter queue
+ *
+ * @throws \Magento\Core\Exception
+ * @return void
+ */
public function saveAction()
{
try {
@@ -294,6 +338,11 @@ public function saveAction()
}
}
+ /**
+ * Check if user has enough privileges
+ *
+ * @return bool
+ */
protected function _isAllowed()
{
return $this->_authorization->isAllowed('Magento_Newsletter::queue');
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
index 3817fe028d51c..339b2f5110aaa 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
@@ -48,6 +48,11 @@ public function __construct(
parent::__construct($context);
}
+ /**
+ * Newsletter subscribers page
+ *
+ * @return void
+ */
public function indexAction()
{
$this->_title->add(__('Newsletter Subscribers'));
@@ -67,6 +72,11 @@ public function indexAction()
$this->_view->renderLayout();
}
+ /**
+ * Managing newsletter grid
+ *
+ * @return void
+ */
public function gridAction()
{
$this->_view->loadLayout(false);
@@ -75,6 +85,8 @@ public function gridAction()
/**
* Export subscribers grid to CSV format
+ *
+ * @return void
*/
public function exportCsvAction()
{
@@ -91,6 +103,8 @@ public function exportCsvAction()
/**
* Export subscribers grid to XML format
+ *
+ * @return void
*/
public function exportXmlAction()
{
@@ -104,6 +118,11 @@ public function exportXmlAction()
);
}
+ /**
+ * Unsubscribe one or more subscribers action
+ *
+ * @return void
+ */
public function massUnsubscribeAction()
{
$subscribersIds = $this->getRequest()->getParam('subscriber');
@@ -127,6 +146,11 @@ public function massUnsubscribeAction()
$this->_redirect('*/*/index');
}
+ /**
+ * Delete one or more subscribers action
+ *
+ * @return void
+ */
public function massDeleteAction()
{
$subscribersIds = $this->getRequest()->getParam('subscriber');
@@ -148,6 +172,11 @@ public function massDeleteAction()
$this->_redirect('*/*/index');
}
+ /**
+ * Check if user has enough privileges
+ *
+ * @return bool
+ */
protected function _isAllowed()
{
return $this->_authorization->isAllowed('Magento_Newsletter::subscriber');
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
index 113f54aca76e9..d23f4f9773058 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
@@ -66,7 +66,7 @@ protected function _isAllowed()
/**
* Set title of page
*
- * @return \Magento\Newsletter\Controller\Adminhtml\Template
+ * @return $this
*/
protected function _setTitle()
{
@@ -76,6 +76,7 @@ protected function _setTitle()
/**
* View Templates list
*
+ * @return void
*/
public function indexAction()
{
@@ -95,6 +96,7 @@ public function indexAction()
/**
* JSON Grid Action
*
+ * @return void
*/
public function gridAction()
{
@@ -107,6 +109,7 @@ public function gridAction()
/**
* Create new Newsletter Template
*
+ * @return void
*/
public function newAction()
{
@@ -116,6 +119,7 @@ public function newAction()
/**
* Edit Newsletter Template
*
+ * @return void
*/
public function editAction()
{
@@ -161,6 +165,7 @@ public function editAction()
/**
* Drop Newsletter Template
*
+ * @return void
*/
public function dropAction()
{
@@ -171,6 +176,7 @@ public function dropAction()
/**
* Save Newsletter Template
*
+ * @return void
*/
public function saveAction()
{
@@ -230,6 +236,7 @@ public function saveAction()
/**
* Delete newsletter Template
*
+ * @return void
*/
public function deleteAction()
{
@@ -254,6 +261,7 @@ public function deleteAction()
/**
* Preview Newsletter template
*
+ * @return void|$this
*/
public function previewAction()
{
diff --git a/app/code/Magento/Newsletter/Controller/Manage.php b/app/code/Magento/Newsletter/Controller/Manage.php
index 45f7c5121aca8..dac326c3f3911 100644
--- a/app/code/Magento/Newsletter/Controller/Manage.php
+++ b/app/code/Magento/Newsletter/Controller/Manage.php
@@ -83,6 +83,11 @@ public function dispatch(RequestInterface $request)
return parent::dispatch($request);
}
+ /**
+ * Managing newsletter subscription page
+ *
+ * @return void
+ */
public function indexAction()
{
$this->_view->loadLayout();
@@ -95,6 +100,11 @@ public function indexAction()
$this->_view->renderLayout();
}
+ /**
+ * Save newsletter subscription preference action
+ *
+ * @return void
+ */
public function saveAction()
{
if (!$this->_formKeyValidator->validate($this->getRequest())) {
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber.php b/app/code/Magento/Newsletter/Controller/Subscriber.php
index 5582b16258d1d..ba201dd3c3bbe 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber.php
@@ -96,6 +96,7 @@ public function __construct(
* New subscription action
*
* @throws \Magento\Core\Exception
+ * @return void
*/
public function newAction()
{
@@ -141,6 +142,7 @@ public function newAction()
/**
* Subscription confirm action
+ * @return void
*/
public function confirmAction()
{
@@ -167,6 +169,7 @@ public function confirmAction()
/**
* Unsubscribe newsletter
+ * @return void
*/
public function unsubscribeAction()
{
diff --git a/app/code/Magento/Newsletter/Model/Observer.php b/app/code/Magento/Newsletter/Model/Observer.php
index a6828f56c485e..17e84ab2a3bce 100644
--- a/app/code/Magento/Newsletter/Model/Observer.php
+++ b/app/code/Magento/Newsletter/Model/Observer.php
@@ -26,6 +26,8 @@
namespace Magento\Newsletter\Model;
+use Magento\Cron\Model\Schedule;
+
/**
* Newsletter module observer
*
@@ -61,6 +63,12 @@ public function __construct(
$this->_queueCollectionFactory = $queueCollectionFactory;
}
+ /**
+ * Subscribe customer handler
+ *
+ * @param \Magento\Object $observer
+ * @return $this
+ */
public function subscribeCustomer($observer)
{
$customer = $observer->getEvent()->getCustomer();
@@ -74,7 +82,7 @@ public function subscribeCustomer($observer)
* Customer delete handler
*
* @param \Magento\Object $observer
- * @return \Magento\Newsletter\Model\Observer
+ * @return $this
*/
public function customerDeleted($observer)
{
@@ -87,6 +95,12 @@ public function customerDeleted($observer)
return $this;
}
+ /**
+ * Customer delete handler
+ *
+ * @param Schedule $schedule
+ * @return void
+ */
public function scheduledSend($schedule)
{
$countOfQueue = 3;
diff --git a/app/code/Magento/Newsletter/Model/Queue.php b/app/code/Magento/Newsletter/Model/Queue.php
index 97875cba2f7b9..49e1f4251d1df 100644
--- a/app/code/Magento/Newsletter/Model/Queue.php
+++ b/app/code/Magento/Newsletter/Model/Queue.php
@@ -207,7 +207,7 @@ public function isNew()
* Set $_data['queue_start'] based on string from backend, which based on locale.
*
* @param string|null $startAt start date of the mailing queue
- * @return \Magento\Newsletter\Model\Queue
+ * @return $this
*/
public function setQueueStartAtByString($startAt)
{
@@ -226,7 +226,7 @@ public function setQueueStartAtByString($startAt)
*
* @param int $count
* @param array $additionalVariables
- * @return \Magento\Newsletter\Model\Queue
+ * @return $this
*/
public function sendPerSubscriber($count = 20, array $additionalVariables = array())
{
@@ -300,7 +300,7 @@ public function sendPerSubscriber($count = 20, array $additionalVariables = arra
/**
* Finish queue: set status SENT and update finish date
*
- * @return \Magento\Newsletter\Model\Queue
+ * @return $this
*/
protected function _finishQueue()
{
@@ -330,7 +330,7 @@ public function getDataForSave()
* Add subscribers to queue.
*
* @param array $subscriberIds
- * @return \Magento\Newsletter\Model\Queue
+ * @return $this
*/
public function addSubscribersToQueue(array $subscriberIds)
{
@@ -342,7 +342,7 @@ public function addSubscribersToQueue(array $subscriberIds)
* Setter for save stores flag.
*
* @param boolean|integer|string $value
- * @return \Magento\Newsletter\Model\Queue
+ * @return $this
*/
public function setSaveStoresFlag($value)
{
@@ -364,8 +364,8 @@ public function getSaveStoresFlag()
/**
* Setter for stores of queue.
*
- * @param array
- * @return \Magento\Newsletter\Model\Queue
+ * @param array $storesIds
+ * @return $this
*/
public function setStores(array $storesIds)
{
diff --git a/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php
index df7ccb11e7c23..f435457ca1254 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php
@@ -60,7 +60,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
* @param \Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Customer\Model\Resource\Customer\CollectionFactory $customerCollectionFactory
- * @param mixed $connection
+ * @param null|\Zend_Db_Adapter_Abstract $connection
* @param \Magento\Core\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
@@ -88,7 +88,7 @@ protected function _construct()
/**
* Adds subscribers info
*
- * @return \Magento\Newsletter\Model\Resource\Problem\Collection
+ * @return $this
*/
public function addSubscriberInfo()
{
@@ -105,7 +105,7 @@ public function addSubscriberInfo()
/**
* Adds queue info
*
- * @return \Magento\Newsletter\Model\Resource\Problem\Collection
+ * @return $this
*/
public function addQueueInfo()
{
@@ -122,6 +122,7 @@ public function addQueueInfo()
/**
* Loads customers info to collection
*
+ * @return void
*/
protected function _addCustomersData()
{
@@ -159,7 +160,7 @@ protected function _addCustomersData()
*
* @param bool $printQuery
* @param bool $logQuery
- * @return \Magento\Newsletter\Model\Resource\Problem\Collection
+ * @return $this
*/
public function load($printQuery = false, $logQuery = false)
{
diff --git a/app/code/Magento/Newsletter/Model/Resource/Queue.php b/app/code/Magento/Newsletter/Model/Resource/Queue.php
index 103bec7ee2f20..2864392ba96e8 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Queue.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Queue.php
@@ -34,6 +34,9 @@
*/
namespace Magento\Newsletter\Model\Resource;
+use Magento\Newsletter\Model\Queue as ModelQueue;
+use Magento\Core\Model\AbstractModel;
+
class Queue extends \Magento\Core\Model\Resource\Db\AbstractDb
{
/**
@@ -69,11 +72,11 @@ protected function _construct()
/**
* Add subscribers to queue
*
- * @param \Magento\Newsletter\Model\Queue $queue
+ * @param ModelQueue $queue
* @param array $subscriberIds
* @throws \Magento\Core\Exception
*/
- public function addSubscribersToQueue(\Magento\Newsletter\Model\Queue $queue, array $subscriberIds)
+ public function addSubscribersToQueue(ModelQueue $queue, array $subscriberIds)
{
if (count($subscriberIds)==0) {
throw new \Magento\Core\Exception(__('There are no subscribers selected.'));
@@ -112,9 +115,11 @@ public function addSubscribersToQueue(\Magento\Newsletter\Model\Queue $queue, ar
/**
* Removes subscriber from queue
*
- * @param \Magento\Newsletter\Model\Queue $queue
+ * @param ModelQueue $queue
+ * @return void
+ * @throws \Exception
*/
- public function removeSubscribersFromQueue(\Magento\Newsletter\Model\Queue $queue)
+ public function removeSubscribersFromQueue(ModelQueue $queue)
{
$adapter = $this->_getWriteAdapter();
try {
@@ -138,10 +143,10 @@ public function removeSubscribersFromQueue(\Magento\Newsletter\Model\Queue $queu
/**
* Links queue to store
*
- * @param \Magento\Newsletter\Model\Queue $queue
- * @return \Magento\Newsletter\Model\Resource\Queue
+ * @param ModelQueue $queue
+ * @return $this
*/
- public function setStores(\Magento\Newsletter\Model\Queue $queue)
+ public function setStores(ModelQueue $queue)
{
$adapter = $this->_getWriteAdapter();
$adapter->delete(
@@ -186,10 +191,10 @@ public function setStores(\Magento\Newsletter\Model\Queue $queue)
/**
* Returns queue linked stores
*
- * @param \Magento\Newsletter\Model\Queue $queue
+ * @param ModelQueue $queue
* @return array
*/
- public function getStores(\Magento\Newsletter\Model\Queue $queue)
+ public function getStores(ModelQueue $queue)
{
$adapter = $this->_getReadAdapter();
$select = $adapter->select()->from($this->getTable('newsletter_queue_store_link'), 'store_id')
@@ -205,10 +210,10 @@ public function getStores(\Magento\Newsletter\Model\Queue $queue)
/**
* Saving template after saving queue action
*
- * @param \Magento\Core\Model\AbstractModel $queue
- * @return \Magento\Newsletter\Model\Resource\Queue
+ * @param AbstractModel $queue
+ * @return $this
*/
- protected function _afterSave(\Magento\Core\Model\AbstractModel $queue)
+ protected function _afterSave(AbstractModel $queue)
{
if ($queue->getSaveStoresFlag()) {
$this->setStores($queue);
diff --git a/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php
index a35915cbd84ec..b1f728ab26421 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php
@@ -63,7 +63,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
* @param \Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Core\Model\Date $date
- * @param mixed $connection
+ * @param null|\Zend_Db_Adapter_Abstract $connection
* @param \Magento\Core\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
@@ -92,7 +92,7 @@ protected function _construct()
/**
* Joines templates information
*
- * @return \Magento\Newsletter\Model\Resource\Queue\Collection
+ * @return $this
*/
public function addTemplateInfo()
{
@@ -107,7 +107,7 @@ public function addTemplateInfo()
/**
* Adds subscribers info to selelect
*
- * @return \Magento\Newsletter\Model\Resource\Queue\Collection
+ * @return $this
*/
protected function _addSubscriberInfoToSelect()
{
@@ -134,7 +134,7 @@ protected function _addSubscriberInfoToSelect()
*
* @param bool $printQuery
* @param bool $logQuery
- * @return \Magento\Newsletter\Model\Resource\Queue\Collection
+ * @return $this
*/
public function load($printQuery = false, $logQuery = false)
{
@@ -147,7 +147,7 @@ public function load($printQuery = false, $logQuery = false)
/**
* Joines subscribers information
*
- * @return \Magento\Newsletter\Model\Resource\Queue\Collection
+ * @return $this
*/
public function addSubscribersInfo()
{
@@ -160,8 +160,8 @@ public function addSubscribersInfo()
* to add specific filter or adds reguler filter
*
* @param string $field
- * @param mixed $condition
- * @return \Magento\Newsletter\Model\Resource\Queue\Collection
+ * @param null|string|array $condition
+ * @return $this
*/
public function addFieldToFilter($field, $condition = null)
{
@@ -177,7 +177,7 @@ public function addFieldToFilter($field, $condition = null)
* Returns ids from queue_link table
*
* @param string $field
- * @param mixed $condition
+ * @param null|string|array $condition
* @return array
*/
protected function _getIdsFromLink($field, $condition)
@@ -207,7 +207,7 @@ protected function _getIdsFromLink($field, $condition)
* Set filter for queue by subscriber.
*
* @param int $subscriberId
- * @return \Magento\Newsletter\Model\Resource\Queue\Collection
+ * @return $this
*/
public function addSubscriberFilter($subscriberId)
{
@@ -223,7 +223,7 @@ public function addSubscriberFilter($subscriberId)
/**
* Add filter by only ready fot sending item
*
- * @return \Magento\Newsletter\Model\Resource\Queue\Collection
+ * @return $this
*/
public function addOnlyForSendingFilter()
{
@@ -239,7 +239,7 @@ public function addOnlyForSendingFilter()
/**
* Add filter by only not sent items
*
- * @return \Magento\Newsletter\Model\Resource\Queue\Collection
+ * @return $this
*/
public function addOnlyUnsentFilter()
{
@@ -261,8 +261,8 @@ public function toOptionArray()
/**
* Filter collection by specified store ids
*
- * @param array|int $storeIds
- * @return \Magento\Newsletter\Model\Resource\Queue\Collection
+ * @param int[]|int $storeIds
+ * @return $this
*/
public function addStoreFilter($storeIds)
{
diff --git a/app/code/Magento/Newsletter/Model/Resource/Subscriber.php b/app/code/Magento/Newsletter/Model/Resource/Subscriber.php
index cf4391478eeac..a3785ec09894c 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Subscriber.php
@@ -110,6 +110,7 @@ protected function _construct()
* Set error messages scope
*
* @param string $scope
+ * @return void
*/
public function setMessagesScope($scope)
{
@@ -183,7 +184,7 @@ protected function _generateRandomCode()
*
* @param \Magento\Newsletter\Model\Subscriber $subscriber
* @param \Magento\Newsletter\Model\Queue $queue
- * @return \Magento\Newsletter\Model\Resource\Subscriber
+ * @return $this
* @throws \Magento\Core\Exception
*/
public function received(\Magento\Newsletter\Model\Subscriber $subscriber, \Magento\Newsletter\Model\Queue $queue)
diff --git a/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
index c36a1b1757da1..60f0f8cd43230 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
@@ -34,6 +34,8 @@
*/
namespace Magento\Newsletter\Model\Resource\Subscriber;
+use Magento\Newsletter\Model\Queue as ModelQueue;
+
class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractCollection
{
@@ -85,7 +87,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
* @param \Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Customer\Model\CustomerFactory $customerFactory
- * @param mixed $connection
+ * @param null|\Zend_Db_Adapter_Abstract $connection
* @param \Magento\Core\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
@@ -128,8 +130,8 @@ protected function _construct()
/**
* Set loading mode subscribers by queue
*
- * @param \Magento\Newsletter\Model\Queue $queue
- * @return \Magento\Newsletter\Model\Resource\Subscriber\Collection
+ * @param ModelQueue $queue
+ * @return $this
*/
public function useQueue(\Magento\Newsletter\Model\Queue $queue)
{
@@ -143,7 +145,7 @@ public function useQueue(\Magento\Newsletter\Model\Queue $queue)
/**
* Set using of links to only unsendet letter subscribers.
*
- * @return \Magento\Newsletter\Model\Resource\Subscriber\Collection
+ * @return $this
*/
public function useOnlyUnsent()
{
@@ -157,7 +159,7 @@ public function useOnlyUnsent()
/**
* Adds customer info to select
*
- * @return \Magento\Newsletter\Model\Resource\Subscriber\Collection
+ * @return $this
*/
public function showCustomerInfo()
{
@@ -187,7 +189,7 @@ public function showCustomerInfo()
/**
* Add type field expression to select
*
- * @return \Magento\Newsletter\Model\Resource\Subscriber\Collection
+ * @return $this
*/
public function addSubscriberTypeField()
{
@@ -199,7 +201,7 @@ public function addSubscriberTypeField()
/**
* Sets flag for customer info loading on load
*
- * @return \Magento\Newsletter\Model\Resource\Subscriber\Collection
+ * @return $this
*/
public function showStoreInfo()
{
@@ -231,7 +233,7 @@ public function getSelectCountSql()
/**
* Load only subscribed customers
*
- * @return \Magento\Newsletter\Model\Resource\Subscriber\Collection
+ * @return $this
*/
public function useOnlyCustomers()
{
@@ -243,7 +245,7 @@ public function useOnlyCustomers()
/**
* Show only with subscribed status
*
- * @return \Magento\Newsletter\Model\Resource\Subscriber\Collection
+ * @return $this
*/
public function useOnlySubscribed()
{
@@ -255,8 +257,8 @@ public function useOnlySubscribed()
/**
* Filter collection by specified store ids
*
- * @param array|int $storeIds
- * @return \Magento\Newsletter\Model\Resource\Subscriber\Collection
+ * @param int[]|int $storeIds
+ * @return $this
*/
public function addStoreFilter($storeIds)
{
diff --git a/app/code/Magento/Newsletter/Model/Session.php b/app/code/Magento/Newsletter/Model/Session.php
index 3a27af51d89fb..be622cced3f16 100644
--- a/app/code/Magento/Newsletter/Model/Session.php
+++ b/app/code/Magento/Newsletter/Model/Session.php
@@ -31,18 +31,35 @@
*/
class Session extends \Magento\Session\Generic
{
+ /**
+ * Set error message
+ *
+ * @param string $message
+ * @return $this
+ */
public function addError($message)
{
$this->setErrorMessage($message);
return $this;
}
+ /**
+ * Set success message
+ *
+ * @param string $message
+ * @return $this
+ */
public function addSuccess($message)
{
$this->setSuccessMessage($message);
return $this;
}
+ /**
+ * Get error message
+ *
+ * @return string $message
+ */
public function getError()
{
$message = $this->getErrorMessage();
@@ -50,6 +67,11 @@ public function getError()
return $message;
}
+ /**
+ * Get success message
+ *
+ * @return string $message
+ */
public function getSuccess()
{
$message = $this->getSuccessMessage();
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index ec170f60b13c2..88ed9e1b16e5b 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -30,17 +30,17 @@
* @method \Magento\Newsletter\Model\Resource\Subscriber _getResource()
* @method \Magento\Newsletter\Model\Resource\Subscriber getResource()
* @method int getStoreId()
- * @method \Magento\Newsletter\Model\Subscriber setStoreId(int $value)
+ * @method Subscriber setStoreId(int $value)
* @method string getChangeStatusAt()
- * @method \Magento\Newsletter\Model\Subscriber setChangeStatusAt(string $value)
+ * @method Subscriber setChangeStatusAt(string $value)
* @method int getCustomerId()
- * @method \Magento\Newsletter\Model\Subscriber setCustomerId(int $value)
+ * @method Subscriber setCustomerId(int $value)
* @method string getSubscriberEmail()
- * @method \Magento\Newsletter\Model\Subscriber setSubscriberEmail(string $value)
+ * @method Subscriber setSubscriberEmail(string $value)
* @method int getSubscriberStatus()
- * @method \Magento\Newsletter\Model\Subscriber setSubscriberStatus(int $value)
+ * @method Subscriber setSubscriberStatus(int $value)
* @method string getSubscriberConfirmCode()
- * @method \Magento\Newsletter\Model\Subscriber setSubscriberConfirmCode(string $value)
+ * @method Subscriber setSubscriberConfirmCode(string $value)
*
* @category Magento
* @package Magento_Newsletter
@@ -239,7 +239,7 @@ public function getUnsubscriptionLink()
* Alias for setSubscriberConfirmCode()
*
* @param string $value
- * @return \Magento\Newsletter\Model\Subscriber
+ * @return $this
*/
public function setCode($value)
{
@@ -259,8 +259,8 @@ public function getStatus()
/**
* Alias for setSubscriberStatus()
*
- * @param int
- * @return \Magento\Newsletter\Model\Subscriber
+ * @param int $value
+ * @return $this
*/
public function setStatus($value)
{
@@ -271,7 +271,7 @@ public function setStatus($value)
* Set the error messages scope for subscription
*
* @param boolean $scope
- * @return \Magento\Newsletter\Model\Subscriber
+ * @return Subscriber
*/
public function setMessagesScope($scope)
@@ -294,7 +294,7 @@ public function getEmail()
* Alias for setSubscriberEmail()
*
* @param string $value
- * @return \Magento\Newsletter\Model\Subscriber
+ * @return $this
*/
public function setEmail($value)
{
@@ -341,7 +341,7 @@ public function isSubscribed()
/**
* Load subscriber data from resource model by email
*
- * @param $subscriberEmail
+ * @param string $subscriberEmail
* @return $this
*/
public function loadByEmail($subscriberEmail)
@@ -354,7 +354,7 @@ public function loadByEmail($subscriberEmail)
* Load subscriber info by customer
*
* @param \Magento\Customer\Model\Customer $customer
- * @return \Magento\Newsletter\Model\Subscriber
+ * @return $this
*/
public function loadByCustomer(\Magento\Customer\Model\Customer $customer)
{
@@ -460,8 +460,8 @@ public function subscribe($email)
/**
* Unsubscribes loaded subscription
*
- * @return \Magento\Newsletter\Model\Subscriber
* @throws \Magento\Core\Exception
+ * @return $this
*/
public function unsubscribe()
{
@@ -479,7 +479,7 @@ public function unsubscribe()
* Saving customer subscription status
*
* @param \Magento\Customer\Model\Customer $customer
- * @return \Magento\Newsletter\Model\Subscriber
+ * @return $this
*/
public function subscribeCustomer($customer)
{
@@ -589,7 +589,7 @@ public function received(\Magento\Newsletter\Model\Queue $queue)
/**
* Sends out confirmation email
*
- * @return \Magento\Newsletter\Model\Subscriber
+ * @return $this
*/
public function sendConfirmationRequestEmail()
{
@@ -624,7 +624,7 @@ public function sendConfirmationRequestEmail()
/**
* Sends out confirmation success email
*
- * @return \Magento\Newsletter\Model\Subscriber
+ * @return $this
*/
public function sendConfirmationSuccessEmail()
{
@@ -659,7 +659,7 @@ public function sendConfirmationSuccessEmail()
/**
* Sends out unsubsciption email
*
- * @return \Magento\Newsletter\Model\Subscriber
+ * @return $this
*/
public function sendUnsubscriptionEmail()
{
diff --git a/app/code/Magento/Newsletter/Model/Template/Filter.php b/app/code/Magento/Newsletter/Model/Template/Filter.php
index fd9b7b164eebc..c2e422c3cbd86 100644
--- a/app/code/Magento/Newsletter/Model/Template/Filter.php
+++ b/app/code/Magento/Newsletter/Model/Template/Filter.php
@@ -38,7 +38,7 @@ class Filter extends \Magento\Widget\Model\Template\Filter
/**
* Generate widget HTML if template variables are assigned
*
- * @param array $construction
+ * @param string[] $construction
* @return string
*/
public function widgetDirective($construction)
diff --git a/app/code/Magento/Newsletter/etc/di.xml b/app/code/Magento/Newsletter/etc/di.xml
index e9ae933643009..59bd57103172a 100644
--- a/app/code/Magento/Newsletter/etc/di.xml
+++ b/app/code/Magento/Newsletter/etc/di.xml
@@ -26,9 +26,9 @@
-
- Magento\Newsletter\Model\Resource\Setup
-
+
+ Magento\Newsletter\Model\Resource\Setup
diff --git a/app/code/Magento/Newsletter/etc/frontend/di.xml b/app/code/Magento/Newsletter/etc/frontend/di.xml
index 37c4aa5147194..e008d19a0300e 100644
--- a/app/code/Magento/Newsletter/etc/frontend/di.xml
+++ b/app/code/Magento/Newsletter/etc/frontend/di.xml
@@ -31,9 +31,9 @@
-
- /newsletter/manage/
-
+
+ /newsletter/manage/
diff --git a/app/code/Magento/Newsletter/etc/module.xml b/app/code/Magento/Newsletter/etc/module.xml
index ede53cc6925b5..a4fd5ee0b558b 100755
--- a/app/code/Magento/Newsletter/etc/module.xml
+++ b/app/code/Magento/Newsletter/etc/module.xml
@@ -39,6 +39,7 @@
-
- /ogone/api
-
+
+ /ogone/api
diff --git a/app/code/Magento/PageCache/Block/Javascript.php b/app/code/Magento/PageCache/Block/Javascript.php
new file mode 100644
index 0000000000000..1472c169e935e
--- /dev/null
+++ b/app/code/Magento/PageCache/Block/Javascript.php
@@ -0,0 +1,49 @@
+ $this->getUrl('page_cache/block/render/'),
+ 'handles' => $this->getLayout()->getUpdate()->getHandles(),
+ 'versionCookieName' => \Magento\PageCache\Model\Version::COOKIE_NAME
+ );
+ return json_encode($params);
+ }
+}
diff --git a/app/code/Magento/PageCache/Controller/Block.php b/app/code/Magento/PageCache/Controller/Block.php
new file mode 100644
index 0000000000000..785a8bc714440
--- /dev/null
+++ b/app/code/Magento/PageCache/Controller/Block.php
@@ -0,0 +1,75 @@
+getRequest()->isAjax()) {
+ $this->_forward('noroute');
+ return;
+ }
+ $blocks = $this->getRequest()->getParam('blocks', array());
+ $handles = $this->getRequest()->getParam('handles', array());
+
+ if (!$handles || !$blocks) {
+ return;
+ }
+ $this->_view->loadLayout($handles);
+ $data = array();
+
+ foreach ($blocks as $blockName) {
+ $blockInstance = $this->_view->getLayout()->getBlock($blockName);
+ if (is_object($blockInstance)) {
+ $data[$blockName] = $blockInstance->toHtml();
+ }
+ }
+
+ $this->setPrivateHeaders();
+
+ $this->getResponse()->appendBody(json_encode($data));
+ }
+
+ /**
+ * Set header parameters for private cache
+ */
+ protected function setPrivateHeaders()
+ {
+ $this->getResponse()->setHeader('cache-control', 'private, max-age=' . Data::PRIVATE_MAX_AGE_CACHE, true);
+ $this->getResponse()->setHeader(
+ 'expires',
+ gmdate('D, d M Y H:i:s T', strtotime('+' . Data::PRIVATE_MAX_AGE_CACHE . ' seconds')),
+ true
+ );
+ }
+}
diff --git a/app/code/Magento/PageCache/Helper/Data.php b/app/code/Magento/PageCache/Helper/Data.php
index 777d68e72b5a8..068007b5fcef4 100644
--- a/app/code/Magento/PageCache/Helper/Data.php
+++ b/app/code/Magento/PageCache/Helper/Data.php
@@ -33,7 +33,42 @@
*/
namespace Magento\PageCache\Helper;
+/**
+ * Class Data
+ * @package Magento\PageCache\Helper
+ */
class Data extends \Magento\App\Helper\AbstractHelper
{
+ /**
+ * Private caching time one year
+ */
+ const PRIVATE_MAX_AGE_CACHE = 31536000;
+
+ /**
+ * XML path to value for public max-age parameter
+ */
+ const PUBLIC_MAX_AGE_PATH = 'system/headers/public-max-age';
+
+ /**
+ * @var \Magento\App\ConfigInterface
+ */
+ protected $config;
+
+ /**
+ * @param \Magento\App\Helper\Context $context
+ * @param \Magento\App\ConfigInterface $config
+ */
+ public function __construct(\Magento\App\Helper\Context $context, \Magento\App\ConfigInterface $config)
+ {
+ parent::__construct($context);
+ $this->config = $config;
+ }
+ /**
+ * @return mixed
+ */
+ public function getPublicMaxAgeCache()
+ {
+ return $this->config->getValue(self::PUBLIC_MAX_AGE_PATH);
+ }
}
diff --git a/app/code/Magento/PageCache/Model/App/FrontController/HeaderPlugin.php b/app/code/Magento/PageCache/Model/App/FrontController/HeaderPlugin.php
index 70cf007729b7a..8a1d53e3e7abb 100644
--- a/app/code/Magento/PageCache/Model/App/FrontController/HeaderPlugin.php
+++ b/app/code/Magento/PageCache/Model/App/FrontController/HeaderPlugin.php
@@ -23,6 +23,8 @@
*/
namespace Magento\PageCache\Model\App\FrontController;
+use Magento\PageCache\Helper\Data;
+
/**
* Class HeadPlugin
*/
@@ -34,22 +36,38 @@ class HeaderPlugin
protected $layout;
/**
- * @var \Magento\Core\Model\ConfigInterface
+ * @var \Magento\App\ConfigInterface
*/
protected $config;
+
+ /**
+ * @var \Magento\PageCache\Model\Version
+ */
+ private $version;
+
+ /**
+ * @var \Magento\PageCache\Helper\Data
+ */
+ private $helper;
/**
* Constructor
*
* @param \Magento\Core\Model\Layout $layout
- * @param \Magento\Core\Model\ConfigInterface $config
+ * @param \Magento\App\ConfigInterface $config
+ * @param \Magento\PageCache\Helper\Data
+ * @param \Magento\PageCache\Model\Version $version
*/
public function __construct(
\Magento\Core\Model\Layout $layout,
- \Magento\Core\Model\ConfigInterface $config
+ \Magento\App\ConfigInterface $config,
+ \Magento\PageCache\Helper\Data $helper,
+ \Magento\PageCache\Model\Version $version
){
$this->layout = $layout;
+ $this->helper = $helper;
$this->config = $config;
+ $this->version = $version;
}
/**
@@ -60,24 +78,43 @@ public function __construct(
*/
public function afterDispatch(\Magento\App\Response\Http $response)
{
- $maxAge = $this->config->getValue('system/headers/max-age');
if ($this->layout->isCacheable()) {
$response->setHeader('pragma', 'cache', true);
- if($this->layout->isPrivate()) {
- $response->setHeader('cache-control', 'private, max-age=' . $maxAge, true);
- $response->setHeader('expires',
- gmdate('D, d M Y H:i:s T', strtotime('+' . $maxAge . ' seconds')), true);
- } else {
- $response->setHeader('cache-control', 'public, max-age=' . $maxAge, true);
- $response->setHeader('expires',
- gmdate('D, d M Y H:i:s T', strtotime('+' . $maxAge . ' seconds')), true);
+ if(!$response->getHeader('cache-control')) {
+ $this->setPublicHeaders($response);
}
} else {
- $response->setHeader('pragma', 'no-cache', true);
- $response->setHeader('cache-control', 'no-store, no-cache, must-revalidate, max-age=0', true);
- $response->setHeader('expires',
- gmdate('D, d M Y H:i:s T', strtotime('-' . $maxAge . ' seconds')), true);
+ $this->setNocacheHeaders($response);
}
+ $this->version->process();
return $response;
}
+
+ /**
+ * @param \Magento\App\Response\Http $response
+ */
+ protected function setPublicHeaders(\Magento\App\Response\Http $response)
+ {
+ $maxAge = $this->helper->getPublicMaxAgeCache();
+ $response->setHeader('cache-control', 'public, max-age=' . $maxAge, true);
+ $response->setHeader(
+ 'expires',
+ gmdate('D, d M Y H:i:s T', strtotime('+' . $maxAge . ' seconds')),
+ true
+ );
+ }
+
+ /**
+ * @param \Magento\App\Response\Http $response
+ */
+ protected function setNocacheHeaders(\Magento\App\Response\Http $response)
+ {
+ $response->setHeader('pragma', 'no-cache', true);
+ $response->setHeader('cache-control', 'no-store, no-cache, must-revalidate, max-age=0', true);
+ $response->setHeader(
+ 'expires',
+ gmdate('D, d M Y H:i:s T', strtotime('-1 year')),
+ true
+ );
+ }
}
diff --git a/app/code/Magento/PageCache/Model/Observer.php b/app/code/Magento/PageCache/Model/Observer.php
new file mode 100644
index 0000000000000..d190f82f0b3dc
--- /dev/null
+++ b/app/code/Magento/PageCache/Model/Observer.php
@@ -0,0 +1,56 @@
+getEvent()->getLayout();
+ if ($layout->isCacheable()) {
+ $name = $observer->getEvent()->getElementName();
+ $block = $layout->getBlock($name);
+ if ($block instanceof \Magento\View\Element\AbstractBlock && $block->isScopePrivate()) {
+ $transport = $observer->getEvent()->getTransport();
+ $output = $transport->getData('output');
+ $html = sprintf('%2$s', $block->getNameInLayout(), $output);
+ $transport->setData('output', $html);
+ }
+ }
+ }
+}
diff --git a/app/code/Magento/PageCache/Model/Version.php b/app/code/Magento/PageCache/Model/Version.php
new file mode 100644
index 0000000000000..727fb8dfaa0aa
--- /dev/null
+++ b/app/code/Magento/PageCache/Model/Version.php
@@ -0,0 +1,97 @@
+cookie = $cookie;
+ $this->request = $request;
+ }
+
+ /**
+ * Increment private content version cookie (for user to pull new private content)
+ */
+ private function set()
+ {
+ $this->cookie->set(self::COOKIE_NAME, $this->generateValue(), self::COOKIE_PERIOD, '/');
+ }
+
+ /**
+ * Generate unique version identifier
+ *
+ * @return string
+ */
+ private function generateValue()
+ {
+ return md5(rand() . time());
+ }
+
+ /**
+ * Handle private content version cookie
+ * Set cookie if it is not set.
+ * Increment version on post requests.
+ * In all other cases do nothing.
+ */
+ public function process()
+ {
+ if ($this->request->isPost()) {
+ $this->set();
+ }
+ }
+}
diff --git a/app/code/Magento/PageCache/etc/config.xml b/app/code/Magento/PageCache/etc/config.xml
index 7f604fac8dc5b..50809da39d543 100644
--- a/app/code/Magento/PageCache/etc/config.xml
+++ b/app/code/Magento/PageCache/etc/config.xml
@@ -29,8 +29,8 @@
- 28800
+ 0
-
+
\ No newline at end of file
diff --git a/app/code/Magento/PageCache/etc/di.xml b/app/code/Magento/PageCache/etc/di.xml
index 8a37a88079fc2..6dba77137b484 100644
--- a/app/code/Magento/PageCache/etc/di.xml
+++ b/app/code/Magento/PageCache/etc/di.xml
@@ -25,7 +25,6 @@
-->
-
diff --git a/app/code/Magento/PageCache/etc/events.xml b/app/code/Magento/PageCache/etc/events.xml
new file mode 100644
index 0000000000000..2de56ec9f5f12
--- /dev/null
+++ b/app/code/Magento/PageCache/etc/events.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/PaypalUk/etc/frontend/routes.xml b/app/code/Magento/PageCache/etc/frontend/routes.xml
similarity index 89%
rename from app/code/Magento/PaypalUk/etc/frontend/routes.xml
rename to app/code/Magento/PageCache/etc/frontend/routes.xml
index be7f0ddb83e8d..6cba7f7e55d34 100644
--- a/app/code/Magento/PaypalUk/etc/frontend/routes.xml
+++ b/app/code/Magento/PageCache/etc/frontend/routes.xml
@@ -25,8 +25,8 @@
-->
-
-
+
-
\ No newline at end of file
+
diff --git a/app/code/Magento/PageCache/etc/module.xml b/app/code/Magento/PageCache/etc/module.xml
index 7b213139f7fb8..bf7c69345b084 100755
--- a/app/code/Magento/PageCache/etc/module.xml
+++ b/app/code/Magento/PageCache/etc/module.xml
@@ -30,6 +30,7 @@
diff --git a/app/code/Magento/PageCache/view/frontend/javascript.phtml b/app/code/Magento/PageCache/view/frontend/javascript.phtml
new file mode 100644
index 0000000000000..dac67a9a75bbf
--- /dev/null
+++ b/app/code/Magento/PageCache/view/frontend/javascript.phtml
@@ -0,0 +1,34 @@
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/PageCache/view/frontend/js/comments.js b/app/code/Magento/PageCache/view/frontend/js/comments.js
new file mode 100644
index 0000000000000..957d391f62079
--- /dev/null
+++ b/app/code/Magento/PageCache/view/frontend/js/comments.js
@@ -0,0 +1,42 @@
+/**
+ * Finds all comment elements
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 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 ($) {
+ "use strict";
+ $.fn.comments = function () {
+ var elements = [];
+ var lookup = function (el) {
+ el.contents().each(function (i, el) {
+ if (el.nodeType == 8) {
+ elements.push(el);
+ } else if (el.nodeType == 1) {
+ lookup($(el));
+ }
+ });
+ };
+ lookup(this);
+ return elements;
+ };
+})(jQuery);
\ No newline at end of file
diff --git a/app/code/Magento/PageCache/view/frontend/js/page-cache.js b/app/code/Magento/PageCache/view/frontend/js/page-cache.js
new file mode 100644
index 0000000000000..f306ada4af154
--- /dev/null
+++ b/app/code/Magento/PageCache/view/frontend/js/page-cache.js
@@ -0,0 +1,128 @@
+/**
+ * Handles additional ajax request for rendering user private content
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2014 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 ($) {
+ "use strict";
+ $.widget('mage.pageCache', {
+ options: {
+ url: '/',
+ patternPlaceholderOpen: /^ BLOCK (.+) $/,
+ patternPlaceholderClose: /^ \/BLOCK (.+) $/,
+ versionCookieName: 'private_content_version',
+ handles: []
+ },
+ _create: function () {
+ var version = $.mage.cookies.get(this.options.versionCookieName);
+ if (!version) {
+ return ;
+ }
+ var placeholders = this._searchPlaceholders(this.element.comments());
+ this._ajax(placeholders, version);
+ },
+ _searchPlaceholders: function (elements) {
+ var placeholders = [],
+ tmp = {};
+ for (var i = 0; i < elements.length; i++) {
+ var el = elements[i],
+ matches = this.options.patternPlaceholderOpen.exec(el.nodeValue),
+ name = null;
+
+ if (matches) {
+ name = matches[1];
+ tmp[name] = {
+ name: name,
+ openElement: el
+ };
+ } else {
+ matches = this.options.patternPlaceholderClose.exec(el.nodeValue);
+ if (matches) {
+ name = matches[1];
+ if (tmp[name]) {
+ tmp[name].closeElement = el;
+ placeholders.push(tmp[name]);
+ delete tmp[name];
+ }
+ }
+ }
+ }
+ return placeholders;
+ },
+ _replacePlaceholder: function(placeholder, html) {
+ var parent = $(placeholder.openElement).parent(),
+ contents = parent.contents(),
+ startReplacing = false,
+ prevSibling = null;
+ for (var y = 0; y < contents.length; y++) {
+ var element = contents[y];
+ if (element == placeholder.openElement) {
+ startReplacing = true;
+ }
+ if (startReplacing) {
+ element.remove();
+ } else if (element.nodeType != 8) {
+ //due to comment tag doesn't have siblings we try to find it manually
+ prevSibling = element;
+ }
+ if (element == placeholder.closeElement) {
+ break;
+ }
+ }
+ if (prevSibling) {
+ $(prevSibling).after(html);
+ } else {
+ $(parent).prepend(html);
+ }
+ },
+ _ajax: function (placeholders, version) {
+ var data = {
+ blocks: [],
+ handles: this.options.handles,
+ version: version
+ };
+ for (var i = 0; i < placeholders.length; i++) {
+ data.blocks.push(placeholders[i].name);
+ }
+ data.blocks.sort();
+ data.handles.sort();
+ $.ajax({
+ url: this.options.url,
+ data: data,
+ type: 'GET',
+ cache: true,
+ dataType: 'json',
+ context: this,
+ success: function (response) {
+ for (var i = 0; i < placeholders.length; i++) {
+ var placeholder = placeholders[i];
+ if (!response.hasOwnProperty(placeholder.name)) {
+ continue;
+ }
+ this._replacePlaceholder(placeholder, response[placeholder.name]);
+ }
+ }
+ });
+ }
+ });
+})(jQuery);
\ No newline at end of file
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/default.xml b/app/code/Magento/PageCache/view/frontend/layout/default.xml
similarity index 66%
rename from app/code/Magento/PaypalUk/view/frontend/layout/default.xml
rename to app/code/Magento/PageCache/view/frontend/layout/default.xml
index 87713b75bf821..eba7a5e3faa08 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/default.xml
+++ b/app/code/Magento/PageCache/view/frontend/layout/default.xml
@@ -24,8 +24,14 @@
*/
-->
-
-
+
+
+ Magento_PageCache::js/comments.js
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 1dbaf1064aa8b..7afe081b5ce93 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -58,7 +58,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
/**
* Config
*
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -81,7 +81,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\View\LayoutInterface $layout
* @param \Magento\Payment\Model\Method\Factory $paymentMethodFactory
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Core\Model\App\Emulation $appEmulation
* @param \Magento\Payment\Model\Config $paymentConfig
* @param \Magento\Core\Model\Config\Initial $initialConfig
@@ -91,7 +91,7 @@ public function __construct(
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\View\LayoutInterface $layout,
\Magento\Payment\Model\Method\Factory $paymentMethodFactory,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Core\Model\App\Emulation $appEmulation,
\Magento\Payment\Model\Config $paymentConfig,
\Magento\Core\Model\Config\Initial $initialConfig
diff --git a/app/code/Magento/Payment/Model/Config.php b/app/code/Magento/Payment/Model/Config.php
index bdf66d4b3f3ad..06f16f767f9e1 100644
--- a/app/code/Magento/Payment/Model/Config.php
+++ b/app/code/Magento/Payment/Model/Config.php
@@ -68,14 +68,14 @@ class Config
* Construct
*
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param \Magento\Payment\Model\Method\Factory $paymentMethodFactory
* @param \Magento\Core\Model\LocaleInterface $locale
* @param \Magento\Config\DataInterface $dataStorage
*/
public function __construct(
\Magento\Core\Model\Store\Config $coreStoreConfig,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\Payment\Model\Method\Factory $paymentMethodFactory,
\Magento\Core\Model\LocaleInterface $locale,
\Magento\Config\DataInterface $dataStorage
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php
index 3efa72c761520..2e94c2a912301 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php
@@ -43,18 +43,18 @@ class Store
protected $_template = 'Magento_Paypal::system/config/fieldset/store.phtml';
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_coreConfig;
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
array $data = array()
) {
parent::__construct($context, $data);
@@ -85,9 +85,9 @@ protected function getPaypalDisabledMethods()
'express' => 'payment/paypal_express/active',
'wps' => 'payment/paypal_standard/active',
'wpp' => 'payment/paypal_direct/active',
- 'wpppe' => 'payment/paypaluk_direct/active',
- 'verisign' => 'payment/verisign/active',
- 'expresspe' => 'payment/paypaluk_express/active'
+ 'wpppe' => 'payment/payflow_direct/active',
+ 'payflowpro' => 'payment/payflowpro/active',
+ 'expresspe' => 'payment/payflow_express/active'
);
// Retrieve a code of the current website
$website = $this->getRequest()->getParam('website');
diff --git a/app/code/Magento/Paypal/Block/Express/Review.php b/app/code/Magento/Paypal/Block/Express/Review.php
index b9c7e8c6ae976..236a8ab7f1305 100644
--- a/app/code/Magento/Paypal/Block/Express/Review.php
+++ b/app/code/Magento/Paypal/Block/Express/Review.php
@@ -48,11 +48,11 @@ class Review extends \Magento\View\Element\Template
protected $_currentShippingRate = null;
/**
- * Paypal action prefix
+ * Paypal controller path
*
* @var string
*/
- protected $_paypalActionPrefix = 'paypal';
+ protected $_controllerPath = 'paypal/express';
/**
* @var \Magento\Tax\Helper\Data
@@ -187,11 +187,11 @@ public function getCurrentShippingRate()
}
/**
- * Set paypal actions prefix
+ * Set controller path
*/
- public function setPaypalActionPrefix($prefix)
+ public function setControllerPath($prefix)
{
- $this->_paypalActionPrefix = $prefix;
+ $this->_controllerPath = $prefix;
}
/**
@@ -233,8 +233,8 @@ protected function _beforeToHtml()
{
$methodInstance = $this->_quote->getPayment()->getMethodInstance();
$this->setPaymentMethodTitle($methodInstance->getTitle());
- $this->setUpdateOrderSubmitUrl($this->getUrl("{$this->_paypalActionPrefix}/express/updateOrder"));
- $this->setUpdateShippingMethodsUrl($this->getUrl("{$this->_paypalActionPrefix}/express/updateShippingMethods"));
+ $this->setUpdateOrderSubmitUrl($this->getUrl("{$this->_controllerPath}/updateOrder"));
+ $this->setUpdateShippingMethodsUrl($this->getUrl("{$this->_controllerPath}/updateShippingMethods"));
$this->setShippingRateRequired(true);
if ($this->_quote->getIsVirtual()) {
@@ -257,14 +257,14 @@ protected function _beforeToHtml()
}
// misc shipping parameters
- $this->setShippingMethodSubmitUrl($this->getUrl("{$this->_paypalActionPrefix}/express/saveShippingMethod"))
+ $this->setShippingMethodSubmitUrl($this->getUrl("{$this->_controllerPath}/saveShippingMethod"))
->setCanEditShippingAddress($this->_quote->getMayEditShippingAddress())
->setCanEditShippingMethod($this->_quote->getMayEditShippingMethod())
;
}
- $this->setEditUrl($this->getUrl("{$this->_paypalActionPrefix}/express/edit"))
- ->setPlaceOrderUrl($this->getUrl("{$this->_paypalActionPrefix}/express/placeOrder"));
+ $this->setEditUrl($this->getUrl("{$this->_controllerPath}/edit"))
+ ->setPlaceOrderUrl($this->getUrl("{$this->_controllerPath}/placeOrder"));
return parent::_beforeToHtml();
}
diff --git a/app/code/Magento/PaypalUk/Block/Express/Form.php b/app/code/Magento/Paypal/Block/PayflowExpress/Form.php
similarity index 91%
rename from app/code/Magento/PaypalUk/Block/Express/Form.php
rename to app/code/Magento/Paypal/Block/PayflowExpress/Form.php
index 8c41af04feb05..f6cf2bc63e289 100644
--- a/app/code/Magento/PaypalUk/Block/Express/Form.php
+++ b/app/code/Magento/Paypal/Block/PayflowExpress/Form.php
@@ -18,14 +18,12 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_PaypalUk
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\PaypalUk\Block\Express;
+namespace Magento\Paypal\Block\PayflowExpress;
class Form extends \Magento\Paypal\Block\Express\Form
{
@@ -34,5 +32,4 @@ class Form extends \Magento\Paypal\Block\Express\Form
* @var string
*/
protected $_methodCode = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
-
}
diff --git a/app/code/Magento/PaypalUk/Block/Express/Shortcut.php b/app/code/Magento/Paypal/Block/PayflowExpress/Shortcut.php
similarity index 85%
rename from app/code/Magento/PaypalUk/Block/Express/Shortcut.php
rename to app/code/Magento/Paypal/Block/PayflowExpress/Shortcut.php
index a467df92060b2..bc659ec1b76c3 100644
--- a/app/code/Magento/PaypalUk/Block/Express/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/PayflowExpress/Shortcut.php
@@ -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 Magento
- * @package Magento_PaypalUk
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,7 +25,7 @@
/**
* Paypal expess checkout shortcut link
*/
-namespace Magento\PaypalUk\Block\Express;
+namespace Magento\Paypal\Block\PayflowExpress;
class Shortcut extends \Magento\Paypal\Block\Express\Shortcut
{
@@ -43,12 +41,12 @@ class Shortcut extends \Magento\Paypal\Block\Express\Shortcut
*
* @var string
*/
- protected $_startAction = 'paypaluk/express/start';
+ protected $_startAction = 'paypal/payflowexpress/start';
/**
* Express checkout model factory name
*
* @var string
*/
- protected $_checkoutType = 'Magento\PaypalUk\Model\Express\Checkout';
+ protected $_checkoutType = 'Magento\Paypal\Model\PayflowExpress\Checkout';
}
diff --git a/app/code/Magento/PaypalUk/Controller/Express.php b/app/code/Magento/Paypal/Controller/Payflowexpress.php
similarity index 84%
rename from app/code/Magento/PaypalUk/Controller/Express.php
rename to app/code/Magento/Paypal/Controller/Payflowexpress.php
index 96a61fdfd65d8..f12d71bf818c8 100644
--- a/app/code/Magento/PaypalUk/Controller/Express.php
+++ b/app/code/Magento/Paypal/Controller/Payflowexpress.php
@@ -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 Magento
- * @package Magento_PaypalUk
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,9 +26,9 @@
* Express Checkout Controller
*/
-namespace Magento\PaypalUk\Controller;
+namespace Magento\Paypal\Controller;
-class Express extends \Magento\Paypal\Controller\Express\AbstractExpress
+class Payflowexpress extends \Magento\Paypal\Controller\Express\AbstractExpress
{
/**
* Config mode type
@@ -51,5 +49,5 @@ class Express extends \Magento\Paypal\Controller\Express\AbstractExpress
*
* @var string
*/
- protected $_checkoutType = 'Magento\PaypalUk\Model\Express\Checkout';
+ protected $_checkoutType = 'Magento\Paypal\Model\PayflowExpress\Checkout';
}
diff --git a/app/code/Magento/PaypalUk/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/PayflowNvp.php
similarity index 96%
rename from app/code/Magento/PaypalUk/Model/Api/Nvp.php
rename to app/code/Magento/Paypal/Model/Api/PayflowNvp.php
index 8ae8f0e31eddd..ee0f5fd805e85 100644
--- a/app/code/Magento/PaypalUk/Model/Api/Nvp.php
+++ b/app/code/Magento/Paypal/Model/Api/PayflowNvp.php
@@ -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 Magento
- * @package Magento_PaypalUk
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,9 +25,9 @@
/**
* NVP API wrappers model
*/
-namespace Magento\PaypalUk\Model\Api;
+namespace Magento\Paypal\Model\Api;
-class Nvp extends \Magento\Paypal\Model\Api\Nvp
+class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
{
/**#@+
* Transaction types declaration
@@ -255,7 +253,7 @@ class Nvp extends \Magento\Paypal\Model\Api\Nvp
'SHIPTOSTREET' => 'street',
'SHIPTOSTREET2' => 'street2',
'SHIPTOZIP' => 'postcode',
- 'SHIPTOPHONENUM' => 'telephone', // does not supported by PaypalUk
+ 'SHIPTOPHONENUM' => 'telephone', // does not supported by Payflow
);
/**
@@ -283,7 +281,7 @@ class Nvp extends \Magento\Paypal\Model\Api\Nvp
);
/**
- * Map for billing address to do request to PayPalUk
+ * Map for billing address to do request to Payflow
*
* @var array
*/
@@ -381,7 +379,7 @@ public function getApiEndpoint()
}
/**
- * Return PaypalUk partner based on config data
+ * Return Payflow partner based on config data
*
* @return string
*/
@@ -391,7 +389,7 @@ public function getPartner()
}
/**
- * Return PaypalUk user based on config data
+ * Return Payflow user based on config data
*
* @return string
*/
@@ -401,7 +399,7 @@ public function getUser()
}
/**
- * Return PaypalUk password based on config data
+ * Return Payflow password based on config data
*
* @return string
*/
@@ -411,7 +409,7 @@ public function getPassword()
}
/**
- * Return PaypalUk vendor based on config data
+ * Return Payflow vendor based on config data
*
* @return string
*/
@@ -421,7 +419,7 @@ public function getVendor()
}
/**
- * Return PaypalUk tender based on config data
+ * Return Payflow tender based on config data
*
* @return string
*/
@@ -456,8 +454,8 @@ public function getPaypalTransactionId()
protected function _addMethodToRequest($methodName, $request)
{
$request['TRXTYPE'] = $this->_mapPaypalMethodName($methodName);
- if (!is_null($this->_getPaypalUkActionName($methodName))) {
- $request['ACTION'] = $this->_getPaypalUkActionName($methodName);
+ if (!is_null($this->_getPayflowActionName($methodName))) {
+ $request['ACTION'] = $this->_getPayflowActionName($methodName);
}
return $request;
}
@@ -468,7 +466,7 @@ protected function _addMethodToRequest($methodName, $request)
* @param string
* @return string | null
*/
- protected function _getPaypalUkActionName($methodName)
+ protected function _getPayflowActionName($methodName)
{
switch($methodName) {
case \Magento\Paypal\Model\Api\Nvp::SET_EXPRESS_CHECKOUT:
@@ -567,7 +565,7 @@ protected function getRequestId()
}
/**
- * "GetTransactionDetails" method does not exists in PaypalUK
+ * "GetTransactionDetails" method does not exists in Payflow
*/
public function callGetTransactionDetails()
{
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 94514f0ca378f..dacf58046d6ee 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -50,17 +50,17 @@ class Config
/**
* Direct Payments (Payflow Edition)
*/
- const METHOD_WPP_PE_DIRECT = 'paypaluk_direct';
+ const METHOD_WPP_PE_DIRECT = 'payflow_direct';
/**
* Express Checkout (Payflow Edition)
*/
- const METHOD_WPP_PE_EXPRESS = 'paypaluk_express';
+ const METHOD_WPP_PE_EXPRESS = 'payflow_express';
/**
* Payflow Pro Gateway
*/
- const METHOD_PAYFLOWPRO = 'verisign';
+ const METHOD_PAYFLOWPRO = 'payflowpro';
const METHOD_PAYFLOWLINK = 'payflow_link';
const METHOD_PAYFLOWADVANCED = 'payflow_advanced';
@@ -177,8 +177,8 @@ class Config
'paypal_standard' => 'WPS',
'paypal_express' => 'EC',
'paypal_direct' => 'DP',
- 'paypaluk_express' => 'EC',
- 'paypaluk_direct' => 'DP',
+ 'payflow_express' => 'EC',
+ 'payflow_direct' => 'DP',
);
/**
@@ -1350,7 +1350,6 @@ protected function _mapWppFieldset($fieldName)
protected function _mapWpukFieldset($fieldName)
{
$pathPrefix = 'paypal/wpuk';
- // Use PUMP credentials from Verisign for EC when Direct Payments are unavailable
if ($this->_methodCode == self::METHOD_WPP_PE_EXPRESS
&& $this->isMethodAvailable(self::METHOD_PAYFLOWLINK)
) {
@@ -1362,7 +1361,7 @@ protected function _mapWpukFieldset($fieldName)
} elseif ($this->_methodCode == self::METHOD_WPP_PE_EXPRESS
&& !$this->isMethodAvailable(self::METHOD_WPP_PE_DIRECT)
) {
- $pathPrefix = 'payment/verisign';
+ $pathPrefix = 'payment/payflowpro';
} elseif ($this->_methodCode == self::METHOD_PAYFLOWADVANCED
|| $this->_methodCode == self::METHOD_PAYFLOWLINK
) {
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index dd7c63606233b..52d4ee2b5d65c 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -185,7 +185,7 @@ class Checkout
protected $_storeManager;
/**
- * @var \Magento\Core\Model\Url
+ * @var \Magento\UrlInterface
*/
protected $_coreUrl;
@@ -236,7 +236,7 @@ class Checkout
* @param \Magento\Core\Model\LocaleInterface $locale
* @param \Magento\Paypal\Model\Info $paypalInfo
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Url $coreUrl
+ * @param \Magento\UrlInterface $coreUrl
* @param \Magento\Paypal\Model\CartFactory $cartFactory
* @param \Magento\Core\Model\Log\AdapterFactory $logFactory
* @param \Magento\Checkout\Model\Type\OnepageFactory $onepageFactory
@@ -257,7 +257,7 @@ public function __construct(
\Magento\Core\Model\LocaleInterface $locale,
\Magento\Paypal\Model\Info $paypalInfo,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Url $coreUrl,
+ \Magento\UrlInterface $coreUrl,
\Magento\Paypal\Model\CartFactory $cartFactory,
\Magento\Core\Model\Log\AdapterFactory $logFactory,
\Magento\Checkout\Model\Type\OnepageFactory $onepageFactory,
diff --git a/app/code/Magento/PaypalUk/Model/Pro.php b/app/code/Magento/Paypal/Model/Payflow/Pro.php
similarity index 90%
rename from app/code/Magento/PaypalUk/Model/Pro.php
rename to app/code/Magento/Paypal/Model/Payflow/Pro.php
index e926687c7ebfd..ae336bb38c21c 100644
--- a/app/code/Magento/PaypalUk/Model/Pro.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Pro.php
@@ -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 Magento
- * @package Magento_PaypalUk
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +27,7 @@
* This model was created because right now PayPal Direct and PayPal Express payment
* (Payflow Edition) methods cannot have same abstract
*/
-namespace Magento\PaypalUk\Model;
+namespace Magento\Paypal\Model\Payflow;
class Pro extends \Magento\Paypal\Model\Pro
{
@@ -38,7 +36,7 @@ class Pro extends \Magento\Paypal\Model\Pro
*
* @var string
*/
- protected $_apiType = 'Magento\PaypalUk\Model\Api\Nvp';
+ protected $_apiType = 'Magento\Paypal\Model\Api\PayflowNvp';
/**
* Config model type
@@ -88,7 +86,7 @@ protected function _getParentTransactionId(\Magento\Object $payment)
{
if ($payment->getParentTransactionId()) {
return $payment->getTransaction($payment->getParentTransactionId())
- ->getAdditionalInformation(\Magento\PaypalUk\Model\Pro::TRANSPORT_PAYFLOW_TXN_ID);
+ ->getAdditionalInformation(self::TRANSPORT_PAYFLOW_TXN_ID);
}
return $payment->getParentTransactionId();
}
@@ -104,7 +102,7 @@ protected function _importCaptureResultToPayment($api, $payment)
$payment->setTransactionId($api->getPaypalTransactionId())
->setIsTransactionClosed(false)
->setTransactionAdditionalInfo(
- \Magento\PaypalUk\Model\Pro::TRANSPORT_PAYFLOW_TXN_ID,
+ self::TRANSPORT_PAYFLOW_TXN_ID,
$api->getTransactionId()
);
$payment->setPreparedMessage(__('Payflow PNREF: #%1.', $api->getTransactionId()));
@@ -112,7 +110,7 @@ protected function _importCaptureResultToPayment($api, $payment)
}
/**
- * Fetch transaction details info method does not exists in PaypalUK
+ * Fetch transaction details info method does not exists in Payflow
*
* @param \Magento\Payment\Model\Info $payment
* @param string $transactionId
@@ -121,7 +119,7 @@ protected function _importCaptureResultToPayment($api, $payment)
*/
public function fetchTransactionInfo(\Magento\Payment\Model\Info $payment, $transactionId)
{
- throw new \Magento\Core\Exception(__('Fetch transaction details method does not exists in PaypalUK'));
+ throw new \Magento\Core\Exception(__('Fetch transaction details method does not exists in Payflow'));
}
/**
@@ -137,7 +135,7 @@ protected function _importRefundResultToPayment($api, $payment, $canRefundMore)
->setIsTransactionClosed(1) // refund initiated by merchant
->setShouldCloseParentTransaction(!$canRefundMore)
->setTransactionAdditionalInfo(
- \Magento\PaypalUk\Model\Pro::TRANSPORT_PAYFLOW_TXN_ID,
+ self::TRANSPORT_PAYFLOW_TXN_ID,
$api->getTransactionId()
);
$payment->setPreparedMessage(__('Payflow PNREF: #%1.', $api->getTransactionId()));
diff --git a/app/code/Magento/PaypalUk/Model/Direct.php b/app/code/Magento/Paypal/Model/PayflowDirect.php
similarity index 90%
rename from app/code/Magento/PaypalUk/Model/Direct.php
rename to app/code/Magento/Paypal/Model/PayflowDirect.php
index d12e147a24a4e..1c30e094b202e 100644
--- a/app/code/Magento/PaypalUk/Model/Direct.php
+++ b/app/code/Magento/Paypal/Model/PayflowDirect.php
@@ -18,18 +18,13 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_PaypalUk
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * PayPalUk Direct Module
- */
-namespace Magento\PaypalUk\Model;
+namespace Magento\Paypal\Model;
-class Direct extends \Magento\Paypal\Model\Direct
+class PayflowDirect extends \Magento\Paypal\Model\Direct
{
protected $_code = \Magento\Paypal\Model\Config::METHOD_WPP_PE_DIRECT;
@@ -38,7 +33,7 @@ class Direct extends \Magento\Paypal\Model\Direct
*
* @var string
*/
- protected $_proType = 'Magento\PaypalUk\Model\Pro';
+ protected $_proType = 'Magento\Paypal\Model\Payflow\Pro';
/**
* Return available CC types for gateway based on merchant country
@@ -78,7 +73,7 @@ protected function _importResultToPayment($api, $payment)
$payment->setTransactionId($api->getPaypalTransactionId())->setIsTransactionClosed(0)
->setIsTransactionPending($api->getIsPaymentPending())
->setTransactionAdditionalInfo(
- \Magento\PaypalUk\Model\Pro::TRANSPORT_PAYFLOW_TXN_ID,
+ \Magento\Paypal\Model\Payflow\Pro::TRANSPORT_PAYFLOW_TXN_ID,
$api->getTransactionId()
);
$payment->setPreparedMessage(__('Payflow PNREF: #%1.', $api->getTransactionId()));
diff --git a/app/code/Magento/PaypalUk/Model/Express.php b/app/code/Magento/Paypal/Model/PayflowExpress.php
similarity index 91%
rename from app/code/Magento/PaypalUk/Model/Express.php
rename to app/code/Magento/Paypal/Model/PayflowExpress.php
index f3532a0929b25..cceebc35964e8 100644
--- a/app/code/Magento/PaypalUk/Model/Express.php
+++ b/app/code/Magento/Paypal/Model/PayflowExpress.php
@@ -18,21 +18,16 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_PaypalUk
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * PayPalUk Express Module
- */
-namespace Magento\PaypalUk\Model;
+namespace Magento\Paypal\Model;
-class Express extends \Magento\Paypal\Model\Express
+class PayflowExpress extends \Magento\Paypal\Model\Express
{
protected $_code = \Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS;
- protected $_formBlockType = 'Magento\PaypalUk\Block\Express\Form';
+ protected $_formBlockType = 'Magento\Paypal\Block\PayflowExpress\Form';
protected $_canCreateBillingAgreement = false;
protected $_canManageRecurringProfiles = false;
@@ -41,7 +36,7 @@ class Express extends \Magento\Paypal\Model\Express
*
* @var $_proType string
*/
- protected $_proType = 'Magento\PaypalUk\Model\Pro';
+ protected $_proType = 'Magento\Paypal\Model\Payflow\Pro';
/**
* Express Checkout payment method instance
@@ -127,7 +122,7 @@ protected function _importToPayment($api, $payment)
$api->getRedirectRequired() || $api->getRedirectRequested()
)
->setIsTransactionPending($api->getIsPaymentPending())
- ->setTransactionAdditionalInfo(\Magento\PaypalUk\Model\Pro::TRANSPORT_PAYFLOW_TXN_ID,
+ ->setTransactionAdditionalInfo(\Magento\Paypal\Model\Payflow\Pro::TRANSPORT_PAYFLOW_TXN_ID,
$api->getTransactionId())
;
$payment->setPreparedMessage(__('Payflow PNREF: #%1.', $api->getTransactionId()));
@@ -143,6 +138,6 @@ protected function _importToPayment($api, $payment)
*/
public function getCheckoutRedirectUrl()
{
- return $this->_urlBuilder->getUrl('paypaluk/express/start');
+ return $this->_urlBuilder->getUrl('paypal/payflowexpress/start');
}
}
diff --git a/app/code/Magento/PaypalUk/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/PayflowExpress/Checkout.php
similarity index 90%
rename from app/code/Magento/PaypalUk/Model/Express/Checkout.php
rename to app/code/Magento/Paypal/Model/PayflowExpress/Checkout.php
index 5edd5ce35d4cc..5b7f1ae5877a4 100644
--- a/app/code/Magento/PaypalUk/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/PayflowExpress/Checkout.php
@@ -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 Magento
- * @package Magento_PaypalUk
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +26,7 @@
* Wrapper that performs Paypal Express and Checkout communication
* Use current Paypal Express method instance
*/
-namespace Magento\PaypalUk\Model\Express;
+namespace Magento\Paypal\Model\PayflowExpress;
class Checkout extends \Magento\Paypal\Model\Express\Checkout
{
@@ -37,7 +35,7 @@ class Checkout extends \Magento\Paypal\Model\Express\Checkout
*
* @var string
*/
- protected $_apiType = 'Magento\PaypalUk\Model\Api\Nvp';
+ protected $_apiType = 'Magento\Paypal\Model\Api\PayflowNvp';
/**
* Payment method type
diff --git a/app/code/Magento/Paypal/Model/Payflowlink.php b/app/code/Magento/Paypal/Model/Payflowlink.php
index c0ba12f013d6f..889ef28538263 100644
--- a/app/code/Magento/Paypal/Model/Payflowlink.php
+++ b/app/code/Magento/Paypal/Model/Payflowlink.php
@@ -741,7 +741,7 @@ protected function _getCallbackUrl($actionName)
/** @var $website \Magento\Core\Model\Website */
$website = $this->_websiteFactory->create()->load($this->_requestHttp->getParam('website'));
$secure = $this->_coreStoreConfig->getConfigFlag(
- \Magento\Core\Model\Url::XML_PATH_SECURE_IN_FRONT,
+ \Magento\Core\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
$website->getDefaultStore()
);
$path = $secure
@@ -749,9 +749,9 @@ protected function _getCallbackUrl($actionName)
: \Magento\Core\Model\Store::XML_PATH_UNSECURE_BASE_LINK_URL;
$websiteUrl = $this->_coreStoreConfig->getConfig($path, $website->getDefaultStore());
} else {
- $secure = $this->_coreStoreConfig->getConfigFlag(\Magento\Core\Model\Url::XML_PATH_SECURE_IN_FRONT);
+ $secure = $this->_coreStoreConfig->getConfigFlag(\Magento\Core\Model\Store::XML_PATH_SECURE_IN_FRONTEND);
$websiteUrl = $this->_storeManager->getStore()
- ->getBaseUrl(\Magento\Core\Model\Store::URL_TYPE_LINK, $secure);
+ ->getBaseUrl(\Magento\UrlInterface::URL_TYPE_LINK, $secure);
}
return $websiteUrl . 'paypal/' . $this->getCallbackController() . '/' . $actionName;
diff --git a/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php b/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php
index 7795617eac352..65a5e8e16b14f 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php
@@ -50,7 +50,7 @@ class Cert extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Paypal\Model\CertFactory $certFactory
* @param \Magento\Encryption\EncryptorInterface $encryptor
* @param \Magento\App\Filesystem $filesystem
@@ -62,7 +62,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Paypal\Model\CertFactory $certFactory,
\Magento\Encryption\EncryptorInterface $encryptor,
\Magento\App\Filesystem $filesystem,
diff --git a/app/code/Magento/Paypal/Model/System/Config/Backend/Cron.php b/app/code/Magento/Paypal/Model/System/Config/Backend/Cron.php
index b29d051f14751..704a7cf08b0cd 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Backend/Cron.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Backend/Cron.php
@@ -40,7 +40,7 @@ class Cron extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Core\Model\Config\ValueFactory $configValueFactory
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -50,7 +50,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Core\Model\Config\ValueFactory $configValueFactory,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Paypal/Model/System/Config/Backend/MerchantCountry.php b/app/code/Magento/Paypal/Model/System/Config/Backend/MerchantCountry.php
index c94e0d56c97e8..326b780a9e3ec 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Backend/MerchantCountry.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Backend/MerchantCountry.php
@@ -42,7 +42,7 @@ class MerchantCountry extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -52,7 +52,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Core\Helper\Data $coreData,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Paypal/etc/adminhtml/di.xml b/app/code/Magento/Paypal/etc/adminhtml/di.xml
index 91084386edc1e..ab03f77ce1d27 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/di.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/di.xml
@@ -37,6 +37,19 @@
adminhtml
+
+
+ paypal_payflow
+
+
+
+
+ adminhtml
+
+
adminhtml
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
index 1cca5c8a2428b..4a389aaff6727 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml
@@ -70,7 +70,7 @@
Process payments using your own internet merchant account.
https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content
+
paypal-enabler paypal-ec-pe
@@ -172,7 +172,7 @@
1
- payment/paypaluk_express/active
+ payment/payflow_express/active
Magento\Paypal\Block\Adminhtml\System\Config\Field\Hidden
Magento\Backend\Model\Config\Source\Yesno
paypal-ec-payflow-enabler
@@ -288,12 +288,12 @@
Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded
-
@@ -602,12 +602,12 @@
-
+
Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment
pp-method-payflow
Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.
- payment/verisign/active
+ payment/payflowpro/active
https://www.paypal.com/webapps/mpp/referral/paypal-payflow-pro?partner_id=NB9WWHYEMVUMS
1
@@ -618,41 +618,41 @@
Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded
- payment/verisign/partner
+ payment/payflowpro/partner
1
- payment/verisign/user
+ payment/payflowpro/user
Magento\Backend\Model\Config\Backend\Encrypted
1
- payment/verisign/vendor
+ payment/payflowpro/vendor
1
- payment/verisign/pwd
+ payment/payflowpro/pwd
Magento\Backend\Model\Config\Backend\Encrypted
1
- payment/verisign/sandbox_flag
+ payment/payflowpro/sandbox_flag
Magento\Backend\Model\Config\Source\Yesno
1
- payment/verisign/use_proxy
+ payment/payflowpro/use_proxy
Magento\Backend\Model\Config\Source\Yesno
1
- payment/verisign/proxy_host
+ payment/payflowpro/proxy_host
1
@@ -660,7 +660,7 @@
- payment/verisign/proxy_port
+ payment/payflowpro/proxy_port
1
@@ -669,7 +669,7 @@
- payment/verisign/active
+ payment/payflowpro/active
Magento\Backend\Model\Config\Source\Yesno
It is recommended to set this value to "Debit or Credit Card" per store views.
- payment/verisign/title
+ payment/payflowpro/title
1
- payment/verisign/sort_order
+ payment/payflowpro/sort_order
validate-number
1
- payment/verisign/payment_action
+ payment/payflowpro/payment_action
Magento\Paypal\Model\System\Config\Source\PaymentActions
1
@@ -709,7 +709,7 @@
http://www.paypal.com/amexupdate.]]>
- payment/verisign/cctypes
+ payment/payflowpro/cctypes
Magento\Paypal\Model\Config::getPayflowproCcTypesAsOptionArray
1
@@ -718,13 +718,13 @@
config-advanced
- payment/verisign/allowspecific
+ payment/payflowpro/allowspecific
Magento\Payment\Model\Config\Source\Allspecificcountries
1
- payment/verisign/specificcountry
+ payment/payflowpro/specificcountry
Magento\Paypal\Model\System\Config\Source\BuyerCountry
1
@@ -733,19 +733,19 @@
- payment/verisign/debug
+ payment/payflowpro/debug
Magento\Backend\Model\Config\Source\Yesno
1
- payment/verisign/verify_peer
+ payment/payflowpro/verify_peer
Magento\Backend\Model\Config\Source\Yesno
1
- payment/verisign/useccv
+ payment/payflowpro/useccv
Magento\Backend\Model\Config\Source\Yesno
1
@@ -756,13 +756,13 @@
- payment/verisign/centinel
+ payment/payflowpro/centinel
Magento\Backend\Model\Config\Source\Yesno
1
- payment/verisign/centinel_is_mode_strict
+ payment/payflowpro/centinel_is_mode_strict
Severe validation removes chargeback liability on merchant.
Magento\Backend\Model\Config\Source\Yesno
@@ -772,7 +772,7 @@
- payment/verisign/centinel_api_url
+ payment/payflowpro/centinel_api_url
A value is required for live mode. Refer to your CardinalCommerce agreement.
Magento\Backend\Model\Config\Source\Yesno
@@ -796,7 +796,7 @@
-
+
0
@@ -829,31 +829,31 @@
Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded
- payment/paypaluk_express/title
+ payment/payflow_express/title
1
- payment/paypaluk_express/sort_order
+ payment/payflow_express/sort_order
validate-number
1
- payment/paypaluk_express/payment_action
+ payment/payflow_express/payment_action
Magento\Paypal\Model\System\Config\Source\PaymentActions
1
Also affects mini-shopping cart.
- payment/paypaluk_express/visible_on_cart
+ payment/payflow_express/visible_on_cart
Magento\Backend\Model\Config\Source\Yesno
1
- payment/paypaluk_express/visible_on_product
+ payment/payflow_express/visible_on_product
Magento\Backend\Model\Config\Source\Yesno
1
@@ -862,13 +862,13 @@
config-advanced
- payment/paypaluk_express/allowspecific
+ payment/payflow_express/allowspecific
Magento\Payment\Model\Config\Source\Allspecificcountries
1
- payment/paypaluk_express/specificcountry
+ payment/payflow_express/specificcountry
Magento\Paypal\Model\System\Config\Source\BuyerCountry
1
@@ -877,19 +877,19 @@
- payment/paypaluk_express/debug
+ payment/payflow_express/debug
Magento\Backend\Model\Config\Source\Yesno
1
- payment/paypaluk_express/verify_peer
+ payment/payflow_express/verify_peer
Magento\Backend\Model\Config\Source\Yesno
1
- payment/paypaluk_express/line_items_enabled
+ payment/payflow_express/line_items_enabled
Magento\Backend\Model\Config\Source\Yesno
1
@@ -981,7 +981,7 @@
- payment/paypaluk_express/active
+ payment/payflow_express/active
Magento\Backend\Model\Config\Source\Yesno
paypal-ec-payflow-enabler
1
@@ -1096,12 +1096,12 @@
Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded
-
diff --git a/app/code/Magento/Paypal/etc/config.xml b/app/code/Magento/Paypal/etc/config.xml
index a9d8bf8375fbf..1329049a0f816 100644
--- a/app/code/Magento/Paypal/etc/config.xml
+++ b/app/code/Magento/Paypal/etc/config.xml
@@ -81,7 +81,7 @@
paypal
1
-
+
PayPal Express Checkout Payflow Edition
Authorization
1
@@ -89,16 +89,18 @@
1
paypal
1
-
-
+ Magento\Paypal\Model\PayflowExpress
+
+
PayPal Direct Payment Payflow Edition
Authorization
VI,MC,AE
1
paypal
1
-
-
+ Magento\Paypal\Model\PayflowDirect
+
+
Magento\Paypal\Model\Payflowpro
Payflow Pro
Authorization
@@ -110,7 +112,7 @@
paypal
1
-
+
1
1
diff --git a/app/code/Magento/Paypal/etc/di.xml b/app/code/Magento/Paypal/etc/di.xml
index f2f6f36342569..b8dfd1cb8c723 100644
--- a/app/code/Magento/Paypal/etc/di.xml
+++ b/app/code/Magento/Paypal/etc/di.xml
@@ -26,9 +26,9 @@
-
- Magento\Sales\Model\Resource\Setup
-
+
+ Magento\Sales\Model\Resource\Setup
diff --git a/app/code/Magento/Paypal/etc/frontend/di.xml b/app/code/Magento/Paypal/etc/frontend/di.xml
index 0e7b099c3a7cc..6e1eb584d9d7b 100644
--- a/app/code/Magento/Paypal/etc/frontend/di.xml
+++ b/app/code/Magento/Paypal/etc/frontend/di.xml
@@ -37,6 +37,19 @@
frontend
+
+
+ paypal_payflow
+
+
+
+
+ frontend
+
+
frontend
@@ -44,11 +57,12 @@
-
- /paypal/express
- /paypal/standard
- paypal/express/callbackshippingoptions
-
+
+ /paypal/express /paypal/payflowexpress /paypal/standard paypal/express/callbackshippingoptions
diff --git a/app/code/Magento/Paypal/etc/frontend/page_types.xml b/app/code/Magento/Paypal/etc/frontend/page_types.xml
index bf5ae85d80754..44dfffd644bf8 100644
--- a/app/code/Magento/Paypal/etc/frontend/page_types.xml
+++ b/app/code/Magento/Paypal/etc/frontend/page_types.xml
@@ -32,4 +32,5 @@
+
+
+ 1
+
+
+ after
+
+
+
diff --git a/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml
index 24a261a22888c..df80c2c2a4541 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml
@@ -33,6 +33,16 @@
+
+
+
+ 1
+
+
+
diff --git a/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml
index 53deb726ad054..406bf753fa84b 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml
@@ -31,6 +31,12 @@
1
+
+
+ 1
+
+
1
+
+
+ 1
+
+
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml
index a5957665188f1..d9bb4cf14d20d 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml
@@ -24,6 +24,7 @@
*/
-->
+
1column.phtml
@@ -39,12 +40,7 @@
as="shipping_method" template="express/review/shipping/method.phtml"/>
-
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml
index f0ed14376cf6f..5407774f232e5 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml
@@ -24,10 +24,9 @@
*/
-->
+
-
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/paypaluk_express_review.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml
similarity index 75%
rename from app/code/Magento/PaypalUk/view/frontend/layout/paypaluk_express_review.xml
rename to app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml
index 17b595fd69733..5cdaf6ca42ce7 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/paypaluk_express_review.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml
@@ -24,6 +24,7 @@
*/
-->
+
1column.phtml
@@ -31,18 +32,13 @@
-
- paypaluk
+ template="payflowexpress/review.phtml">
+
+ paypal/payflowexpress
-
diff --git a/app/code/Magento/PaypalUk/view/frontend/express/review.phtml b/app/code/Magento/Paypal/view/frontend/payflowexpress/review.phtml
similarity index 100%
rename from app/code/Magento/PaypalUk/view/frontend/express/review.phtml
rename to app/code/Magento/Paypal/view/frontend/payflowexpress/review.phtml
diff --git a/app/code/Magento/PaypalUk/i18n/de_DE.csv b/app/code/Magento/PaypalUk/i18n/de_DE.csv
deleted file mode 100644
index dff193d6cb66f..0000000000000
--- a/app/code/Magento/PaypalUk/i18n/de_DE.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","PayPal Express Checkout (Payflow Edition) Shortcut Wrapper"
-"PayPal Express Order Review Form","PayPal Express Bestellübersichtsformular"
diff --git a/app/code/Magento/PaypalUk/i18n/en_US.csv b/app/code/Magento/PaypalUk/i18n/en_US.csv
deleted file mode 100644
index 94085b297f0a3..0000000000000
--- a/app/code/Magento/PaypalUk/i18n/en_US.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","PayPal Express Checkout (Payflow Edition) Shortcut Wrapper"
-"PayPal Express Order Review Form","PayPal Express Order Review Form"
diff --git a/app/code/Magento/PaypalUk/i18n/es_ES.csv b/app/code/Magento/PaypalUk/i18n/es_ES.csv
deleted file mode 100644
index d50b06868ab77..0000000000000
--- a/app/code/Magento/PaypalUk/i18n/es_ES.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","Contenedor de acceso directo a Pago Express de PayPal (Edición de Flujo de Pago)"
-"PayPal Express Order Review Form","Formulario para revisar el pedido express de Paypal"
diff --git a/app/code/Magento/PaypalUk/i18n/fr_FR.csv b/app/code/Magento/PaypalUk/i18n/fr_FR.csv
deleted file mode 100644
index eee5aec03eb53..0000000000000
--- a/app/code/Magento/PaypalUk/i18n/fr_FR.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","Paiement express Paypal (Edition Payflow) Shortcut Wrapper"
-"PayPal Express Order Review Form","Formulaire de vérification du paiement express via Paypal."
diff --git a/app/code/Magento/PaypalUk/i18n/nl_NL.csv b/app/code/Magento/PaypalUk/i18n/nl_NL.csv
deleted file mode 100644
index c260cba00ac6b..0000000000000
--- a/app/code/Magento/PaypalUk/i18n/nl_NL.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","PayPal Express Checkout (Payflow Edition) Shortcut Wrapper"
-"PayPal Express Order Review Form","PayPal Express Bestelling Terugzien Formulier"
diff --git a/app/code/Magento/PaypalUk/i18n/pt_BR.csv b/app/code/Magento/PaypalUk/i18n/pt_BR.csv
deleted file mode 100644
index 2b6cee81fc3f5..0000000000000
--- a/app/code/Magento/PaypalUk/i18n/pt_BR.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","Fechar Pedido com PayPal Express (Edição Payflow): Wrapper Simplificado"
-"PayPal Express Order Review Form","PayPal Express: Revisar Pedido"
diff --git a/app/code/Magento/PaypalUk/i18n/zh_CN.csv b/app/code/Magento/PaypalUk/i18n/zh_CN.csv
deleted file mode 100644
index e899368134f93..0000000000000
--- a/app/code/Magento/PaypalUk/i18n/zh_CN.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"PayPal Express Checkout (Payflow Edition) Shortcut Wrapper","PayPal快速结账（Payflow版）快捷方式包装"
-"PayPal Express Order Review Form","PayPal快速订单审查表单"
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/SHORTCUT_uk_popup.xml b/app/code/Magento/PaypalUk/view/frontend/layout/SHORTCUT_uk_popup.xml
deleted file mode 100644
index 5e340be4acfa9..0000000000000
--- a/app/code/Magento/PaypalUk/view/frontend/layout/SHORTCUT_uk_popup.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
- 1
-
-
- after
-
-
-
-
-
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/PaypalUk/view/frontend/layout/catalog_product_view.xml
deleted file mode 100644
index daf2f151f4b46..0000000000000
--- a/app/code/Magento/PaypalUk/view/frontend/layout/catalog_product_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
- 1
-
-
-
-
-
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/PaypalUk/view/frontend/layout/catalogsearch_result_index.xml
deleted file mode 100644
index 40668f6fc4bdb..0000000000000
--- a/app/code/Magento/PaypalUk/view/frontend/layout/catalogsearch_result_index.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/PaypalUk/view/frontend/layout/checkout_cart_index.xml
deleted file mode 100644
index 87b1ed17124fc..0000000000000
--- a/app/code/Magento/PaypalUk/view/frontend/layout/checkout_cart_index.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/checkout_onepage_failure.xml b/app/code/Magento/PaypalUk/view/frontend/layout/checkout_onepage_failure.xml
deleted file mode 100644
index 40668f6fc4bdb..0000000000000
--- a/app/code/Magento/PaypalUk/view/frontend/layout/checkout_onepage_failure.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/PaypalUk/view/frontend/layout/checkout_onepage_success.xml
deleted file mode 100644
index 40668f6fc4bdb..0000000000000
--- a/app/code/Magento/PaypalUk/view/frontend/layout/checkout_onepage_success.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/review_product_list.xml b/app/code/Magento/PaypalUk/view/frontend/layout/review_product_list.xml
deleted file mode 100644
index 40668f6fc4bdb..0000000000000
--- a/app/code/Magento/PaypalUk/view/frontend/layout/review_product_list.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/tag_customer_view.xml b/app/code/Magento/PaypalUk/view/frontend/layout/tag_customer_view.xml
deleted file mode 100644
index 40668f6fc4bdb..0000000000000
--- a/app/code/Magento/PaypalUk/view/frontend/layout/tag_customer_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/tag_product_list.xml b/app/code/Magento/PaypalUk/view/frontend/layout/tag_product_list.xml
deleted file mode 100644
index 40668f6fc4bdb..0000000000000
--- a/app/code/Magento/PaypalUk/view/frontend/layout/tag_product_list.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/PaypalUk/view/frontend/layout/wishlist_index_index.xml
deleted file mode 100644
index 40668f6fc4bdb..0000000000000
--- a/app/code/Magento/PaypalUk/view/frontend/layout/wishlist_index_index.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
diff --git a/app/code/Magento/Persistent/Model/Session.php b/app/code/Magento/Persistent/Model/Session.php
index 56e94d4e26ad8..3b9900655cad3 100644
--- a/app/code/Magento/Persistent/Model/Session.php
+++ b/app/code/Magento/Persistent/Model/Session.php
@@ -70,7 +70,7 @@ class Session extends \Magento\Core\Model\AbstractModel
protected $_coreData;
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_coreConfig;
@@ -103,7 +103,7 @@ class Session extends \Magento\Core\Model\AbstractModel
*
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Persistent\Helper\Data $persistentData
* @param \Magento\Stdlib\Cookie $cookie
@@ -117,7 +117,7 @@ class Session extends \Magento\Core\Model\AbstractModel
public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\Core\Helper\Data $coreData,
\Magento\Persistent\Helper\Data $persistentData,
\Magento\Stdlib\Cookie $cookie,
diff --git a/app/code/Magento/Persistent/etc/frontend/di.xml b/app/code/Magento/Persistent/etc/frontend/di.xml
index 59fec0ddd696a..8a467c2a49cd0 100644
--- a/app/code/Magento/Persistent/etc/frontend/di.xml
+++ b/app/code/Magento/Persistent/etc/frontend/di.xml
@@ -26,9 +26,9 @@
-
- /persistent/index/saveMethod
-
+
+ /persistent/index/saveMethod
diff --git a/app/code/Magento/Persistent/etc/frontend/events.xml b/app/code/Magento/Persistent/etc/frontend/events.xml
index ce099785c6afc..926499b7bc952 100644
--- a/app/code/Magento/Persistent/etc/frontend/events.xml
+++ b/app/code/Magento/Persistent/etc/frontend/events.xml
@@ -76,7 +76,7 @@
-
+
diff --git a/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php b/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
index d8a4ae38ad81f..d698531ef0af6 100644
--- a/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
+++ b/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
@@ -132,8 +132,8 @@ public function getProducts()
protected function _getUrlParams()
{
return array(
- '_store' => $this->getStore(),
- '_store_to_url' => true
+ '_scope' => $this->getStore(),
+ '_scope_to_url' => true
);
}
}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
index 460b4bfecca9e..f4e7c602b3011 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
@@ -57,7 +57,6 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory
* @param \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory
@@ -66,7 +65,6 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory,
\Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory,
@@ -76,7 +74,7 @@ public function __construct(
$this->_resourceFactory = $resourceFactory;
$this->_collectionFactory = $collectionFactory;
$this->_reportsData = $reportsData;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
index d3ecb6ffc3a96..37fc636f6e7a4 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
@@ -42,20 +42,18 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Reports\Model\Resource\Product\Downloads\CollectionFactory $downloadsFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Reports\Model\Resource\Product\Downloads\CollectionFactory $downloadsFactory,
array $data = array()
) {
$this->_downloadsFactory = $downloadsFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Grid.php
index 3da2162f06834..185294d94033b 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Grid.php
@@ -42,20 +42,18 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Reports\Model\Resource\Product\CollectionFactory $collectionFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Reports\Model\Resource\Product\CollectionFactory $collectionFactory,
array $data = array()
) {
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
index 0975c8efc3347..2de893c3cabf7 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
@@ -42,20 +42,18 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Reports\Model\Resource\Product\Lowstock\CollectionFactory $lowstocksFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Reports\Model\Resource\Product\Lowstock\CollectionFactory $lowstocksFactory,
array $data = array()
) {
$this->_lowstocksFactory = $lowstocksFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php
index bac69719883b2..d28086d5d6e72 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php
@@ -42,20 +42,18 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Reports\Model\Resource\Review\CollectionFactory $reviewsFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Reports\Model\Resource\Review\CollectionFactory $reviewsFactory,
array $data = array()
) {
$this->_reviewsFactory = $reviewsFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
index aed5ce92b1737..44adfe5e890f4 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
@@ -44,7 +44,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory
* @param \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory
@@ -54,7 +53,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory,
\Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory,
@@ -65,7 +63,6 @@ public function __construct(
$this->_configFactory = $configFactory;
parent::__construct(
$context,
- $urlModel,
$backendHelper,
$resourceFactory,
$collectionFactory,
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
index db70f4963208e..ff7f09092ab17 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
@@ -42,20 +42,18 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Reports\Model\Resource\Quote\CollectionFactory $quotesFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Reports\Model\Resource\Quote\CollectionFactory $quotesFactory,
array $data = array()
) {
$this->_quotesFactory = $quotesFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
index 9ea648a0be0d6..0505ca3af83c8 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
@@ -42,20 +42,18 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Reports\Model\Resource\Customer\CollectionFactory $customersFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Reports\Model\Resource\Customer\CollectionFactory $customersFactory,
array $data = array()
) {
$this->_customersFactory = $customersFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
index 6cd417d299c14..a90e69386d318 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
@@ -42,20 +42,18 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Reports\Model\Resource\Quote\CollectionFactory $quotesFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Reports\Model\Resource\Quote\CollectionFactory $quotesFactory,
array $data = array()
) {
$this->_quotesFactory = $quotesFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
index 304db730dee46..e51e4034265e9 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
@@ -42,20 +42,18 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Reports\Model\Resource\Wishlist\Product\CollectionFactory $productsFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Reports\Model\Resource\Wishlist\Product\CollectionFactory $productsFactory,
array $data = array()
) {
$this->_productsFactory = $productsFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Reports/etc/di.xml b/app/code/Magento/Reports/etc/di.xml
index e0b2110c9146c..cc274db9d331e 100644
--- a/app/code/Magento/Reports/etc/di.xml
+++ b/app/code/Magento/Reports/etc/di.xml
@@ -29,9 +29,9 @@
-
- Magento\Reports\Model\Resource\Setup
-
+
+ Magento\Reports\Model\Resource\Setup
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
index 136b520c6f4a7..7bcf2e85007b7 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add.php
@@ -24,6 +24,8 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Block\Adminhtml;
+
/**
* Adminhtml add Review main block
*
@@ -31,9 +33,6 @@
* @package Magento_Review
* @author Magento Core Team
*/
-
-namespace Magento\Review\Block\Adminhtml;
-
class Add extends \Magento\Backend\Block\Widget\Form\Container
{
protected function _construct()
@@ -119,6 +118,9 @@ protected function _construct()
';
}
+ /**
+ * @return string
+ */
public function getHeaderText()
{
return __('Add New Review');
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add/Form.php b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
index 710f4fd2a21e7..35371248f652b 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
@@ -69,6 +69,9 @@ public function __construct(
parent::__construct($context, $registry, $formFactory, $data);
}
+ /**
+ * @return void
+ */
protected function _prepareForm()
{
/** @var \Magento\Data\Form $form */
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
index 52b2840b8ad64..23ff1302b99a1 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -24,11 +24,11 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Block\Adminhtml;
+
/**
* Review edit form
*/
-namespace Magento\Review\Block\Adminhtml;
-
class Edit extends \Magento\Backend\Block\Widget\Form\Container
{
/**
@@ -213,6 +213,9 @@ protected function _construct()
';
}
+ /**
+ * @return string
+ */
public function getHeaderText()
{
$reviewData = $this->_coreRegistry->registry('review_data');
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
index 0ac0acf6ebc28..e429057dabfb4 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
@@ -80,6 +80,9 @@ public function __construct(
parent::__construct($context, $registry, $formFactory, $data);
}
+ /**
+ * @return $this
+ */
protected function _prepareForm()
{
$review = $this->_coreRegistry->registry('review_data');
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Grid.php
index 671b81f9ae6e8..a954bc7dfa949 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid.php
@@ -74,7 +74,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Review\Model\ReviewFactory $reviewFactory
* @param \Magento\Review\Model\Resource\Review\Product\CollectionFactory $productsFactory
@@ -85,7 +84,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Review\Model\ReviewFactory $reviewFactory,
\Magento\Review\Model\Resource\Review\Product\CollectionFactory $productsFactory,
@@ -99,7 +97,7 @@ public function __construct(
$this->_reviewData = $reviewData;
$this->_reviewActionPager = $reviewActionPager;
$this->_reviewFactory = $reviewFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
@@ -305,7 +303,7 @@ protected function _prepareColumns()
/**
* Prepare grid mass actions
*
- * @return \Magento\Backend\Block\Widget\Grid|void
+ * @return void
*/
protected function _prepareMassaction()
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php b/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
index 132b4cedecedf..8d8721e2e5979 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
@@ -24,6 +24,8 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Block\Adminhtml\Grid\Filter;
+
/**
* Adminhtml review grid filter by type
*
@@ -31,11 +33,11 @@
* @package Magento_Review
* @author Magento Core Team
*/
-
-namespace Magento\Review\Block\Adminhtml\Grid\Filter;
-
class Type extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
{
+ /**
+ * @return array
+ */
protected function _getOptions()
{
return array(
@@ -46,6 +48,9 @@ protected function _getOptions()
);
}
+ /**
+ * @return int
+ */
public function getCondition()
{
if ($this->getValue() == 1) {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
index 8745462be1088..67ebcececcc40 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
@@ -24,6 +24,8 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Block\Adminhtml\Grid\Renderer;
+
/**
* Adminhtml review grid item renderer for item type
*
@@ -31,11 +33,11 @@
* @package Magento_Review
* @author Magento Core Team
*/
-
-namespace Magento\Review\Block\Adminhtml\Grid\Renderer;
-
class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
+ /**
+ * @return string
+ */
public function render(\Magento\Object $row)
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
index 8c29fbee23484..8cda7a1478d53 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
@@ -42,7 +42,6 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Core\Model\WebsiteFactory $websiteFactory
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory $setsFactory
@@ -58,7 +57,6 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Core\Model\WebsiteFactory $websiteFactory,
\Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory $setsFactory,
@@ -73,7 +71,6 @@ public function __construct(
$this->_websitesFactory = $websitesFactory;
parent::__construct(
$context,
- $urlModel,
$backendHelper,
$websiteFactory,
$setsFactory,
@@ -93,6 +90,9 @@ protected function _construct()
$this->setUseAjax(true);
}
+ /**
+ * @return void
+ */
protected function _prepareColumns()
{
$this->addColumn('entity_id', array(
@@ -157,16 +157,25 @@ protected function _prepareColumns()
}
}
+ /**
+ * @return string
+ */
public function getGridUrl()
{
return $this->getUrl('catalog/*/productGrid', array('_current'=>true));
}
+ /**
+ * @return string
+ */
public function getRowUrl($row)
{
return $this->getUrl('catalog/*/jsonProductInfo', array('id' => $row->getId()));
}
+ /**
+ * @return $this
+ */
protected function _prepareMassaction()
{
return $this;
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
index c5eda0804c5db..db12de01600d8 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
@@ -23,16 +23,26 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Block\Adminhtml\Rating;
+
+use Magento\Rating\Model\Rating;
+use Magento\Rating\Model\Rating\Option;
+use Magento\Rating\Model\Resource\Rating\Collection as RatingCollection;
+use Magento\Rating\Model\Resource\Rating\Option\Vote\Collection as VoteCollection;
/**
* Adminhtml detailed rating stars
*/
-namespace Magento\Review\Block\Adminhtml\Rating;
-
class Detailed extends \Magento\Backend\Block\Template
{
+ /**
+ * @var VoteCollection
+ */
protected $_voteCollection = false;
+ /**
+ * @var string
+ */
protected $_template = 'Magento_Rating::rating/detailed.phtml';
/**
@@ -81,6 +91,9 @@ protected function _construct()
}
}
+ /**
+ * @return RatingCollection
+ */
public function getRating()
{
if (!$this->getRatingCollection()) {
@@ -131,12 +144,20 @@ public function getRating()
return $this->getRatingCollection();
}
+ /**
+ * @return $this
+ */
public function setIndependentMode()
{
$this->setIsIndependentMode(true);
return $this;
}
+ /**
+ * @param Option $option
+ * @param Rating $rating
+ * @return bool
+ */
public function isSelected($option, $rating)
{
if ($this->getIsIndependentMode()) {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
index f1b4eda9b0565..11abe14d21f44 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
@@ -24,13 +24,18 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Block\Adminhtml\Rating;
+
+use Magento\Rating\Model\Resource\Rating\Collection as RatingCollection;
+
/**
* Adminhtml summary rating stars
*/
-namespace Magento\Review\Block\Adminhtml\Rating;
-
class Summary extends \Magento\Backend\Block\Template
{
+ /**
+ * @var string
+ */
protected $_template = 'Magento_Rating::rating/stars/summary.phtml';
/**
@@ -77,6 +82,9 @@ protected function _construct()
}
}
+ /**
+ * @return RatingCollection
+ */
public function getRating()
{
if (!$this->getRatingCollection()) {
@@ -89,6 +97,9 @@ public function getRating()
return $this->getRatingCollection();
}
+ /**
+ * @return string
+ */
public function getRatingSummary()
{
if (!$this->getRatingSummaryCache()) {
diff --git a/app/code/Magento/Review/Block/Customer/ListCustomer.php b/app/code/Magento/Review/Block/Customer/ListCustomer.php
index ce91b039562c5..e2a46d8c5b729 100644
--- a/app/code/Magento/Review/Block/Customer/ListCustomer.php
+++ b/app/code/Magento/Review/Block/Customer/ListCustomer.php
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-
+namespace Magento\Review\Block\Customer;
/**
* Customer Reviews list block
@@ -32,8 +32,6 @@
* @package Magento_Review
* @author Magento Core Team
*/
-namespace Magento\Review\Block\Customer;
-
class ListCustomer extends \Magento\Customer\Block\Account\Dashboard
{
/**
@@ -67,6 +65,9 @@ public function __construct(
$this->_isScopePrivate = true;
}
+ /**
+ * @return $this
+ */
protected function _initCollection()
{
$this->_collection = $this->_collectionFactory->create();
@@ -157,7 +158,7 @@ public function getProductLink()
/**
* Format date in short format
*
- * @param $date
+ * @param string $date
* @return string
*/
public function dateFormat($date)
diff --git a/app/code/Magento/Review/Block/Customer/Recent.php b/app/code/Magento/Review/Block/Customer/Recent.php
index 3e2ea6e2bb482..c2d11019f5c73 100644
--- a/app/code/Magento/Review/Block/Customer/Recent.php
+++ b/app/code/Magento/Review/Block/Customer/Recent.php
@@ -26,6 +26,8 @@
namespace Magento\Review\Block\Customer;
+use Magento\Review\Model\Resource\Review\Product\Collection;
+
/**
* Recent Customer Reviews Block
*/
@@ -39,7 +41,7 @@ class Recent extends \Magento\View\Element\Template
/**
* Product reviews collection
*
- * @var \Magento\Review\Model\Resource\Review\Product\Collection
+ * @var Collection
*/
protected $_collection;
@@ -91,6 +93,9 @@ public function truncateString($value, $length = 80, $etc = '...', &$remainder =
));
}
+ /**
+ * @return $this
+ */
protected function _initCollection()
{
$this->_collection = $this->_collectionFactory->create();
@@ -104,11 +109,17 @@ protected function _initCollection()
return $this;
}
+ /**
+ * @return int
+ */
public function count()
{
return $this->_getCollection()->getSize();
}
+ /**
+ * @return Collection
+ */
protected function _getCollection()
{
if (!$this->_collection) {
@@ -117,31 +128,49 @@ protected function _getCollection()
return $this->_collection;
}
+ /**
+ * @return Collection
+ */
public function getCollection()
{
return $this->_getCollection();
}
+ /**
+ * @return string
+ */
public function getReviewLink()
{
return $this->getUrl('review/customer/view/');
}
+ /**
+ * @return string
+ */
public function getProductLink()
{
return $this->getUrl('catalog/product/view/');
}
+ /**
+ * @return string
+ */
public function dateFormat($date)
{
return $this->formatDate($date, \Magento\Core\Model\LocaleInterface::FORMAT_TYPE_SHORT);
}
+ /**
+ * @return string
+ */
public function getAllReviewsUrl()
{
return $this->getUrl('review/customer');
}
+ /**
+ * @return string
+ */
public function getReviewUrl($id)
{
return $this->getUrl('review/customer/view', array('id' => $id));
diff --git a/app/code/Magento/Review/Block/Customer/View.php b/app/code/Magento/Review/Block/Customer/View.php
index f2514ef107a53..b41a95cb47896 100644
--- a/app/code/Magento/Review/Block/Customer/View.php
+++ b/app/code/Magento/Review/Block/Customer/View.php
@@ -34,6 +34,10 @@
namespace Magento\Review\Block\Customer;
+use Magento\Catalog\Model\Product as Product;
+use Magento\Rating\Model\Rating\Option\Vote\Collection as VoteCollection;
+use Magento\Review\Model\Review as Review;
+
class View extends \Magento\Catalog\Block\Product\AbstractProduct
{
protected $_template = 'customer/view.phtml';
@@ -136,6 +140,9 @@ protected function _construct()
$this->setReviewId($this->getRequest()->getParam('id', false));
}
+ /**
+ * @return Product
+ */
public function getProductData()
{
if( $this->getReviewId() && !$this->getProductCacheData() ) {
@@ -147,6 +154,9 @@ public function getProductData()
return $this->getProductCacheData();
}
+ /**
+ * @return Review
+ */
public function getReviewData()
{
if( $this->getReviewId() && !$this->getReviewCachedData() ) {
@@ -155,11 +165,17 @@ public function getReviewData()
return $this->getReviewCachedData();
}
+ /**
+ * @return string
+ */
public function getBackUrl()
{
return $this->getUrl('review/customer');
}
+ /**
+ * @return VoteCollection
+ */
public function getRating()
{
if( !$this->getRatingCollection() ) {
@@ -176,6 +192,9 @@ public function getRating()
return $this->getRatingCollection();
}
+ /**
+ * @return array
+ */
public function getRatingSummary()
{
if( !$this->getRatingSummaryCache() ) {
@@ -184,6 +203,9 @@ public function getRatingSummary()
return $this->getRatingSummaryCache();
}
+ /**
+ * @return int
+ */
public function getTotalReviews()
{
if( !$this->getTotalReviewsCache() ) {
@@ -192,6 +214,9 @@ public function getTotalReviews()
return $this->getTotalReviewsCache();
}
+ /**
+ * @return string
+ */
public function dateFormat($date)
{
return $this->formatDate($date, \Magento\Core\Model\LocaleInterface::FORMAT_TYPE_LONG);
@@ -200,7 +225,7 @@ public function dateFormat($date)
/**
* Check whether current customer is review owner
*
- * @return boolean
+ * @return bool
*/
public function isReviewOwner()
{
diff --git a/app/code/Magento/Review/Block/Form.php b/app/code/Magento/Review/Block/Form.php
index 31361997ee1b7..10ab8e13a75dd 100644
--- a/app/code/Magento/Review/Block/Form.php
+++ b/app/code/Magento/Review/Block/Form.php
@@ -33,6 +33,9 @@
*/
namespace Magento\Review\Block;
+use Magento\Catalog\Model\Product;
+use Magento\Rating\Model\Resource\Rating\Collection as RatingCollection;
+
class Form extends \Magento\View\Element\Template
{
/**
@@ -139,18 +142,27 @@ protected function _construct()
->assign('messages', $this->messageManager->getMessages(true));
}
+ /**
+ * @return Product
+ */
public function getProductInfo()
{
$product = $this->_productFactory->create();
return $product->load($this->getRequest()->getParam('id'));
}
+ /**
+ * @return string
+ */
public function getAction()
{
$productId = $this->getRequest()->getParam('id', false);
return $this->getUrl('review/product/post', array('id' => $productId));
}
+ /**
+ * @return RatingCollection
+ */
public function getRatings()
{
return $this->_ratingFactory->create()
diff --git a/app/code/Magento/Review/Block/Helper.php b/app/code/Magento/Review/Block/Helper.php
index a92e36adddc2f..98c04a9a85a1c 100644
--- a/app/code/Magento/Review/Block/Helper.php
+++ b/app/code/Magento/Review/Block/Helper.php
@@ -24,6 +24,10 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Block;
+
+use Magento\Catalog\Model\Product;
+
/**
* Review helper
*
@@ -31,10 +35,11 @@
* @package Magento_Review
* @author Magento Core Team
*/
-namespace Magento\Review\Block;
-
class Helper extends \Magento\View\Element\Template
{
+ /**
+ * @var array
+ */
protected $_availableTemplates = array(
'default' => 'helper/summary.phtml',
'short' => 'helper/summary_short.phtml'
@@ -59,6 +64,12 @@ public function __construct(
parent::__construct($context, $data);
}
+ /**
+ * @param Product $product
+ * @param string $templateType
+ * @param bool $displayIfNoReviews
+ * @return string
+ */
public function getSummaryHtml($product, $templateType, $displayIfNoReviews)
{
// pick template among available
@@ -77,16 +88,25 @@ public function getSummaryHtml($product, $templateType, $displayIfNoReviews)
return $this->toHtml();
}
+ /**
+ * @return string
+ */
public function getRatingSummary()
{
return $this->getProduct()->getRatingSummary()->getRatingSummary();
}
+ /**
+ * @return int
+ */
public function getReviewsCount()
{
return $this->getProduct()->getRatingSummary()->getReviewsCount();
}
+ /**
+ * @return string
+ */
public function getReviewsUrl()
{
return $this->getUrl('review/product/list', array(
@@ -102,6 +122,7 @@ public function getReviewsUrl()
*
* @param string $type
* @param string $template
+ * @return void
*/
public function addTemplate($type, $template)
{
diff --git a/app/code/Magento/Review/Block/Product/View.php b/app/code/Magento/Review/Block/Product/View.php
index 9ad39b65b6a26..93c8ed0d78580 100644
--- a/app/code/Magento/Review/Block/Product/View.php
+++ b/app/code/Magento/Review/Block/Product/View.php
@@ -23,6 +23,9 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Block\Product;
+
+use Magento\Review\Model\Resource\Review\Collection as ReviewCollection;
/**
* Product Reviews Page
@@ -31,12 +34,10 @@
* @package Magento_Review
* @author Magento Core Team
*/
-namespace Magento\Review\Block\Product;
-
class View extends \Magento\Catalog\Block\Product\View
{
/**
- * @var \Magento\Review\Model\Resource\Review\Collection
+ * @var ReviewCollection
*/
protected $_reviewsCollection;
@@ -155,6 +156,9 @@ public function getReviewsSummaryHtml(
;
}
+ /**
+ * @return ReviewCollection
+ */
public function getReviewsCollection()
{
if (null === $this->_reviewsCollection) {
diff --git a/app/code/Magento/Review/Block/Product/View/ListView.php b/app/code/Magento/Review/Block/Product/View/ListView.php
index 09e1dfc70a59b..a7f419253c757 100644
--- a/app/code/Magento/Review/Block/Product/View/ListView.php
+++ b/app/code/Magento/Review/Block/Product/View/ListView.php
@@ -23,6 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Block\Product\View;
/**
* Detailed Product Reviews
@@ -31,17 +32,24 @@
* @package Magento_Review
* @author Magento Core Team
*/
-namespace Magento\Review\Block\Product\View;
-
class ListView extends \Magento\Review\Block\Product\View
{
+ /**
+ * @var false
+ */
protected $_forceHasOptions = false;
+ /**
+ * @return int
+ */
public function getProductId()
{
return $this->_coreRegistry->registry('product')->getId();
}
+ /**
+ * @return $this
+ */
protected function _prepareLayout()
{
parent::_prepareLayout();
@@ -54,6 +62,9 @@ protected function _prepareLayout()
return $this;
}
+ /**
+ * @return $this
+ */
protected function _beforeToHtml()
{
$this->getReviewsCollection()
@@ -62,6 +73,9 @@ protected function _beforeToHtml()
return parent::_beforeToHtml();
}
+ /**
+ * @return string
+ */
public function getReviewUrl($id)
{
return $this->getUrl('*/*/view', array('id' => $id));
diff --git a/app/code/Magento/Review/Block/Product/View/Other.php b/app/code/Magento/Review/Block/Product/View/Other.php
index 2f204470c5cda..e4e6d04c2384d 100644
--- a/app/code/Magento/Review/Block/Product/View/Other.php
+++ b/app/code/Magento/Review/Block/Product/View/Other.php
@@ -24,11 +24,11 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Block\Product\View;
+
/**
* Product view other block
*/
-namespace Magento\Review\Block\Product\View;
-
class Other extends \Magento\View\Element\Template
{
/**
diff --git a/app/code/Magento/Review/Block/View.php b/app/code/Magento/Review/Block/View.php
index b66af65dd3450..080ecb97caf57 100644
--- a/app/code/Magento/Review/Block/View.php
+++ b/app/code/Magento/Review/Block/View.php
@@ -36,6 +36,9 @@
class View extends \Magento\Catalog\Block\Product\AbstractProduct
{
+ /**
+ * @var string
+ */
protected $_template = 'view.phtml';
/**
diff --git a/app/code/Magento/Review/Controller/Customer.php b/app/code/Magento/Review/Controller/Customer.php
index 791ab0b6d1848..6b557555a7d8c 100644
--- a/app/code/Magento/Review/Controller/Customer.php
+++ b/app/code/Magento/Review/Controller/Customer.php
@@ -70,6 +70,9 @@ public function dispatch(RequestInterface $request)
return parent::dispatch($request);
}
+ /**
+ * @return void
+ */
public function indexAction()
{
$this->_view->loadLayout();
@@ -87,6 +90,9 @@ public function indexAction()
$this->_view->renderLayout();
}
+ /**
+ * @return void
+ */
public function viewAction()
{
$this->_view->loadLayout();
diff --git a/app/code/Magento/Review/Controller/Product.php b/app/code/Magento/Review/Controller/Product.php
index ab4f2ff63799d..a90661fa3e9db 100644
--- a/app/code/Magento/Review/Controller/Product.php
+++ b/app/code/Magento/Review/Controller/Product.php
@@ -35,6 +35,7 @@
use Magento\App\Action\NotFoundException;
use Magento\App\RequestInterface;
+use Magento\Review\Model\Review;
class Product extends \Magento\App\Action\Action
{
@@ -241,8 +242,8 @@ protected function _loadProduct($productId)
* Load review model with data by passed id.
* Return false if review was not loaded or review is not approved.
*
- * @param $reviewId
- * @return bool|\Magento\Review\Model\Review
+ * @param int $reviewId
+ * @return bool|Review
*/
protected function _loadReview($reviewId)
{
@@ -251,7 +252,7 @@ protected function _loadReview($reviewId)
}
$review = $this->_reviewFactory->create()->load($reviewId);
- /* @var $review \Magento\Review\Model\Review */
+ /* @var $review Review */
if (!$review->getId()
|| !$review->isApproved()
|| !$review->isAvailableOnStore($this->_storeManager->getStore())
@@ -266,6 +267,8 @@ protected function _loadReview($reviewId)
/**
* Submit new review action
+ *
+ * @return void
*/
public function postAction()
{
@@ -289,14 +292,14 @@ public function postAction()
$session = $this->_session;
/* @var $session \Magento\Core\Model\Session */
$review = $this->_reviewFactory->create()->setData($data);
- /* @var $review \Magento\Review\Model\Review */
+ /* @var $review Review */
$validate = $review->validate();
if ($validate === true) {
try {
- $review->setEntityId($review->getEntityIdByCode(\Magento\Review\Model\Review::ENTITY_PRODUCT_CODE))
+ $review->setEntityId($review->getEntityIdByCode(Review::ENTITY_PRODUCT_CODE))
->setEntityPkValue($product->getId())
- ->setStatusId(\Magento\Review\Model\Review::STATUS_PENDING)
+ ->setStatusId(Review::STATUS_PENDING)
->setCustomerId($this->_customerSession->getCustomerId())
->setStoreId($this->_storeManager->getStore()->getId())
->setStores(array($this->_storeManager->getStore()->getId()))
@@ -339,6 +342,7 @@ public function postAction()
/**
* Show list of product's reviews
*
+ * @return void
*/
public function listAction()
{
@@ -373,6 +377,7 @@ public function listAction()
/**
* Show details of one review
*
+ * @return void
*/
public function viewAction()
{
@@ -396,6 +401,7 @@ public function viewAction()
/**
* Load specific layout handles by product type id
*
+ * @return void
*/
protected function _initProductLayout($product)
{
diff --git a/app/code/Magento/Review/Helper/Action/Pager.php b/app/code/Magento/Review/Helper/Action/Pager.php
index 651b24717bb1d..94321d412917b 100644
--- a/app/code/Magento/Review/Helper/Action/Pager.php
+++ b/app/code/Magento/Review/Helper/Action/Pager.php
@@ -66,6 +66,7 @@ public function __construct(
* Set storage id
*
* @param $storageId
+ * @return void
*/
public function setStorageId($storageId)
{
@@ -76,7 +77,7 @@ public function setStorageId($storageId)
* Set items to storage
*
* @param array $items
- * @return \Magento\Review\Helper\Action\Pager
+ * @return $this
*/
public function setItems(array $items)
{
@@ -88,6 +89,8 @@ public function setItems(array $items)
/**
* Load stored items
+ *
+ * @return void
*/
protected function _loadItems()
{
@@ -129,7 +132,6 @@ public function getPreviousItemId($id)
}
/**
- *
*
* @param mixed $value
* @return int|bool
diff --git a/app/code/Magento/Review/Model/Resource/Review.php b/app/code/Magento/Review/Model/Resource/Review.php
index 2010a0ac73f7a..a738d34a5134d 100644
--- a/app/code/Magento/Review/Model/Resource/Review.php
+++ b/app/code/Magento/Review/Model/Resource/Review.php
@@ -23,7 +23,9 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Model\Resource;
+use Magento\Core\Model\AbstractModel;
/**
* Review resource model
@@ -32,8 +34,6 @@
* @package Magento_Review
* @author Magento Core Team
*/
-namespace Magento\Review\Model\Resource;
-
class Review extends \Magento\Core\Model\Resource\Db\AbstractDb
{
/**
@@ -147,7 +147,7 @@ protected function _construct()
*
* @param string $field
* @param mixed $value
- * @param unknown_type $object
+ * @param AbstractModel $object
* @return \Zend_Db_Select
*/
protected function _getLoadSelect($field, $value, $object)
@@ -163,10 +163,10 @@ protected function _getLoadSelect($field, $value, $object)
/**
* Perform actions before object save
*
- * @param \Magento\Core\Model\AbstractModel $object
- * @return $this|\Magento\Core\Model\Resource\Db\AbstractDb
+ * @param AbstractModel $object
+ * @return $this
*/
- protected function _beforeSave(\Magento\Core\Model\AbstractModel $object)
+ protected function _beforeSave(AbstractModel $object)
{
if (!$object->getId()) {
$object->setCreatedAt($this->_date->gmtDate());
@@ -184,10 +184,10 @@ protected function _beforeSave(\Magento\Core\Model\AbstractModel $object)
/**
* Perform actions after object save
*
- * @param \Magento\Object $object
- * @return \Magento\Review\Model\Resource\Review
+ * @param AbstractModel $object
+ * @return $this
*/
- protected function _afterSave(\Magento\Core\Model\AbstractModel $object)
+ protected function _afterSave(AbstractModel $object)
{
$adapter = $this->_getWriteAdapter();
/**
@@ -249,10 +249,10 @@ protected function _afterSave(\Magento\Core\Model\AbstractModel $object)
/**
* Perform actions after object load
*
- * @param \Magento\Object $object
- * @return \Magento\Review\Model\Resource\Review
+ * @param AbstractModel $object
+ * @return $this
*/
- protected function _afterLoad(\Magento\Core\Model\AbstractModel $object)
+ protected function _afterLoad(AbstractModel $object)
{
$adapter = $this->_getReadAdapter();
$select = $adapter->select()
@@ -270,10 +270,10 @@ protected function _afterLoad(\Magento\Core\Model\AbstractModel $object)
/**
* Action before delete
*
- * @param \Magento\Core\Model\AbstractModel $object
- * @return \Magento\Review\Model\Resource\Review
+ * @param AbstractModel $object
+ * @return $this
*/
- protected function _beforeDelete(\Magento\Core\Model\AbstractModel $object)
+ protected function _beforeDelete(AbstractModel $object)
{
// prepare rating ids, that depend on review
$this->_deleteCache = array(
@@ -286,10 +286,10 @@ protected function _beforeDelete(\Magento\Core\Model\AbstractModel $object)
/**
* Perform actions after object delete
*
- * @param \Magento\Core\Model\AbstractModel $object
- * @return \Magento\Review\Model\Resource\Review
+ * @param AbstractModel $object
+ * @return $this
*/
- public function afterDeleteCommit(\Magento\Core\Model\AbstractModel $object)
+ public function afterDeleteCommit(AbstractModel $object)
{
$this->aggregate($object);
@@ -337,7 +337,8 @@ public function getTotalReviews($entityPkValue, $approvedOnly = false, $storeId
/**
* Aggregate
*
- * @param \Magento\Core\Model\AbstractModel $object
+ * @param AbstractModel $object
+ * @return void
*/
public function aggregate($object)
{
@@ -420,9 +421,9 @@ protected function _loadVotedRatingIds($reviewId)
* Aggregate this review's ratings.
* Useful, when changing the review.
*
- * @param array $ratingIds
+ * @param int[] $ratingIds
* @param int $entityPkValue
- * @return \Magento\Review\Model\Resource\Review
+ * @return $this
*/
protected function _aggregateRatings($ratingIds, $entityPkValue)
{
@@ -442,6 +443,7 @@ protected function _aggregateRatings($ratingIds, $entityPkValue)
*
* @param int $reviewId
* @param int $entityPkValue
+ * @return void
*/
public function reAggregateReview($reviewId, $entityPkValue)
{
diff --git a/app/code/Magento/Review/Model/Resource/Review/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Collection.php
index ba06eae13fdd0..0ccbe91e17361 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Collection.php
@@ -140,7 +140,7 @@ protected function _construct()
/**
* init select
*
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
protected function _initSelect()
{
@@ -154,7 +154,7 @@ protected function _initSelect()
/**
* @param int|string $customerId
- * @return \Magento\Review\Model\Resource\Review\Collection
+ * @return $this
*/
public function addCustomerFilter($customerId)
{
@@ -167,8 +167,8 @@ public function addCustomerFilter($customerId)
/**
* Add store filter
*
- * @param int|array $storeId
- * @return \Magento\Review\Model\Resource\Review\Collection
+ * @param int|int[] $storeId
+ * @return $this
*/
public function addStoreFilter($storeId)
{
@@ -183,7 +183,7 @@ public function addStoreFilter($storeId)
/**
* Add stores data
*
- * @return \Magento\Review\Model\Resource\Review\Collection
+ * @return $this
*/
public function addStoreData()
{
@@ -196,7 +196,7 @@ public function addStoreData()
*
* @param int|string $entity
* @param int $pkValue
- * @return \Magento\Review\Model\Resource\Review\Collection
+ * @return $this
*/
public function addEntityFilter($entity, $pkValue)
{
@@ -225,7 +225,7 @@ public function addEntityFilter($entity, $pkValue)
* Add status filter
*
* @param int|string $status
- * @return \Magento\Review\Model\Resource\Review\Collection
+ * @return $this
*/
public function addStatusFilter($status)
{
@@ -245,7 +245,7 @@ public function addStatusFilter($status)
* Set date order
*
* @param string $dir
- * @return \Magento\Review\Model\Resource\Review\Collection
+ * @return $this
*/
public function setDateOrder($dir = 'DESC')
{
@@ -256,7 +256,7 @@ public function setDateOrder($dir = 'DESC')
/**
* Add rate votes
*
- * @return \Magento\Review\Model\Resource\Review\Collection
+ * @return $this
*/
public function addRateVotes()
{
@@ -276,7 +276,7 @@ public function addRateVotes()
/**
* Add reviews total count
*
- * @return \Magento\Review\Model\Resource\Review\Collection
+ * @return $this
*/
public function addReviewsTotalCount()
{
@@ -295,7 +295,7 @@ public function addReviewsTotalCount()
*
* @param boolean $printQuery
* @param boolean $logQuery
- * @return \Magento\Review\Model\Resource\Review\Collection
+ * @return $this
*/
public function load($printQuery = false, $logQuery = false)
{
@@ -313,6 +313,7 @@ public function load($printQuery = false, $logQuery = false)
/**
* Add store data
*
+ * @return void
*/
protected function _addStoreData()
{
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 c4cfe55e4d327..0ddcd16cb2a72 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
@@ -23,7 +23,9 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Model\Resource\Review\Product;
+use \Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
/**
* Review Product Collection
@@ -32,8 +34,6 @@
* @package Magento_Review
* @author Magento Core Team
*/
-namespace Magento\Review\Model\Resource\Review\Product;
-
class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
{
/**
@@ -53,11 +53,10 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
/**
* Add store data flag
*
- * @var boolean
+ * @var bool
*/
protected $_addStoreDataFlag = false;
-
/**
* Filter by stores for the collection
*
@@ -162,7 +161,7 @@ protected function _construct()
/**
* init select
*
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
protected function _initSelect()
{
@@ -174,8 +173,8 @@ protected function _initSelect()
/**
* Adds store filter into array
*
- * @param mixed $storeId
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @param int|int[] $storeId
+ * @return $this
*/
public function addStoreFilter($storeId = null)
{
@@ -202,7 +201,7 @@ public function addStoreFilter($storeId = null)
* Adds specific store id into array
*
* @param array $storeId
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
public function setStoreFilter($storeId)
{
@@ -227,7 +226,7 @@ public function setStoreFilter($storeId)
* Applies all store filters in one place to prevent multiple joins in select
*
* @param null|Zend_Db_Select $select
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
protected function _applyStoresFilterToSelect(\Zend_Db_Select $select = null)
{
@@ -259,7 +258,7 @@ protected function _applyStoresFilterToSelect(\Zend_Db_Select $select = null)
/**
* Add stores data
*
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
public function addStoreData()
{
@@ -271,7 +270,7 @@ public function addStoreData()
* Add customer filter
*
* @param int $customerId
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
public function addCustomerFilter($customerId)
{
@@ -284,7 +283,7 @@ public function addCustomerFilter($customerId)
* Add entity filter
*
* @param int $entityId
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
public function addEntityFilter($entityId)
{
@@ -296,8 +295,8 @@ public function addEntityFilter($entityId)
/**
* Add status filter
*
- * @param mixed $status
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @param int $status
+ * @return $this
*/
public function addStatusFilter($status)
{
@@ -310,7 +309,7 @@ public function addStatusFilter($status)
* Set date order
*
* @param string $dir
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
public function setDateOrder($dir = 'DESC')
{
@@ -321,7 +320,7 @@ public function setDateOrder($dir = 'DESC')
/**
* Add review summary
*
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
public function addReviewSummary()
{
@@ -336,7 +335,7 @@ public function addReviewSummary()
/**
* Add rote votes
*
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
public function addRateVotes()
{
@@ -352,9 +351,9 @@ public function addRateVotes()
}
/**
- * join fields to entity
+ * Join fields to entity
*
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
protected function _joinFields()
{
@@ -428,7 +427,7 @@ public function getSelectCountSql()
*
* @param string $attribute
* @param string $dir
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
public function setOrder($attribute, $dir = 'DESC')
{
@@ -457,10 +456,10 @@ public function setOrder($attribute, $dir = 'DESC')
/**
* Add attribute to filter
*
- * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|string $attribute
- * @param array $condition
+ * @param AbstractAttribute|string $attribute
+ * @param array|null $condition
* @param string $joinType
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
{
@@ -527,7 +526,7 @@ public function getColumnValues($colName)
/**
* Action after load
*
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
protected function _afterLoad()
{
@@ -541,6 +540,7 @@ protected function _afterLoad()
/**
* Add store data
*
+ * @return void
*/
protected function _addStoreData()
{
@@ -577,7 +577,7 @@ protected function _addStoreData()
/**
* Redeclare parent method for store filters applying
*
- * @return \Magento\Review\Model\Resource\Review\Product\Collection
+ * @return $this
*/
protected function _beforeLoad()
{
diff --git a/app/code/Magento/Review/Model/Resource/Review/Summary.php b/app/code/Magento/Review/Model/Resource/Review/Summary.php
index 2f44a63753ae6..97ddf61f1eaa9 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Summary.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Summary.php
@@ -23,7 +23,9 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Model\Resource\Review;
+use Magento\Core\Model\AbstractModel;
/**
* Review summary resource model
@@ -32,8 +34,6 @@
* @package Magento_Review
* @author Magento Core Team
*/
-namespace Magento\Review\Model\Resource\Review;
-
class Summary extends \Magento\Core\Model\Resource\Db\AbstractDb
{
/**
@@ -50,8 +50,8 @@ protected function _construct()
*
* @param string $field
* @param mixed $value
- * @param \Magento\Core\Model\AbstractModel $object
- * @return unknown
+ * @param AbstractModel $object
+ * @return \Zend_Db_Select
*/
protected function _getLoadSelect($field, $value, $object)
{
diff --git a/app/code/Magento/Review/Model/Review.php b/app/code/Magento/Review/Model/Review.php
index 252465010c7f5..2ce301b60d6cd 100644
--- a/app/code/Magento/Review/Model/Review.php
+++ b/app/code/Magento/Review/Model/Review.php
@@ -23,6 +23,11 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Model;
+
+use Magento\Review\Model\Resource\Review\Product\Collection as ProductCollection;
+use Magento\Review\Model\Resource\Review\Status\Collection as StatusCollection;
+use Magento\Catalog\Model\Product;
/**
* Review model
@@ -41,8 +46,6 @@
* @package Magento_Review
* @author Magento Core Team
*/
-namespace Magento\Review\Model;
-
class Review extends \Magento\Core\Model\AbstractModel
{
/**
@@ -142,27 +145,47 @@ protected function _construct()
$this->_init('Magento\Review\Model\Resource\Review');
}
+ /**
+ * @return ProductCollection
+ */
public function getProductCollection()
{
return $this->_productFactory->create();
}
+ /**
+ * @return StatusCollection
+ */
public function getStatusCollection()
{
return $this->_statusFactory->create();
}
+ /**
+ * @param int $entityPkValue
+ * @param bool approvedOnly
+ * @param int $storeId
+ * @return int
+ */
public function getTotalReviews($entityPkValue, $approvedOnly=false, $storeId=0)
{
return $this->getResource()->getTotalReviews($entityPkValue, $approvedOnly, $storeId);
}
+ /**
+ * @return $this
+ */
public function aggregate()
{
$this->getResource()->aggregate($this);
return $this;
}
+ /**
+ * @param Product $product
+ * @param int $storeId
+ * @return void
+ */
public function getEntitySummary($product, $storeId=0)
{
$summaryData = $this->_summaryModFactory->create()
@@ -173,16 +196,25 @@ public function getEntitySummary($product, $storeId=0)
$product->setRatingSummary($summary);
}
+ /**
+ * @return int
+ */
public function getPendingStatus()
{
return self::STATUS_PENDING;
}
+ /**
+ * @return string
+ */
public function getReviewUrl()
{
return $this->_urlModel->getUrl('review/product/view', array('id' => $this->getReviewId()));
}
+ /**
+ * @return bool|string[]
+ */
public function validate()
{
$errors = array();
@@ -219,8 +251,8 @@ protected function _afterDeleteCommit()
/**
* Append review summary to product collection
*
- * @param \Magento\Catalog\Model\Resource\Product\Collection $collection
- * @return \Magento\Review\Model\Review
+ * @param ProductCollection $collection
+ * @return $this
*/
public function appendSummary($collection)
{
@@ -249,6 +281,9 @@ public function appendSummary($collection)
return $this;
}
+ /**
+ * @return $this
+ */
protected function _beforeDelete()
{
$this->_protectFromNonAdmin();
diff --git a/app/code/Magento/Review/Model/Review/Summary.php b/app/code/Magento/Review/Model/Review/Summary.php
index 4118a2a5407c0..9ce693020bfa3 100644
--- a/app/code/Magento/Review/Model/Review/Summary.php
+++ b/app/code/Magento/Review/Model/Review/Summary.php
@@ -23,13 +23,11 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Review\Model\Review;
/**
* Review summary
*/
-
-namespace Magento\Review\Model\Review;
-
class Summary extends \Magento\Core\Model\AbstractModel
{
/**
@@ -49,16 +47,25 @@ public function __construct(
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
}
+ /**
+ * @return int
+ */
public function getEntityPkValue()
{
return $this->_getData('entity_pk_value');
}
+ /**
+ * @return string
+ */
public function getRatingSummary()
{
return $this->_getData('rating_summary');
}
+ /**
+ * @return int
+ */
public function getReviewsCount()
{
return $this->_getData('reviews_count');
diff --git a/app/code/Magento/Review/etc/frontend/di.xml b/app/code/Magento/Review/etc/frontend/di.xml
index 97900597754f7..0959fd7c574db 100644
--- a/app/code/Magento/Review/etc/frontend/di.xml
+++ b/app/code/Magento/Review/etc/frontend/di.xml
@@ -50,16 +50,16 @@
-
- /review/customer/
-
+
+ /review/customer/
-
- post
-
+
+ post
diff --git a/app/code/Magento/Rss/App/Action/Plugin/Authentication.php b/app/code/Magento/Rss/App/Action/Plugin/Authentication.php
index d5a579d2ed2c5..8cd80cb51b846 100644
--- a/app/code/Magento/Rss/App/Action/Plugin/Authentication.php
+++ b/app/code/Magento/Rss/App/Action/Plugin/Authentication.php
@@ -56,7 +56,7 @@ class Authentication extends \Magento\Backend\App\Action\Plugin\Authentication
/**
* @param \Magento\Backend\Model\Auth $auth
- * @param \Magento\Backend\Model\Url $url
+ * @param \Magento\Backend\Model\UrlInterface $url
* @param \Magento\App\ResponseInterface $response
* @param \Magento\App\ActionFlag $actionFlag
* @param \Magento\Message\ManagerInterface $messageManager
@@ -66,7 +66,7 @@ class Authentication extends \Magento\Backend\App\Action\Plugin\Authentication
*/
public function __construct(
\Magento\Backend\Model\Auth $auth,
- \Magento\Backend\Model\Url $url,
+ \Magento\Backend\Model\UrlInterface $url,
\Magento\App\ResponseInterface $response,
\Magento\App\ActionFlag $actionFlag,
\Magento\Message\ManagerInterface $messageManager,
diff --git a/app/code/Magento/Rss/Block/Catalog/AbstractCatalog.php b/app/code/Magento/Rss/Block/Catalog/AbstractCatalog.php
index 5244c5699c48b..cf0e59c185a7f 100644
--- a/app/code/Magento/Rss/Block/Catalog/AbstractCatalog.php
+++ b/app/code/Magento/Rss/Block/Catalog/AbstractCatalog.php
@@ -29,23 +29,15 @@
class AbstractCatalog extends \Magento\Rss\Block\AbstractBlock
{
/**
- * Stored price block instances
- * @var array
+ * Block alias fallback
*/
- protected $_priceBlock = array();
+ const DEFAULT_TYPE = 'default';
/**
- * Stored price blocks info
+ * Stored price block instances
* @var array
*/
- protected $_priceBlockTypes = array();
-
- /**
- * Default values for price block and template
- * @var string
- */
- protected $_priceBlockDefaultTemplate = 'rss/product/price.phtml';
- protected $_priceBlockDefaultType = 'Magento\Catalog\Block\Product\Price';
+ protected $_priceBlock = array();
/**
* Whether to show "As low as" as a link
@@ -87,37 +79,27 @@ public function __construct(
/**
* Return Price Block renderer for specified product type
*
- * @param string $productTypeId Catalog Product type
- * @return \Magento\View\Element\AbstractBlock
+ * @param string $type Catalog Product type
+ * @return \Magento\View\Element\Template
*/
- protected function _getPriceBlock($productTypeId)
+ protected function _getPriceBlock($type)
{
- if (!isset($this->_priceBlock[$productTypeId])) {
- $block = $this->_priceBlockDefaultType;
- if (isset($this->_priceBlockTypes[$productTypeId])) {
- if ($this->_priceBlockTypes[$productTypeId]['block'] != '') {
- $block = $this->_priceBlockTypes[$productTypeId]['block'];
- }
+ if (!isset($this->_priceBlock[$type])) {
+ /** @var \Magento\View\Element\RendererList $rendererList */
+ $rendererList = $this->getRendererListName()
+ ? $this->getLayout()->getBlock($this->getRendererListName())
+ : $this->getChildBlock('renderer.list');
+ if (!$rendererList) {
+ throw new \RuntimeException(
+ 'Renderer list for block "' . $this->getNameInLayout() . '" is not defined'
+ );
}
- $this->_priceBlock[$productTypeId] = $this->getLayout()->createBlock($block);
+ $overriddenTemplates = $this->getOverriddenTemplates() ?: array();
+ $template = isset($overriddenTemplates[$type]) ? $overriddenTemplates[$type] : $this->getRendererTemplate();
+ $renderer = $rendererList->getRenderer($type, self::DEFAULT_TYPE, $template);
+ $this->_priceBlock[$type] = $renderer;
}
- return $this->_priceBlock[$productTypeId];
- }
-
- /**
- * Return template for Price Block renderer
- *
- * @param string $productTypeId Catalog Product type
- * @return string
- */
- protected function _getPriceBlockTemplate($productTypeId)
- {
- if (isset($this->_priceBlockTypes[$productTypeId])) {
- if ($this->_priceBlockTypes[$productTypeId]['template'] != '') {
- return $this->_priceBlockTypes[$productTypeId]['template'];
- }
- }
- return $this->_priceBlockDefaultTemplate;
+ return $this->_priceBlock[$type];
}
/**
@@ -136,28 +118,10 @@ public function getPriceHtml($product, $displayMinimalPrice = false, $idSuffix='
}
return $this->_getPriceBlock($typeId)
- ->setTemplate($this->_getPriceBlockTemplate($typeId))
->setProduct($product)
->setDisplayMinimalPrice($displayMinimalPrice)
->setIdSuffix($idSuffix)
->setUseLinkForAsLowAs($this->_useLinkForAsLowAs)
->toHtml();
}
-
- /**
- * Adding customized price template for product type, used as action in layouts
- *
- * @param string $type Catalog Product Type
- * @param string $block Block Type
- * @param string $template Template
- */
- public function addPriceBlockType($type, $block = '', $template = '')
- {
- if ($type) {
- $this->_priceBlockTypes[$type] = array(
- 'block' => $block,
- 'template' => $template
- );
- }
- }
}
diff --git a/app/code/Magento/Rss/Block/Catalog/Review.php b/app/code/Magento/Rss/Block/Catalog/Review.php
index ded1c8572161c..f569004435741 100644
--- a/app/code/Magento/Rss/Block/Catalog/Review.php
+++ b/app/code/Magento/Rss/Block/Catalog/Review.php
@@ -51,18 +51,12 @@ class Review extends \Magento\Backend\Block\AbstractBlock
*/
protected $_storeManager;
- /**
- * @var \Magento\Core\Model\Url
- */
- protected $_urlModel;
-
/**
* @param \Magento\Backend\Block\Context $context
* @param \Magento\Rss\Model\RssFactory $rssFactory
* @param \Magento\Core\Model\Resource\Iterator $resourceIterator
* @param \Magento\Review\Model\ReviewFactory $reviewFactory
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Url $urlModel
* @param array $data
*/
public function __construct(
@@ -71,14 +65,12 @@ public function __construct(
\Magento\Core\Model\Resource\Iterator $resourceIterator,
\Magento\Review\Model\ReviewFactory $reviewFactory,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Url $urlModel,
array $data = array()
) {
$this->_rssFactory = $rssFactory;
$this->_resourceIterator = $resourceIterator;
$this->_reviewFactory = $reviewFactory;
$this->_storeManager = $storeManager;
- $this->_urlModel = $urlModel;
parent::__construct($context, $data);
}
@@ -130,8 +122,8 @@ public function addReviewItemXmlCallback($args)
$rssObj = $args['rssObj'];
$row = $args['row'];
- $productUrl = $this->_urlModel
- ->setStore($row['store_id'])
+ $productUrl = $this->_urlBuilder
+ ->setScope($row['store_id'])
->getUrl('catalog/product/view', array('id' => $row['entity_id']));
$reviewUrl = $this->getUrl(
'catalog/product_review/edit/',
diff --git a/app/code/Magento/Rss/Controller/Adminhtml/Authenticate.php b/app/code/Magento/Rss/Controller/Adminhtml/Authenticate.php
index 991f4381c059f..c025c09eccb38 100644
--- a/app/code/Magento/Rss/Controller/Adminhtml/Authenticate.php
+++ b/app/code/Magento/Rss/Controller/Adminhtml/Authenticate.php
@@ -39,6 +39,6 @@ class Authenticate extends \Magento\Backend\App\Action
public function __construct(Action\Context $context)
{
parent::__construct($context);
- $this->_objectManager->get('Magento\Backend\Model\Url')->turnOffSecretKey();
+ $this->_objectManager->get('Magento\Backend\Model\UrlInterface')->turnOffSecretKey();
}
}
diff --git a/app/code/Magento/Rss/Model/System/Config/Backend/Links.php b/app/code/Magento/Rss/Model/System/Config/Backend/Links.php
index 18b02f0d15452..84953cec8ddc3 100644
--- a/app/code/Magento/Rss/Model/System/Config/Backend/Links.php
+++ b/app/code/Magento/Rss/Model/System/Config/Backend/Links.php
@@ -41,7 +41,7 @@ class Links extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\App\Cache\TypeListInterface $cacheTypeList
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -51,7 +51,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\App\Cache\TypeListInterface $cacheTypeList,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Rss/view/frontend/layout/rss_catalog_category.xml b/app/code/Magento/Rss/view/frontend/layout/rss_catalog_category.xml
index e5d031662dbe5..ae600eef4793f 100644
--- a/app/code/Magento/Rss/view/frontend/layout/rss_catalog_category.xml
+++ b/app/code/Magento/Rss/view/frontend/layout/rss_catalog_category.xml
@@ -24,11 +24,8 @@
*/
-->
+
-
- msrp_rss
- Magento\Catalog\Block\Product\Price
- product/price_msrp_rss.phtml
-
+
diff --git a/app/code/Magento/Rss/view/frontend/layout/rss_catalog_new.xml b/app/code/Magento/Rss/view/frontend/layout/rss_catalog_new.xml
index 0961f315709e9..dfc688fd6bde0 100644
--- a/app/code/Magento/Rss/view/frontend/layout/rss_catalog_new.xml
+++ b/app/code/Magento/Rss/view/frontend/layout/rss_catalog_new.xml
@@ -24,11 +24,8 @@
*/
-->
+
-
- msrp_rss
- Magento\Catalog\Block\Product\Price
- product/price_msrp_rss.phtml
-
+
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/Grid.php
index ab034b11330ce..f21568db051d3 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/Grid.php
@@ -52,7 +52,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Payment\Helper\Data $paymentData
* @param \Magento\Sales\Model\Resource\Billing\Agreement\CollectionFactory $agreementFactory
@@ -61,7 +60,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Payment\Helper\Data $paymentData,
\Magento\Sales\Model\Resource\Billing\Agreement\CollectionFactory $agreementFactory,
@@ -71,7 +69,7 @@ public function __construct(
$this->_paymentData = $paymentData;
$this->_agreementFactory = $agreementFactory;
$this->_agreementModel = $agreementModel;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
index 002d19e665e4e..fae5615476164 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
@@ -43,27 +43,23 @@ class Info extends \Magento\Backend\Block\Template
*/
protected $_coreRegistry = null;
- /**
- * Core registry
- *
- * @var \Magento\Customer\Model\CustomerFactory
- */
- protected $_customerFactory;
+ /** @var \Magento\Customer\Service\V1\CustomerServiceInterface */
+ protected $_customerService;
/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Customer\Model\CustomerFactory $customerFactory
+ * @param \Magento\Customer\Service\V1\CustomerServiceInterface $customerService
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Core\Model\Registry $registry,
- \Magento\Customer\Model\CustomerFactory $customerFactory,
+ \Magento\Customer\Service\V1\CustomerServiceInterface $customerService,
array $data = array()
) {
$this->_coreRegistry = $registry;
- $this->_customerFactory = $customerFactory;
+ $this->_customerService = $customerService;
parent::__construct($context, $data);
}
@@ -126,11 +122,13 @@ protected function _toHtml()
{
$agreement = $this->_getBillingAgreement();
$this->setReferenceId($agreement->getReferenceId());
- $customer = $this->_customerFactory->create()->load($agreement->getCustomerId());
+ $customerId = $agreement->getCustomerId();
+ $customer = $this->_customerService->getCustomer($customerId);
+
+ $this->setCustomerEmail($customer->getEmail());
$this->setCustomerUrl(
- $this->getUrl('customer/index/edit', array('id' => $customer->getId()))
+ $this->getUrl('customer/index/edit', array('id' => $customerId))
);
- $this->setCustomerEmail($customer->getEmail());
$this->setStatus($agreement->getStatusLabel());
$this->setCreatedAt(
$this->formatDate($agreement->getCreatedAt(), 'short', true)
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Creditmemo/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Creditmemo/Grid.php
index 59c01c8d39232..e0480bfd91cfe 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Creditmemo/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Creditmemo/Grid.php
@@ -45,7 +45,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Sales\Model\Order\CreditmemoFactory $creditmemoFactory
* @param \Magento\Sales\Model\Resource\Order\Creditmemo\Grid\CollectionFactory $collectionFactory
@@ -53,7 +52,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Sales\Model\Order\CreditmemoFactory $creditmemoFactory,
\Magento\Sales\Model\Resource\Order\Creditmemo\Grid\CollectionFactory $collectionFactory,
@@ -61,7 +59,7 @@ public function __construct(
) {
$this->_creditmemoFactory = $creditmemoFactory;
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php b/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
index 29007f631b396..26967cda12b08 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
@@ -51,7 +51,6 @@ class Agreement
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Payment\Helper\Data $paymentData
* @param \Magento\Sales\Model\Resource\Billing\Agreement\CollectionFactory $agreementFactory
@@ -61,7 +60,6 @@ class Agreement
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Payment\Helper\Data $paymentData,
\Magento\Sales\Model\Resource\Billing\Agreement\CollectionFactory $agreementFactory,
@@ -72,7 +70,6 @@ public function __construct(
$this->_coreRegistry = $coreRegistry;
parent::__construct(
$context,
- $urlModel,
$backendHelper,
$paymentData,
$agreementFactory,
@@ -119,7 +116,7 @@ public function getTabTitle()
public function canShowTab()
{
$customer = $this->_coreRegistry->registry('current_customer');
- return (bool)$customer->getId();
+ return !is_null($customer);
}
/**
@@ -154,8 +151,12 @@ public function getAfter()
*/
protected function _prepareCollection()
{
+ $customerId = $this->_coreRegistry->registry('current_customer_id');
+ if (!$customerId) {
+ $customerId = $this->_coreRegistry->registry('current_customer')->getId();
+ }
$collection = $this->_agreementFactory->create()
- ->addFieldToFilter('customer_id', $this->_coreRegistry->registry('current_customer')->getId())
+ ->addFieldToFilter('customer_id', $customerId)
->setOrder('created_at');
$this->setCollection($collection);
return \Magento\Backend\Block\Widget\Grid::_prepareCollection();
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php b/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php
index f20749ec7480f..d589742d0d7a6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php
@@ -18,19 +18,17 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_Sales
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
* Adminhtml customer recurring profiles tab
- *
- * @author Magento Core Team
*/
namespace Magento\Sales\Block\Adminhtml\Customer\Edit\Tab\Recurring;
+use Magento\Customer\Controller\Adminhtml\Index as CustomerController;
+
class Profile
extends \Magento\Sales\Block\Adminhtml\Recurring\Profile\Grid
implements \Magento\Backend\Block\Widget\Tab\TabInterface
@@ -42,9 +40,13 @@ class Profile
*/
protected $_coreRegistry = null;
+ /**
+ * @var int
+ */
+ protected $_currentCustomerId;
+
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Payment\Helper\Data $paymentData
* @param \Magento\Sales\Model\Resource\Recurring\Profile\CollectionFactory $profileCollection
@@ -54,7 +56,6 @@ class Profile
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Payment\Helper\Data $paymentData,
\Magento\Sales\Model\Resource\Recurring\Profile\CollectionFactory $profileCollection,
@@ -63,9 +64,19 @@ public function __construct(
array $data = array()
) {
$this->_coreRegistry = $coreRegistry;
+
+ // @todo remove usage of REGISTRY_CURRENT_CUSTOMER in advantage of REGISTRY_CURRENT_CUSTOMER_ID
+ $currentCustomer = $this->_coreRegistry->registry(CustomerController::REGISTRY_CURRENT_CUSTOMER);
+ if ($currentCustomer) {
+ $this->_currentCustomerId = $currentCustomer->getId();
+ } else {
+ $this->_currentCustomerId = $this->_coreRegistry->registry(
+ CustomerController::REGISTRY_CURRENT_CUSTOMER_ID
+ );
+ }
+
parent::__construct(
$context,
- $urlModel,
$backendHelper,
$paymentData,
$profileCollection,
@@ -111,8 +122,7 @@ public function getTabTitle()
*/
public function canShowTab()
{
- $customer = $this->_coreRegistry->registry('current_customer');
- return (bool)$customer->getId();
+ return (bool)$this->_currentCustomerId;
}
/**
@@ -132,12 +142,18 @@ public function isHidden()
*/
protected function _prepareCollection()
{
- $collection = $this->_profileCollection->create()
- ->addFieldToFilter('customer_id', $this->_coreRegistry->registry('current_customer')->getId());
+ if (!$this->_currentCustomerId) {
+ return $this;
+ }
+
+ $collection = $this->_profileCollection->create()->addFieldToFilter('customer_id', $this->_currentCustomerId);
+
if (!$this->getParam($this->getVarNameSort())) {
$collection->setOrder('profile_id', 'desc');
}
+
$this->setCollection($collection);
+
return parent::_prepareCollection();
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Invoice/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Invoice/Grid.php
index cbe163e884030..5043c9b50e1fe 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Invoice/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Invoice/Grid.php
@@ -45,7 +45,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Sales\Model\Order\InvoiceFactory $invoiceFactory
* @param \Magento\Sales\Model\Resource\Order\Invoice\Grid\CollectionFactory $collectionFactory
@@ -53,7 +52,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Sales\Model\Order\InvoiceFactory $invoiceFactory,
\Magento\Sales\Model\Resource\Order\Invoice\Grid\CollectionFactory $collectionFactory,
@@ -61,7 +59,7 @@ public function __construct(
) {
$this->_invoiceFactory = $invoiceFactory;
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
index 15c4b2e2ad84e..348a185fc5a87 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -18,21 +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 Magento
- * @package Magento_Sales
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Adminhtml sales order edit address block
- *
- * @category Magento
- * @package Magento_Sales
- * @author Magento Core Team
- */
namespace Magento\Sales\Block\Adminhtml\Order\Address;
+/**
+ * Adminhtml sales order address block
+ */
class Form
extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
{
@@ -52,13 +46,12 @@ class Form
* @param \Magento\Data\FormFactory $formFactory
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Json\EncoderInterface $jsonEncoder
- * @param \Magento\Customer\Model\AddressFactory $addressFactory
- * @param \Magento\Customer\Model\FormFactory $customerFormFactory
- * @param \Magento\Backend\Helper\Addresses $adminhtmlAddresses
+ * @param \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory
* @param \Magento\Customer\Helper\Data $customerHelper
+ * @param \Magento\Customer\Service\V1\CustomerAddressServiceInterface $addressService
+ * @param \Magento\Customer\Helper\Address $addressHelper
* @param \Magento\Core\Model\Registry $registry
* @param array $data
- *
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -68,10 +61,10 @@ public function __construct(
\Magento\Data\FormFactory $formFactory,
\Magento\Core\Helper\Data $coreData,
\Magento\Json\EncoderInterface $jsonEncoder,
- \Magento\Customer\Model\AddressFactory $addressFactory,
- \Magento\Customer\Model\FormFactory $customerFormFactory,
- \Magento\Backend\Helper\Addresses $adminhtmlAddresses,
+ \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory,
\Magento\Customer\Helper\Data $customerHelper,
+ \Magento\Customer\Service\V1\CustomerAddressServiceInterface $addressService,
+ \Magento\Customer\Helper\Address $addressHelper,
\Magento\Core\Model\Registry $registry,
array $data = array()
) {
@@ -83,10 +76,10 @@ public function __construct(
$formFactory,
$coreData,
$jsonEncoder,
- $addressFactory,
$customerFormFactory,
- $adminhtmlAddresses,
$customerHelper,
+ $addressService,
+ $addressHelper,
$data
);
}
@@ -111,7 +104,9 @@ protected function _prepareForm()
parent::_prepareForm();
$this->_form->setId('edit_form');
$this->_form->setMethod('post');
- $this->_form->setAction($this->getUrl('sales/*/addressSave', array('address_id'=>$this->_getAddress()->getId())));
+ $this->_form->setAction(
+ $this->getUrl('sales/*/addressSave', array('address_id' => $this->_getAddress()->getId()))
+ );
$this->_form->setUseContainer(true);
return $this;
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
index 942ff0f5072fb..f70617314472a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
@@ -86,16 +86,6 @@ public function getQuote()
return $this->_getSession()->getQuote();
}
- /**
- * Retrieve customer model object
- *
- * @return \Magento\Customer\Model\Customer
- */
- public function getCustomer()
- {
- return $this->_getSession()->getCustomer();
- }
-
/**
* Retrieve customer identifier
*
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
index a6900f817f540..c2fba38e16e01 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
@@ -97,7 +97,7 @@ public function getAddressId()
/**
* Return billing address object
*
- * @return \Magento\Customer\Model\Address
+ * @return \Magento\Sales\Model\Quote\Address
*/
public function getAddress()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
index 982d4c3bf2f53..5b9b5708f4b2a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
@@ -18,40 +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 Magento
- * @package Magento_Sales
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Adminhtml sales order create sidebar
- *
- * @category Magento
- * @package Magento_Sales
- * @author Magento Core Team
- */
-
namespace Magento\Sales\Block\Adminhtml\Order\Create;
+/**
+ * Adminhtml sales order create form block
+ */
class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
- /**
- * @var \Magento\Customer\Model\FormFactory
- */
+ /** @var \Magento\Customer\Model\Metadata\FormFactory */
protected $_customerFormFactory;
- /**
- * @var \Magento\Json\EncoderInterface
- */
+ /** @var \Magento\Json\EncoderInterface */
protected $_jsonEncoder;
+ /** @var \Magento\Customer\Service\V1\CustomerAddressServiceInterface */
+ protected $_addressService;
+
/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Json\EncoderInterface $jsonEncoder
* @param \Magento\Backend\Model\Session\Quote $sessionQuote
* @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
- * @param \Magento\Customer\Model\FormFactory $customerFormFactory
+ * @param \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory
+ * @param \Magento\Customer\Service\V1\CustomerAddressServiceInterface $addressService
* @param array $data
*/
public function __construct(
@@ -59,11 +52,13 @@ public function __construct(
\Magento\Backend\Model\Session\Quote $sessionQuote,
\Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Json\EncoderInterface $jsonEncoder,
- \Magento\Customer\Model\FormFactory $customerFormFactory,
+ \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory,
+ \Magento\Customer\Service\V1\CustomerAddressServiceInterface $addressService,
array $data = array()
) {
$this->_jsonEncoder = $jsonEncoder;
$this->_customerFormFactory = $customerFormFactory;
+ $this->_addressService = $addressService;
parent::__construct($context, $sessionQuote, $orderCreate, $data);
}
@@ -75,6 +70,7 @@ protected function _construct()
/**
* Retrieve url for loading blocks
+ *
* @return string
*/
public function getLoadBlockUrl()
@@ -84,6 +80,7 @@ public function getLoadBlockUrl()
/**
* Retrieve url for form submiting
+ *
* @return string
*/
public function getSaveUrl()
@@ -102,7 +99,7 @@ public function getCustomerSelectorDisplay()
public function getStoreSelectorDisplay()
{
- $storeId = $this->getStoreId();
+ $storeId = $this->getStoreId();
$customerId = $this->getCustomerId();
if (!is_null($customerId) && !$storeId) {
return 'block';
@@ -112,7 +109,7 @@ public function getStoreSelectorDisplay()
public function getDataSelectorDisplay()
{
- $storeId = $this->getStoreId();
+ $storeId = $this->getStoreId();
$customerId = $this->getCustomerId();
if (!is_null($customerId) && $storeId) {
return 'block';
@@ -123,16 +120,17 @@ public function getDataSelectorDisplay()
public function getOrderDataJson()
{
$data = array();
- if (!is_null($this->getCustomerId())) {
+ if ($this->getCustomerId()) {
$data['customer_id'] = $this->getCustomerId();
$data['addresses'] = array();
-
- /* @var $addressForm \Magento\Customer\Model\Form */
- $addressForm = $this->_customerFormFactory->create()
- ->setFormCode('adminhtml_customer_address')
- ->setStore($this->getStore());
- foreach ($this->getCustomer()->getAddresses() as $address) {
- $data['addresses'][$address->getId()] = $addressForm->setEntity($address)
+ $addresses = $this->_addressService->getAddresses($this->getCustomerId());
+ foreach ($addresses as $addressDto) {
+ $addressForm = $this->_customerFormFactory->create(
+ 'customer_address',
+ 'adminhtml_customer_address',
+ $addressDto->__toArray()
+ );
+ $data['addresses'][$addressDto->getId()] = $addressForm
->outputData(\Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON);
}
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index 36d1aa152fa39..8b028e58fe9ff 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -160,7 +160,7 @@ protected function _addAdditionalFormElementData(\Magento\Data\Form\Element\Abst
/**
* Add rendering EAV attributes to Form element
*
- * @param array|\Magento\Data\Collection $attributes
+ * @param \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata[] $attributes
* @param \Magento\Data\Form\AbstractForm $form
* @return \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
*/
@@ -174,16 +174,14 @@ protected function _addAttributesToForm($attributes, \Magento\Data\Form\Abstract
$renderers = $this->_getAdditionalFormElementRenderers();
foreach ($attributes as $attribute) {
- /** @var $attribute \Magento\Customer\Model\Attribute */
- $attribute->setStoreId($this->_sessionQuote->getStoreId());
- $inputType = $attribute->getFrontend()->getInputType();
+ $inputType = $attribute->getFrontendInput();
if ($inputType) {
$element = $form->addField($attribute->getAttributeCode(), $inputType, array(
'name' => $attribute->getAttributeCode(),
'label' => __($attribute->getStoreLabel()),
- 'class' => $attribute->getFrontend()->getClass(),
- 'required' => $attribute->getIsRequired(),
+ 'class' => $attribute->getFrontendClass(),
+ 'required' => $attribute->isRequired(),
));
if ($inputType == 'multiline') {
$element->setLineCount($attribute->getMultilineCount());
@@ -196,7 +194,11 @@ protected function _addAttributesToForm($attributes, \Magento\Data\Form\Abstract
}
if ($inputType == 'select' || $inputType == 'multiselect') {
- $element->setValues($attribute->getFrontend()->getSelectOptions());
+ $options = array();
+ foreach ($attribute->getOptions() as $optionDto) {
+ $options[] = $optionDto->__toArray();
+ }
+ $element->setValues($options);
} else if ($inputType == 'date') {
$format = $this->_locale->getDateFormat(\Magento\Core\Model\LocaleInterface::FORMAT_TYPE_SHORT);
$element->setImage($this->getViewFileUrl('images/grid-cal.gif'));
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index c08c18eb0a6e3..363f0cf19638c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -34,22 +34,20 @@
class Account extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
{
/**
- * @var \Magento\Customer\Model\CustomerFactory
+ * @var \Magento\Customer\Model\Metadata\FormFactory
*/
- protected $_customerFactory;
+ protected $_metadataFormFactory;
- /**
- * @var \Magento\Customer\Model\FormFactory
- */
- protected $_customerFormFactory;
+ /** @var \Magento\Customer\Service\V1\CustomerServiceInterface */
+ protected $_customerService;
/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Backend\Model\Session\Quote $sessionQuote
* @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Data\FormFactory $formFactory
- * @param \Magento\Customer\Model\CustomerFactory $customerFactory
- * @param \Magento\Customer\Model\FormFactory $customerFormFactory
+ * @param \Magento\Customer\Model\Metadata\FormFactory $metadataFormFactory
+ * @param \Magento\Customer\Service\V1\CustomerServiceInterface $customerService
* @param array $data
*/
public function __construct(
@@ -57,12 +55,12 @@ public function __construct(
\Magento\Backend\Model\Session\Quote $sessionQuote,
\Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Data\FormFactory $formFactory,
- \Magento\Customer\Model\CustomerFactory $customerFactory,
- \Magento\Customer\Model\FormFactory $customerFormFactory,
+ \Magento\Customer\Model\Metadata\FormFactory $metadataFormFactory,
+ \Magento\Customer\Service\V1\CustomerServiceInterface $customerService,
array $data = array()
) {
- $this->_customerFactory = $customerFactory;
- $this->_customerFormFactory = $customerFormFactory;
+ $this->_metadataFormFactory = $metadataFormFactory;
+ $this->_customerService = $customerService;
parent::__construct($context, $sessionQuote, $orderCreate, $formFactory, $data);
}
@@ -93,22 +91,18 @@ public function getHeaderText()
*/
protected function _prepareForm()
{
- /* @var $customerModel \Magento\Customer\Model\Customer */
- $customerModel = $this->_customerFactory->create();
-
- /* @var $customerForm \Magento\Customer\Model\Form */
- $customerForm = $this->_customerFormFactory->create();
- $customerForm->setFormCode('adminhtml_checkout')
- ->setStore($this->getStore())
- ->setEntity($customerModel);
+ /** @var \Magento\Customer\Model\Metadata\Form $customerForm */
+ $customerForm = $this->_metadataFormFactory->create(
+ 'customer',
+ 'adminhtml_checkout'
+ );
// prepare customer attributes to show
- $attributes = array();
+ $attributes = [];
// add system required attributes
foreach ($customerForm->getSystemAttributes() as $attribute) {
- /* @var $attribute \Magento\Customer\Model\Attribute */
- if ($attribute->getIsRequired()) {
+ if ($attribute->isRequired()) {
$attributes[$attribute->getAttributeCode()] = $attribute;
}
}
@@ -119,7 +113,6 @@ protected function _prepareForm()
// add user defined attributes
foreach ($customerForm->getUserAttributes() as $attribute) {
- /* @var $attribute \Magento\Customer\Model\Attribute */
$attributes[$attribute->getAttributeCode()] = $attribute;
}
@@ -157,7 +150,12 @@ protected function _addAdditionalFormElementData(\Magento\Data\Form\Element\Abst
*/
public function getFormValues()
{
- $data = $this->getCustomer()->getData();
+ try {
+ $customer = $this->_customerService->getCustomer($this->getCustomerId());
+ } catch (\Exception $e) {
+ /** If customer does not exist do nothing. */
+ }
+ $data = isset($customer) ? $customer->__toArray() : array();
foreach ($this->getQuote()->getData() as $key => $value) {
if (strpos($key, 'customer_') === 0) {
$data[substr($key, 9)] = $value;
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
index 5c636f2791dff..84b9b7eb8a9b2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -33,30 +33,10 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
-class Address
- extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
+class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
{
/**
- * Customer Address Form instance
- *
- * @var \Magento\Customer\Model\Form
- */
- protected $_addressForm;
-
- /**
- * Adminhtml addresses
- *
- * @var \Magento\Backend\Helper\Addresses
- */
- protected $_adminhtmlAddresses = null;
-
- /**
- * @var \Magento\Customer\Model\AddressFactory
- */
- protected $_addressFactory;
-
- /**
- * @var \Magento\Customer\Model\FormFactory
+ * @var \Magento\Customer\Model\Metadata\FormFactory
*/
protected $_customerFormFactory;
@@ -75,6 +55,16 @@ class Address
*/
protected $_customerHelper;
+ /**
+ * @var \Magento\Customer\Service\V1\CustomerAddressServiceInterface
+ */
+ protected $_addressService;
+
+ /**
+ * @var \Magento\Customer\Helper\Address
+ */
+ protected $_addressHelper;
+
/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Backend\Model\Session\Quote $sessionQuote
@@ -82,12 +72,12 @@ class Address
* @param \Magento\Data\FormFactory $formFactory
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Json\EncoderInterface $jsonEncoder
- * @param \Magento\Customer\Model\AddressFactory $addressFactory
- * @param \Magento\Customer\Model\FormFactory $customerFormFactory
- * @param \Magento\Backend\Helper\Addresses $adminhtmlAddresses
+ * @param \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory
* @param \Magento\Customer\Helper\Data $customerHelper
+ * @param \Magento\Customer\Service\V1\CustomerAddressServiceInterface $addressService
+ * @param \Magento\Customer\Helper\Address $addressHelper
* @param array $data
- *
+ *
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -97,18 +87,18 @@ public function __construct(
\Magento\Data\FormFactory $formFactory,
\Magento\Core\Helper\Data $coreData,
\Magento\Json\EncoderInterface $jsonEncoder,
- \Magento\Customer\Model\AddressFactory $addressFactory,
- \Magento\Customer\Model\FormFactory $customerFormFactory,
- \Magento\Backend\Helper\Addresses $adminhtmlAddresses,
+ \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory,
\Magento\Customer\Helper\Data $customerHelper,
+ \Magento\Customer\Service\V1\CustomerAddressServiceInterface $addressService,
+ \Magento\Customer\Helper\Address $addressHelper,
array $data = array()
) {
$this->_customerHelper = $customerHelper;
$this->_coreData = $coreData;
$this->_jsonEncoder = $jsonEncoder;
- $this->_addressFactory = $addressFactory;
$this->_customerFormFactory = $customerFormFactory;
- $this->_adminhtmlAddresses = $adminhtmlAddresses;
+ $this->_addressService = $addressService;
+ $this->_addressHelper = $addressHelper;
parent::__construct($context, $sessionQuote, $orderCreate, $formFactory, $data);
}
@@ -123,28 +113,16 @@ public function getConfig($path)
return $this->_storeConfig->getConfig($path);
}
/**
- * Return Customer Address Collection as array
+ * Retrieve current customer address DTOs collection.
*
- * @return array
+ * @return \Magento\Customer\Service\V1\Dto\Address[]
*/
public function getAddressCollection()
{
- return $this->getCustomer()->getAddresses();
- }
-
- /**
- * Return customer address form instance
- *
- * @return \Magento\Customer\Model\Form
- */
- protected function _getAddressForm()
- {
- if (is_null($this->_addressForm)) {
- $this->_addressForm = $this->_customerFormFactory->create()
- ->setFormCode('adminhtml_customer_address')
- ->setStore($this->getStore());
+ if ($this->getCustomerId()) {
+ return $this->_addressService->getAddresses($this->getCustomerId());
}
- return $this->_addressForm;
+ return [];
}
/**
@@ -154,18 +132,20 @@ protected function _getAddressForm()
*/
public function getAddressCollectionJson()
{
- $addressForm = $this->_getAddressForm();
- $data = array();
-
- $emptyAddress = $this->getCustomer()
- ->getAddressById(null)
- ->setCountryId($this->_coreData->getDefaultCountry($this->getStore()));
- $data[0] = $addressForm->setEntity($emptyAddress)
- ->outputData(\Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON);
-
- foreach ($this->getAddressCollection() as $address) {
- $addressForm->setEntity($address);
- $data[$address->getId()] = $addressForm->outputData(
+ $defaultCountryId = $this->_coreData->getDefaultCountry($this->getStore());
+ $emptyAddressForm = $this->_customerFormFactory->create(
+ 'customer_address',
+ 'adminhtml_customer_address',
+ [\Magento\Customer\Service\V1\Dto\Address::KEY_COUNTRY_ID => $defaultCountryId]
+ );
+ $data = [0 => $emptyAddressForm->outputData(\Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON)];
+ foreach ($this->getAddressCollection() as $addressDto) {
+ $addressForm = $this->_customerFormFactory->create(
+ 'customer_address',
+ 'adminhtml_customer_address',
+ $addressDto->__toArray()
+ );
+ $data[$addressDto->getId()] = $addressForm->outputData(
\Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON
);
}
@@ -175,6 +155,8 @@ public function getAddressCollectionJson()
/**
* Prepare Form and add elements to form
*
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
* @return \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
*/
protected function _prepareForm()
@@ -183,17 +165,11 @@ protected function _prepareForm()
'no_container' => true
));
- /* @var $addressModel \Magento\Customer\Model\Address */
- $addressModel = $this->_addressFactory->create();
-
- $addressForm = $this->_getAddressForm()
- ->setEntity($addressModel);
-
+ $addressForm = $this->_customerFormFactory->create(
+ 'customer_address',
+ 'adminhtml_customer_address'
+ );
$attributes = $addressForm->getAttributes();
- if (isset($attributes['street'])) {
- $this->_adminhtmlAddresses
- ->processStreetAttribute($attributes['street']);
- }
$this->_addAttributesToForm($attributes, $fieldset);
$prefixElement = $this->_form->getElement('prefix');
@@ -291,13 +267,18 @@ public function getAddressId()
}
/**
- * Return customer address formated as one-line string
+ * Represent customer address in 'online' format.
*
- * @param \Magento\Customer\Model\Address $address
+ * @param \Magento\Customer\Service\V1\Dto\Address $addressData
* @return string
*/
- public function getAddressAsString($address)
+ public function getAddressAsString($addressData)
{
- return $this->escapeHtml($address->format('oneline'));
+ $formatTypeRenderer = $this->_addressHelper->getFormatTypeRenderer('oneline');
+ $result = '';
+ if ($formatTypeRenderer) {
+ $result = $formatTypeRenderer->renderArray($addressData->__toArray());
+ }
+ return $this->escapeHtml($result);
}
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Header.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Header.php
index 1a192c33cb712..64a59582d9f9d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Header.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Header.php
@@ -18,46 +18,97 @@
* 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_Sales
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
+
/**
* Create order form header
- *
- * @author Magento Core Team
*/
-namespace Magento\Sales\Block\Adminhtml\Order\Create;
-
class Header extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
+ /** @var \Magento\Customer\Service\V1\CustomerServiceInterface */
+ protected $_customerService;
+
+ /** @var \Magento\Customer\Helper\View */
+ protected $_customerViewHelper;
+
+ /**
+ * Initialize dependencies.
+ *
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Backend\Model\Session\Quote $sessionQuote
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
+ * @param \Magento\Customer\Service\V1\CustomerServiceInterface $customerService
+ * @param \Magento\Customer\Helper\View $customerViewHelper
+ * @param array $data
+ */
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Backend\Model\Session\Quote $sessionQuote,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
+ \Magento\Customer\Service\V1\CustomerServiceInterface $customerService,
+ \Magento\Customer\Helper\View $customerViewHelper,
+ array $data = array()
+ ) {
+ $this->_customerService = $customerService;
+ $this->_customerViewHelper = $customerViewHelper;
+ parent::__construct($context, $sessionQuote, $orderCreate, $data);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
protected function _toHtml()
{
if ($this->_getSession()->getOrder()->getId()) {
return __('Edit Order #%1', $this->_getSession()->getOrder()->getIncrementId());
}
+ $out = $this->_getCreateOrderTitle();
+ return $this->escapeHtml($out);
+ }
+ /**
+ * Generate title for new order creation page.
+ *
+ * @return string
+ */
+ protected function _getCreateOrderTitle()
+ {
$customerId = $this->getCustomerId();
- $storeId = $this->getStoreId();
+ $storeId = $this->getStoreId();
$out = '';
if ($customerId && $storeId) {
- $out.= __('Create New Order for %1 in %2', $this->getCustomer()->getName(), $this->getStore()->getName());
- }
- elseif (!is_null($customerId) && $storeId){
- $out.= __('Create New Order for New Customer in %1', $this->getStore()->getName());
- }
- elseif ($customerId) {
- $out.= __('Create New Order for %1', $this->getCustomer()->getName());
- }
- elseif (!is_null($customerId)){
- $out.= __('Create New Order for New Customer');
+ $out .= __(
+ 'Create New Order for %1 in %2',
+ $this->_getCustomerName($customerId),
+ $this->getStore()->getName()
+ );
+ return $out;
+ } elseif (!$customerId && $storeId) {
+ $out .= __('Create New Order for New Customer in %1', $this->getStore()->getName());
+ return $out;
+ } elseif ($customerId && !$storeId) {
+ $out .= __('Create New Order for %1', $this->_getCustomerName($customerId));
+ return $out;
+ } elseif (!$customerId && !$storeId) {
+ $out .= __('Create New Order for New Customer');
+ return $out;
}
- else {
- $out.= __('Create New Order');
- }
- $out = $this->escapeHtml($out);
return $out;
}
+
+ /**
+ * Get customer name by his ID.
+ *
+ * @param int $customerId
+ * @return string
+ */
+ protected function _getCustomerName($customerId)
+ {
+ $customerData = $this->_customerService->getCustomer($customerId);
+ return $this->_customerViewHelper->getCustomerName($customerData);
+ }
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
index 2d27a4fdc2133..24c9cfe6bae84 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
@@ -57,7 +57,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\Catalog\Model\Config $catalogConfig
@@ -67,7 +66,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\Catalog\Model\Config $catalogConfig,
@@ -79,7 +77,7 @@ public function __construct(
$this->_catalogConfig = $catalogConfig;
$this->_sessionQuote = $sessionQuote;
$this->_salesConfig = $salesConfig;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
index 734d7e9627670..ec9d7ab7f05dd 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
@@ -36,6 +36,25 @@
class Qty
extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Input
{
+ /**
+ * @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
+ */
+ protected $typeConfig;
+
+ /**
+ * @param \Magento\Backend\Block\Context $context
+ * @param \Magento\Catalog\Model\ProductTypes\ConfigInterface $typeConfig
+ * @param array $data
+ */
+ public function __construct(
+ \Magento\Backend\Block\Context $context,
+ \Magento\Catalog\Model\ProductTypes\ConfigInterface $typeConfig,
+ array $data = array()
+ ) {
+ parent::__construct($context, $data);
+ $this->typeConfig = $typeConfig;
+ }
+
/**
* Returns whether this qty field must be inactive
*
@@ -44,7 +63,7 @@ class Qty
*/
protected function _isInactive($row)
{
- return $row->getTypeId() == \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE;
+ return $this->typeConfig->isProductSet($row->getTypeId());
}
/**
@@ -56,10 +75,13 @@ protected function _isInactive($row)
public function render(\Magento\Object $row)
{
// Prepare values
- $isInactive = $this->_isInactive($row);
+ $disabled = '';
+ $addClass = '';
- if ($isInactive) {
+ if ($this->_isInactive($row)) {
$qty = '';
+ $disabled = 'disabled="disabled" ';
+ $addClass = ' input-inactive';
} else {
$qty = $row->getData($this->getColumn()->getIndex());
$qty *= 1;
@@ -71,11 +93,8 @@ public function render(\Magento\Object $row)
// Compose html
$html = 'getColumn()->getId() . '" ';
- $html .= 'value="' . $qty . '" ';
- if ($isInactive) {
- $html .= 'disabled="disabled" ';
- }
- $html .= 'class="input-text ' . $this->getColumn()->getInlineCss() . ($isInactive ? ' input-inactive' : '') . '" />';
+ $html .= 'value="' . $qty . '" ' . $disabled;
+ $html .= 'class="input-text ' . $this->getColumn()->getInlineCss() . $addClass . '" />';
return $html;
}
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
index da382631565be..313aab696aca1 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
@@ -34,8 +34,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Create\Shipping;
-class Address
- extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
+class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
{
/**
* Return header text
@@ -127,7 +126,7 @@ public function getAddressId()
/**
* Return address object
*
- * @return \Magento\Customer\Model\Address
+ * @return \Magento\Sales\Model\Quote\Address
*/
public function getAddress()
{
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 1529106211fc2..42854d006252a 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
@@ -168,7 +168,7 @@ public function getItems()
/*
* Filtering items by allowed product type
*/
- foreach($items as $key => $item) {
+ foreach ($items as $key => $item) {
if ($item instanceof \Magento\Catalog\Model\Product) {
$type = $item->getTypeId();
} else if ($item instanceof \Magento\Sales\Model\Order\Item) {
@@ -209,4 +209,25 @@ public function canDisplayPrice()
return true;
}
+ /**
+ * Get item qty
+ *
+ * @param \Magento\Object $item
+ * @return int
+ */
+ public function getItemQty(\Magento\Object $item)
+ {
+ return $item->getQty()*1 ? $item->getQty()*1 : 1;
+ }
+
+ /**
+ * Check whether product configuration is required before adding to order
+ *
+ * @param $productType
+ * @return bool
+ */
+ public function isConfigurationRequired($productType)
+ {
+ return false;
+ }
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
index 3212636b73d07..e62c28153fdb1 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
@@ -18,67 +18,57 @@
* 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_Sales
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Sales\Block\Adminhtml\Order\View;
+
+use Magento\Customer\Service\V1\CustomerMetadataServiceInterface;
+use Magento\Eav\Model\AttributeDataFactory;
/**
* Order history block
- *
- * @category Magento
- * @package Magento_Sales
- * @author Magento Core Team
*/
-namespace Magento\Sales\Block\Adminhtml\Order\View;
-
class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
{
/**
- * @var \Magento\Customer\Model\GroupFactory
- */
- protected $_groupFactory;
-
- /**
- * @var \Magento\Eav\Model\AttributeDataFactory
+ * Customer service
+ *
+ * @var CustomerMetadataServiceInterface
*/
- protected $_attrDataFactory;
+ protected $_customerMetadataService;
/**
- * @var \Magento\Customer\Model\CustomerFactory
+ * @var \Magento\Customer\Service\V1\CustomerGroupServiceInterface
*/
- protected $_customerFactory;
+ protected $_groupService;
/**
- * @var \Magento\Eav\Model\Config
+ * @var \Magento\Customer\Model\Metadata\ElementFactory
*/
- protected $_eavConfig;
+ protected $_metadataElementFactory;
/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Sales\Helper\Admin $adminHelper
- * @param \Magento\Customer\Model\GroupFactory $groupFactory
- * @param \Magento\Customer\Model\CustomerFactory $customerFactory
- * @param \Magento\Eav\Model\Config $eavConfig
- * @param \Magento\Eav\Model\AttributeDataFactory $attrDataFactory
+ * @param \Magento\Customer\Service\V1\CustomerGroupServiceInterface $groupService
+ * @param CustomerMetadataServiceInterface $customerMetadataService
+ * @param \Magento\Customer\Model\Metadata\ElementFactory $elementFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Sales\Helper\Admin $adminHelper,
- \Magento\Customer\Model\GroupFactory $groupFactory,
- \Magento\Customer\Model\CustomerFactory $customerFactory,
- \Magento\Eav\Model\Config $eavConfig,
- \Magento\Eav\Model\AttributeDataFactory $attrDataFactory,
+ \Magento\Customer\Service\V1\CustomerGroupServiceInterface $groupService,
+ CustomerMetadataServiceInterface $customerMetadataService,
+ \Magento\Customer\Model\Metadata\ElementFactory $elementFactory,
array $data = array()
) {
- $this->_customerFactory = $customerFactory;
- $this->_groupFactory = $groupFactory;
- $this->_eavConfig = $eavConfig;
- $this->_attrDataFactory = $attrDataFactory;
+ $this->_groupService = $groupService;
+ $this->_customerMetadataService = $customerMetadataService;
+ $this->_metadataElementFactory = $elementFactory;
parent::__construct($context, $registry, $adminHelper, $data);
}
@@ -118,22 +108,41 @@ public function getOrderStoreName()
return null;
}
+ /**
+ * Return name of the customer group.
+ *
+ * @return string
+ */
public function getCustomerGroupName()
{
if ($this->getOrder()) {
- return $this->_groupFactory->create()->load((int)$this->getOrder()->getCustomerGroupId())->getCode();
+ $customerGroupId = $this->getOrder()->getCustomerGroupId();
+ if (!is_null($customerGroupId)) {
+ return $this->_groupService->getGroup($customerGroupId)->getCode();
+ }
}
- return null;
+ return '';
}
+ /**
+ * Get URL to edit the customer.
+ *
+ * @return string
+ */
public function getCustomerViewUrl()
{
if ($this->getOrder()->getCustomerIsGuest() || !$this->getOrder()->getCustomerId()) {
- return false;
+ return '';
}
return $this->getUrl('customer/index/edit', array('id' => $this->getOrder()->getCustomerId()));
}
+ /**
+ * Get order view URL.
+ *
+ * @param int $orderId
+ * @return string
+ */
public function getViewUrl($orderId)
{
return $this->getUrl('sales/order/view', array('order_id'=>$orderId));
@@ -163,28 +172,25 @@ protected function _prepareAccountDataSortOrder(array $data, $sortOrder)
*/
public function getCustomerAccountData()
{
- $accountData = array();
-
+ $accountData = [];
$entityType = 'customer';
- $customer = $this->_customerFactory->create();
- foreach ($this->_eavConfig->getEntityAttributeCodes($entityType) as $attributeCode) {
- /* @var $attribute \Magento\Customer\Model\Attribute */
- $attribute = $this->_eavConfig->getAttribute($entityType, $attributeCode);
- if (!$attribute->getIsVisible() || $attribute->getIsSystem()) {
+
+ foreach ($this->_customerMetadataService->getAllCustomerAttributeMetadata($entityType) as $attribute) {
+ /* @var $attribute \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata */
+ if (!$attribute->isVisible() || $attribute->isSystem()) {
continue;
}
$orderKey = sprintf('customer_%s', $attribute->getAttributeCode());
$orderValue = $this->getOrder()->getData($orderKey);
if ($orderValue != '') {
- $customer->setData($attribute->getAttributeCode(), $orderValue);
- $dataModel = $this->_attrDataFactory->create($attribute, $customer);
- $value = $dataModel->outputValue(\Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_HTML);
- $sortOrder = $attribute->getSortOrder() + $attribute->getIsUserDefined() ? 200 : 0;
+ $metadataElement = $this->_metadataElementFactory->create($attribute, $orderValue, $entityType);
+ $value = $metadataElement->outputValue(AttributeDataFactory::OUTPUT_FORMAT_HTML);
+ $sortOrder = $attribute->getSortOrder() + $attribute->isUserDefined() ? 200 : 0;
$sortOrder = $this->_prepareAccountDataSortOrder($accountData, $sortOrder);
- $accountData[$sortOrder] = array(
+ $accountData[$sortOrder] = [
'label' => $attribute->getFrontendLabel(),
- 'value' => $this->escapeHtml($value, array('br'))
- );
+ 'value' => $this->escapeHtml($value, ['br'])
+ ];
}
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Creditmemos.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Creditmemos.php
index d8b472d56b53d..6cfa1ee36a42a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Creditmemos.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Creditmemos.php
@@ -56,7 +56,6 @@ class Creditmemos
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Sales\Model\Resource\Order\Collection\Factory $collectionFactory
* @param \Magento\Sales\Model\Order\Creditmemo $orderCreditmemo
@@ -65,7 +64,6 @@ class Creditmemos
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Sales\Model\Resource\Order\Collection\Factory $collectionFactory,
\Magento\Sales\Model\Order\Creditmemo $orderCreditmemo,
@@ -75,7 +73,7 @@ public function __construct(
$this->_coreRegistry = $coreRegistry;
$this->_orderCreditmemo = $orderCreditmemo;
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Invoices.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Invoices.php
index d1ef50e1ab266..41743203a0911 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Invoices.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Invoices.php
@@ -56,7 +56,6 @@ class Invoices
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Sales\Model\Resource\Order\Collection\Factory $collectionFactory
* @param \Magento\Sales\Model\Order\Invoice $orderInvoice
@@ -65,7 +64,6 @@ class Invoices
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Sales\Model\Resource\Order\Collection\Factory $collectionFactory,
\Magento\Sales\Model\Order\Invoice $orderInvoice,
@@ -75,7 +73,7 @@ public function __construct(
$this->_coreRegistry = $coreRegistry;
$this->_orderInvoice = $orderInvoice;
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Shipments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Shipments.php
index 9d7598bc97c09..ca7726e567b66 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Shipments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Shipments.php
@@ -47,7 +47,6 @@ class Shipments
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Sales\Model\Resource\Order\Collection\Factory $collectionFactory
* @param \Magento\Core\Model\Registry $coreRegistry
@@ -55,7 +54,6 @@ class Shipments
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Sales\Model\Resource\Order\Collection\Factory $collectionFactory,
\Magento\Core\Model\Registry $coreRegistry,
@@ -63,7 +61,7 @@ public function __construct(
) {
$this->_coreRegistry = $coreRegistry;
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Grid.php
index be1e8bb9e9117..7847b9ceb92b0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Grid.php
@@ -53,7 +53,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Payment\Helper\Data $paymentData
* @param \Magento\Sales\Model\Resource\Recurring\Profile\CollectionFactory $profileCollection
@@ -62,7 +61,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Payment\Helper\Data $paymentData,
\Magento\Sales\Model\Resource\Recurring\Profile\CollectionFactory $profileCollection,
@@ -72,7 +70,7 @@ public function __construct(
$this->_paymentData = $paymentData;
$this->_profileCollection = $profileCollection;
$this->_recurringProfile = $recurringProfile;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php
index 422dcefdea863..7b41c64d2b99e 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php
@@ -52,7 +52,6 @@ class Orders
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Core\Model\Registry $coreRegistry
* @param \Magento\Sales\Model\Resource\Order\Grid\CollectionFactory $orderCollection
@@ -61,7 +60,6 @@ class Orders
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Core\Model\Registry $coreRegistry,
\Magento\Sales\Model\Resource\Order\Grid\CollectionFactory $orderCollection,
@@ -71,7 +69,7 @@ public function __construct(
$this->_coreRegistry = $coreRegistry;
$this->_orderCollection = $orderCollection;
$this->_orderConfig = $orderConfig;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Shipment/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Shipment/Grid.php
index f69d9a75faea8..6ba615240c0e9 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Shipment/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Shipment/Grid.php
@@ -40,20 +40,18 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Sales\Model\Resource\Order\Collection\Factory $collectionFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Sales\Model\Resource\Order\Collection\Factory $collectionFactory,
array $data = array()
) {
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
index 344a67cfef1e9..11c7f3a29b193 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
@@ -49,7 +49,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Data\CollectionFactory $collectionFactory
* @param \Magento\Core\Model\Registry $coreRegistry
@@ -57,7 +56,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Data\CollectionFactory $collectionFactory,
\Magento\Core\Model\Registry $coreRegistry,
@@ -65,7 +63,7 @@ public function __construct(
) {
$this->_collectionFactory = $collectionFactory;
$this->_coreRegistry = $coreRegistry;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Grid.php
index a09fb1b1e8a6e..de7195575f2f7 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Grid.php
@@ -61,7 +61,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Sales\Model\Order\Payment\Transaction $transaction
* @param \Magento\Sales\Model\Resource\Order\Payment\Transaction\CollectionFactory $collectionFactory
@@ -71,7 +70,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Sales\Model\Order\Payment\Transaction $transaction,
\Magento\Sales\Model\Resource\Order\Payment\Transaction\CollectionFactory $collectionFactory,
@@ -83,7 +81,7 @@ public function __construct(
$this->_paymentData = $paymentData;
$this->_transaction = $transaction;
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/Sales/Block/Billing/Agreement/View.php b/app/code/Magento/Sales/Block/Billing/Agreement/View.php
index 59a5c435e2b12..1493ade7ffc04 100644
--- a/app/code/Magento/Sales/Block/Billing/Agreement/View.php
+++ b/app/code/Magento/Sales/Block/Billing/Agreement/View.php
@@ -116,14 +116,16 @@ public function __construct(
public function getRelatedOrders()
{
if (is_null($this->_relatedOrders)) {
+ $billingAgreement = $this->_getBillingAgreementInstance();
+ $billingAgreementId = $billingAgreement ? $billingAgreement->getAgreementId() : 0;
$this->_relatedOrders = $this->_orderCollectionFactory->create()
->addFieldToSelect('*')
- ->addFieldToFilter('customer_id', $this->_customerSession->getCustomer()->getId())
+ ->addFieldToFilter('customer_id', (int)$this->_customerSession->getCustomerId())
->addFieldToFilter(
'state',
array('in' => $this->_orderConfig->getVisibleOnFrontStates())
)
- ->addBillingAgreementsFilter($this->_billingAgreementInstance->getAgreementId())
+ ->addBillingAgreementsFilter($billingAgreementId)
->setOrder('created_at', 'desc');
}
return $this->_relatedOrders;
@@ -174,9 +176,6 @@ public function getOrderItemValue(\Magento\Sales\Model\Order $order, $key)
*/
protected function _prepareLayout()
{
- if (is_null($this->_billingAgreementInstance)) {
- $this->_billingAgreementInstance = $this->_coreRegistry->registry('current_billing_agreement');
- }
parent::_prepareLayout();
$pager = $this->getLayout()->createBlock('Magento\Theme\Block\Html\Pager')
@@ -187,6 +186,19 @@ protected function _prepareLayout()
return $this;
}
+ /**
+ * Return current billing agreement.
+ *
+ * @return \Magento\Sales\Model\Billing\Agreement|null
+ */
+ protected function _getBillingAgreementInstance()
+ {
+ if (is_null($this->_billingAgreementInstance)) {
+ $this->_billingAgreementInstance = $this->_coreRegistry->registry('current_billing_agreement');
+ }
+ return $this->_billingAgreementInstance;
+ }
+
/**
* Load available billing agreement methods
*
@@ -211,21 +223,22 @@ protected function _toHtml()
{
$this->_loadPaymentMethods();
$this->setBackUrl($this->getUrl('*/billing_agreement/'));
- if ($this->_billingAgreementInstance) {
- $this->setReferenceId($this->_billingAgreementInstance->getReferenceId());
+ $billingAgreement = $this->_getBillingAgreementInstance();
+ if ($billingAgreement) {
+ $this->setReferenceId($billingAgreement->getReferenceId());
- $this->setCanCancel($this->_billingAgreementInstance->canCancel());
+ $this->setCanCancel($billingAgreement->canCancel());
$this->setCancelUrl(
$this->getUrl('*/billing_agreement/cancel', array(
'_current' => true,
- 'payment_method' => $this->_billingAgreementInstance->getMethodCode()))
+ 'payment_method' => $billingAgreement->getMethodCode()))
);
- $paymentMethodTitle = $this->_billingAgreementInstance->getAgreementLabel();
+ $paymentMethodTitle = $billingAgreement->getAgreementLabel();
$this->setPaymentMethodTitle($paymentMethodTitle);
- $createdAt = $this->_billingAgreementInstance->getCreatedAt();
- $updatedAt = $this->_billingAgreementInstance->getUpdatedAt();
+ $createdAt = $billingAgreement->getCreatedAt();
+ $updatedAt = $billingAgreement->getUpdatedAt();
$this->setAgreementCreatedAt(
($createdAt)
? $this->formatDate($createdAt, 'short', true)
@@ -236,7 +249,7 @@ protected function _toHtml()
$this->formatDate($updatedAt, 'short', true)
);
}
- $this->setAgreementStatus($this->_billingAgreementInstance->getStatusLabel());
+ $this->setAgreementStatus($billingAgreement->getStatusLabel());
}
return parent::_toHtml();
diff --git a/app/code/Magento/Sales/Block/Items/AbstractItems.php b/app/code/Magento/Sales/Block/Items/AbstractItems.php
index aa0eeaf1b4968..53bb39eedfe8d 100644
--- a/app/code/Magento/Sales/Block/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Block/Items/AbstractItems.php
@@ -40,21 +40,6 @@ class AbstractItems extends \Magento\View\Element\Template
*/
const DEFAULT_TYPE = 'default';
- /**
- * Initialize default item renderer
- */
- protected function _prepareLayout()
- {
- if (!$this->getChildBlock(self::DEFAULT_TYPE)) {
- $this->addChild(
- self::DEFAULT_TYPE,
- 'Magento\Checkout\Block\Cart\Item\Renderer',
- array('template' => 'cart/item/default.phtml')
- );
- }
- return parent::_prepareLayout();
- }
-
/**
* Retrieve item renderer block
*
@@ -64,11 +49,16 @@ protected function _prepareLayout()
*/
public function getItemRenderer($type)
{
- $renderer = $this->getChildBlock($type) ?: $this->getChildBlock(self::DEFAULT_TYPE);
- if (!$renderer instanceof \Magento\View\Element\BlockInterface) {
- throw new \RuntimeException('Renderer for type "' . $type . '" does not exist.');
+ /** @var \Magento\View\Element\RendererList $rendererList */
+ $rendererList = $this->getRendererListName()
+ ? $this->getLayout()->getBlock($this->getRendererListName())
+ : $this->getChildBlock('renderer.list');
+ if (!$rendererList) {
+ throw new \RuntimeException('Renderer list for block "' . $this->getNameInLayout() . '" is not defined');
}
- $renderer->setRenderedBlock($this);
+ $overriddenTemplates = $this->getOverriddenTemplates() ?: array();
+ $template = isset($overriddenTemplates[$type]) ? $overriddenTemplates[$type] : $this->getRendererTemplate();
+ $renderer = $rendererList->getRenderer($type, self::DEFAULT_TYPE, $template);
return $renderer;
}
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Billing/Agreement.php b/app/code/Magento/Sales/Controller/Adminhtml/Billing/Agreement.php
index 7f246512a9857..9a8ae0c9627f2 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Billing/Agreement.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Billing/Agreement.php
@@ -192,14 +192,10 @@ protected function _initBillingAgreement()
*/
protected function _initCustomer()
{
- $customerId = (int) $this->getRequest()->getParam('id');
- $customer = $this->_objectManager->create('Magento\Customer\Model\Customer');
-
+ $customerId = (int)$this->getRequest()->getParam('id');
if ($customerId) {
- $customer->load($customerId);
+ $this->_coreRegistry->register('current_customer_id', $customerId);
}
-
- $this->_coreRegistry->register('current_customer', $customer);
return $this;
}
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Recurring/Profile.php b/app/code/Magento/Sales/Controller/Adminhtml/Recurring/Profile.php
index 1b16eef117d8a..e3b936978d1c3 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Recurring/Profile.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Recurring/Profile.php
@@ -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 Magento
- * @package Magento_Sales
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -32,9 +30,27 @@
namespace Magento\Sales\Controller\Adminhtml\Recurring;
use Magento\App\Action\NotFoundException;
+use Magento\Core\Exception as CoreException;
+use Magento\Customer\Controller\Adminhtml\Index as CustomerController;
class Profile extends \Magento\Backend\App\Action
{
+ /**#@+
+ * Request parameter keys
+ */
+ const PARAM_CUSTOMER_ID = 'id';
+ const PARAM_PROFILE = 'profile';
+ const PARAM_ACTION = 'action';
+ /**#@-*/
+
+ /**#@+
+ * Values for PARAM_ACTION request parameter
+ */
+ const ACTION_CANCEL = 'cancel';
+ const ACTION_SUSPEND = 'suspend';
+ const ACTION_ACTIVATE = 'activate';
+ /**#@-*/
+
/**
* Core registry
*
@@ -42,15 +58,31 @@ class Profile extends \Magento\Backend\App\Action
*/
protected $_coreRegistry = null;
+ /**
+ * @var \Magento\Customer\Service\V1\CustomerServiceInterface
+ */
+ protected $_customerService;
+
+ /**
+ * @var \Magento\Logger
+ */
+ protected $_logger;
+
/**
* @param \Magento\Backend\App\Action\Context $context
* @param \Magento\Core\Model\Registry $coreRegistry
+ * @param \Magento\Customer\Service\V1\CustomerServiceInterface $customerService
+ * @param \Magento\Logger $logger
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
- \Magento\Core\Model\Registry $coreRegistry
+ \Magento\Core\Model\Registry $coreRegistry,
+ \Magento\Customer\Service\V1\CustomerServiceInterface $customerService,
+ \Magento\Logger $logger
) {
$this->_coreRegistry = $coreRegistry;
+ $this->_customerService = $customerService;
+ $this->_logger = $logger;
parent::__construct($context);
}
@@ -78,10 +110,10 @@ public function viewAction()
$this->_title->add(__('Profile #%1', $profile->getReferenceId()));
$this->_view->renderLayout();
return;
- } catch (\Magento\Core\Exception $e) {
+ } catch (CoreException $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Logger')->logException($e);
+ $this->_logger->logException($e);
}
$this->_redirect('sales/*/');
}
@@ -94,10 +126,10 @@ public function gridAction()
try {
$this->_view->loadLayout()->renderLayout();
return;
- } catch (\Magento\Core\Exception $e) {
+ } catch (CoreException $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Logger')->logException($e);
+ $this->_logger->logException($e);
}
$this->_redirect('sales/*/');
}
@@ -113,7 +145,7 @@ public function ordersAction()
$this->_initProfile();
$this->_view->loadLayout()->renderLayout();
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Logger')->logException($e);
+ $this->_logger->logException($e);
throw new NotFoundException();
}
}
@@ -126,27 +158,30 @@ public function updateStateAction()
$profile = null;
try {
$profile = $this->_initProfile();
+ $action = $this->getRequest()->getParam(self::PARAM_ACTION);
- switch ($this->getRequest()->getParam('action')) {
- case 'cancel':
+ switch ($action) {
+ case self::ACTION_CANCEL:
$profile->cancel();
break;
- case 'suspend':
+ case self::ACTION_SUSPEND:
$profile->suspend();
break;
- case 'activate':
+ case self::ACTION_ACTIVATE:
$profile->activate();
break;
+ default:
+ throw new \Exception(sprintf('Wrong action parameter: %s', $action));
}
$this->messageManager->addSuccess(__('The profile state has been updated.'));
- } catch (\Magento\Core\Exception $e) {
+ } catch (CoreException $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('We could not update the profile.'));
- $this->_objectManager->get('Magento\Logger')->logException($e);
+ $this->_logger->logException($e);
}
if ($profile) {
- $this->_redirect('sales/*/view', array('profile' => $profile->getId()));
+ $this->_redirect('sales/*/view', array(self::PARAM_PROFILE => $profile->getId()));
} else {
$this->_redirect('sales/*/');
}
@@ -167,14 +202,14 @@ public function updateProfileAction()
} else {
$this->messageManager->addNotice(__('The profile has no changes.'));
}
- } catch (\Magento\Core\Exception $e) {
+ } catch (CoreException $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('We could not update the profile.'));
- $this->_objectManager->get('Magento\Logger')->logException($e);
+ $this->_logger->logException($e);
}
if ($profile) {
- $this->_redirect('sales/*/view', array('profile' => $profile->getId()));
+ $this->_redirect('sales/*/view', array(self::PARAM_PROFILE => $profile->getId()));
} else {
$this->_redirect('sales/*/');
}
@@ -186,39 +221,29 @@ public function updateProfileAction()
*/
public function customerGridAction()
{
- $this->_initCustomer();
- $this->_view->loadLayout(false);
- $this->_view->renderLayout();
- }
-
- /**
- * Initialize customer by ID specified in request
- *
- * @return \Magento\Sales\Controller\Adminhtml\Billing\Agreement
- */
- protected function _initCustomer()
- {
- $customerId = (int) $this->getRequest()->getParam('id');
- $customer = $this->_objectManager->create('Magento\Customer\Model\Customer');
+ $customerId = (int)$this->getRequest()->getParam(self::PARAM_CUSTOMER_ID);
if ($customerId) {
- $customer->load($customerId);
+ $this->_coreRegistry->register(CustomerController::REGISTRY_CURRENT_CUSTOMER_ID, $customerId);
}
- $this->_coreRegistry->register('current_customer', $customer);
- return $this;
+ $this->_view->loadLayout(false);
+ $this->_view->renderLayout();
}
/**
* Load/set profile
*
* @return \Magento\Sales\Model\Recurring\Profile
+ * @throws \Magento\Core\Exception
*/
protected function _initProfile()
{
- $profile = $this->_objectManager->create('Magento\Sales\Model\Recurring\Profile')->load($this->getRequest()->getParam('profile'));
+ /** @var \Magento\Sales\Model\Recurring\Profile $profile */
+ $profile = $this->_objectManager->create('Magento\Sales\Model\Recurring\Profile')
+ ->load($this->getRequest()->getParam(self::PARAM_PROFILE));
if (!$profile->getId()) {
- throw new \Magento\Core\Exception(__('The profile you specified does not exist.'));
+ throw new CoreException(__('The profile you specified does not exist.'));
}
$this->_coreRegistry->register('current_recurring_profile', $profile);
return $profile;
diff --git a/app/code/Magento/Sales/Controller/Billing/Agreement.php b/app/code/Magento/Sales/Controller/Billing/Agreement.php
index 6299b46c1c8ab..e5e63f5cad58a 100644
--- a/app/code/Magento/Sales/Controller/Billing/Agreement.php
+++ b/app/code/Magento/Sales/Controller/Billing/Agreement.php
@@ -122,9 +122,9 @@ public function startWizardAction()
$agreement
->setStoreId($this->_objectManager->get('Magento\Core\Model\StoreManager')->getStore()->getId())
->setMethodCode($paymentCode)
- ->setReturnUrl($this->_objectManager->create('Magento\Core\Model\Url')
+ ->setReturnUrl($this->_objectManager->create('Magento\UrlInterface')
->getUrl('*/*/returnWizard', array('payment_method' => $paymentCode)))
- ->setCancelUrl($this->_objectManager->create('Magento\Core\Model\Url')
+ ->setCancelUrl($this->_objectManager->create('Magento\UrlInterface')
->getUrl('*/*/cancelWizard', array('payment_method' => $paymentCode)));
return $this->getResponse()->setRedirect($agreement->initToken());
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 57913eee0c3c2..97246cabba103 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -159,6 +159,11 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
*/
protected $messageManager;
+ /**
+ * @var Product\Quote\Initializer
+ */
+ protected $quoteInitializer;
+
/**
* @param \Magento\ObjectManager $objectManager
* @param \Magento\Event\ManagerInterface $eventManager
@@ -168,6 +173,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* @param \Magento\Logger $logger
* @param \Magento\Object\Copy $objectCopyService
* @param \Magento\Message\ManagerInterface $messageManager
+ * @param Product\Quote\Initializer $quoteInitializer
* @param array $data
*/
public function __construct(
@@ -179,6 +185,7 @@ public function __construct(
\Magento\Logger $logger,
\Magento\Object\Copy $objectCopyService,
\Magento\Message\ManagerInterface $messageManager,
+ Product\Quote\Initializer $quoteInitializer,
array $data = array()
) {
$this->_objectManager = $objectManager;
@@ -187,6 +194,7 @@ public function __construct(
$this->_salesConfig = $salesConfig;
$this->_logger = $logger;
$this->_objectCopyService = $objectCopyService;
+ $this->quoteInitializer = $quoteInitializer;
parent::__construct($data);
$this->_session = $sessionQuote;
$this->messageManager = $messageManager;
@@ -817,30 +825,10 @@ public function addProduct($product, $config = 1)
}
}
- $stockItem = $product->getStockItem();
- if ($stockItem && $stockItem->getIsQtyDecimal()) {
- $product->setIsQtyDecimal(1);
- } else {
- $config->setQty((int) $config->getQty());
- }
+ $item = $this->quoteInitializer->init($this->getQuote(), $product, $config);
- $product->setCartQty($config->getQty());
- $item = $this->getQuote()->addProductAdvanced(
- $product,
- $config,
- \Magento\Catalog\Model\Product\Type\AbstractType::PROCESS_MODE_FULL
- );
if (is_string($item)) {
- if ($product->getTypeId() != \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
- $item = $this->getQuote()->addProductAdvanced(
- $product,
- $config,
- \Magento\Catalog\Model\Product\Type\AbstractType::PROCESS_MODE_LITE
- );
- }
- if (is_string($item)) {
- throw new \Magento\Core\Exception($item);
- }
+ throw new \Magento\Core\Exception($item);
}
$item->checkData();
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Product/Quote/Initializer.php b/app/code/Magento/Sales/Model/AdminOrder/Product/Quote/Initializer.php
new file mode 100644
index 0000000000000..0e77c12ac3978
--- /dev/null
+++ b/app/code/Magento/Sales/Model/AdminOrder/Product/Quote/Initializer.php
@@ -0,0 +1,64 @@
+
+ *
+ */
+namespace Magento\Sales\Model\AdminOrder\Product\Quote;
+
+class Initializer
+{
+ /**
+ * @param \Magento\Sales\Model\Quote $quote
+ * @param \Magento\Catalog\Model\Product $product
+ * @param \Magento\Object $config
+ * @return \Magento\Sales\Model\Quote\Item|string
+ */
+ public function init(
+ \Magento\Sales\Model\Quote $quote,
+ \Magento\Catalog\Model\Product $product,
+ \Magento\Object $config
+ ) {
+ $stockItem = $product->getStockItem();
+ if ($stockItem && $stockItem->getIsQtyDecimal()) {
+ $product->setIsQtyDecimal(1);
+ } else {
+ $config->setQty((int) $config->getQty());
+ }
+
+ $product->setCartQty($config->getQty());
+
+ $item = $quote->addProductAdvanced(
+ $product,
+ $config,
+ \Magento\Catalog\Model\Product\Type\AbstractType::PROCESS_MODE_FULL
+ );
+
+ return $item;
+ }
+
+}
diff --git a/app/code/Magento/Sales/Model/Order/Grid/Row/UrlGenerator.php b/app/code/Magento/Sales/Model/Order/Grid/Row/UrlGenerator.php
index cc16eb5ea4f7d..d04a759081e56 100644
--- a/app/code/Magento/Sales/Model/Order/Grid/Row/UrlGenerator.php
+++ b/app/code/Magento/Sales/Model/Order/Grid/Row/UrlGenerator.php
@@ -37,12 +37,12 @@ class UrlGenerator extends \Magento\Backend\Model\Widget\Grid\Row\UrlGenerator
protected $_authorization;
/**
- * @param \Magento\Backend\Model\Url $backendUrl
+ * @param \Magento\Backend\Model\UrlInterface $backendUrl
* @param \Magento\AuthorizationInterface $authorization
* @param array $args
*/
public function __construct(
- \Magento\Backend\Model\Url $backendUrl,
+ \Magento\Backend\Model\UrlInterface $backendUrl,
\Magento\AuthorizationInterface $authorization,
array $args = array()
) {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
index 747da4c7137e3..52700c71af862 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
@@ -24,11 +24,11 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Sales\Model\Order\Pdf\Items;
+
/**
* Sales Order Pdf Items renderer Abstract
*/
-namespace Magento\Sales\Model\Order\Pdf\Items;
-
abstract class AbstractItems extends \Magento\Core\Model\AbstractModel
{
/**
@@ -71,18 +71,24 @@ abstract class AbstractItems extends \Magento\Core\Model\AbstractModel
*
* @var \Magento\Tax\Helper\Data
*/
- protected $_taxData = null;
+ protected $_taxData;
/**
* @var \Magento\Filesystem\Directory\ReadInterface
*/
protected $_rootDirectory;
+ /**
+ * @var \Magento\Filter\FilterManager
+ */
+ protected $filterManager;
+
/**
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Tax\Helper\Data $taxData
- * @param \Magento\App\Filesystem $filesystem,
+ * @param \Magento\App\Filesystem $filesystem ,
+ * @param \Magento\Filter\FilterManager $filterManager
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
* @param array $data
@@ -92,10 +98,12 @@ public function __construct(
\Magento\Core\Model\Registry $registry,
\Magento\Tax\Helper\Data $taxData,
\Magento\App\Filesystem $filesystem,
+ \Magento\Filter\FilterManager $filterManager,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
) {
+ $this->filterManager = $filterManager;
$this->_taxData = $taxData;
$this->_rootDirectory = $filesystem->getDirectoryRead(\Magento\App\Filesystem::ROOT_DIR);
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
@@ -169,7 +177,7 @@ public function setPage(\Zend_Pdf_Page $page)
*/
public function getOrder()
{
- if (is_null($this->_order)) {
+ if (null === $this->_order) {
throw new \Magento\Core\Exception(__('The order object is not specified.'));
}
return $this->_order;
@@ -183,7 +191,7 @@ public function getOrder()
*/
public function getSource()
{
- if (is_null($this->_source)) {
+ if (null === $this->_source) {
throw new \Magento\Core\Exception(__('The source object is not specified.'));
}
return $this->_source;
@@ -197,7 +205,7 @@ public function getSource()
*/
public function getItem()
{
- if (is_null($this->_item)) {
+ if (null === $this->_item) {
throw new \Magento\Core\Exception(__('An item object is not specified.'));
}
return $this->_item;
@@ -211,7 +219,7 @@ public function getItem()
*/
public function getPdf()
{
- if (is_null($this->_pdf)) {
+ if (null === $this->_pdf) {
throw new \Magento\Core\Exception(__('A PDF object is not specified.'));
}
return $this->_pdf;
@@ -225,7 +233,7 @@ public function getPdf()
*/
public function getPage()
{
- if (is_null($this->_pdfPage)) {
+ if (null === $this->_pdfPage) {
throw new \Magento\Core\Exception(__('A PDF page object is not specified.'));
}
return $this->_pdfPage;
@@ -250,7 +258,7 @@ protected function _formatOptionValue($value)
$resultValue = '';
if (is_array($value)) {
if (isset($value['qty'])) {
- $resultValue .= sprintf('%d', $value['qty']) . ' x ';
+ $resultValue .= $this->filterManager->sprintf($value['qty'], array('format' => '%d')) . ' x ';
}
$resultValue .= $value['title'];
@@ -313,7 +321,8 @@ public function getItemPricesForDisplay()
*
* @return array
*/
- public function getItemOptions() {
+ public function getItemOptions()
+ {
$result = array();
$options = $this->getItem()->getOrderItem()->getProductOptions();
if ($options) {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
index 644e446049ef0..e66e3689e6ef5 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
@@ -24,15 +24,11 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Sales\Model\Order\Pdf\Items\Creditmemo;
+
/**
* Sales Order Creditmemo Pdf default items renderer
- *
- * @category Magento
- * @package Magento_Sales
- * @author Magento Core Team
*/
-namespace Magento\Sales\Model\Order\Pdf\Items\Creditmemo;
-
class DefaultCreditmemo extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
{
/**
@@ -47,6 +43,7 @@ class DefaultCreditmemo extends \Magento\Sales\Model\Order\Pdf\Items\AbstractIte
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\App\Filesystem $filesystem
+ * @param \Magento\Filter\FilterManager $filterManager
* @param \Magento\Stdlib\String $string
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -57,13 +54,23 @@ public function __construct(
\Magento\Core\Model\Registry $registry,
\Magento\Tax\Helper\Data $taxData,
\Magento\App\Filesystem $filesystem,
+ \Magento\Filter\FilterManager $filterManager,
\Magento\Stdlib\String $string,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
) {
$this->string = $string;
- parent::__construct($context, $registry, $taxData, $filesystem, $resource, $resourceCollection, $data);
+ parent::__construct(
+ $context,
+ $registry,
+ $taxData,
+ $filesystem,
+ $filterManager,
+ $resource,
+ $resourceCollection,
+ $data
+ );
}
/**
@@ -138,15 +145,17 @@ public function draw()
foreach ($options as $option) {
// draw options label
$lines[][] = array(
- 'text' => $this->string->split(strip_tags($option['label']), 40, true, true),
+ 'text' => $this->string->split($this->filterManager->stripTags($option['label']), 40, true, true),
'font' => 'italic',
'feed' => 35
);
// draw options value
- $_printValue = isset($option['print_value']) ? $option['print_value'] : strip_tags($option['value']);
+ $printValue = isset($option['print_value'])
+ ? $option['print_value']
+ : $this->filterManager->stripTags($option['value']);
$lines[][] = array(
- 'text' => $this->string->split($_printValue, 30, true, true),
+ 'text' => $this->string->split($printValue, 30, true, true),
'feed' => 40
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
index 2fd9830570529..ea9e408dc51bc 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
@@ -24,11 +24,11 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Sales\Model\Order\Pdf\Items\Invoice;
+
/**
* Sales Order Invoice Pdf default items renderer
*/
-namespace Magento\Sales\Model\Order\Pdf\Items\Invoice;
-
class DefaultInvoice extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
{
/**
@@ -43,6 +43,7 @@ class DefaultInvoice extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\App\Filesystem $filesystem
+ * @param \Magento\Filter\FilterManager $filterManager
* @param \Magento\Stdlib\String $string
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -53,13 +54,23 @@ public function __construct(
\Magento\Core\Model\Registry $registry,
\Magento\Tax\Helper\Data $taxData,
\Magento\App\Filesystem $filesystem,
+ \Magento\Filter\FilterManager $filterManager,
\Magento\Stdlib\String $string,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
) {
$this->string = $string;
- parent::__construct($context, $registry, $taxData, $filesystem, $resource, $resourceCollection, $data);
+ parent::__construct(
+ $context,
+ $registry,
+ $taxData,
+ $filesystem,
+ $filterManager,
+ $resource,
+ $resourceCollection,
+ $data
+ );
}
/**
@@ -98,7 +109,7 @@ public function draw()
$prices = $this->getItemPricesForDisplay();
$feedPrice = 395;
$feedSubtotal = $feedPrice + 170;
- foreach ($prices as $priceData){
+ foreach ($prices as $priceData) {
if (isset($priceData['label'])) {
// draw Price label
$lines[$i][] = array(
@@ -145,18 +156,18 @@ public function draw()
foreach ($options as $option) {
// draw options label
$lines[][] = array(
- 'text' => $this->string->split(strip_tags($option['label']), 40, true, true),
+ 'text' => $this->string->split($this->filterManager->stripTags($option['label']), 40, true, true),
'font' => 'italic',
'feed' => 35
);
if ($option['value']) {
if (isset($option['print_value'])) {
- $_printValue = $option['print_value'];
+ $printValue = $option['print_value'];
} else {
- $_printValue = strip_tags($option['value']);
+ $printValue = $this->filterManager->stripTags($option['value']);
}
- $values = explode(', ', $_printValue);
+ $values = explode(', ', $printValue);
foreach ($values as $value) {
$lines[][] = array(
'text' => $this->string->split($value, 30, true, true),
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
index 3d5427b9e57b4..b51d13f24fcb5 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
@@ -24,11 +24,11 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Sales\Model\Order\Pdf\Items\Shipment;
+
/**
* Sales Order Shipment Pdf default items renderer
*/
-namespace Magento\Sales\Model\Order\Pdf\Items\Shipment;
-
class DefaultShipment extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
{
/**
@@ -43,6 +43,7 @@ class DefaultShipment extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\App\Filesystem $filesystem
+ * @param \Magento\Filter\FilterManager $filterManager
* @param \Magento\Stdlib\String $string
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -53,13 +54,23 @@ public function __construct(
\Magento\Core\Model\Registry $registry,
\Magento\Tax\Helper\Data $taxData,
\Magento\App\Filesystem $filesystem,
+ \Magento\Filter\FilterManager $filterManager,
\Magento\Stdlib\String $string,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
) {
$this->string = $string;
- parent::__construct($context, $registry, $taxData, $filesystem, $resource, $resourceCollection, $data);
+ parent::__construct(
+ $context,
+ $registry,
+ $taxData,
+ $filesystem,
+ $filterManager,
+ $resource,
+ $resourceCollection,
+ $data
+ );
}
/**
@@ -73,7 +84,6 @@ public function draw()
$lines = array();
// draw Product name
- $stringHelper = $this->string;
$lines[0] = array(array(
'text' => $this->string->split($item->getName(), 60, true, true),
'feed' => 100,
@@ -81,7 +91,7 @@ public function draw()
// draw QTY
$lines[0][] = array(
- 'text' => $item->getQty()*1,
+ 'text' => $item->getQty() * 1,
'feed' => 35
);
@@ -98,17 +108,17 @@ public function draw()
foreach ($options as $option) {
// draw options label
$lines[][] = array(
- 'text' => $stringHelper->split(strip_tags($option['label']), 70, true, true),
+ 'text' => $this->string->split($this->filterManager->stripTags($option['label']), 70, true, true),
'font' => 'italic',
'feed' => 110
);
// draw options value
if ($option['value']) {
- $_printValue = isset($option['print_value'])
+ $printValue = isset($option['print_value'])
? $option['print_value']
- : strip_tags($option['value']);
- $values = explode(', ', $_printValue);
+ : $this->filterManager->stripTags($option['value']);
+ $values = explode(', ', $printValue);
foreach ($values as $value) {
$lines[][] = array(
'text' => $this->string->split($value, 50, true, true),
diff --git a/app/code/Magento/Sales/Model/Quote.php b/app/code/Magento/Sales/Model/Quote.php
index 61594e2c68f5b..ac36e1945ac20 100644
--- a/app/code/Magento/Sales/Model/Quote.php
+++ b/app/code/Magento/Sales/Model/Quote.php
@@ -220,7 +220,7 @@ class Quote extends \Magento\Core\Model\AbstractModel
protected $_storeManager;
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -291,7 +291,7 @@ class Quote extends \Magento\Core\Model\AbstractModel
* @param \Magento\Catalog\Helper\Product $catalogProduct
* @param \Magento\Core\Model\Store\ConfigInterface $coreStoreConfig
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Sales\Model\Quote\AddressFactory $quoteAddressFactory
* @param \Magento\Customer\Model\CustomerFactory $customerFactory
* @param \Magento\Customer\Model\GroupFactory $customerGroupFactory
@@ -315,7 +315,7 @@ public function __construct(
\Magento\Catalog\Helper\Product $catalogProduct,
\Magento\Core\Model\Store\ConfigInterface $coreStoreConfig,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Sales\Model\Quote\AddressFactory $quoteAddressFactory,
\Magento\Customer\Model\CustomerFactory $customerFactory,
\Magento\Customer\Model\GroupFactory $customerGroupFactory,
diff --git a/app/code/Magento/Sales/Model/Quote/Item/RelatedProducts.php b/app/code/Magento/Sales/Model/Quote/Item/RelatedProducts.php
new file mode 100644
index 0000000000000..3776bf178d387
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Quote/Item/RelatedProducts.php
@@ -0,0 +1,67 @@
+_relatedProductTypes = $relatedProductTypes;
+ }
+
+ /**
+ * Retrieve Array of product ids which have special relation with products in Cart
+ *
+ * @param \Magento\Sales\Model\Quote\Item[] $quoteItems
+ * @return array
+ */
+ public function getRelatedProductIds(array $quoteItems)
+ {
+ $productIds = array();
+ /** @var $quoteItems \Magento\Sales\Model\Quote\Item[] */
+ foreach ($quoteItems as $quoteItem) {
+ $productTypeOpt = $quoteItem->getOptionByCode('product_type');
+ if ($productTypeOpt instanceof \Magento\Sales\Model\Quote\Item\Option) {
+ if (in_array($productTypeOpt->getValue(), $this->_relatedProductTypes)
+ && $productTypeOpt->getProductId()
+ ) {
+ $productIds[] = $productTypeOpt->getProductId();
+ }
+ }
+ }
+ return $productIds;
+ }
+}
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
index 750cb67340180..5e6f50f10039c 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
@@ -45,6 +45,17 @@ class Bestsellers extends \Magento\Sales\Model\Resource\Report\AbstractReport
*/
protected $_salesResourceHelper;
+ /**
+ * Ignored product types list
+ *
+ * @var array
+ */
+ protected $ignoredProductTypes = array(
+ \Magento\Catalog\Model\Product\Type::TYPE_CONFIGURABLE
+ => \Magento\Catalog\Model\Product\Type::TYPE_CONFIGURABLE,
+ \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE => \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE,
+ );
+
/**
* @param \Magento\App\Resource $resource
* @param \Magento\Logger $logger
@@ -54,6 +65,7 @@ class Bestsellers extends \Magento\Sales\Model\Resource\Report\AbstractReport
* @param \Magento\Stdlib\DateTime\Timezone\Validator $timezoneValidator
* @param \Magento\Catalog\Model\Resource\Product $productResource
* @param \Magento\Sales\Model\Resource\Helper $salesResourceHelper
+ * @param array $ignoredProductTypes
*/
public function __construct(
\Magento\App\Resource $resource,
@@ -63,11 +75,13 @@ public function __construct(
\Magento\Stdlib\DateTime $dateTime,
\Magento\Stdlib\DateTime\Timezone\Validator $timezoneValidator,
\Magento\Catalog\Model\Resource\Product $productResource,
- \Magento\Sales\Model\Resource\Helper $salesResourceHelper
+ \Magento\Sales\Model\Resource\Helper $salesResourceHelper,
+ array $ignoredProductTypes = array()
) {
parent::__construct($resource, $logger, $locale, $reportsFlagFactory, $dateTime, $timezoneValidator);
$this->_productResource = $productResource;
$this->_salesResourceHelper = $salesResourceHelper;
+ $this->ignoredProductTypes = array_merge($this->ignoredProductTypes, $ignoredProductTypes);
}
@@ -154,16 +168,10 @@ public function aggregate($from = null, $to = null)
)
->where('source_table.state != ?', \Magento\Sales\Model\Order::STATE_CANCELED);
- $productTypes = array(
- \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE,
- \Magento\Catalog\Model\Product\Type::TYPE_CONFIGURABLE,
- \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE,
- );
-
$joinExpr = array(
'product.entity_id = order_item.product_id',
$adapter->quoteInto('product.entity_type_id = ?', $this->_productResource->getTypeId()),
- $adapter->quoteInto('product.type_id NOT IN(?)', $productTypes)
+ $adapter->quoteInto('product.type_id NOT IN(?)', $this->ignoredProductTypes)
);
$joinExpr = implode(' AND ', $joinExpr);
diff --git a/app/code/Magento/Sales/Model/Resource/Setup.php b/app/code/Magento/Sales/Model/Resource/Setup.php
index 4d0e07fc22233..06de721bebb6d 100644
--- a/app/code/Magento/Sales/Model/Resource/Setup.php
+++ b/app/code/Magento/Sales/Model/Resource/Setup.php
@@ -32,7 +32,7 @@
class Setup extends \Magento\Eav\Model\Entity\Setup
{
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_config;
@@ -46,7 +46,7 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
* @param string $resourceName
* @param \Magento\App\CacheInterface $cache
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $attrGroupCollectionFactory
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param string $moduleName
* @param string $connectionName
*/
@@ -55,7 +55,7 @@ public function __construct(
$resourceName,
\Magento\App\CacheInterface $cache,
\Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $attrGroupCollectionFactory,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
$moduleName = 'Magento_Sales',
$connectionName = ''
) {
@@ -260,7 +260,7 @@ public function getDefaultEntities()
/**
* Get config model
*
- * @return \Magento\Core\Model\Config
+ * @return \Magento\App\ConfigInterface
*/
public function getConfigModel()
{
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index 59078dba80599..3c57eced98723 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -51,16 +51,16 @@
-
- sales_quote_item
-
+
+ sales_quote_item
-
- Magento\Sales\Model\Resource\Setup
-
+
+ Magento\Sales\Model\Resource\Setup
diff --git a/app/code/Magento/Sales/etc/frontend/di.xml b/app/code/Magento/Sales/etc/frontend/di.xml
index a80b694568a68..dc8ac95a7b91c 100644
--- a/app/code/Magento/Sales/etc/frontend/di.xml
+++ b/app/code/Magento/Sales/etc/frontend/di.xml
@@ -26,9 +26,9 @@
-
- /sales/
-
+
+ /sales/
diff --git a/app/code/Magento/Sales/etc/module.xml b/app/code/Magento/Sales/etc/module.xml
index ca7f4f1ff6d8c..6f7a570a72044 100755
--- a/app/code/Magento/Sales/etc/module.xml
+++ b/app/code/Magento/Sales/etc/module.xml
@@ -28,13 +28,11 @@
Magento\Sales\Model\Order\Pdf\Items\Invoice\DefaultInvoice
- Magento\Sales\Model\Order\Pdf\Items\Invoice\Grouped
Magento\Sales\Model\Order\Pdf\Items\Shipment\DefaultShipment
Magento\Sales\Model\Order\Pdf\Items\Creditmemo\DefaultCreditmemo
- Magento\Sales\Model\Order\Pdf\Items\Creditmemo\Grouped
diff --git a/app/code/Magento/Sales/etc/sales.xml b/app/code/Magento/Sales/etc/sales.xml
index 1d1a9e1d01086..9c9396f7723cd 100644
--- a/app/code/Magento/Sales/etc/sales.xml
+++ b/app/code/Magento/Sales/etc/sales.xml
@@ -63,6 +63,5 @@
@@ -43,41 +42,6 @@
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
index 6a00c82dd57a4..2b526cbbd1225 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
@@ -33,53 +33,10 @@
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
index 8a658bd1e9bd9..c0f08719b17fb 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
@@ -28,53 +28,10 @@
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml
index d8081b524f28d..9d5646513aeb1 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml
@@ -33,7 +33,6 @@
@@ -43,48 +42,6 @@
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 48542594e246c..b32df85183b4b 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
@@ -48,7 +48,6 @@
escapeHtml($_item->getName()) ?>
canDisplayItemQty()): ?>
- getProduct()->getTypeId() != \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE): ?>
- getQty()*1 ? $_item->getQty()*1 : 1 ?>
-
+ getItemQty($_item); ?>
canDisplayPrice()): ?>
@@ -82,9 +80,9 @@
- getTypeId() == \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE && $this->getDataId() == 'wishlist'): ?>
+ isConfigurationRequired($_item->getTypeId()) && $this->getDataId() == 'wishlist'): ?>
 ?> "<?php echo __('Configure and Add to Order') ?>")
- getTypeId() == \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE): ?>
+ isConfigurationRequired($_item->getTypeId())): ?>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
index 8606fd7ae2387..a92b603517b6b 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
@@ -24,9 +24,9 @@
*/
-->
+
-
colspan="3" align="right" style="padding:3px 9px"
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_renderers.xml
similarity index 75%
rename from app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice.xml
rename to app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_renderers.xml
index 861baa1c1087f..6103c5b3f2397 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_renderers.xml
@@ -23,8 +23,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-
-
-
+
+
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
index fc245231b4706..20883ecb5ca33 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
@@ -24,9 +24,9 @@
*/
-->
+
-
colspan="3" align="right" style="padding:3px 9px"
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_renderers.xml
new file mode 100644
index 0000000000000..5a95ce784ced9
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
index fcba97901fe21..aea3fbcde4e36 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
@@ -24,9 +24,9 @@
*/
-->
+
-
colspan="3" align="right" style="padding:3px 9px"
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_guest_shipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_renderers.xml
similarity index 76%
rename from app/code/Magento/Bundle/view/frontend/layout/sales_guest_shipment.xml
rename to app/code/Magento/Sales/view/frontend/layout/sales_email_order_renderers.xml
index d34a37f904840..506495e63bf9c 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/sales_guest_shipment.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_renderers.xml
@@ -23,8 +23,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-
-
-
+
+
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
index dbf12ea55f9c1..f041570c04a1d 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
@@ -24,8 +24,9 @@
*/
-->
+
-
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_renderers.xml
new file mode 100644
index 0000000000000..1c435a00cc111
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml
index 17b7d0cb21109..91ecf77c39532 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml
@@ -24,6 +24,7 @@
*/
-->
+
1column.phtml
@@ -35,8 +36,7 @@
-
colspan="6" class="mark"
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml
index 54bd4a12913bc..35aab993fe85a 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml
@@ -24,6 +24,7 @@
*/
-->
+
1column.phtml
@@ -35,8 +36,7 @@
-
colspan="4" class="mark"
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml
index 7b55c73b3b5af..947436d8b7188 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml
@@ -24,10 +24,10 @@
*/
-->
+
-
colspan="4" class="mark"
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printcreditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printcreditmemo.xml
index f8d89184781e6..9fe41bf9baaac 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printcreditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printcreditmemo.xml
@@ -24,10 +24,10 @@
*/
-->
+
-
colspan="6" class="mark"
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printinvoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printinvoice.xml
index 13c631f5b3f33..5eacd46c052b7 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printinvoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printinvoice.xml
@@ -24,10 +24,10 @@
*/
-->
+
-
colspan="4" class="mark"
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml
index 7725c00812929..c496aad0a008a 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml
@@ -24,9 +24,10 @@
*/
-->
+
-
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml
index eb67d146a8a4c..1474388986a21 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml
@@ -24,6 +24,8 @@
*/
-->
+
1column.phtml
@@ -35,8 +37,7 @@
-
colspan="4" class="mark"
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
index 15fd5b781dec4..edaffb426d100 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
@@ -24,6 +24,7 @@
*/
-->
+
@@ -31,8 +32,7 @@
-
colspan="6" class="mark"
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo_renderers.xml
new file mode 100644
index 0000000000000..a963c5fa43eaf
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
index 856c8e534e64f..127c7ea7d22a8 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
@@ -25,14 +25,14 @@
-->
-
colspan="4" class="mark"
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice_renderers.xml
new file mode 100644
index 0000000000000..81ebc1a621825
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_item_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_item_renderers.xml
new file mode 100644
index 0000000000000..2789f977398fc
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_item_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
index 26b8965c4893a..67df30b8b6c40 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
@@ -24,10 +24,10 @@
*/
-->
+
-
colspan="4" class="mark"
diff --git a/app/code/Magento/Bundle/view/frontend/layout/paypal_express_review.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_creditmemo_renderers.xml
similarity index 82%
rename from app/code/Magento/Bundle/view/frontend/layout/paypal_express_review.xml
rename to app/code/Magento/Sales/view/frontend/layout/sales_order_print_creditmemo_renderers.xml
index 657757e4e4a6d..66eb571443331 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/paypal_express_review.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_creditmemo_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
-
+
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print_invoice_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_invoice_renderers.xml
new file mode 100644
index 0000000000000..323263038a0a3
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_invoice_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_renderers.xml
new file mode 100644
index 0000000000000..bc4ce6d24df16
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_renderers.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_printorder.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_shipment_renderers.xml
similarity index 83%
rename from app/code/Magento/Bundle/view/frontend/layout/sales_order_printorder.xml
rename to app/code/Magento/Sales/view/frontend/layout/sales_order_print_shipment_renderers.xml
index bea81de24d974..7b6bbe02442de 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_printorder.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_shipment_renderers.xml
@@ -24,7 +24,7 @@
*/
-->
-
-
+
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml
index 7f684f4d30603..282a266052201 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml
@@ -24,10 +24,10 @@
*/
-->
+
-
colspan="6" class="mark"
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
index a080901d33eaf..8c6395175efb3 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
@@ -24,10 +24,10 @@
*/
-->
+
-
colspan="4" class="mark"
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
index 70846a8bc6dfc..0908006fc8353 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
@@ -24,9 +24,10 @@
*/
-->
+
-
+
+
+
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
index ac1f33f1ca9d8..8cfeed067d18f 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
@@ -25,14 +25,14 @@
-->
-
colspan="4" class="mark"
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
index af304f06f027b..35da87ab0f25f 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
@@ -50,7 +50,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\SalesRule\Model\Resource\Coupon\CollectionFactory $salesRuleCoupon
* @param \Magento\Core\Model\Registry $coreRegistry
@@ -58,7 +57,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\SalesRule\Model\Resource\Coupon\CollectionFactory $salesRuleCoupon,
\Magento\Core\Model\Registry $coreRegistry,
@@ -66,7 +64,7 @@ public function __construct(
) {
$this->_coreRegistry = $coreRegistry;
$this->_salesRuleCoupon = $salesRuleCoupon;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
index d20c3b174cd6d..6bca308be0b0c 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
@@ -17,7 +17,7 @@
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
- *
+ *
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -32,20 +32,18 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\SalesRule\Model\RuleFactory $ruleFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\SalesRule\Model\RuleFactory $ruleFactory,
array $data = array()
) {
$this->ruleFactory = $ruleFactory;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
@@ -134,53 +132,53 @@ function (grid, event) {
protected function _prepareColumns()
{
$this->addColumn('rule_id', array(
- 'header' => __('ID'),
- 'align' => 'right',
- 'width' => '50px',
- 'index' => 'rule_id',
- ));
+ 'header' => __('ID'),
+ 'align' => 'right',
+ 'width' => '50px',
+ 'index' => 'rule_id',
+ ));
$this->addColumn('name', array(
- 'header' => __('Rule'),
- 'align' => 'left',
- 'index' => 'name',
- ));
+ 'header' => __('Rule'),
+ 'align' => 'left',
+ 'index' => 'name',
+ ));
$this->addColumn('coupon_code', array(
- 'header' => __('Coupon Code'),
- 'align' => 'left',
- 'width' => '150px',
- 'index' => 'code',
- ));
+ 'header' => __('Coupon Code'),
+ 'align' => 'left',
+ 'width' => '150px',
+ 'index' => 'code',
+ ));
$this->addColumn('from_date', array(
- 'header' => __('Start on'),
- 'align' => 'left',
- 'width' => '120px',
- 'type' => 'date',
- 'index' => 'from_date',
- ));
+ 'header' => __('Start on'),
+ 'align' => 'left',
+ 'width' => '120px',
+ 'type' => 'date',
+ 'index' => 'from_date',
+ ));
$this->addColumn('to_date', array(
- 'header' => __('End on'),
- 'align' => 'left',
- 'width' => '120px',
- 'type' => 'date',
- 'default' => '--',
- 'index' => 'to_date',
- ));
+ 'header' => __('End on'),
+ 'align' => 'left',
+ 'width' => '120px',
+ 'type' => 'date',
+ 'default' => '--',
+ 'index' => 'to_date',
+ ));
$this->addColumn('is_active', array(
- 'header' => __('Status'),
- 'align' => 'left',
- 'width' => '80px',
- 'index' => 'is_active',
- 'type' => 'options',
- 'options' => array(
- 1 => 'Active',
- 0 => 'Inactive',
- ),
- ));
+ 'header' => __('Status'),
+ 'align' => 'left',
+ 'width' => '80px',
+ 'index' => 'is_active',
+ 'type' => 'options',
+ 'options' => array(
+ 1 => 'Active',
+ 0 => 'Inactive',
+ ),
+ ));
return parent::_prepareColumns();
}
diff --git a/app/code/Magento/SalesRule/etc/adminhtml/di.xml b/app/code/Magento/SalesRule/etc/adminhtml/di.xml
index c411729e5b098..09cab679ac02e 100644
--- a/app/code/Magento/SalesRule/etc/adminhtml/di.xml
+++ b/app/code/Magento/SalesRule/etc/adminhtml/di.xml
@@ -26,14 +26,16 @@
-
- -
-
- ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
- ABCDEFGHIJKLMNOPQRSTUVWXYZ
- 0123456789
-
-
+
+ - -
+
+ ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789
+
+
diff --git a/app/code/Magento/SalesRule/etc/di.xml b/app/code/Magento/SalesRule/etc/di.xml
index 2ce784a1decdf..2f86d60345d63 100644
--- a/app/code/Magento/SalesRule/etc/di.xml
+++ b/app/code/Magento/SalesRule/etc/di.xml
@@ -30,9 +30,9 @@
-
- Magento\SalesRule\Model\Resource\Setup
-
+
+ Magento\SalesRule\Model\Resource\Setup
diff --git a/app/code/Magento/Sendfriend/Controller/Product.php b/app/code/Magento/Sendfriend/Controller/Product.php
index e8cace7f2e0a0..61c2220522c2d 100644
--- a/app/code/Magento/Sendfriend/Controller/Product.php
+++ b/app/code/Magento/Sendfriend/Controller/Product.php
@@ -88,7 +88,7 @@ public function dispatch(RequestInterface $request)
$this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
if ($this->getRequest()->getActionName() == 'sendemail') {
$session->setBeforeAuthUrl($this->_objectManager
- ->create('Magento\Core\Model\Url')
+ ->create('Magento\UrlInterface')
->getUrl('*/*/send', array(
'_current' => true
)));
@@ -246,7 +246,7 @@ public function sendmailAction()
$catalogSession->setSendfriendFormData($data);
$url = $this->_objectManager
- ->create('Magento\Core\Model\Url')
+ ->create('Magento\UrlInterface')
->getUrl('*/*/send', array('_current' => true));
$this->getResponse()->setRedirect($this->_redirect->error($url));
}
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Carrier/Tablerate/Grid.php b/app/code/Magento/Shipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
index 8ab9b62ea10f9..46672da0c9205 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
@@ -62,7 +62,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Shipping\Model\Resource\Carrier\Tablerate\CollectionFactory $collectionFactory
* @param \Magento\Shipping\Model\Carrier\Tablerate $tablerate
@@ -70,7 +69,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Shipping\Model\Resource\Carrier\Tablerate\CollectionFactory $collectionFactory,
\Magento\Shipping\Model\Carrier\Tablerate $tablerate,
@@ -78,7 +76,7 @@ public function __construct(
) {
$this->_collectionFactory = $collectionFactory;
$this->_tablerate = $tablerate;
- parent::__construct($context, $urlModel, $backendHelper, $data);
+ parent::__construct($context, $backendHelper, $data);
}
/**
diff --git a/app/code/Magento/Shipping/Model/Config/Backend/Tablerate.php b/app/code/Magento/Shipping/Model/Config/Backend/Tablerate.php
index 00d0e6a579439..f486f7d75b4a7 100644
--- a/app/code/Magento/Shipping/Model/Config/Backend/Tablerate.php
+++ b/app/code/Magento/Shipping/Model/Config/Backend/Tablerate.php
@@ -45,7 +45,7 @@ class Tablerate extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Shipping\Model\Resource\Carrier\TablerateFactory $tablerateFactory
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -55,7 +55,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Shipping\Model\Resource\Carrier\TablerateFactory $tablerateFactory,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Shipping/Model/Resource/Carrier/Tablerate.php b/app/code/Magento/Shipping/Model/Resource/Carrier/Tablerate.php
index 4d7365b57d38b..92c32c7d01dd5 100644
--- a/app/code/Magento/Shipping/Model/Resource/Carrier/Tablerate.php
+++ b/app/code/Magento/Shipping/Model/Resource/Carrier/Tablerate.php
@@ -100,7 +100,7 @@ class Tablerate extends \Magento\Core\Model\Resource\Db\AbstractDb
protected $_conditionFullNames = array();
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\App\ConfigInterface
*/
protected $_coreConfig;
@@ -139,7 +139,7 @@ class Tablerate extends \Magento\Core\Model\Resource\Db\AbstractDb
/**
* @param \Magento\App\Resource $resource
* @param \Magento\Logger $logger
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ConfigInterface $coreConfig
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Shipping\Model\Carrier\Tablerate $carrierTablerate
* @param \Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollectionFactory
@@ -149,7 +149,7 @@ class Tablerate extends \Magento\Core\Model\Resource\Db\AbstractDb
public function __construct(
\Magento\App\Resource $resource,
\Magento\Logger $logger,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ConfigInterface $coreConfig,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Shipping\Model\Carrier\Tablerate $carrierTablerate,
\Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollectionFactory,
diff --git a/app/code/Magento/Shipping/view/frontend/layout/sales_guest_shipment.xml b/app/code/Magento/Shipping/view/frontend/layout/sales_guest_shipment.xml
index 514bfcc9d82e2..0d905bf0aacc2 100644
--- a/app/code/Magento/Shipping/view/frontend/layout/sales_guest_shipment.xml
+++ b/app/code/Magento/Shipping/view/frontend/layout/sales_guest_shipment.xml
@@ -24,17 +24,18 @@
*/
-->
+
+
Track All Shipments
-
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Shipping/view/frontend/layout/sales_order_shipment.xml b/app/code/Magento/Shipping/view/frontend/layout/sales_order_shipment.xml
index 514bfcc9d82e2..0d905bf0aacc2 100644
--- a/app/code/Magento/Shipping/view/frontend/layout/sales_order_shipment.xml
+++ b/app/code/Magento/Shipping/view/frontend/layout/sales_order_shipment.xml
@@ -24,17 +24,18 @@
*/
-->
+
+
Track All Shipments
-
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 83ac6d0b323c3..b09e67f21bf02 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -561,7 +561,7 @@ protected function _getBaseDir()
* @param string $type
* @return string
*/
- protected function _getStoreBaseUrl($type = \Magento\Core\Model\Store::URL_TYPE_LINK)
+ protected function _getStoreBaseUrl($type = \Magento\UrlInterface::URL_TYPE_LINK)
{
return rtrim($this->_storeManager->getStore($this->getStoreId())->getBaseUrl($type), '/') . '/';
}
@@ -573,7 +573,7 @@ protected function _getStoreBaseUrl($type = \Magento\Core\Model\Store::URL_TYPE_
* @param string $type
* @return string
*/
- protected function _getUrl($url, $type = \Magento\Core\Model\Store::URL_TYPE_LINK)
+ protected function _getUrl($url, $type = \Magento\UrlInterface::URL_TYPE_LINK)
{
return $this->_getStoreBaseUrl($type) . ltrim($url, '/');
}
@@ -586,7 +586,7 @@ protected function _getUrl($url, $type = \Magento\Core\Model\Store::URL_TYPE_LIN
*/
protected function _getMediaUrl($url)
{
- return $this->_getUrl($url, \Magento\Core\Model\Store::URL_TYPE_MEDIA);
+ return $this->_getUrl($url, \Magento\UrlInterface::URL_TYPE_MEDIA);
}
/**
@@ -629,7 +629,7 @@ protected function _getStoreBaseDomain()
$storeDomain = rtrim($url . '/' . $installationFolder, '/');
} else {
//case when documentRoot contains symlink to basedir
- $url = $this->_getStoreBaseUrl(\Magento\Core\Model\Store::URL_TYPE_WEB);
+ $url = $this->_getStoreBaseUrl(\Magento\UrlInterface::URL_TYPE_WEB);
$storeDomain = rtrim($url, '/');
}
diff --git a/app/code/Magento/Tax/Model/Config/Price/IncludePrice.php b/app/code/Magento/Tax/Model/Config/Price/IncludePrice.php
index 5131c2d073d4c..41ce467fa9ae6 100644
--- a/app/code/Magento/Tax/Model/Config/Price/IncludePrice.php
+++ b/app/code/Magento/Tax/Model/Config/Price/IncludePrice.php
@@ -37,7 +37,7 @@ class IncludePrice extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Core\Model\App $app
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -47,7 +47,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Core\Model\App $app,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Tax/Model/Resource/Setup.php b/app/code/Magento/Tax/Model/Resource/Setup.php
index 03a4c4177976f..d3876846b83b6 100644
--- a/app/code/Magento/Tax/Model/Resource/Setup.php
+++ b/app/code/Magento/Tax/Model/Resource/Setup.php
@@ -41,7 +41,7 @@ class Setup extends \Magento\Sales\Model\Resource\Setup
* @param string $resourceName
* @param \Magento\App\CacheInterface $cache
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $attrGroupCollectionFactory
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\App\ConfigInterface $config
* @param \Magento\Catalog\Model\Resource\SetupFactory $setupFactory
* @param string $moduleName
* @param string $connectionName
@@ -51,7 +51,7 @@ public function __construct(
$resourceName,
\Magento\App\CacheInterface $cache,
\Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $attrGroupCollectionFactory,
- \Magento\Core\Model\Config $config,
+ \Magento\App\ConfigInterface $config,
\Magento\Catalog\Model\Resource\SetupFactory $setupFactory,
$moduleName = 'Magento_Tax',
$connectionName = ''
diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
index a3a3cccb3cc73..8a88e481c3982 100644
--- a/app/code/Magento/Tax/etc/di.xml
+++ b/app/code/Magento/Tax/etc/di.xml
@@ -31,9 +31,9 @@
-
- Magento\Tax\Model\Resource\Setup
-
+
+ Magento\Tax\Model\Resource\Setup
diff --git a/app/code/Magento/Theme/Block/Html.php b/app/code/Magento/Theme/Block/Html.php
index f8bb35b1b90b5..7c2ebee96a9ac 100644
--- a/app/code/Magento/Theme/Block/Html.php
+++ b/app/code/Magento/Theme/Block/Html.php
@@ -57,7 +57,7 @@ protected function _construct()
$this->addBodyClass($this->_request->getFullActionName('-'));
if ($this->_cacheState->isEnabled(self::CACHE_GROUP)) {
- $this->_app->setUseSessionVar(true);
+ $this->_sidResolver->setUseSessionVar(true);
}
}
@@ -119,7 +119,7 @@ public function getPrintLogoUrl()
// buld url
if (!empty($logo)) {
- $logo = $this->_urlBuilder->getBaseUrl(array('_type' => \Magento\Core\Model\Store::URL_TYPE_MEDIA)) . $logo;
+ $logo = $this->_urlBuilder->getBaseUrl(array('_type' => \Magento\UrlInterface::URL_TYPE_MEDIA)) . $logo;
} else {
$logo = '';
}
@@ -214,7 +214,7 @@ public function getAbsoluteFooter()
protected function _afterToHtml($html)
{
if ($this->_cacheState->isEnabled(self::CACHE_GROUP)) {
- $this->_app->setUseSessionVar(false);
+ $this->_sidResolver->setUseSessionVar(false);
\Magento\Profiler::start('CACHE_URL');
$html = $this->_urlBuilder->sessionUrlVar($html);
\Magento\Profiler::stop('CACHE_URL');
diff --git a/app/code/Magento/Theme/Block/Html/Head.php b/app/code/Magento/Theme/Block/Html/Head.php
index 09600c188ace8..4902352edb13b 100644
--- a/app/code/Magento/Theme/Block/Html/Head.php
+++ b/app/code/Magento/Theme/Block/Html/Head.php
@@ -386,7 +386,8 @@ protected function _getFaviconFile()
$folderName = \Magento\Backend\Model\Config\Backend\Image\Favicon::UPLOAD_DIR;
$storeConfig = $this->_storeConfig->getConfig('design/head/shortcut_icon');
$path = $folderName . '/' . $storeConfig;
- $faviconFile = $this->_storeManager->getStore()->getBaseUrl('media') . $path;
+ $faviconFile = $this->_storeManager->getStore()
+ ->getBaseUrl(\Magento\UrlInterface::URL_TYPE_MEDIA) . $path;
if (!is_null($storeConfig) && $this->_isFile($path)) {
$url = $faviconFile;
diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php
index ff028e4139d3e..32f9a799ab86e 100644
--- a/app/code/Magento/Theme/Block/Html/Header.php
+++ b/app/code/Magento/Theme/Block/Html/Header.php
@@ -130,7 +130,7 @@ protected function _getLogoUrl()
$folderName = \Magento\Backend\Model\Config\Backend\Image\Logo::UPLOAD_DIR;
$storeLogoPath = $this->_storeConfig->getConfig('design/header/logo_src');
$path = $folderName . '/' . $storeLogoPath;
- $logoUrl = $this->_urlBuilder->getBaseUrl(array('_type' => \Magento\Core\Model\Store::URL_TYPE_MEDIA)) . $path;
+ $logoUrl = $this->_urlBuilder->getBaseUrl(array('_type' => \Magento\UrlInterface::URL_TYPE_MEDIA)) . $path;
if (!is_null($storeLogoPath) && $this->_isFile($path)) {
$url = $logoUrl;
diff --git a/app/code/Magento/Theme/Block/Html/Notices.php b/app/code/Magento/Theme/Block/Html/Notices.php
index f8cf1a1c2797a..64740be03ec2e 100644
--- a/app/code/Magento/Theme/Block/Html/Notices.php
+++ b/app/code/Magento/Theme/Block/Html/Notices.php
@@ -29,22 +29,14 @@
*/
class Notices extends \Magento\View\Element\Template
{
- /**
- * @var \Magento\Core\Model\Url
- */
- protected $_urlModel;
-
/**
* @param \Magento\View\Element\Template\Context $context
- * @param \Magento\Core\Model\Url $urlModel
* @param array $data
*/
public function __construct(
\Magento\View\Element\Template\Context $context,
- \Magento\Core\Model\Url $urlModel,
array $data = array()
) {
- $this->_urlModel = $urlModel;
parent::__construct($context, $data);
}
@@ -75,6 +67,6 @@ public function displayDemoNotice()
*/
public function getPrivacyPolicyLink()
{
- return $this->_urlModel->getUrl('privacy-policy-cookie-restriction-mode');
+ return $this->_urlBuilder->getUrl('privacy-policy-cookie-restriction-mode');
}
}
diff --git a/app/code/Magento/Theme/Model/Config.php b/app/code/Magento/Theme/Model/Config.php
index 3a6f43c3cf4db..f40d94b7b6a1b 100644
--- a/app/code/Magento/Theme/Model/Config.php
+++ b/app/code/Magento/Theme/Model/Config.php
@@ -37,7 +37,7 @@ class Config
protected $_configWriter;
/**
- * @var \Magento\Core\Model\Config\Value
+ * @var \Magento\App\Config\ValueInterface
*/
protected $_configData;
@@ -64,7 +64,7 @@ class Config
protected $_layoutCache;
/**
- * @param \Magento\Core\Model\Config\Value $configData
+ * @param \Magento\App\Config\ValueInterface $configData
* @param \Magento\Core\Model\Config\Storage\WriterInterface $configWriter
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Event\ManagerInterface $eventManager
@@ -72,7 +72,7 @@ class Config
* @param \Magento\Cache\FrontendInterface $layoutCache
*/
public function __construct(
- \Magento\Core\Model\Config\Value $configData,
+ \Magento\App\Config\ValueInterface $configData,
\Magento\Core\Model\Config\Storage\WriterInterface $configWriter,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Event\ManagerInterface $eventManager,
@@ -95,8 +95,11 @@ public function __construct(
* @param string $scope
* @return $this
*/
- public function assignToStore($theme, array $stores = array(), $scope = \Magento\Core\Model\Config::SCOPE_STORES)
- {
+ public function assignToStore(
+ $theme,
+ array $stores = array(),
+ $scope = \Magento\Core\Model\ScopeInterface::SCOPE_STORES
+ ) {
$isReassigned = false;
$this->_unassignThemeFromStores(
@@ -191,7 +194,7 @@ protected function _assignThemeToStores($themeId, $stores, $scope, &$isReassigne
protected function _assignThemeToDefaultScope($themeId, &$isReassigned)
{
$configPath = \Magento\View\DesignInterface::XML_PATH_THEME_ID;
- $this->_configWriter->save($configPath, $themeId, \Magento\Core\Model\Config::SCOPE_DEFAULT);
+ $this->_configWriter->save($configPath, $themeId, \Magento\Core\Model\ScopeInterface::SCOPE_DEFAULT);
$isReassigned = true;
return $this;
}
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index ad6d2b5d914cc..b1e7b0e503c6d 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -34,10 +34,10 @@
-
- 2M
- 2M
-
+
+ 2M 2M
diff --git a/app/code/Magento/Theme/view/frontend/html/breadcrumbs.phtml b/app/code/Magento/Theme/view/frontend/html/breadcrumbs.phtml
index 7e7f174b21f92..e358f2e12f49f 100644
--- a/app/code/Magento/Theme/view/frontend/html/breadcrumbs.phtml
+++ b/app/code/Magento/Theme/view/frontend/html/breadcrumbs.phtml
@@ -23,17 +23,19 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-
+
", $values); + break; + case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_ONELINE: + $output = implode(" ", $values); + break; + default: + $output = implode("\n", $values); + break; + } + return $output; + } +} diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Multiselect.php b/app/code/Magento/Customer/Model/Metadata/Form/Multiselect.php new file mode 100644 index 0000000000000..586bedfbd7f11 --- /dev/null +++ b/app/code/Magento/Customer/Model/Metadata/Form/Multiselect.php @@ -0,0 +1,99 @@ +_getRequestValue($request); + if ($values !== false && !is_array($values)) { + $values = array($values); + } + return $values; + } + + /** + * Export attribute value to entity model + * + * @param array|string $value + * @return \Magento\Customer\Model\Metadata\Form\Multiselect + */ + public function compactValue($value) + { + if (is_array($value)) { + $value = implode(',', $value); + } + return parent::compactValue($value); + } + + /** + * Return formated attribute value from entity model + * + * @param string $format + * @return array|string + */ + public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT) + { + $values = $this->_value; + if (!is_array($values)) { + $values = explode(',', $values); + } + + switch ($format) { + case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON: + case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_ARRAY: + $output = $values; + default: + $output = array(); + foreach ($values as $value) { + if (!$value) { + continue; + } + $optionText = false; + foreach ($this->getAttribute()->getOptions() as $optionKey => $optionValue) { + if ($optionValue == $value) { + $optionText = $optionKey; + } + } + $output[] = $optionText; + } + $output = implode(', ', $output); + break; + } + + return $output; + } +} diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Select.php b/app/code/Magento/Customer/Model/Metadata/Form/Select.php new file mode 100644 index 0000000000000..8ee81142130d2 --- /dev/null +++ b/app/code/Magento/Customer/Model/Metadata/Form/Select.php @@ -0,0 +1,142 @@ +_getRequestValue($request); + } + + /** + * Validate data + * Return true or array of errors + * + * @param array|string $value + * @return boolean|array + */ + public function validateValue($value) + { + $errors = array(); + $attribute = $this->getAttribute(); + $label = __($attribute->getStoreLabel()); + + if ($value === false) { + // try to load original value and validate it + $value = $this->_value; + } + + if ($attribute->isRequired() && empty($value) && $value != '0') { + $errors[] = __('"%1" is a required value.', $label); + } + + if (!$errors && !$attribute->isRequired() && empty($value)) { + return true; + } + + if (count($errors) == 0) { + return true; + } + + return $errors; + } + + /** + * Export attribute value to entity model + * + * @param array|string $value + * @return string + */ + public function compactValue($value) + { + if ($value !== false) { + $value; + } + return false; + } + + /** + * Restore attribute value from SESSION to entity model + * + * @param array|string $value + * @return string + */ + public function restoreValue($value) + { + return $this->compactValue($value); + } + + /** + * Return a text for option value + * + * @param int $value + * @return string + */ + protected function _getOptionText($value) + { + $optionText = false; + foreach ($this->getAttribute()->getOptions() as $optionKey => $optionValue) { + if ($optionValue == $value) { + $optionText = $optionKey; + } + } + $output[] = $optionText; + } + + /** + * Return formated attribute value from entity model + * + * @return string|array + */ + public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT) + { + $value = $this->_value; + switch ($format) { + case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON: + $output = $value; + break; + default: + if ($value != '') { + $output = $this->_getOptionText($value); + } else { + $output = ''; + } + break; + } + + return $output; + } +} diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Text.php b/app/code/Magento/Customer/Model/Metadata/Form/Text.php new file mode 100644 index 0000000000000..59bc406fce491 --- /dev/null +++ b/app/code/Magento/Customer/Model/Metadata/Form/Text.php @@ -0,0 +1,168 @@ + + */ +namespace Magento\Customer\Model\Metadata\Form; + +class Text extends AbstractData +{ + /** + * @var \Magento\Core\Helper\String + */ + protected $_string; + + /** + * @param \Magento\Core\Model\LocaleInterface $locale + * @param \Magento\Logger $logger + * @param \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata $attribute + * @param null $value + * @param $entityTypeCode + * @param bool $isAjax + * @param \Magento\Stdlib\String $stringHelper + */ + public function __construct( + \Magento\Core\Model\LocaleInterface $locale, + \Magento\Logger $logger, + \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata $attribute, + $value = null, + $entityTypeCode, + $isAjax = false, + \Magento\Stdlib\String $stringHelper + ) { + parent::__construct($locale, $logger, $attribute, $value, $entityTypeCode, $isAjax); + $this->_string = $stringHelper; + } + + /** + * Extract data from request and return value + * + * @param \Magento\App\RequestInterface $request + * @return array|string + */ + public function extractValue(\Magento\App\RequestInterface $request) + { + $value = $this->_getRequestValue($request); + return $this->_applyInputFilter($value); + } + + /** + * Validate data + * Return true or array of errors + * + * @param array|string $value + * @return boolean|array + */ + public function validateValue($value) + { + $errors = array(); + $attribute = $this->getAttribute(); + $label = __($attribute->getStoreLabel()); + + if ($value === false) { + // try to load original value and validate it + $value = $this->_value; + } + + if ($attribute->isRequired() && empty($value) && $value !== '0') { + $errors[] = __('"%1" is a required value.', $label); + } + + if (!$errors && !$attribute->isRequired() && empty($value)) { + return true; + } + + // validate length + $length = $this->_string->strlen(trim($value)); + + $validateRules = $attribute->getValidationRules(); + if (!empty($validateRules['min_text_length']) && $length < $validateRules['min_text_length']) { + $v = $validateRules['min_text_length']; + $errors[] = __('"%1" length must be equal or greater than %2 characters.', $label, $v); + } + if (!empty($validateRules['max_text_length']) && $length > $validateRules['max_text_length']) { + $v = $validateRules['max_text_length']; + $errors[] = __('"%1" length must be equal or less than %2 characters.', $label, $v); + } + + $result = $this->_validateInputRule($value); + if ($result !== true) { + $errors = array_merge($errors, $result); + } + if (count($errors) == 0) { + return true; + } + + return $errors; + } + + /** + * Export attribute value to entity model + * + * @param array|string $value + * @return string|value + */ + public function compactValue($value) + { + if ($value !== false) { + $value; + } + return false; + } + + /** + * Restore attribute value from SESSION to entity model + * + * @param array|string $value + * @return string|value + */ + public function restoreValue($value) + { + return $this->compactValue($value); + } + + /** + * Return formated attribute value from entity model + * + * @param string $format + * @return string|array + */ + public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT) + { + $value = $this->_value; + $value = $this->_applyOutputFilter($value); + + return $value; + } +} diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Grouped.php b/app/code/Magento/Customer/Model/Metadata/Form/Textarea.php similarity index 71% rename from app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Grouped.php rename to app/code/Magento/Customer/Model/Metadata/Form/Textarea.php index 0f1b4a5d3f764..eeb7bec0d8366 100644 --- a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Grouped.php +++ b/app/code/Magento/Customer/Model/Metadata/Form/Textarea.php @@ -1,5 +1,7 @@ - */ -namespace Magento\ImportExport\Model\Export\Entity\Product\Type; +namespace Magento\Customer\Model\Metadata\Form; -class Grouped - extends \Magento\ImportExport\Model\Export\Entity\Product\Type\AbstractType +class Textarea extends \Magento\Eav\Model\Attribute\Data\Text { } diff --git a/app/code/Magento/Customer/Model/Metadata/FormFactory.php b/app/code/Magento/Customer/Model/Metadata/FormFactory.php new file mode 100644 index 0000000000000..7a4984c1cbfb8 --- /dev/null +++ b/app/code/Magento/Customer/Model/Metadata/FormFactory.php @@ -0,0 +1,70 @@ +_objectManager = $objectManager; + } + + + /** + * Create Form + * + * @param string $entityType + * @param string $formCode + * @param array $attributeValues + * @param bool $isAjax + * @return \Magento\Customer\Model\Metadata\Form + */ + public function create( + $entityType, + $formCode, + $attributeValues = [], + $isAjax = false + ) { + $params = [ + 'entityType' => $entityType, + 'formCode' => $formCode, + 'attributeValues' => $attributeValues, + 'isAjax' => $isAjax, + ]; + return $this->_objectManager->create('Magento\Customer\Model\Metadata\Form', $params); + } +} \ No newline at end of file diff --git a/app/code/Magento/Customer/Model/Resource/Form/Attribute/CollectionFactory.php b/app/code/Magento/Customer/Model/Resource/Form/Attribute/CollectionFactory.php new file mode 100644 index 0000000000000..410a6ff9d0005 --- /dev/null +++ b/app/code/Magento/Customer/Model/Resource/Form/Attribute/CollectionFactory.php @@ -0,0 +1,54 @@ +_objectManager = $objectManager; + } + + + /** + * Create Collection + * + * @return \Magento\Customer\Model\Resource\Form\Attribute\Collection + */ + public function create() + { + return $this->_objectManager->create('Magento\Customer\Model\Resource\Form\Attribute\Collection'); + } +} \ No newline at end of file diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php index 6c971a51859f4..133fa1f2b1fd6 100644 --- a/app/code/Magento/Customer/Model/Session.php +++ b/app/code/Magento/Customer/Model/Session.php @@ -80,7 +80,7 @@ class Session extends \Magento\Session\SessionManager protected $_customerFactory; /** - * @var \Magento\Core\Model\UrlFactory + * @var \Magento\UrlFactory */ protected $_urlFactory; @@ -106,7 +106,7 @@ class Session extends \Magento\Session\SessionManager * @param \Magento\Customer\Helper\Data $customerData * @param Resource\Customer $customerResource * @param CustomerFactory $customerFactory - * @param \Magento\Core\Model\UrlFactory $urlFactory + * @param \Magento\UrlFactory $urlFactory * @param \Magento\Core\Model\Session $session * @param \Magento\Event\ManagerInterface $eventManager * @param \Magento\Core\Model\StoreManagerInterface $storeManager @@ -125,7 +125,7 @@ public function __construct( \Magento\Customer\Helper\Data $customerData, \Magento\Customer\Model\Resource\Customer $customerResource, \Magento\Customer\Model\CustomerFactory $customerFactory, - \Magento\Core\Model\UrlFactory $urlFactory, + \Magento\UrlFactory $urlFactory, \Magento\Core\Model\Session $session, \Magento\Event\ManagerInterface $eventManager, \Magento\Core\Model\StoreManagerInterface $storeManager, @@ -441,7 +441,7 @@ protected function _createCustomer() } /** - * @return \Magento\Core\Model\Url + * @return \Magento\UrlInterface */ protected function _createUrl() { diff --git a/app/code/Magento/Customer/Service/Customer.php b/app/code/Magento/Customer/Service/Customer.php deleted file mode 100644 index ff922d06d93cd..0000000000000 --- a/app/code/Magento/Customer/Service/Customer.php +++ /dev/null @@ -1,416 +0,0 @@ -_dataHelper = $helper; - $this->_customerFactory = $customerFactory; - $this->_addressFactory = $addressFactory; - $this->_isAdminStore = $isAdminStore; - } - - /** - * Set is admin store flag. - * - * @param bool $isAdminStore - * @return \Magento\Customer\Service\Customer - */ - public function setIsAdminStore($isAdminStore) - { - $this->_isAdminStore = $isAdminStore; - return $this; - } - - /** - * Set flag if send remainder email - * - * @param bool $flag - * @return \Magento\Customer\Service\Customer - */ - public function setSendRemainderEmail($flag) - { - // todo: drop next string as soon as front controller of webapi will be able to return routers - $this->_sendRemainderEmail = (bool)$flag; - return $this; - } - - /** - * Set before save callback. - * - * @param callable $callback - * @return \Magento\Customer\Service\Customer - */ - public function setBeforeSaveCallback($callback) - { - $this->_beforeSaveCallback = $callback; - return $this; - } - - /** - * Set after save callback. - * - * @param callable $callback - * @return \Magento\Customer\Service\Customer - */ - public function setAfterSaveCallback($callback) - { - $this->_afterSaveCallback = $callback; - return $this; - } - - /** - * Create customer with optional ability of adding addresses. - * - * @param array $customerData - * @param array|null $addressesData array of addresses - * @return \Magento\Customer\Model\Customer - */ - public function create(array $customerData, array $addressesData = null) - { - $customer = $this->_customerFactory->create(); - $this->_preparePasswordForSave($customer, $customerData); - $this->_save($customer, $customerData, $addressesData); - - return $customer; - } - - /** - * Update customer entity. - * - * Update customer with optional ability to update customer addresses. - * Addresses that are not in $addressesData array but present in customer addresses collection will be removed. - * New address is created in case when no entity_id is present, otherwise corresponding address will be updated - * with data provided. - * - * @param string|int $customerId - * @param array $customerData - * @param array|null $addressesData array of addresses - * @return \Magento\Customer\Model\Customer - */ - public function update($customerId, array $customerData, array $addressesData = null) - { - /** @var \Magento\Customer\Model\Customer $customer */ - $customer = $this->_loadCustomerById($customerId); - - $this->_save($customer, $customerData, $addressesData); - if ($customerData) { - $this->_changePassword($customer, $customerData); - } - - return $customer; - } - - /** - * Save customer entity. Perform supplementary business workflow actions - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @param array|null $addressesData - * @return \Magento\Customer\Service\Customer - */ - protected function _save($customer, array $customerData, array $addressesData = null) - { - if ($customerData) { - $this->_setDataUsingMethods($customer, $customerData); - } - $this->_beforeSave($customer, $customerData, $addressesData); - $customer->save(); - $this->_afterSave($customer, $customerData, $addressesData); - - return $this; - } - - /** - * Sets each value from data to entity \Magento\Object using setter method. - * - * @param \Magento\Object $entity - * @param array $data - */ - protected function _setDataUsingMethods($entity, array $data) - { - foreach ($data as $property => $value) { - $entity->setDataUsingMethod($property, $value); - } - } - - /** - * Trigger before save logic - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @param array $addressesData - */ - protected function _beforeSave($customer, array $customerData, array $addressesData = null) - { - if (!is_null($addressesData)) { - $this->_prepareCustomerAddressesForSave($customer, $addressesData); - } - if (is_callable($this->_beforeSaveCallback)) { - call_user_func_array($this->_beforeSaveCallback, array($customer, $customerData, $addressesData)); - } - } - - /** - * Trigger before save logic - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @param array $addressesData - */ - protected function _afterSave($customer, array $customerData, array $addressesData = null) - { - if (is_callable($this->_afterSaveCallback)) { - call_user_func_array($this->_afterSaveCallback, array($customer, $customerData, $addressesData)); - } - $this->_sendWelcomeEmail($customer, $customerData); - } - - /** - * Set customer password - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - */ - protected function _preparePasswordForSave($customer, array $customerData) - { - $password = $this->_getCustomerPassword($customer, $customerData); - if (!is_null($password)) { - // 'force_confirmed' should be set in admin area only - if ($this->_isAdminStore) { - $customer->setForceConfirmed(true); - } - $customer->setPassword($password); - } - } - - /** - * Get customer password - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @return string|null - */ - protected function _getCustomerPassword($customer, array $customerData) - { - $password = null; - - if ($this->_isAutogeneratePassword($customerData)) { - $password = $customer->generatePassword(); - } elseif (isset($customerData['password'])) { - $password = $customerData['password']; - } - - return $password; - } - - /** - * Change customer password - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @return \Magento\Customer\Service\Customer - */ - protected function _changePassword($customer, array $customerData) - { - if (!empty($customerData['password']) || $this->_isAutogeneratePassword($customerData)) { - $newPassword = $this->_getCustomerPassword($customer, $customerData); - $customer->changePassword($newPassword); - if ($this->_sendRemainderEmail) { - $customer->sendPasswordReminderEmail(); - } - } - - return $this; - } - - /** - * Check if password should be generated automatically - * - * @param array $customerData - * @return bool - */ - protected function _isAutogeneratePassword(array $customerData) - { - return isset($customerData['autogenerate_password']) && $customerData['autogenerate_password']; - } - - /** - * Retrieve send email flag - * - * @param array $customerData - * @return bool - */ - protected function _isSendEmail(array $customerData) - { - return isset($customerData['sendemail']) && $customerData['sendemail']; - } - - /** - * Send welcome email to customer - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $customerData - * @return \Magento\Customer\Service\Customer - */ - protected function _sendWelcomeEmail($customer, array $customerData) - { - if ($customer->getWebsiteId() - && ($this->_isSendEmail($customerData) || $this->_isAutogeneratePassword($customerData)) - ) { - $isNewCustomer = !(bool)$customer->getOrigData($customer->getIdFieldName()); - $storeId = $customer->getSendemailStoreId(); - - if ($isNewCustomer) { - $newLinkToken = $this->_dataHelper->generateResetPasswordLinkToken(); - $customer->changeResetPasswordLinkToken($newLinkToken); - $customer->sendNewAccountEmail('registered', '', $storeId); - } elseif (!$customer->getConfirmation()) { - // Confirm not confirmed customer - $customer->sendNewAccountEmail('confirmed', '', $storeId); - } - } - return $this; - } - - /** - * Load customer by its ID - * - * @param int|string $customerId - * @return \Magento\Customer\Model\Customer - * @throws \Magento\Core\Exception - */ - protected function _loadCustomerById($customerId) - { - $customer = $this->_customerFactory->create(); - $customer->load($customerId); - if (!$customer->getId()) { - throw new \Magento\Core\Exception(__("The customer with the specified ID not found.")); - } - - return $customer; - } - - /** - * Save customer addresses. - * - * @param \Magento\Customer\Model\Customer $customer - * @param array $addressesData - * @throws \Magento\Core\Exception - */ - protected function _prepareCustomerAddressesForSave($customer, array $addressesData) - { - $hasChanges = $customer->hasDataChanges(); - $actualAddressesIds = array(); - foreach ($addressesData as $addressData) { - $addressId = null; - if (array_key_exists('entity_id', $addressData)) { - $addressId = $addressData['entity_id']; - unset($addressData['entity_id']); - } - - if (null !== $addressId) { - $address = $customer->getAddressItemById($addressId); - if (!$address || !$address->getId()) { - throw new \Magento\Core\Exception( - __('The address with the specified ID not found.') - ); - } - } else { - $address = $this->_addressFactory->create(); - $address->setCustomerId($customer->getId()); - // Add customer address into addresses collection - $customer->addAddress($address); - } - $address->addData($addressData); - $hasChanges = $hasChanges || $address->hasDataChanges(); - - // Set post_index for detect default billing and shipping addresses - $address->setPostIndex($addressId); - - $actualAddressesIds[] = $address->getId(); - } - - /** @var \Magento\Customer\Model\Address $address */ - foreach ($customer->getAddressesCollection() as $address) { - if (!in_array($address->getId(), $actualAddressesIds)) { - $address->setData('_deleted', true); - $hasChanges = true; - } - } - $customer->setDataChanges($hasChanges); - } -} diff --git a/app/code/Magento/Customer/Service/V1/CustomerMetadataService.php b/app/code/Magento/Customer/Service/V1/CustomerMetadataService.php index 695b5cf701b62..a9e9cd5d702dc 100644 --- a/app/code/Magento/Customer/Service/V1/CustomerMetadataService.php +++ b/app/code/Magento/Customer/Service/V1/CustomerMetadataService.php @@ -25,9 +25,7 @@ */ namespace Magento\Customer\Service\V1; -use Magento\Customer\Service\V1\CustomerMetadataServiceInterface; use Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata; -use Magento\Customer\Service\V1\Dto\Eav\OptionBuilder; class CustomerMetadataService implements CustomerMetadataServiceInterface { @@ -40,9 +38,9 @@ class CustomerMetadataService implements CustomerMetadataServiceInterface private $_cache; /** - * @var \Magento\Customer\Model\Resource\Form\Attribute\Collection + * @var \Magento\Customer\Model\Resource\Form\Attribute\CollectionFactory */ - private $_attrFormCollection; + private $_attrFormCollectionFactory; /** * @var \Magento\Core\Model\StoreManager @@ -61,21 +59,21 @@ class CustomerMetadataService implements CustomerMetadataServiceInterface /** * @param \Magento\Eav\Model\Config $eavConfig - * @param \Magento\Customer\Model\Resource\Form\Attribute\Collection $attrFormCollection + * @param \Magento\Customer\Model\Resource\Form\Attribute\CollectionFactory $attrFormCollectionFactory * @param \Magento\Core\Model\StoreManager $storeManager * @param \Magento\Customer\Service\V1\Dto\Eav\OptionBuilder $optionBuilder * @param \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadataBuilder $attributeMetadataBuilder */ public function __construct( \Magento\Eav\Model\Config $eavConfig, - \Magento\Customer\Model\Resource\Form\Attribute\Collection $attrFormCollection, + \Magento\Customer\Model\Resource\Form\Attribute\CollectionFactory $attrFormCollectionFactory, \Magento\Core\Model\StoreManager $storeManager, \Magento\Customer\Service\V1\Dto\Eav\OptionBuilder $optionBuilder, \Magento\Customer\Service\V1\Dto\Eav\AttributeMetadataBuilder $attributeMetadataBuilder ) { $this->_eavConfig = $eavConfig; $this->_cache = []; - $this->_attrFormCollection = $attrFormCollection; + $this->_attrFormCollectionFactory = $attrFormCollectionFactory; $this->_storeManager = $storeManager; $this->_optionBuilder = $optionBuilder; $this->_attributeMetadataBuilder = $attributeMetadataBuilder; @@ -138,8 +136,8 @@ public function getAllAttributeSetMetadata($entityType, $attributeSetId = 0, $st public function getAttributes($entityType, $formCode) { $attributes = []; - $this->_loadAttributesCollection($entityType, $formCode); - foreach ($this->_attrFormCollection as $attribute) { + $attributesFormCollection = $this->_loadAttributesCollection($entityType, $formCode); + foreach ($attributesFormCollection as $attribute) { $attributes[$attribute->getAttributeCode()] = $this->_createMetadataAttribute($attribute); } return $attributes; @@ -150,34 +148,34 @@ public function getAttributes($entityType, $formCode) * * @param $entityType * @param $formCode - * @return null + * @return \Magento\Customer\Model\Resource\Form\Attribute\Collection */ private function _loadAttributesCollection($entityType, $formCode) { - $this->_attrFormCollection - ->setStore($this->_storeManager->getStore()) + $attributesFormCollection = $this->_attrFormCollectionFactory->create(); + $attributesFormCollection->setStore($this->_storeManager->getStore()) ->setEntityType($entityType) ->addFormCodeFilter($formCode) - ->setSortOrder() - ->load(); + ->setSortOrder(); + + return $attributesFormCollection; } /** - * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute + * @param \Magento\Customer\Model\Attribute $attribute * @return AttributeMetadata */ private function _createMetadataAttribute($attribute) { $options = []; - try { + if ($attribute->usesSource()) { foreach ($attribute->getSource()->getAllOptions() as $option) { $options[$option['label']] = $this->_optionBuilder->setLabel($option['label']) ->setValue($option['value']) ->create(); } - } catch (\Exception $e) { - // There is no source for this attribute } + $this->_attributeMetadataBuilder->setAttributeCode($attribute->getAttributeCode()) ->setFrontendInput($attribute->getFrontendInput()) ->setInputFilter($attribute->getInputFilter()) @@ -187,7 +185,12 @@ private function _createMetadataAttribute($attribute) ->setIsRequired($attribute->getIsRequired()) ->setMultilineCount($attribute->getMultilineCount()) ->setDataModel($attribute->getDataModel()) - ->setOptions($options); + ->setOptions($options) + ->setFrontendClass($attribute->getFrontend()->getClass()) + ->setFrontendLabel($attribute->getFrontendLabel()) + ->setIsSystem($attribute->getIsSystem()) + ->setIsUserDefined($attribute->getIsUserDefined()) + ->setSortOrder($attribute->getSortOrder()); return $this->_attributeMetadataBuilder->create(); } diff --git a/app/code/Magento/Customer/Service/V1/Dto/Address.php b/app/code/Magento/Customer/Service/V1/Dto/Address.php index 771209452dc0c..9c0905ef8bf75 100644 --- a/app/code/Magento/Customer/Service/V1/Dto/Address.php +++ b/app/code/Magento/Customer/Service/V1/Dto/Address.php @@ -29,6 +29,9 @@ class Address extends \Magento\Service\Entity\AbstractDto implements Eav\EntityInterface { + + const KEY_COUNTRY_ID = 'country_id'; + /** * @var array */ @@ -105,7 +108,7 @@ public function getRegion() */ public function getCountryId() { - return $this->_get('country_id'); + return $this->_get(self::KEY_COUNTRY_ID); } /** diff --git a/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadata.php b/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadata.php index 7c1c05328af52..eeb75e9466a5e 100644 --- a/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadata.php +++ b/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadata.php @@ -25,11 +25,9 @@ */ namespace Magento\Customer\Service\V1\Dto\Eav; -use Magento\Customer\Service\V1\Dto\Eav\Option; - class AttributeMetadata extends \Magento\Service\Entity\AbstractDto { - /** + /**#@+ * Constants used as keys into $_data */ const ATTRIBUTE_CODE = 'attribute_code'; @@ -42,8 +40,16 @@ class AttributeMetadata extends \Magento\Service\Entity\AbstractDto const REQUIRED = 'is_required'; const MULTILINE_COUNT = 'multiline_count'; const DATA_MODEL = 'data_model'; + const IS_USER_DEFINED = 'is_user_defined'; + const FRONTEND_CLASS = 'front_end_class'; + const SORT_ORDER = 'sort_order'; + const FRONTEND_LABEL = 'frontend_label'; + const IS_SYSTEM = 'is_system'; + /**#@-*/ /** + * Retrieve code of the attribute. + * * @return string */ public function getAttributeCode() @@ -52,6 +58,8 @@ public function getAttributeCode() } /** + * Frontend HTML for input element. + * * @return string */ public function getFrontendInput() @@ -60,6 +68,8 @@ public function getFrontendInput() } /** + * Get template used for input (e.g. "date") + * * @return string */ public function getInputFilter() @@ -68,6 +78,8 @@ public function getInputFilter() } /** + * Get label of the store. + * * @return string */ public function getStoreLabel() @@ -76,6 +88,8 @@ public function getStoreLabel() } /** + * Retrieve validation rules. + * * @return string */ public function getValidationRules() @@ -84,6 +98,8 @@ public function getValidationRules() } /** + * Number of lines of the attribute value. + * * @return int */ public function getMultilineCount() @@ -92,22 +108,28 @@ public function getMultilineCount() } /** + * Whether attribute is visible on frontend. + * * @return boolean */ - public function getIsVisible() + public function isVisible() { return $this->_get(self::VISIBLE); } /** + * Whether attribute is required. + * * @return boolean */ - public function getIsRequired() + public function isRequired() { return $this->_get(self::REQUIRED); } /** + * Get data model for attribute. + * * @return string */ public function getDataModel() @@ -116,10 +138,62 @@ public function getDataModel() } /** + * Return options of the attribute (key => value pairs for select) + * * @return Option[] */ public function getOptions() { return $this->_get(self::OPTIONS); } + + /** + * Get class which is used to display the attribute on frontend. + * + * @return string + */ + public function getFrontendClass() + { + return $this->_get(self::FRONTEND_CLASS); + } + + /** + * Whether current attribute has been defined by a user. + * + * @return bool + */ + public function isUserDefined() + { + return $this->_get(self::IS_USER_DEFINED); + } + + /** + * Get attributes sort order. + * + * @return int + */ + public function getSortOrder() + { + return $this->_get(self::SORT_ORDER); + } + + /** + * Get label which supposed to be displayed on frontend. + * + * @return string + */ + public function getFrontendLabel() + { + return $this->_get(self::FRONTEND_LABEL); + } + + /** + * Whether this is a system attribute. + * + * @return bool + */ + public function isSystem() + { + return $this->_get(self::IS_SYSTEM); + } } diff --git a/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadataBuilder.php b/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadataBuilder.php index 72792c4292fd7..acbf32174ccdb 100644 --- a/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadataBuilder.php +++ b/app/code/Magento/Customer/Service/V1/Dto/Eav/AttributeMetadataBuilder.php @@ -25,8 +25,6 @@ */ namespace Magento\Customer\Service\V1\Dto\Eav; -use Magento\Customer\Service\V1\Dto\Eav\AttributeMetadata; - class AttributeMetadataBuilder extends \Magento\Service\Entity\AbstractDtoBuilder { /** @@ -89,7 +87,7 @@ public function setValidationRules($validationRules) */ public function setOptions($options) { - $this->_set(AttributeMetadata::OPTIONS, $options); + return $this->_set(AttributeMetadata::OPTIONS, $options); } /** @@ -121,11 +119,56 @@ public function setMultilineCount($count) } /** - * @param string + * @param string $dataModel * @return AttributeMetadataBuilder */ public function setDataModel($dataModel) { return $this->_set(AttributeMetadata::DATA_MODEL, $dataModel); } + + /** + * @param $frontendClass + * @return AttributeMetadataBuilder + */ + public function setFrontendClass($frontendClass) + { + return $this->_set(AttributeMetadata::FRONTEND_CLASS, $frontendClass); + } + + /** + * @param bool $isUserDefined + * @return AttributeMetadataBuilder + */ + public function setIsUserDefined($isUserDefined) + { + return $this->_set(AttributeMetadata::IS_USER_DEFINED, $isUserDefined); + } + + /** + * @param int $sortOrder + * @return AttributeMetadataBuilder + */ + public function setSortOrder($sortOrder) + { + return $this->_set(AttributeMetadata::SORT_ORDER, $sortOrder); + } + + /** + * @param string $frontendLabel + * @return AttributeMetadataBuilder + */ + public function setFrontendLabel($frontendLabel) + { + return $this->_set(AttributeMetadata::FRONTEND_LABEL, $frontendLabel); + } + + /** + * @param bool $isSystem + * @return AttributeMetadataBuilder + */ + public function setIsSystem($isSystem) + { + return $this->_set(AttributeMetadata::IS_SYSTEM, $isSystem); + } } diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml index dfb7026534a0e..486515cdbc3f2 100644 --- a/app/code/Magento/Customer/etc/di.xml +++ b/app/code/Magento/Customer/etc/di.xml @@ -50,9 +50,9 @@
- escapeHtml($this->getProductName()) ?>
- getOptionList()): ?>
-
-
-
- getLinks()): ?>
-
-
-
- getProductAdditionalInformationBlock()): ?>
- setItem($this->getItem())->toHtml() ?>
-
-
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
deleted file mode 100644
index 4815d67044af5..0000000000000
--- a/app/code/Magento/Downloadable/view/frontend/checkout/onepage/review/item.phtml
+++ /dev/null
@@ -1,243 +0,0 @@
-
-getItem()?>
-
- :
helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?> -
-
-
- helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?> -
- :
helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?> -
-
-
- helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?> -
- :
helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?> -
-
-
- helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?> -
- :
helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?> -
-
-
- helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?> -
- getTypeId() == \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE): ?>
+ isConfigurationRequired($_item->getTypeId())): ?>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
index 8606fd7ae2387..a92b603517b6b 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
@@ -24,9 +24,9 @@
*/
-->