', $params, $href);
+ break;
+ }
+ }
+
+ /**
+ * Render arbitrary HTML head items
+ *
+ * @see self::getCssJsHtml()
+ * @param array $items
+ * @return string
+ */
+ protected function _prepareOtherHtmlHeadElements($items)
+ {
+ return implode(PHP_EOL, $items);
+ }
/**
* Retrieve path to Favicon
diff --git a/app/code/core/Mage/Page/Block/Html/Pager.php b/app/code/core/Mage/Page/Block/Html/Pager.php
index 43054d081e6..88ce5f5eae4 100644
--- a/app/code/core/Mage/Page/Block/Html/Pager.php
+++ b/app/code/core/Mage/Page/Block/Html/Pager.php
@@ -63,14 +63,6 @@ class Mage_Page_Block_Html_Pager extends Mage_Core_Block_Template
*/
protected $_frameEnd;
- protected function _construct()
- {
- parent::_construct();
- $this->setData('show_amounts', true);
- $this->setData('use_container', true);
- $this->setTemplate('page/html/pager.phtml');
- }
-
/**
* Return current page
*
@@ -565,6 +557,56 @@ public function canShowNextJump()
return $this->getNextJumpPage() !== null;
}
+ /**
+ * Check if frame data was initialized
+ *
+ * @return bool
+ */
+ public function isFrameInitialized()
+ {
+ return $this->_frameInitialized;
+ }
+
+ /**
+ * Getter for alternative text for Previous link in pagination frame
+ *
+ * @return string
+ */
+ public function getAnchorTextForPrevious()
+ {
+ return Mage::getStoreConfig('design/pagination/anchor_text_for_previous');
+ }
+
+ /**
+ * Getter for alternative text for Next link in pagination frame
+ *
+ * @return string
+ */
+ public function getAnchorTextForNext()
+ {
+ return Mage::getStoreConfig('design/pagination/anchor_text_for_next');
+ }
+
+ /**
+ * Set whether output of the pager is mandatory
+ *
+ * @param bool $isRequired
+ * @return $this
+ */
+ public function setIsOutputRequired($isRequired)
+ {
+ $this->_outputRequired = (bool) $isRequired;
+ return $this;
+ }
+
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setData('show_amounts', true);
+ $this->setData('use_container', true);
+ $this->setTemplate('page/html/pager.phtml');
+ }
+
/**
* Initialize frame data, such as frame start, frame start etc.
*
@@ -616,48 +658,6 @@ protected function _setFrameInitialized($flag)
return $this;
}
- /**
- * Check if frame data was initialized
- *
- * @return bool
- */
- public function isFrameInitialized()
- {
- return $this->_frameInitialized;
- }
-
- /**
- * Getter for alternative text for Previous link in pagination frame
- *
- * @return string
- */
- public function getAnchorTextForPrevious()
- {
- return Mage::getStoreConfig('design/pagination/anchor_text_for_previous');
- }
-
- /**
- * Getter for alternative text for Next link in pagination frame
- *
- * @return string
- */
- public function getAnchorTextForNext()
- {
- return Mage::getStoreConfig('design/pagination/anchor_text_for_next');
- }
-
- /**
- * Set whether output of the pager is mandatory
- *
- * @param bool $isRequired
- * @return $this
- */
- public function setIsOutputRequired($isRequired)
- {
- $this->_outputRequired = (bool) $isRequired;
- return $this;
- }
-
/**
* Determine whether the pagination should be eventually rendered
*
diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu.php b/app/code/core/Mage/Page/Block/Html/Topmenu.php
index 0ab1ddd6716..e542138b33c 100644
--- a/app/code/core/Mage/Page/Block/Html/Topmenu.php
+++ b/app/code/core/Mage/Page/Block/Html/Topmenu.php
@@ -81,6 +81,49 @@ public function getHtml($outermostClass = '', $childrenWrapClass = '')
return $html;
}
+ /**
+ * Retrieve cache key data
+ *
+ * @return array
+ */
+ public function getCacheKeyInfo()
+ {
+ $shortCacheId = [
+ 'TOPMENU',
+ Mage::app()->getStore()->getId(),
+ Mage::getDesign()->getPackageName(),
+ Mage::getDesign()->getTheme('template'),
+ Mage::getSingleton('customer/session')->getCustomerGroupId(),
+ 'template' => $this->getTemplate(),
+ 'name' => $this->getNameInLayout(),
+ $this->getCurrentEntityKey(),
+ ];
+ $cacheId = $shortCacheId;
+
+ $shortCacheId = array_values($shortCacheId);
+ $shortCacheId = implode('|', $shortCacheId);
+ $shortCacheId = md5($shortCacheId);
+
+ $cacheId['entity_key'] = $this->getCurrentEntityKey();
+ $cacheId['short_cache_id'] = $shortCacheId;
+
+ return $cacheId;
+ }
+
+ /**
+ * Retrieve current entity key
+ *
+ * @return int|string
+ */
+ public function getCurrentEntityKey()
+ {
+ if ($this->_currentEntityKey === null) {
+ $this->_currentEntityKey = Mage::registry('current_entity_key')
+ ? Mage::registry('current_entity_key') : Mage::app()->getStore()->getRootCategoryId();
+ }
+ return $this->_currentEntityKey;
+ }
+
/**
* Recursively generates top menu html from data that is specified in $menuTree
*
@@ -204,47 +247,4 @@ protected function _getMenuItemClasses(Varien_Data_Tree_Node $item)
return $classes;
}
-
- /**
- * Retrieve cache key data
- *
- * @return array
- */
- public function getCacheKeyInfo()
- {
- $shortCacheId = [
- 'TOPMENU',
- Mage::app()->getStore()->getId(),
- Mage::getDesign()->getPackageName(),
- Mage::getDesign()->getTheme('template'),
- Mage::getSingleton('customer/session')->getCustomerGroupId(),
- 'template' => $this->getTemplate(),
- 'name' => $this->getNameInLayout(),
- $this->getCurrentEntityKey(),
- ];
- $cacheId = $shortCacheId;
-
- $shortCacheId = array_values($shortCacheId);
- $shortCacheId = implode('|', $shortCacheId);
- $shortCacheId = md5($shortCacheId);
-
- $cacheId['entity_key'] = $this->getCurrentEntityKey();
- $cacheId['short_cache_id'] = $shortCacheId;
-
- return $cacheId;
- }
-
- /**
- * Retrieve current entity key
- *
- * @return int|string
- */
- public function getCurrentEntityKey()
- {
- if ($this->_currentEntityKey === null) {
- $this->_currentEntityKey = Mage::registry('current_entity_key')
- ? Mage::registry('current_entity_key') : Mage::app()->getStore()->getRootCategoryId();
- }
- return $this->_currentEntityKey;
- }
}
diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php
index 3f930560b86..733841c6931 100644
--- a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php
+++ b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php
@@ -27,6 +27,24 @@ class Mage_Page_Block_Html_Topmenu_Renderer extends Mage_Page_Block_Html_Topmenu
{
protected $_templateFile;
+ /**
+ * Fetches template. If template has return statement, than its value is used and direct output otherwise.
+ * @param string $childrenWrapClass
+ * @return string
+ */
+ public function render(Varien_Data_Tree_Node $menuTree, $childrenWrapClass)
+ {
+ ob_start();
+ $html = include $this->_templateFile;
+ $directOutput = ob_get_clean();
+
+ if (is_string($html)) {
+ return $html;
+ } else {
+ return $directOutput;
+ }
+ }
+
/**
* Renders block html
* @return string
@@ -60,22 +78,4 @@ protected function _addCacheTags()
$this->addCacheTag($parentBlock->getCacheTags());
}
}
-
- /**
- * Fetches template. If template has return statement, than its value is used and direct output otherwise.
- * @param string $childrenWrapClass
- * @return string
- */
- public function render(Varien_Data_Tree_Node $menuTree, $childrenWrapClass)
- {
- ob_start();
- $html = include $this->_templateFile;
- $directOutput = ob_get_clean();
-
- if (is_string($html)) {
- return $html;
- } else {
- return $directOutput;
- }
- }
}
diff --git a/app/code/core/Mage/Page/Block/Html/Welcome.php b/app/code/core/Mage/Page/Block/Html/Welcome.php
index 43e644a22fe..b2cd9a4087c 100644
--- a/app/code/core/Mage/Page/Block/Html/Welcome.php
+++ b/app/code/core/Mage/Page/Block/Html/Welcome.php
@@ -24,6 +24,19 @@
*/
class Mage_Page_Block_Html_Welcome extends Mage_Core_Block_Template
{
+ /**
+ * Get tags array for saving cache
+ *
+ * @return array
+ */
+ public function getCacheTags()
+ {
+ if ($this->_getSession()->isLoggedIn()) {
+ $this->addModelTags($this->_getSession()->getCustomer());
+ }
+
+ return parent::getCacheTags();
+ }
/**
* Get customer session
*
@@ -51,18 +64,4 @@ protected function _toHtml()
return $this->_data['welcome'];
}
-
- /**
- * Get tags array for saving cache
- *
- * @return array
- */
- public function getCacheTags()
- {
- if ($this->_getSession()->isLoggedIn()) {
- $this->addModelTags($this->_getSession()->getCustomer());
- }
-
- return parent::getCacheTags();
- }
}
diff --git a/app/code/core/Mage/Page/Block/Html/Wrapper.php b/app/code/core/Mage/Page/Block/Html/Wrapper.php
index e6b37dd27dc..a8e1e49d806 100644
--- a/app/code/core/Mage/Page/Block/Html/Wrapper.php
+++ b/app/code/core/Mage/Page/Block/Html/Wrapper.php
@@ -36,6 +36,27 @@ class Mage_Page_Block_Html_Wrapper extends Mage_Core_Block_Abstract
*/
protected $_dependsOnChildren = true;
+ /**
+ * Wrapper element tag name getter
+ * @return string
+ */
+ public function getElementTagName()
+ {
+ $tagName = $this->_getData('html_tag_name');
+ return $tagName ? $tagName : 'div';
+ }
+
+ /**
+ * Setter whether this block depends on children
+ * @param string $depends
+ * @return $this
+ */
+ public function dependsOnChildren($depends = '0')
+ {
+ $this->_dependsOnChildren = (bool) (int) $depends;
+ return $this;
+ }
+
/**
* Render the wrapper element html
* Supports different optional parameters, set in data by keys:
@@ -63,27 +84,6 @@ protected function _toHtml()
return sprintf('<%1$s%2$s%3$s%4$s>%5$s', $this->getElementTagName(), $id, $class, $otherParams, $html);
}
- /**
- * Wrapper element tag name getter
- * @return string
- */
- public function getElementTagName()
- {
- $tagName = $this->_getData('html_tag_name');
- return $tagName ? $tagName : 'div';
- }
-
- /**
- * Setter whether this block depends on children
- * @param string $depends
- * @return $this
- */
- public function dependsOnChildren($depends = '0')
- {
- $this->_dependsOnChildren = (bool) (int) $depends;
- return $this;
- }
-
/**
* Whether the wrapper element should be eventually rendered
* If it becomes "invisible", the behaviour will be somewhat similar to core/text_list
diff --git a/app/code/core/Mage/Page/Block/Template/Links.php b/app/code/core/Mage/Page/Block/Template/Links.php
index 01b4cc5ee51..9859c20a205 100644
--- a/app/code/core/Mage/Page/Block/Template/Links.php
+++ b/app/code/core/Mage/Page/Block/Template/Links.php
@@ -36,15 +36,6 @@ class Mage_Page_Block_Template_Links extends Mage_Core_Block_Template
*/
protected $_cacheKeyInfo = null;
- /**
- * Set default template
- *
- */
- protected function _construct()
- {
- $this->setTemplate('page/template/links.phtml');
- }
-
/**
* Get all links
*
@@ -101,24 +92,6 @@ public function addLink(
return $this;
}
- /**
- * Add link into collection
- *
- * @param Varien_Object $link
- * @param int $position
- * @return $this
- */
- protected function _addIntoPosition($link, $position)
- {
- $this->_links[$this->_getNewPosition($position)] = $link;
-
- if ((int) $position > 0) {
- ksort($this->_links);
- }
-
- return $this;
- }
-
/**
* Add block to link list
*
@@ -194,6 +167,47 @@ public function getCacheKeyInfo()
return $this->_cacheKeyInfo;
}
+ /**
+ * Get tags array for saving cache
+ *
+ * @return array
+ */
+ public function getCacheTags()
+ {
+ if (Mage::getSingleton('customer/session')->isLoggedIn()) {
+ $this->addModelTags(Mage::getSingleton('customer/session')->getCustomer());
+ }
+
+ return parent::getCacheTags();
+ }
+
+ /**
+ * Set default template
+ *
+ */
+ protected function _construct()
+ {
+ $this->setTemplate('page/template/links.phtml');
+ }
+
+ /**
+ * Add link into collection
+ *
+ * @param Varien_Object $link
+ * @param int $position
+ * @return $this
+ */
+ protected function _addIntoPosition($link, $position)
+ {
+ $this->_links[$this->_getNewPosition($position)] = $link;
+
+ if ((int) $position > 0) {
+ ksort($this->_links);
+ }
+
+ return $this;
+ }
+
/**
* Prepare tag attributes
*
@@ -251,18 +265,4 @@ protected function _getNewPosition($position = 0)
}
return $position;
}
-
- /**
- * Get tags array for saving cache
- *
- * @return array
- */
- public function getCacheTags()
- {
- if (Mage::getSingleton('customer/session')->isLoggedIn()) {
- $this->addModelTags(Mage::getSingleton('customer/session')->getCustomer());
- }
-
- return parent::getCacheTags();
- }
}
diff --git a/app/code/core/Mage/Page/Block/Template/Links/Block.php b/app/code/core/Mage/Page/Block/Template/Links/Block.php
index 3fe5c720caa..248128cf081 100644
--- a/app/code/core/Mage/Page/Block/Template/Links/Block.php
+++ b/app/code/core/Mage/Page/Block/Template/Links/Block.php
@@ -91,15 +91,6 @@ class Mage_Page_Block_Template_Links_Block extends Mage_Core_Block_Template
*/
protected $_position = 0;
- /**
- * Set default template
- *
- */
- protected function _construct()
- {
- $this->setTemplate('page/template/linksblock.phtml');
- }
-
/**
* Return link position in link list
*
@@ -186,26 +177,6 @@ public function getLinkUrl()
return $this->_url;
}
- /**
- * Prepare tag attributes
- *
- * @param string|array $params
- * @return string
- */
- protected function _prepareParams($params)
- {
- if (is_string($params)) {
- return $params;
- } elseif (is_array($params)) {
- $result = '';
- foreach ($params as $key => $value) {
- $result .= ' ' . $key . '="' . addslashes($value) . '"';
- }
- return $result;
- }
- return '';
- }
-
/**
* Return Li Params
*
@@ -225,4 +196,33 @@ public function getAParams()
{
return $this->_prepareParams($this->_aParams);
}
+
+ /**
+ * Set default template
+ *
+ */
+ protected function _construct()
+ {
+ $this->setTemplate('page/template/linksblock.phtml');
+ }
+
+ /**
+ * Prepare tag attributes
+ *
+ * @param string|array $params
+ * @return string
+ */
+ protected function _prepareParams($params)
+ {
+ if (is_string($params)) {
+ return $params;
+ } elseif (is_array($params)) {
+ $result = '';
+ foreach ($params as $key => $value) {
+ $result .= ' ' . $key . '="' . addslashes($value) . '"';
+ }
+ return $result;
+ }
+ return '';
+ }
}
diff --git a/app/code/core/Mage/Page/Model/Config.php b/app/code/core/Mage/Page/Model/Config.php
index 70095187c24..a485dd952bc 100644
--- a/app/code/core/Mage/Page/Model/Config.php
+++ b/app/code/core/Mage/Page/Model/Config.php
@@ -32,6 +32,46 @@ class Mage_Page_Model_Config
*/
protected $_pageLayouts = null;
+ /**
+ * Retrieve available page layouts
+ *
+ * @return array
+ */
+ public function getPageLayouts()
+ {
+ $this->_initPageLayouts();
+ return $this->_pageLayouts;
+ }
+
+ /**
+ * Retrieve page layout by code
+ *
+ * @param string $layoutCode
+ * @return Varien_Object|false
+ */
+ public function getPageLayout($layoutCode)
+ {
+ $this->_initPageLayouts();
+
+ return $this->_pageLayouts[$layoutCode] ?? false;
+ }
+
+ /**
+ * Retrieve page layout handles
+ *
+ * @return array
+ */
+ public function getPageLayoutHandles()
+ {
+ $handles = [];
+
+ foreach ($this->getPageLayouts() as $layout) {
+ $handles[$layout->getCode()] = $layout->getLayoutHandle();
+ }
+
+ return $handles;
+ }
+
/**
* Initialize page layouts list
*
@@ -72,44 +112,4 @@ protected function _appendPageLayouts($xmlPath)
}
return $this;
}
-
- /**
- * Retrieve available page layouts
- *
- * @return array
- */
- public function getPageLayouts()
- {
- $this->_initPageLayouts();
- return $this->_pageLayouts;
- }
-
- /**
- * Retrieve page layout by code
- *
- * @param string $layoutCode
- * @return Varien_Object|false
- */
- public function getPageLayout($layoutCode)
- {
- $this->_initPageLayouts();
-
- return $this->_pageLayouts[$layoutCode] ?? false;
- }
-
- /**
- * Retrieve page layout handles
- *
- * @return array
- */
- public function getPageLayoutHandles()
- {
- $handles = [];
-
- foreach ($this->getPageLayouts() as $layout) {
- $handles[$layout->getCode()] = $layout->getLayoutHandle();
- }
-
- return $handles;
- }
}
diff --git a/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php b/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php
index 002b79726cc..7b743085c31 100644
--- a/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php
+++ b/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php
@@ -20,15 +20,6 @@
*/
class Mage_Paygate_Block_Authorizenet_Form_Cc extends Mage_Payment_Block_Form
{
- /**
- * Set block template
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('paygate/form/cc.phtml');
- }
-
/**
* Retrieve payment method form html
*
@@ -74,18 +65,6 @@ public function getAdminCancelUrl()
return Mage::getModel('adminhtml/url')->getUrl('adminhtml/paygate_authorizenet_payment/cancel');
}
- /**
- * Render block HTML
- *
- * @return string
- */
- protected function _toHtml()
- {
- $this->setChild('cards', $this->getCardsBlock());
- $this->setChild('method_form_block', $this->getMethodFormBlock());
- return parent::_toHtml();
- }
-
/**
* Get notice message
*
@@ -177,4 +156,24 @@ public function getCancelButtonHtml()
]);
return $cancelButton->toHtml();
}
+ /**
+ * Set block template
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('paygate/form/cc.phtml');
+ }
+
+ /**
+ * Render block HTML
+ *
+ * @return string
+ */
+ protected function _toHtml()
+ {
+ $this->setChild('cards', $this->getCardsBlock());
+ $this->setChild('method_form_block', $this->getMethodFormBlock());
+ return parent::_toHtml();
+ }
}
diff --git a/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php b/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php
index 6f210445dbf..510fffdef24 100644
--- a/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php
+++ b/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php
@@ -26,14 +26,6 @@ class Mage_Paygate_Block_Authorizenet_Info_Cc extends Mage_Payment_Block_Info_Cc
* @var bool
*/
protected $_isCheckoutProgressBlockFlag = true;
- /**
- * Set block template
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('paygate/info/cc.phtml');
- }
/**
* Render as PDF
@@ -105,4 +97,12 @@ public function getCards()
}
return $cards;
}
+ /**
+ * Set block template
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('paygate/info/cc.phtml');
+ }
}
diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php
index 59459bd07c1..d8e315993a4 100644
--- a/app/code/core/Mage/Paygate/Model/Authorizenet.php
+++ b/app/code/core/Mage/Paygate/Model/Authorizenet.php
@@ -487,6 +487,110 @@ public function cancelPartialAuthorization(Mage_Payment_Model_Info $payment)
}
}
+ /**
+ * Return cards storage model
+ *
+ * @param Mage_Payment_Model_Info $payment
+ * @return Mage_Paygate_Model_Authorizenet_Cards
+ */
+ public function getCardsStorage($payment = null)
+ {
+ if (is_null($payment)) {
+ $payment = $this->getInfoInstance();
+ }
+ if (is_null($this->_cardsStorage)) {
+ $this->_initCardsStorage($payment);
+ }
+ return $this->_cardsStorage;
+ }
+
+ /**
+ * If partial authorization is started method will return true
+ *
+ * @param Mage_Payment_Model_Info $payment
+ * @return bool
+ */
+ public function isPartialAuthorization($payment = null)
+ {
+ if (is_null($payment)) {
+ $payment = $this->getInfoInstance();
+ }
+ return $payment->getAdditionalInformation($this->_splitTenderIdKey);
+ }
+
+ /**
+ * Mock capture transaction id in invoice
+ *
+ * @param Mage_Sales_Model_Order_Invoice $invoice
+ * @param Mage_Sales_Model_Order_Payment $payment
+ * @return Mage_Payment_Model_Method_Abstract
+ */
+ public function processInvoice($invoice, $payment)
+ {
+ $invoice->setTransactionId(1);
+ return $this;
+ }
+
+ /**
+ * Set transaction ID into creditmemo for informational purposes
+ * @param Mage_Sales_Model_Order_Creditmemo $creditmemo
+ * @param Mage_Sales_Model_Order_Payment $payment
+ * @return Mage_Payment_Model_Method_Abstract
+ */
+ public function processCreditmemo($creditmemo, $payment)
+ {
+ $creditmemo->setTransactionId(1);
+ return $this;
+ }
+
+ /**
+ * Fetch transaction details info
+ *
+ * Update transaction info if there is one placing transaction only
+ *
+ * @param string $transactionId
+ * @return array
+ */
+ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transactionId)
+ {
+ $data = parent::fetchTransactionInfo($payment, $transactionId);
+ $cardsStorage = $this->getCardsStorage($payment);
+
+ if ($cardsStorage->getCardsCount() != 1) {
+ return $data;
+ }
+ $cards = $cardsStorage->getCards();
+ $card = array_shift($cards);
+
+ /*
+ * We need try to get transaction from Mage::registry,
+ * because in cases when fetch calling from Mage_Adminhtml_Sales_TransactionsController::fetchAction()
+ * this line "$transaction = $payment->getTransaction($transactionId)" loads a fetching transaction into a new object,
+ * so some changes (for ex. $transaction->setAdditionalInformation($this->_isTransactionFraud, false) ) will not saved,
+ * because controller have another object for this transaction and Mage_Sales_Model_Order_Payment_Transaction::RAW_DETAILS isn't includes _isTransactionFraud flag.
+ */
+ $transaction = Mage::registry('current_transaction');
+ if (is_null($transaction)) {
+ //this is for payment info update:
+ $transactionId = $card->getLastTransId();
+ $transaction = $payment->getTransaction($transactionId);
+ }
+ //because in child transaction, the txn_id spoils by added additional word (@see $this->_preauthorizeCaptureCardTransaction()):
+ if (empty($transactionId) || $transaction->getParentId()) {
+ $transactionId = $transaction->getAdditionalInformation($this->_realTransactionIdKey);
+ }
+ $response = $this->_getTransactionDetails($transactionId);
+ $data = array_merge($data, $response->getData());
+
+ if ($response->getResponseCode() == self::RESPONSE_CODE_APPROVED) {
+ $transaction->setAdditionalInformation($this->_isTransactionFraud, false);
+ $payment->setIsTransactionApproved(true);
+ } elseif ($response->getResponseReasonCode() == self::RESPONSE_REASON_CODE_PENDING_REVIEW_DECLINED) {
+ $payment->setIsTransactionDenied(true);
+ }
+ return $data;
+ }
+
/**
* Send request with new payment to gateway
*
@@ -993,110 +1097,6 @@ protected function _initCardsStorage($payment)
$this->_cardsStorage = Mage::getModel('paygate/authorizenet_cards')->setPayment($payment);
}
- /**
- * Return cards storage model
- *
- * @param Mage_Payment_Model_Info $payment
- * @return Mage_Paygate_Model_Authorizenet_Cards
- */
- public function getCardsStorage($payment = null)
- {
- if (is_null($payment)) {
- $payment = $this->getInfoInstance();
- }
- if (is_null($this->_cardsStorage)) {
- $this->_initCardsStorage($payment);
- }
- return $this->_cardsStorage;
- }
-
- /**
- * If partial authorization is started method will return true
- *
- * @param Mage_Payment_Model_Info $payment
- * @return bool
- */
- public function isPartialAuthorization($payment = null)
- {
- if (is_null($payment)) {
- $payment = $this->getInfoInstance();
- }
- return $payment->getAdditionalInformation($this->_splitTenderIdKey);
- }
-
- /**
- * Mock capture transaction id in invoice
- *
- * @param Mage_Sales_Model_Order_Invoice $invoice
- * @param Mage_Sales_Model_Order_Payment $payment
- * @return Mage_Payment_Model_Method_Abstract
- */
- public function processInvoice($invoice, $payment)
- {
- $invoice->setTransactionId(1);
- return $this;
- }
-
- /**
- * Set transaction ID into creditmemo for informational purposes
- * @param Mage_Sales_Model_Order_Creditmemo $creditmemo
- * @param Mage_Sales_Model_Order_Payment $payment
- * @return Mage_Payment_Model_Method_Abstract
- */
- public function processCreditmemo($creditmemo, $payment)
- {
- $creditmemo->setTransactionId(1);
- return $this;
- }
-
- /**
- * Fetch transaction details info
- *
- * Update transaction info if there is one placing transaction only
- *
- * @param string $transactionId
- * @return array
- */
- public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transactionId)
- {
- $data = parent::fetchTransactionInfo($payment, $transactionId);
- $cardsStorage = $this->getCardsStorage($payment);
-
- if ($cardsStorage->getCardsCount() != 1) {
- return $data;
- }
- $cards = $cardsStorage->getCards();
- $card = array_shift($cards);
-
- /*
- * We need try to get transaction from Mage::registry,
- * because in cases when fetch calling from Mage_Adminhtml_Sales_TransactionsController::fetchAction()
- * this line "$transaction = $payment->getTransaction($transactionId)" loads a fetching transaction into a new object,
- * so some changes (for ex. $transaction->setAdditionalInformation($this->_isTransactionFraud, false) ) will not saved,
- * because controller have another object for this transaction and Mage_Sales_Model_Order_Payment_Transaction::RAW_DETAILS isn't includes _isTransactionFraud flag.
- */
- $transaction = Mage::registry('current_transaction');
- if (is_null($transaction)) {
- //this is for payment info update:
- $transactionId = $card->getLastTransId();
- $transaction = $payment->getTransaction($transactionId);
- }
- //because in child transaction, the txn_id spoils by added additional word (@see $this->_preauthorizeCaptureCardTransaction()):
- if (empty($transactionId) || $transaction->getParentId()) {
- $transactionId = $transaction->getAdditionalInformation($this->_realTransactionIdKey);
- }
- $response = $this->_getTransactionDetails($transactionId);
- $data = array_merge($data, $response->getData());
-
- if ($response->getResponseCode() == self::RESPONSE_CODE_APPROVED) {
- $transaction->setAdditionalInformation($this->_isTransactionFraud, false);
- $payment->setIsTransactionApproved(true);
- } elseif ($response->getResponseReasonCode() == self::RESPONSE_REASON_CODE_PENDING_REVIEW_DECLINED) {
- $payment->setIsTransactionDenied(true);
- }
- return $data;
- }
-
/**
* Set split_tender_id to quote payment if needed
*
@@ -1422,28 +1422,6 @@ protected function _registerCard(Varien_Object $response, Mage_Sales_Model_Order
return $card;
}
- /**
- * Reset assigned data in payment info model
- *
- * @param Mage_Payment_Model_Info $payment
- * @return $this
- */
- private function _clearAssignedData($payment)
- {
- $payment->setCcType(null)
- ->setCcOwner(null)
- ->setCcLast4(null)
- ->setCcNumber(null)
- ->setCcCid(null)
- ->setCcExpMonth(null)
- ->setCcExpYear(null)
- ->setCcSsIssue(null)
- ->setCcSsStartMonth(null)
- ->setCcSsStartYear(null)
- ;
- return $this;
- }
-
/**
* Add payment transaction
*
@@ -1631,4 +1609,26 @@ protected function _parseTransactionDetailsXmlResponseToVarienObject(Varien_Simp
return $response;
}
+
+ /**
+ * Reset assigned data in payment info model
+ *
+ * @param Mage_Payment_Model_Info $payment
+ * @return $this
+ */
+ private function _clearAssignedData($payment)
+ {
+ $payment->setCcType(null)
+ ->setCcOwner(null)
+ ->setCcLast4(null)
+ ->setCcNumber(null)
+ ->setCcCid(null)
+ ->setCcExpMonth(null)
+ ->setCcExpYear(null)
+ ->setCcSsIssue(null)
+ ->setCcSsStartMonth(null)
+ ->setCcSsStartYear(null)
+ ;
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php
index e4b78908be9..d5c8d90cf84 100644
--- a/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php
+++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php
@@ -169,18 +169,6 @@ public function flushCards()
$this->_payment->setAdditionalInformation(self::CARDS_NAMESPACE, null);
return $this;
}
-
- /**
- * Check for payment instance present
- *
- * @throws Exception
- */
- protected function _isPaymentValid()
- {
- if (!$this->_payment) {
- throw new Exception('Payment instance is not set');
- }
- }
/**
* Return total for cards data fields
*
@@ -197,4 +185,16 @@ public function _getAmount($key)
}
return $amount;
}
+
+ /**
+ * Check for payment instance present
+ *
+ * @throws Exception
+ */
+ protected function _isPaymentValid()
+ {
+ if (!$this->_payment) {
+ throw new Exception('Payment instance is not set');
+ }
+ }
}
diff --git a/app/code/core/Mage/Payment/Block/Form/Banktransfer.php b/app/code/core/Mage/Payment/Block/Form/Banktransfer.php
index 815b01213bd..a60b4d1abb0 100644
--- a/app/code/core/Mage/Payment/Block/Form/Banktransfer.php
+++ b/app/code/core/Mage/Payment/Block/Form/Banktransfer.php
@@ -29,15 +29,6 @@ class Mage_Payment_Block_Form_Banktransfer extends Mage_Payment_Block_Form
*/
protected $_instructions;
- /**
- * Block construction. Set block template.
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('payment/form/banktransfer.phtml');
- }
-
/**
* Get instructions text from config
*
@@ -50,4 +41,13 @@ public function getInstructions()
}
return $this->_instructions;
}
+
+ /**
+ * Block construction. Set block template.
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('payment/form/banktransfer.phtml');
+ }
}
diff --git a/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php b/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php
index 333c7f09924..6938d20d1f5 100644
--- a/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php
+++ b/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php
@@ -29,15 +29,6 @@ class Mage_Payment_Block_Form_Cashondelivery extends Mage_Payment_Block_Form
*/
protected $_instructions;
- /**
- * Block construction. Set block template.
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('payment/form/cashondelivery.phtml');
- }
-
/**
* Get instructions text from config
*
@@ -50,4 +41,13 @@ public function getInstructions()
}
return $this->_instructions;
}
+
+ /**
+ * Block construction. Set block template.
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('payment/form/cashondelivery.phtml');
+ }
}
diff --git a/app/code/core/Mage/Payment/Block/Form/Cc.php b/app/code/core/Mage/Payment/Block/Form/Cc.php
index c7cddd4cb98..7b6a0e9b3f9 100644
--- a/app/code/core/Mage/Payment/Block/Form/Cc.php
+++ b/app/code/core/Mage/Payment/Block/Form/Cc.php
@@ -20,22 +20,6 @@
*/
class Mage_Payment_Block_Form_Cc extends Mage_Payment_Block_Form
{
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('payment/form/cc.phtml');
- }
-
- /**
- * Retrieve payment configuration object
- *
- * @return Mage_Payment_Model_Config
- */
- protected function _getConfig()
- {
- return Mage::getSingleton('payment/config');
- }
-
/**
* Retrieve availables credit card types
*
@@ -141,6 +125,21 @@ public function getSsStartYears()
}
return [0 => $this->__('Year')] + $years;
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('payment/form/cc.phtml');
+ }
+
+ /**
+ * Retrieve payment configuration object
+ *
+ * @return Mage_Payment_Model_Config
+ */
+ protected function _getConfig()
+ {
+ return Mage::getSingleton('payment/config');
+ }
/**
* Render block HTML
diff --git a/app/code/core/Mage/Payment/Block/Form/Container.php b/app/code/core/Mage/Payment/Block/Form/Container.php
index 75f8641b486..ac0399ef543 100644
--- a/app/code/core/Mage/Payment/Block/Form/Container.php
+++ b/app/code/core/Mage/Payment/Block/Form/Container.php
@@ -24,54 +24,6 @@
*/
class Mage_Payment_Block_Form_Container extends Mage_Core_Block_Template
{
- /**
- * Prepare children blocks
- */
- protected function _prepareLayout()
- {
- /** @var Mage_Payment_Helper_Data $helper */
- $helper = $this->helper('payment');
-
- /**
- * Create child blocks for payment methods forms
- */
- foreach ($this->getMethods() as $method) {
- $this->setChild(
- 'payment.method.' . $method->getCode(),
- $helper->getMethodFormBlock($method),
- );
- }
-
- return parent::_prepareLayout();
- }
-
- /**
- * Check payment method model
- *
- * @param Mage_Payment_Model_Method_Abstract $method
- * @return bool
- */
- protected function _canUseMethod($method)
- {
- return $method->isApplicableToQuote($this->getQuote(), Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_COUNTRY
- | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_CURRENCY
- | Mage_Payment_Model_Method_Abstract::CHECK_ORDER_TOTAL_MIN_MAX);
- }
-
- /**
- * Check and prepare payment method model
- *
- * Redeclare this method in child classes for declaring method info instance
- *
- * @param Mage_Payment_Model_Method_Abstract $method
- * @return $this
- */
- protected function _assignMethod($method)
- {
- $method->setInfoInstance($this->getQuote()->getPayment());
- return $this;
- }
-
/**
* Declare template for payment method form block
*
@@ -131,4 +83,51 @@ public function getSelectedMethodCode()
}
return false;
}
+ /**
+ * Prepare children blocks
+ */
+ protected function _prepareLayout()
+ {
+ /** @var Mage_Payment_Helper_Data $helper */
+ $helper = $this->helper('payment');
+
+ /**
+ * Create child blocks for payment methods forms
+ */
+ foreach ($this->getMethods() as $method) {
+ $this->setChild(
+ 'payment.method.' . $method->getCode(),
+ $helper->getMethodFormBlock($method),
+ );
+ }
+
+ return parent::_prepareLayout();
+ }
+
+ /**
+ * Check payment method model
+ *
+ * @param Mage_Payment_Model_Method_Abstract $method
+ * @return bool
+ */
+ protected function _canUseMethod($method)
+ {
+ return $method->isApplicableToQuote($this->getQuote(), Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_COUNTRY
+ | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_CURRENCY
+ | Mage_Payment_Model_Method_Abstract::CHECK_ORDER_TOTAL_MIN_MAX);
+ }
+
+ /**
+ * Check and prepare payment method model
+ *
+ * Redeclare this method in child classes for declaring method info instance
+ *
+ * @param Mage_Payment_Model_Method_Abstract $method
+ * @return $this
+ */
+ protected function _assignMethod($method)
+ {
+ $method->setInfoInstance($this->getQuote()->getPayment());
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Payment/Block/Info.php b/app/code/core/Mage/Payment/Block/Info.php
index 7564e47fd73..565e10696d0 100644
--- a/app/code/core/Mage/Payment/Block/Info.php
+++ b/app/code/core/Mage/Payment/Block/Info.php
@@ -31,12 +31,6 @@ class Mage_Payment_Block_Info extends Mage_Core_Block_Template
*/
protected $_paymentSpecificInformation = null;
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('payment/info/default.phtml');
- }
-
/**
* Retrieve info model
*
@@ -143,6 +137,12 @@ public function getIsSecureMode()
return !Mage::app()->getStore($method->getStore())->isAdmin();
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('payment/info/default.phtml');
+ }
+
/**
* Prepare information specific to current payment method
*
diff --git a/app/code/core/Mage/Payment/Block/Info/Banktransfer.php b/app/code/core/Mage/Payment/Block/Info/Banktransfer.php
index 432a4fecb05..45d55f170ab 100644
--- a/app/code/core/Mage/Payment/Block/Info/Banktransfer.php
+++ b/app/code/core/Mage/Payment/Block/Info/Banktransfer.php
@@ -29,12 +29,6 @@ class Mage_Payment_Block_Info_Banktransfer extends Mage_Payment_Block_Info
*/
protected $_instructions;
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('payment/info/banktransfer.phtml');
- }
-
/**
* Get instructions text from order payment
* (or from config, if instructions are missed in payment)
@@ -51,4 +45,10 @@ public function getInstructions()
}
return $this->_instructions;
}
+
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('payment/info/banktransfer.phtml');
+ }
}
diff --git a/app/code/core/Mage/Payment/Block/Info/Checkmo.php b/app/code/core/Mage/Payment/Block/Info/Checkmo.php
index fbb231d359d..51b66f53ef4 100644
--- a/app/code/core/Mage/Payment/Block/Info/Checkmo.php
+++ b/app/code/core/Mage/Payment/Block/Info/Checkmo.php
@@ -23,12 +23,6 @@ class Mage_Payment_Block_Info_Checkmo extends Mage_Payment_Block_Info
protected $_payableTo;
protected $_mailingAddress;
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('payment/info/checkmo.phtml');
- }
-
/**
* @return string
*/
@@ -51,6 +45,21 @@ public function getMailingAddress()
return $this->_mailingAddress;
}
+ /**
+ * @return string
+ */
+ public function toPdf()
+ {
+ $this->setTemplate('payment/info/pdf/checkmo.phtml');
+ return $this->toHtml();
+ }
+
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('payment/info/checkmo.phtml');
+ }
+
/**
* @return $this
*/
@@ -72,13 +81,4 @@ protected function _convertAdditionalData()
}
return $this;
}
-
- /**
- * @return string
- */
- public function toPdf()
- {
- $this->setTemplate('payment/info/pdf/checkmo.phtml');
- return $this->toHtml();
- }
}
diff --git a/app/code/core/Mage/Payment/Block/Info/Container.php b/app/code/core/Mage/Payment/Block/Info/Container.php
index c6e81669a09..590c102ce3e 100644
--- a/app/code/core/Mage/Payment/Block/Info/Container.php
+++ b/app/code/core/Mage/Payment/Block/Info/Container.php
@@ -22,6 +22,32 @@
*/
class Mage_Payment_Block_Info_Container extends Mage_Core_Block_Template
{
+ /**
+ * Retrieve payment info model
+ *
+ * @return Mage_Payment_Model_Info|false
+ */
+ public function getPaymentInfo()
+ {
+ return false;
+ }
+
+ /**
+ * Declare info block template
+ *
+ * @param string $method
+ * @param string $template
+ * @return Mage_Payment_Block_Info_Container
+ */
+ public function setInfoTemplate($method = '', $template = '')
+ {
+ if ($info = $this->getPaymentInfo()) {
+ if ($info->getMethodInstance()->getCode() == $method) {
+ $this->getChild($this->_getInfoBlockName())->setTemplate($template);
+ }
+ }
+ return $this;
+ }
/**
* Add payment info block to layout
*
@@ -50,31 +76,4 @@ protected function _getInfoBlockName()
}
return false;
}
-
- /**
- * Retrieve payment info model
- *
- * @return Mage_Payment_Model_Info|false
- */
- public function getPaymentInfo()
- {
- return false;
- }
-
- /**
- * Declare info block template
- *
- * @param string $method
- * @param string $template
- * @return Mage_Payment_Block_Info_Container
- */
- public function setInfoTemplate($method = '', $template = '')
- {
- if ($info = $this->getPaymentInfo()) {
- if ($info->getMethodInstance()->getCode() == $method) {
- $this->getChild($this->_getInfoBlockName())->setTemplate($template);
- }
- }
- return $this;
- }
}
diff --git a/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php b/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php
index f99eca3b056..43cd34664be 100644
--- a/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php
+++ b/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php
@@ -20,12 +20,6 @@
*/
class Mage_Payment_Block_Info_Purchaseorder extends Mage_Payment_Block_Info
{
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('payment/info/purchaseorder.phtml');
- }
-
/**
* @return string
*/
@@ -34,4 +28,9 @@ public function toPdf()
$this->setTemplate('payment/info/pdf/purchaseorder.phtml');
return $this->toHtml();
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('payment/info/purchaseorder.phtml');
+ }
}
diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php
index 3a64034c869..544881d2e42 100644
--- a/app/code/core/Mage/Payment/Helper/Data.php
+++ b/app/code/core/Mage/Payment/Helper/Data.php
@@ -92,19 +92,6 @@ public function getStoreMethods($store = null, $quote = null)
return $res;
}
- /**
- * @param object $a
- * @param object $b
- * @return int
- */
- protected function _sortMethods($a, $b)
- {
- if (is_object($a)) {
- return (int) $a->sort_order < (int) $b->sort_order ? -1 : ((int) $a->sort_order > (int) $b->sort_order ? 1 : 0);
- }
- return 0;
- }
-
/**
* Retrieve payment method form html
*
@@ -316,4 +303,17 @@ public function getZeroSubTotalPaymentAutomaticInvoice($store = null)
{
return Mage::getStoreConfig(Mage_Payment_Model_Method_Free::XML_PATH_PAYMENT_FREE_PAYMENT_ACTION, $store);
}
+
+ /**
+ * @param object $a
+ * @param object $b
+ * @return int
+ */
+ protected function _sortMethods($a, $b)
+ {
+ if (is_object($a)) {
+ return (int) $a->sort_order < (int) $b->sort_order ? -1 : ((int) $a->sort_order > (int) $b->sort_order ? 1 : 0);
+ }
+ return 0;
+ }
}
diff --git a/app/code/core/Mage/Payment/Model/Config.php b/app/code/core/Mage/Payment/Model/Config.php
index 779f81c2553..9c62bc969cb 100644
--- a/app/code/core/Mage/Payment/Model/Config.php
+++ b/app/code/core/Mage/Payment/Model/Config.php
@@ -68,30 +68,6 @@ public function getAllMethods($store = null)
return $methods;
}
- /**
- * @param string $code
- * @param array $config
- * @param null|string|bool|int|Mage_Core_Model_Store $store $store
- * @return false|Mage_Payment_Model_Method_Abstract
- */
- protected function _getMethod($code, $config, $store = null)
- {
- if (isset(self::$_methods[$code])) {
- return self::$_methods[$code];
- }
- if (empty($config['model'])) {
- return false;
- }
- $modelName = $config['model'];
- $method = Mage::getModel($modelName);
- if (!$method) {
- return false;
- }
- $method->setId($code)->setStore($store);
- self::$_methods[$code] = $method;
- return self::$_methods[$code];
- }
-
/**
* Retrieve array of credit card types
*
@@ -169,4 +145,28 @@ public static function compareCcTypes($a, $b)
return -1;
}
}
+
+ /**
+ * @param string $code
+ * @param array $config
+ * @param null|string|bool|int|Mage_Core_Model_Store $store $store
+ * @return false|Mage_Payment_Model_Method_Abstract
+ */
+ protected function _getMethod($code, $config, $store = null)
+ {
+ if (isset(self::$_methods[$code])) {
+ return self::$_methods[$code];
+ }
+ if (empty($config['model'])) {
+ return false;
+ }
+ $modelName = $config['model'];
+ $method = Mage::getModel($modelName);
+ if (!$method) {
+ return false;
+ }
+ $method->setId($code)->setStore($store);
+ self::$_methods[$code] = $method;
+ return self::$_methods[$code];
+ }
}
diff --git a/app/code/core/Mage/Payment/Model/Method/Abstract.php b/app/code/core/Mage/Payment/Model/Method/Abstract.php
index 8fecb02d2c3..327bfca7a9e 100644
--- a/app/code/core/Mage/Payment/Model/Method/Abstract.php
+++ b/app/code/core/Mage/Payment/Model/Method/Abstract.php
@@ -323,16 +323,6 @@ public function canManageRecurringProfiles()
&& ($this instanceof Mage_Payment_Model_Recurring_Profile_MethodInterface);
}
- /**
- * Retrieve model helper
- *
- * @return Mage_Payment_Helper_Data
- */
- protected function _getHelper()
- {
- return Mage::helper('payment');
- }
-
/**
* Retrieve payment method code
*
@@ -740,20 +730,6 @@ public function getConfigPaymentAction()
return $this->getConfigData('payment_action');
}
- /**
- * Log debug data to file
- *
- * @param mixed $debugData
- */
- protected function _debug($debugData)
- {
- if ($this->getDebugFlag()) {
- Mage::getModel('core/log_adapter', 'payment_' . $this->getCode() . '.log')
- ->setFilterDataKeys($this->_debugReplacePrivateDataKeys)
- ->log($debugData);
- }
- }
-
/**
* Define if debugging is enabled
*
@@ -773,4 +749,28 @@ public function debugData($debugData)
{
$this->_debug($debugData);
}
+
+ /**
+ * Retrieve model helper
+ *
+ * @return Mage_Payment_Helper_Data
+ */
+ protected function _getHelper()
+ {
+ return Mage::helper('payment');
+ }
+
+ /**
+ * Log debug data to file
+ *
+ * @param mixed $debugData
+ */
+ protected function _debug($debugData)
+ {
+ if ($this->getDebugFlag()) {
+ Mage::getModel('core/log_adapter', 'payment_' . $this->getCode() . '.log')
+ ->setFilterDataKeys($this->_debugReplacePrivateDataKeys)
+ ->log($debugData);
+ }
+ }
}
diff --git a/app/code/core/Mage/Payment/Model/Method/Cc.php b/app/code/core/Mage/Payment/Model/Method/Cc.php
index 80ab880e3bd..846034a539b 100644
--- a/app/code/core/Mage/Payment/Model/Method/Cc.php
+++ b/app/code/core/Mage/Payment/Model/Method/Cc.php
@@ -197,23 +197,6 @@ public function getVerificationRegEx()
];
}
- /**
- * @param string $expYear
- * @param string $expMonth
- * @return bool
- * @throws Zend_Date_Exception
- */
- protected function _validateExpDate($expYear, $expMonth)
- {
- $date = Mage::app()->getLocale()->date();
- if (!$expYear || !$expMonth || ($date->compareYear($expYear) == 1)
- || ($date->compareYear($expYear) == 0 && ($date->compareMonth($expMonth) == 1))
- ) {
- return false;
- }
- return true;
- }
-
/**
* @param string $type
* @return bool
@@ -332,6 +315,23 @@ public function getCentinelValidationData()
return $params;
}
+ /**
+ * @param string $expYear
+ * @param string $expMonth
+ * @return bool
+ * @throws Zend_Date_Exception
+ */
+ protected function _validateExpDate($expYear, $expMonth)
+ {
+ $date = Mage::app()->getLocale()->date();
+ if (!$expYear || !$expMonth || ($date->compareYear($expYear) == 1)
+ || ($date->compareYear($expYear) == 0 && ($date->compareMonth($expMonth) == 1))
+ ) {
+ return false;
+ }
+ return true;
+ }
+
/**
* Order increment ID getter (either real from order or a reserved from quote)
*
diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php
index abb4481d46f..efddc22aa40 100644
--- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php
+++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php
@@ -40,6 +40,24 @@ public function __construct()
$this->setUseAjax(true);
}
+ /**
+ * Return grid URL
+ * @return string
+ */
+ public function getGridUrl()
+ {
+ return $this->getUrl('*/*/grid');
+ }
+
+ /**
+ * Return item view URL
+ * @return string
+ */
+ public function getRowUrl($item)
+ {
+ return $this->getUrl('*/*/details', ['id' => $item->getId()]);
+ }
+
/**
* @inheritDoc
*/
@@ -110,22 +128,4 @@ protected function _prepareColumns()
]);
return parent::_prepareColumns();
}
-
- /**
- * Return grid URL
- * @return string
- */
- public function getGridUrl()
- {
- return $this->getUrl('*/*/grid');
- }
-
- /**
- * Return item view URL
- * @return string
- */
- public function getRowUrl($item)
- {
- return $this->getUrl('*/*/details', ['id' => $item->getId()]);
- }
}
diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
index f465de95bb9..f04a401b561 100644
--- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
+++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
@@ -27,6 +27,17 @@ class Mage_Paypal_Block_Adminhtml_System_Config_ApiWizard extends Mage_Adminhtml
*/
protected $_wizardTemplate = 'paypal/system/config/api_wizard.phtml';
+ /**
+ * Unset some non-related element parameters
+ *
+ * @return string
+ */
+ public function render(Varien_Data_Form_Element_Abstract $element)
+ {
+ $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
+ return parent::render($element);
+ }
+
/**
* Set template to itself
*/
@@ -39,17 +50,6 @@ protected function _prepareLayout()
return $this;
}
- /**
- * Unset some non-related element parameters
- *
- * @return string
- */
- public function render(Varien_Data_Form_Element_Abstract $element)
- {
- $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
- return parent::render($element);
- }
-
/**
* Get the button and scripts contents
*
diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php
index 76ff1f6ee36..bdb6b18bb1d 100644
--- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php
+++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php
@@ -22,6 +22,45 @@
*/
class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Deprecated extends Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Payment
{
+ /**
+ * Check whether current payment method is enabled on any scope
+ *
+ * @param string $activityPath
+ * @return bool
+ */
+ public function isPaymentEnabledAnyScope($activityPath)
+ {
+ if ((bool) (string) $this->_getConfigModel()->getNode($activityPath, 'default')) {
+ return true;
+ }
+ foreach ($this->_getWebsites() as $website) {
+ if ((bool) (string) $this->_getConfigModel()->getNode($activityPath, 'website', (int) $website->getId())) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Do not render solution if disabled
+ *
+ * @return string
+ */
+ public function render(Varien_Data_Form_Element_Abstract $element)
+ {
+ $isPaymentEnabled = $this->_isPaymentEnabled($element, [$this, 'isPaymentEnabledAnyScope']);
+ if ($this->_wasActive($element) && $isPaymentEnabled) {
+ return parent::render($element);
+ }
+
+ if ($isPaymentEnabled) {
+ $this->_setWasActive($element);
+ return parent::render($element);
+ }
+
+ return '';
+ }
/**
* Get was enabled config path
*
@@ -85,44 +124,4 @@ protected function _getWebsites()
return $this->getWebsites();
}
-
- /**
- * Check whether current payment method is enabled on any scope
- *
- * @param string $activityPath
- * @return bool
- */
- public function isPaymentEnabledAnyScope($activityPath)
- {
- if ((bool) (string) $this->_getConfigModel()->getNode($activityPath, 'default')) {
- return true;
- }
- foreach ($this->_getWebsites() as $website) {
- if ((bool) (string) $this->_getConfigModel()->getNode($activityPath, 'website', (int) $website->getId())) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Do not render solution if disabled
- *
- * @return string
- */
- public function render(Varien_Data_Form_Element_Abstract $element)
- {
- $isPaymentEnabled = $this->_isPaymentEnabled($element, [$this, 'isPaymentEnabledAnyScope']);
- if ($this->_wasActive($element) && $isPaymentEnabled) {
- return parent::render($element);
- }
-
- if ($isPaymentEnabled) {
- $this->_setWasActive($element);
- return parent::render($element);
- }
-
- return '';
- }
}
diff --git a/app/code/core/Mage/Paypal/Block/Express/Shortcut.php b/app/code/core/Mage/Paypal/Block/Express/Shortcut.php
index ac6d827afd3..a79ee1da708 100644
--- a/app/code/core/Mage/Paypal/Block/Express/Shortcut.php
+++ b/app/code/core/Mage/Paypal/Block/Express/Shortcut.php
@@ -67,6 +67,28 @@ class Mage_Paypal_Block_Express_Shortcut extends Mage_Core_Block_Template
*/
protected $_checkoutType = 'paypal/express_checkout';
+ /**
+ * Check is "OR" label position before shortcut
+ *
+ * @return bool
+ */
+ public function isOrPositionBefore()
+ {
+ return ($this->getIsInCatalogProduct() && !$this->getShowOrPosition())
+ || ($this->getShowOrPosition() && $this->getShowOrPosition() === self::POSITION_BEFORE);
+ }
+
+ /**
+ * Check is "OR" label position after shortcut
+ *
+ * @return bool
+ */
+ public function isOrPositionAfter()
+ {
+ return (!$this->getIsInCatalogProduct() && !$this->getShowOrPosition())
+ || ($this->getShowOrPosition() && $this->getShowOrPosition() === self::POSITION_AFTER);
+ }
+
/**
* @return Mage_Core_Block_Abstract
*/
@@ -179,26 +201,4 @@ protected function _toHtml()
}
return parent::_toHtml();
}
-
- /**
- * Check is "OR" label position before shortcut
- *
- * @return bool
- */
- public function isOrPositionBefore()
- {
- return ($this->getIsInCatalogProduct() && !$this->getShowOrPosition())
- || ($this->getShowOrPosition() && $this->getShowOrPosition() === self::POSITION_BEFORE);
- }
-
- /**
- * Check is "OR" label position after shortcut
- *
- * @return bool
- */
- public function isOrPositionAfter()
- {
- return (!$this->getIsInCatalogProduct() && !$this->getShowOrPosition())
- || ($this->getShowOrPosition() && $this->getShowOrPosition() === self::POSITION_AFTER);
- }
}
diff --git a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php
index 8031ab59784..d02d434ec71 100644
--- a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php
+++ b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php
@@ -22,15 +22,6 @@
*/
class Mage_Paypal_Block_Hosted_Pro_Iframe extends Mage_Paypal_Block_Iframe
{
- /**
- * Set payment method code
- */
- protected function _construct()
- {
- parent::_construct();
- $this->_paymentMethodCode = Mage_Paypal_Model_Config::METHOD_HOSTEDPRO;
- }
-
/**
* Get iframe action URL
* @return string
@@ -41,4 +32,12 @@ public function getFrameActionUrl()
->getPayment()
->getAdditionalInformation('secure_form_url');
}
+ /**
+ * Set payment method code
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_paymentMethodCode = Mage_Paypal_Model_Config::METHOD_HOSTEDPRO;
+ }
}
diff --git a/app/code/core/Mage/Paypal/Block/Iframe.php b/app/code/core/Mage/Paypal/Block/Iframe.php
index d7637aaf333..64693077964 100644
--- a/app/code/core/Mage/Paypal/Block/Iframe.php
+++ b/app/code/core/Mage/Paypal/Block/Iframe.php
@@ -48,6 +48,61 @@ class Mage_Paypal_Block_Iframe extends Mage_Payment_Block_Form
*/
protected $_block;
+ /**
+ * Get iframe action URL
+ *
+ * @return string
+ * @throws Mage_Core_Exception
+ */
+ public function getFrameActionUrl()
+ {
+ return $this->_getBlock()->getFrameActionUrl();
+ }
+
+ /**
+ * Get secure token
+ *
+ * @return string
+ * @throws Mage_Core_Exception
+ */
+ public function getSecureToken()
+ {
+ return $this->_getBlock()->getSecureToken();
+ }
+
+ /**
+ * Get secure token ID
+ *
+ * @return string
+ * @throws Mage_Core_Exception
+ */
+ public function getSecureTokenId()
+ {
+ return $this->_getBlock()->getSecureTokenId();
+ }
+
+ /**
+ * Get payflow transaction URL
+ *
+ * @return string
+ * @throws Mage_Core_Exception
+ */
+ public function getTransactionUrl()
+ {
+ return $this->_getBlock()->getTransactionUrl();
+ }
+
+ /**
+ * Check sandbox mode
+ *
+ * @return bool
+ * @throws Mage_Core_Exception
+ */
+ public function isTestMode()
+ {
+ return $this->_getBlock()->isTestMode();
+ }
+
/**
* Internal constructor
* Set info template for payment step
@@ -178,59 +233,4 @@ protected function _isAfterPaymentSave()
return false;
}
-
- /**
- * Get iframe action URL
- *
- * @return string
- * @throws Mage_Core_Exception
- */
- public function getFrameActionUrl()
- {
- return $this->_getBlock()->getFrameActionUrl();
- }
-
- /**
- * Get secure token
- *
- * @return string
- * @throws Mage_Core_Exception
- */
- public function getSecureToken()
- {
- return $this->_getBlock()->getSecureToken();
- }
-
- /**
- * Get secure token ID
- *
- * @return string
- * @throws Mage_Core_Exception
- */
- public function getSecureTokenId()
- {
- return $this->_getBlock()->getSecureTokenId();
- }
-
- /**
- * Get payflow transaction URL
- *
- * @return string
- * @throws Mage_Core_Exception
- */
- public function getTransactionUrl()
- {
- return $this->_getBlock()->getTransactionUrl();
- }
-
- /**
- * Check sandbox mode
- *
- * @return bool
- * @throws Mage_Core_Exception
- */
- public function isTestMode()
- {
- return $this->_getBlock()->isTestMode();
- }
}
diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php
index b05a13bb3cb..3bf56cbc4e6 100644
--- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php
+++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php
@@ -23,22 +23,21 @@
class Mage_Paypal_Block_Payflow_Advanced_Form extends Mage_Paypal_Block_Payflow_Link_Form
{
/**
- * Set payment method code
+ * Get frame action URL
*
+ * @return string
*/
- protected function _construct()
+ public function getFrameActionUrl()
{
- parent::_construct();
- $this->setTemplate('paypal/payflowadvanced/info.phtml');
+ return $this->getUrl('paypal/payflowadvanced/form', ['_secure' => true]);
}
-
/**
- * Get frame action URL
+ * Set payment method code
*
- * @return string
*/
- public function getFrameActionUrl()
+ protected function _construct()
{
- return $this->getUrl('paypal/payflowadvanced/form', ['_secure' => true]);
+ parent::_construct();
+ $this->setTemplate('paypal/payflowadvanced/info.phtml');
}
}
diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php
index f7511847903..b6ba1794d17 100644
--- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php
+++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php
@@ -22,15 +22,6 @@
*/
class Mage_Paypal_Block_Payflow_Advanced_Iframe extends Mage_Paypal_Block_Payflow_Link_Iframe
{
- /**
- * Set payment method code
- */
- protected function _construct()
- {
- parent::_construct();
- $this->_paymentMethodCode = Mage_Paypal_Model_Config::METHOD_PAYFLOWADVANCED;
- }
-
/**
* Get frame action URL
* @return string
@@ -53,4 +44,12 @@ public function isTestMode()
->getConfigData('sandbox_flag');
return (bool) $mode;
}
+ /**
+ * Set payment method code
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_paymentMethodCode = Mage_Paypal_Model_Config::METHOD_PAYFLOWADVANCED;
+ }
}
diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php
index e5eb68239e9..c1c6b7b4140 100644
--- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php
+++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php
@@ -23,22 +23,21 @@
class Mage_Paypal_Block_Payflow_Link_Form extends Mage_Payment_Block_Form
{
/**
- * Set payment method code
+ * Get frame action URL
*
+ * @return string
*/
- protected function _construct()
+ public function getFrameActionUrl()
{
- parent::_construct();
- $this->setTemplate('paypal/payflowlink/info.phtml');
+ return $this->getUrl('paypal/payflow/form', ['_secure' => true]);
}
-
/**
- * Get frame action URL
+ * Set payment method code
*
- * @return string
*/
- public function getFrameActionUrl()
+ protected function _construct()
{
- return $this->getUrl('paypal/payflow/form', ['_secure' => true]);
+ parent::_construct();
+ $this->setTemplate('paypal/payflowlink/info.phtml');
}
}
diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php
index 70001bd00f6..477b0e1a102 100644
--- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php
+++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php
@@ -22,15 +22,6 @@
*/
class Mage_Paypal_Block_Payflow_Link_Iframe extends Mage_Paypal_Block_Iframe
{
- /**
- * Set payment method code
- */
- protected function _construct()
- {
- parent::_construct();
- $this->_paymentMethodCode = Mage_Paypal_Model_Config::METHOD_PAYFLOWLINK;
- }
-
/**
* Get frame action URL
*
@@ -88,4 +79,12 @@ public function isTestMode()
->getConfigData('sandbox_flag');
return (bool) $mode;
}
+ /**
+ * Set payment method code
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_paymentMethodCode = Mage_Paypal_Model_Config::METHOD_PAYFLOWLINK;
+ }
}
diff --git a/app/code/core/Mage/Paypal/Block/Standard/Form.php b/app/code/core/Mage/Paypal/Block/Standard/Form.php
index 7ec17ec204a..45028abc593 100644
--- a/app/code/core/Mage/Paypal/Block/Standard/Form.php
+++ b/app/code/core/Mage/Paypal/Block/Standard/Form.php
@@ -35,6 +35,15 @@ class Mage_Paypal_Block_Standard_Form extends Mage_Payment_Block_Form
*/
protected $_config;
+ /**
+ * Payment method code getter
+ * @return string
+ */
+ public function getMethodCode()
+ {
+ return $this->_methodCode;
+ }
+
/**
* Set template and redirect message
*
@@ -59,13 +68,4 @@ protected function _construct()
;
parent::_construct();
}
-
- /**
- * Payment method code getter
- * @return string
- */
- public function getMethodCode()
- {
- return $this->_methodCode;
- }
}
diff --git a/app/code/core/Mage/Paypal/Controller/Express/Abstract.php b/app/code/core/Mage/Paypal/Controller/Express/Abstract.php
index a04dbfff98c..f87ba3d0a24 100644
--- a/app/code/core/Mage/Paypal/Controller/Express/Abstract.php
+++ b/app/code/core/Mage/Paypal/Controller/Express/Abstract.php
@@ -52,17 +52,6 @@ abstract class Mage_Paypal_Controller_Express_Abstract extends Mage_Core_Control
*/
protected $_configType;
- /**
- * Instantiate config
- */
- protected function _construct()
- {
- parent::_construct();
- /** @var Mage_Paypal_Model_Config $classInstance */
- $classInstance = Mage::getModel($this->_configType, [$this->_configMethod]);
- $this->_config = $classInstance;
- }
-
/**
* Start Express Checkout by requesting initial token and dispatching customer to PayPal
*/
@@ -384,6 +373,32 @@ public function placeOrderAction()
}
}
+ /**
+ * Redirect to login page
+ *
+ */
+ public function redirectLogin()
+ {
+ $this->setFlag('', 'no-dispatch', true);
+ $this->getResponse()->setRedirect(
+ Mage::helper('core/url')->addRequestParam(
+ Mage::helper('customer')->getLoginUrl(),
+ ['context' => 'checkout'],
+ ),
+ );
+ }
+
+ /**
+ * Instantiate config
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ /** @var Mage_Paypal_Model_Config $classInstance */
+ $classInstance = Mage::getModel($this->_configType, [$this->_configMethod]);
+ $this->_config = $classInstance;
+ }
+
/**
* Process PayPal API's processable errors
*
@@ -495,23 +510,23 @@ protected function _initToken($setToken = null)
}
/**
- * PayPal session instance getter
+ * Return checkout session object
*
- * @return Mage_Paypal_Model_Session
+ * @return Mage_Checkout_Model_Session
*/
- private function _getSession()
+ protected function _getCheckoutSession()
{
- return Mage::getSingleton('paypal/session');
+ return Mage::getSingleton('checkout/session');
}
/**
- * Return checkout session object
+ * PayPal session instance getter
*
- * @return Mage_Checkout_Model_Session
+ * @return Mage_Paypal_Model_Session
*/
- protected function _getCheckoutSession()
+ private function _getSession()
{
- return Mage::getSingleton('checkout/session');
+ return Mage::getSingleton('paypal/session');
}
/**
@@ -526,19 +541,4 @@ private function _getQuote()
}
return $this->_quote;
}
-
- /**
- * Redirect to login page
- *
- */
- public function redirectLogin()
- {
- $this->setFlag('', 'no-dispatch', true);
- $this->getResponse()->setRedirect(
- Mage::helper('core/url')->addRequestParam(
- Mage::helper('customer')->getLoginUrl(),
- ['context' => 'checkout'],
- ),
- );
- }
}
diff --git a/app/code/core/Mage/Paypal/Helper/Data.php b/app/code/core/Mage/Paypal/Helper/Data.php
index 5222803b75b..ff3b5127eca 100644
--- a/app/code/core/Mage/Paypal/Helper/Data.php
+++ b/app/code/core/Mage/Paypal/Helper/Data.php
@@ -22,8 +22,6 @@
*/
class Mage_Paypal_Helper_Data extends Mage_Core_Helper_Abstract
{
- protected $_moduleName = 'Mage_Paypal';
-
/**
* US country code
*/
@@ -33,6 +31,7 @@ class Mage_Paypal_Helper_Data extends Mage_Core_Helper_Abstract
* Config path for merchant country
*/
public const MERCHANT_COUNTRY_CONFIG_PATH = 'paypal/general/merchant_country';
+ protected $_moduleName = 'Mage_Paypal';
/**
* Cache for shouldAskToCreateBillingAgreement()
diff --git a/app/code/core/Mage/Paypal/Model/Api/Abstract.php b/app/code/core/Mage/Paypal/Model/Api/Abstract.php
index ba66a505243..a5f5bf709fe 100644
--- a/app/code/core/Mage/Paypal/Model/Api/Abstract.php
+++ b/app/code/core/Mage/Paypal/Model/Api/Abstract.php
@@ -316,6 +316,26 @@ public function addRecurringPaymentProfiles(array $items)
return $this;
}
+ /**
+ * Define if debugging is enabled
+ *
+ * @return bool
+ */
+ public function getDebugFlag()
+ {
+ return $this->_config->debug;
+ }
+
+ /**
+ * Check whether API certificate authentication should be used
+ *
+ * @return bool
+ */
+ public function getUseCertAuthentication()
+ {
+ return (bool) $this->_config->apiAuthentication;
+ }
+
/**
* Export $this public data to private request array
*
@@ -559,24 +579,4 @@ protected function _debug($debugData)
->log($debugData);
}
}
-
- /**
- * Define if debugging is enabled
- *
- * @return bool
- */
- public function getDebugFlag()
- {
- return $this->_config->debug;
- }
-
- /**
- * Check whether API certificate authentication should be used
- *
- * @return bool
- */
- public function getUseCertAuthentication()
- {
- return (bool) $this->_config->apiAuthentication;
- }
}
diff --git a/app/code/core/Mage/Paypal/Model/Api/Nvp.php b/app/code/core/Mage/Paypal/Model/Api/Nvp.php
index 07ca5731558..c1aeaf41a5e 100644
--- a/app/code/core/Mage/Paypal/Model/Api/Nvp.php
+++ b/app/code/core/Mage/Paypal/Model/Api/Nvp.php
@@ -900,19 +900,6 @@ public function formatShippingOptionsCallback()
return $this->_buildQuery($response);
}
- /**
- * Add method to request array
- *
- * @param string $methodName
- * @param array $request
- * @return array
- */
- protected function _addMethodToRequest($methodName, $request)
- {
- $request['METHOD'] = $methodName;
- return $request;
- }
-
/**
* Do the API call
*
@@ -1011,6 +998,19 @@ public function setRawResponseNeeded($flag)
return $this;
}
+ /**
+ * Add method to request array
+ *
+ * @param string $methodName
+ * @param array $request
+ * @return array
+ */
+ protected function _addMethodToRequest($methodName, $request)
+ {
+ $request['METHOD'] = $methodName;
+ return $request;
+ }
+
/**
* Handle logical errors
*
diff --git a/app/code/core/Mage/Paypal/Model/Cart.php b/app/code/core/Mage/Paypal/Model/Cart.php
index a57a6d71583..1aecea1dbe2 100644
--- a/app/code/core/Mage/Paypal/Model/Cart.php
+++ b/app/code/core/Mage/Paypal/Model/Cart.php
@@ -263,6 +263,31 @@ public function isShippingAsItem($setValue = null)
return $this->_totalAsItem('_isShippingAsItem', $setValue);
}
+ /**
+ * Check whether items are valid
+ *
+ * @return bool
+ */
+ public function areItemsValid()
+ {
+ return $this->_areItemsValid;
+ }
+
+ /**
+ * Check whether any item has negative amount
+ *
+ * @return bool
+ */
+ public function hasNegativeItemAmount()
+ {
+ foreach ($this->_items as $item) {
+ if ($item->getAmount() < 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* (re)Render all items and totals
*/
@@ -415,16 +440,6 @@ protected function _validate()
$this->_areItemsValid = $this->_areItemsValid && $this->_areTotalsValid;
}
- /**
- * Check whether items are valid
- *
- * @return bool
- */
- public function areItemsValid()
- {
- return $this->_areItemsValid;
- }
-
/**
* Add a usual line item with amount and qty
*
@@ -504,19 +519,4 @@ private function _applyHiddenTaxWorkaround($salesEntity)
$this->_totals[self::TOTAL_TAX] += (float) $salesEntity->getBaseHiddenTaxAmount();
$this->_totals[self::TOTAL_TAX] += (float) $salesEntity->getBaseShippingHiddenTaxAmount();
}
-
- /**
- * Check whether any item has negative amount
- *
- * @return bool
- */
- public function hasNegativeItemAmount()
- {
- foreach ($this->_items as $item) {
- if ($item->getAmount() < 0) {
- return true;
- }
- }
- return false;
- }
}
diff --git a/app/code/core/Mage/Paypal/Model/Cert.php b/app/code/core/Mage/Paypal/Model/Cert.php
index fb3fd4fd878..ac81201ebde 100644
--- a/app/code/core/Mage/Paypal/Model/Cert.php
+++ b/app/code/core/Mage/Paypal/Model/Cert.php
@@ -27,11 +27,6 @@ class Mage_Paypal_Model_Cert extends Mage_Core_Model_Abstract
*/
public const BASEPATH_PAYPAL_CERT = 'cert/paypal';
- protected function _construct()
- {
- $this->_init('paypal/cert');
- }
-
/**
* Load model by website id
*
@@ -66,6 +61,11 @@ public function getCertPath()
return $certFile;
}
+ protected function _construct()
+ {
+ $this->_init('paypal/cert');
+ }
+
/**
* Create physical certificate file based on DB data
*
diff --git a/app/code/core/Mage/Paypal/Model/Config.php b/app/code/core/Mage/Paypal/Model/Config.php
index 6415dbc27d7..59fa8d5a990 100644
--- a/app/code/core/Mage/Paypal/Model/Config.php
+++ b/app/code/core/Mage/Paypal/Model/Config.php
@@ -644,6 +644,33 @@ public function __construct($params = [])
}
}
+ /**
+ * Config field magic getter
+ * The specified key can be either in camelCase or under_score format
+ * Tries to map specified value according to set payment method code, into the configuration value
+ * Sets the values into public class parameters, to avoid redundant calls of this method
+ *
+ * @param string $key
+ * @return string|null
+ */
+ public function __get($key)
+ {
+ if (array_key_exists($key, $this->_config)) {
+ return $this->_config[$key];
+ }
+
+ $underscored = strtolower(preg_replace('/(.)([A-Z])/', '$1_$2', $key));
+ if (array_key_exists($underscored, $this->_config)) {
+ return $this->_config[$underscored];
+ }
+
+ $value = Mage::getStoreConfig($this->_getSpecificConfigPath($underscored), $this->_storeId);
+ $value = $this->_prepareValue($underscored, $value);
+ $this->_config[$key] = $value;
+ $this->_config[$underscored] = $value;
+ return $value;
+ }
+
/**
* Method code setter
*
@@ -770,53 +797,6 @@ public function isMethodAvailable($methodCode = null)
return $result;
}
- /**
- * Config field magic getter
- * The specified key can be either in camelCase or under_score format
- * Tries to map specified value according to set payment method code, into the configuration value
- * Sets the values into public class parameters, to avoid redundant calls of this method
- *
- * @param string $key
- * @return string|null
- */
- public function __get($key)
- {
- if (array_key_exists($key, $this->_config)) {
- return $this->_config[$key];
- }
-
- $underscored = strtolower(preg_replace('/(.)([A-Z])/', '$1_$2', $key));
- if (array_key_exists($underscored, $this->_config)) {
- return $this->_config[$underscored];
- }
-
- $value = Mage::getStoreConfig($this->_getSpecificConfigPath($underscored), $this->_storeId);
- $value = $this->_prepareValue($underscored, $value);
- $this->_config[$key] = $value;
- $this->_config[$underscored] = $value;
- return $value;
- }
-
- /**
- * Perform additional config value preparation and return new value if needed
- *
- * @param string $key Underscored key
- * @param string $value Old value
- * @return string Modified value or old value
- */
- protected function _prepareValue($key, $value)
- {
- // Always set payment action as "Sale" for Unilateral payments in EC
- if ($key == 'payment_action'
- && $value != self::PAYMENT_ACTION_SALE
- && $this->_methodCode == self::METHOD_WPP_EXPRESS
- && $this->shouldUseUnilateralPayments()
- ) {
- return self::PAYMENT_ACTION_SALE;
- }
- return $value;
- }
-
/**
* Return merchant country codes supported by PayPal
*
@@ -1550,6 +1530,98 @@ public function exportExpressCheckoutStyleSettings(Varien_Object $to)
}
}
+ /**
+ * Payment API authentication methods source getter
+ *
+ * @return array
+ */
+ public function getApiAuthenticationMethods()
+ {
+ return [
+ '0' => Mage::helper('paypal')->__('API Signature'),
+ '1' => Mage::helper('paypal')->__('API Certificate'),
+ ];
+ }
+
+ /**
+ * Api certificate getter
+ *
+ * @return string
+ */
+ public function getApiCertificate()
+ {
+ $websiteId = Mage::app()->getStore($this->_storeId)->getWebsiteId();
+ return Mage::getModel('paypal/cert')->loadByWebsite($websiteId, false)->getCertPath();
+ }
+
+ /**
+ * Get PublisherId from stored config
+ *
+ * @return mixed
+ */
+ public function getBmlPublisherId()
+ {
+ return Mage::getStoreConfig('payment/paypal_express_bml/publisher_id', $this->_storeId);
+ }
+
+ /**
+ * Get Display option from stored config
+ * @param string $section
+ *
+ * @return mixed
+ */
+ public function getBmlDisplay($section)
+ {
+ $display = Mage::getStoreConfig('payment/paypal_express_bml/' . $section . '_display', $this->_storeId);
+ $ecActive = Mage::getStoreConfig('payment/paypal_express/active', $this->_storeId);
+ $ecUkActive = Mage::getStoreConfig('payment/paypaluk_express/active', $this->_storeId);
+ $bmlActive = Mage::getStoreConfig('payment/paypal_express_bml/active', $this->_storeId);
+ $bmlUkActive = Mage::getStoreConfig('payment/paypaluk_express_bml/active', $this->_storeId);
+ return (($bmlActive && $ecActive) || ($bmlUkActive && $ecUkActive)) ? $display : 0;
+ }
+
+ /**
+ * Get Position option from stored config
+ * @param string $section
+ *
+ * @return mixed
+ */
+ public function getBmlPosition($section)
+ {
+ return Mage::getStoreConfig('payment/paypal_express_bml/' . $section . '_position', $this->_storeId);
+ }
+
+ /**
+ * Get Size option from stored config
+ * @param string $section
+ *
+ * @return mixed
+ */
+ public function getBmlSize($section)
+ {
+ return Mage::getStoreConfig('payment/paypal_express_bml/' . $section . '_size', $this->_storeId);
+ }
+
+ /**
+ * Perform additional config value preparation and return new value if needed
+ *
+ * @param string $key Underscored key
+ * @param string $value Old value
+ * @return string Modified value or old value
+ */
+ protected function _prepareValue($key, $value)
+ {
+ // Always set payment action as "Sale" for Unilateral payments in EC
+ if ($key == 'payment_action'
+ && $value != self::PAYMENT_ACTION_SALE
+ && $this->_methodCode == self::METHOD_WPP_EXPRESS
+ && $this->shouldUseUnilateralPayments()
+ ) {
+ return self::PAYMENT_ACTION_SALE;
+ }
+ return $value;
+ }
+
/**
* Dynamic PayPal image URL getter
* Also can render dynamic Acceptance Mark
@@ -1871,76 +1943,4 @@ protected function _mapMethodFieldset($fieldName)
return null;
}
}
-
- /**
- * Payment API authentication methods source getter
- *
- * @return array
- */
- public function getApiAuthenticationMethods()
- {
- return [
- '0' => Mage::helper('paypal')->__('API Signature'),
- '1' => Mage::helper('paypal')->__('API Certificate'),
- ];
- }
-
- /**
- * Api certificate getter
- *
- * @return string
- */
- public function getApiCertificate()
- {
- $websiteId = Mage::app()->getStore($this->_storeId)->getWebsiteId();
- return Mage::getModel('paypal/cert')->loadByWebsite($websiteId, false)->getCertPath();
- }
-
- /**
- * Get PublisherId from stored config
- *
- * @return mixed
- */
- public function getBmlPublisherId()
- {
- return Mage::getStoreConfig('payment/paypal_express_bml/publisher_id', $this->_storeId);
- }
-
- /**
- * Get Display option from stored config
- * @param string $section
- *
- * @return mixed
- */
- public function getBmlDisplay($section)
- {
- $display = Mage::getStoreConfig('payment/paypal_express_bml/' . $section . '_display', $this->_storeId);
- $ecActive = Mage::getStoreConfig('payment/paypal_express/active', $this->_storeId);
- $ecUkActive = Mage::getStoreConfig('payment/paypaluk_express/active', $this->_storeId);
- $bmlActive = Mage::getStoreConfig('payment/paypal_express_bml/active', $this->_storeId);
- $bmlUkActive = Mage::getStoreConfig('payment/paypaluk_express_bml/active', $this->_storeId);
- return (($bmlActive && $ecActive) || ($bmlUkActive && $ecUkActive)) ? $display : 0;
- }
-
- /**
- * Get Position option from stored config
- * @param string $section
- *
- * @return mixed
- */
- public function getBmlPosition($section)
- {
- return Mage::getStoreConfig('payment/paypal_express_bml/' . $section . '_position', $this->_storeId);
- }
-
- /**
- * Get Size option from stored config
- * @param string $section
- *
- * @return mixed
- */
- public function getBmlSize($section)
- {
- return Mage::getStoreConfig('payment/paypal_express_bml/' . $section . '_size', $this->_storeId);
- }
}
diff --git a/app/code/core/Mage/Paypal/Model/Direct.php b/app/code/core/Mage/Paypal/Model/Direct.php
index aca456621b3..bb01fb1af84 100644
--- a/app/code/core/Mage/Paypal/Model/Direct.php
+++ b/app/code/core/Mage/Paypal/Model/Direct.php
@@ -280,6 +280,22 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact
return $this->_pro->fetchTransactionInfo($payment, $transactionId);
}
+ /**
+ * Check void availability
+ *
+ * @return bool
+ */
+ public function canVoid(Varien_Object $payment)
+ {
+ if ($payment instanceof Mage_Sales_Model_Order_Invoice
+ || $payment instanceof Mage_Sales_Model_Order_Creditmemo
+ ) {
+ return false;
+ }
+
+ return $this->_canVoid;
+ }
+
/**
* Place an order with authorization or capture action
*
@@ -366,20 +382,4 @@ protected function _importResultToPayment($api, $payment)
$payment->setTransactionId($api->getTransactionId())->setIsTransactionClosed(0);
$this->_pro->importPaymentInfo($api, $payment);
}
-
- /**
- * Check void availability
- *
- * @return bool
- */
- public function canVoid(Varien_Object $payment)
- {
- if ($payment instanceof Mage_Sales_Model_Order_Invoice
- || $payment instanceof Mage_Sales_Model_Order_Creditmemo
- ) {
- return false;
- }
-
- return $this->_canVoid;
- }
}
diff --git a/app/code/core/Mage/Paypal/Model/Express.php b/app/code/core/Mage/Paypal/Model/Express.php
index d2e27b1a905..9b8aa9cadfd 100644
--- a/app/code/core/Mage/Paypal/Model/Express.php
+++ b/app/code/core/Mage/Paypal/Model/Express.php
@@ -80,28 +80,6 @@ public function __construct($params = [])
$this->_setApiProcessableErrors();
}
- /**
- * Set processable error codes to API model
- *
- * @return Mage_Paypal_Model_Api_Nvp
- */
- protected function _setApiProcessableErrors()
- {
- return $this->_pro->getApi()->setProcessableErrors(
- [
- Mage_Paypal_Model_Api_ProcessableException::API_INTERNAL_ERROR,
- Mage_Paypal_Model_Api_ProcessableException::API_UNABLE_PROCESS_PAYMENT_ERROR_CODE,
- Mage_Paypal_Model_Api_ProcessableException::API_DO_EXPRESS_CHECKOUT_FAIL,
- Mage_Paypal_Model_Api_ProcessableException::API_UNABLE_TRANSACTION_COMPLETE,
- Mage_Paypal_Model_Api_ProcessableException::API_TRANSACTION_EXPIRED,
- Mage_Paypal_Model_Api_ProcessableException::API_MAX_PAYMENT_ATTEMPTS_EXCEEDED,
- Mage_Paypal_Model_Api_ProcessableException::API_COUNTRY_FILTER_DECLINE,
- Mage_Paypal_Model_Api_ProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
- Mage_Paypal_Model_Api_ProcessableException::API_OTHER_FILTER_DECLINE,
- ],
- );
- }
-
/**
* Store setter
* Also updates store ID in config object
@@ -537,61 +515,6 @@ public function assignData($data)
return $result;
}
- /**
- * Place an order with authorization or capture action
- *
- * @param float $amount
- * @return $this
- */
- protected function _placeOrder(Mage_Sales_Model_Order_Payment $payment, $amount)
- {
- $order = $payment->getOrder();
-
- // prepare api call
- $token = $payment->getAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_TOKEN);
- $api = $this->_pro->getApi()
- ->setToken($token)
- ->setPayerId($payment->
- getAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_PAYER_ID))
- ->setAmount($amount)
- ->setPaymentAction($this->_pro->getConfig()->paymentAction)
- ->setNotifyUrl(Mage::getUrl('paypal/ipn/'))
- ->setInvNum($order->getIncrementId())
- ->setCurrencyCode($order->getBaseCurrencyCode())
- ->setPaypalCart(Mage::getModel('paypal/cart', [$order]))
- ->setIsLineItemsEnabled($this->_pro->getConfig()->lineItemsEnabled);
-
- // call api and get details from it
- $api->callDoExpressCheckoutPayment();
-
- $this->_importToPayment($api, $payment);
- return $this;
- }
-
- /**
- * Import payment info to payment
- *
- * @param Mage_Paypal_Model_Api_Nvp $api
- * @param Mage_Sales_Model_Order_Payment $payment
- */
- protected function _importToPayment($api, $payment)
- {
- $payment->setTransactionId($api->getTransactionId())->setIsTransactionClosed(0)
- ->setAdditionalInformation(
- Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_REDIRECT,
- $api->getRedirectRequired(),
- );
-
- if ($api->getBillingAgreementId()) {
- $payment->setBillingAgreementData([
- 'billing_agreement_id' => $api->getBillingAgreementId(),
- 'method_code' => Mage_Paypal_Model_Config::METHOD_BILLING_AGREEMENT,
- ]);
- }
-
- $this->_pro->importPaymentInfo($api, $payment);
- }
-
/**
* Check void availability
*
@@ -650,6 +573,83 @@ public function canCapture()
return $this->_canCapture;
}
+ /**
+ * Set processable error codes to API model
+ *
+ * @return Mage_Paypal_Model_Api_Nvp
+ */
+ protected function _setApiProcessableErrors()
+ {
+ return $this->_pro->getApi()->setProcessableErrors(
+ [
+ Mage_Paypal_Model_Api_ProcessableException::API_INTERNAL_ERROR,
+ Mage_Paypal_Model_Api_ProcessableException::API_UNABLE_PROCESS_PAYMENT_ERROR_CODE,
+ Mage_Paypal_Model_Api_ProcessableException::API_DO_EXPRESS_CHECKOUT_FAIL,
+ Mage_Paypal_Model_Api_ProcessableException::API_UNABLE_TRANSACTION_COMPLETE,
+ Mage_Paypal_Model_Api_ProcessableException::API_TRANSACTION_EXPIRED,
+ Mage_Paypal_Model_Api_ProcessableException::API_MAX_PAYMENT_ATTEMPTS_EXCEEDED,
+ Mage_Paypal_Model_Api_ProcessableException::API_COUNTRY_FILTER_DECLINE,
+ Mage_Paypal_Model_Api_ProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
+ Mage_Paypal_Model_Api_ProcessableException::API_OTHER_FILTER_DECLINE,
+ ],
+ );
+ }
+
+ /**
+ * Place an order with authorization or capture action
+ *
+ * @param float $amount
+ * @return $this
+ */
+ protected function _placeOrder(Mage_Sales_Model_Order_Payment $payment, $amount)
+ {
+ $order = $payment->getOrder();
+
+ // prepare api call
+ $token = $payment->getAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_TOKEN);
+ $api = $this->_pro->getApi()
+ ->setToken($token)
+ ->setPayerId($payment->
+ getAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_PAYER_ID))
+ ->setAmount($amount)
+ ->setPaymentAction($this->_pro->getConfig()->paymentAction)
+ ->setNotifyUrl(Mage::getUrl('paypal/ipn/'))
+ ->setInvNum($order->getIncrementId())
+ ->setCurrencyCode($order->getBaseCurrencyCode())
+ ->setPaypalCart(Mage::getModel('paypal/cart', [$order]))
+ ->setIsLineItemsEnabled($this->_pro->getConfig()->lineItemsEnabled);
+
+ // call api and get details from it
+ $api->callDoExpressCheckoutPayment();
+
+ $this->_importToPayment($api, $payment);
+ return $this;
+ }
+
+ /**
+ * Import payment info to payment
+ *
+ * @param Mage_Paypal_Model_Api_Nvp $api
+ * @param Mage_Sales_Model_Order_Payment $payment
+ */
+ protected function _importToPayment($api, $payment)
+ {
+ $payment->setTransactionId($api->getTransactionId())->setIsTransactionClosed(0)
+ ->setAdditionalInformation(
+ Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_REDIRECT,
+ $api->getRedirectRequired(),
+ );
+
+ if ($api->getBillingAgreementId()) {
+ $payment->setBillingAgreementData([
+ 'billing_agreement_id' => $api->getBillingAgreementId(),
+ 'method_code' => Mage_Paypal_Model_Config::METHOD_BILLING_AGREEMENT,
+ ]);
+ }
+
+ $this->_pro->importPaymentInfo($api, $payment);
+ }
+
/**
* Call DoAuthorize
*
diff --git a/app/code/core/Mage/Paypal/Model/Express/Checkout.php b/app/code/core/Mage/Paypal/Model/Express/Checkout.php
index 0ec6258ad76..2783a175739 100644
--- a/app/code/core/Mage/Paypal/Model/Express/Checkout.php
+++ b/app/code/core/Mage/Paypal/Model/Express/Checkout.php
@@ -630,20 +630,6 @@ public function place($token, $shippingMethodCode = null)
$this->_order = $order;
}
- /**
- * Make sure addresses will be saved without validation errors
- */
- private function _ignoreAddressValidation()
- {
- $this->_quote->getBillingAddress()->setShouldIgnoreValidation(true);
- if (!$this->_quote->getIsVirtual()) {
- $this->_quote->getShippingAddress()->setShouldIgnoreValidation(true);
- if (!$this->_config->requireBillingAddress && !$this->_quote->getBillingAddress()->getEmail()) {
- $this->_quote->getBillingAddress()->setSameAsBilling(1);
- }
- }
- }
-
/**
* Determine whether redirect somewhere specifically is required
*
@@ -704,6 +690,16 @@ public function getCheckoutMethod()
return $this->_quote->getCheckoutMethod();
}
+ /**
+ * Get customer session object
+ *
+ * @return Mage_Customer_Model_Session
+ */
+ public function getCustomerSession()
+ {
+ return $this->_customerSession;
+ }
+
/**
* Sets address data from exported address
*
@@ -1049,16 +1045,6 @@ protected function _involveNewCustomer()
return $this;
}
- /**
- * Get customer session object
- *
- * @return Mage_Customer_Model_Session
- */
- public function getCustomerSession()
- {
- return $this->_customerSession;
- }
-
/**
* Check if customer email exists
*
@@ -1080,4 +1066,18 @@ protected function _customerEmailExists($email)
return $result;
}
+
+ /**
+ * Make sure addresses will be saved without validation errors
+ */
+ private function _ignoreAddressValidation()
+ {
+ $this->_quote->getBillingAddress()->setShouldIgnoreValidation(true);
+ if (!$this->_quote->getIsVirtual()) {
+ $this->_quote->getShippingAddress()->setShouldIgnoreValidation(true);
+ if (!$this->_config->requireBillingAddress && !$this->_quote->getBillingAddress()->getEmail()) {
+ $this->_quote->getBillingAddress()->setSameAsBilling(1);
+ }
+ }
+ }
}
diff --git a/app/code/core/Mage/Paypal/Model/Hostedpro.php b/app/code/core/Mage/Paypal/Model/Hostedpro.php
index d36cc5941d7..fff76c1d546 100644
--- a/app/code/core/Mage/Paypal/Model/Hostedpro.php
+++ b/app/code/core/Mage/Paypal/Model/Hostedpro.php
@@ -145,6 +145,39 @@ public function initialize($paymentAction, $stateObject)
return $this;
}
+ /**
+ * Get return URL
+ *
+ * @param int $storeId
+ * @return string
+ */
+ public function getReturnUrl($storeId = null)
+ {
+ return $this->_getUrl('paypal/hostedpro/return', $storeId);
+ }
+
+ /**
+ * Get notify (IPN) URL
+ *
+ * @param int $storeId
+ * @return string
+ */
+ public function getNotifyUrl($storeId = null)
+ {
+ return $this->_getUrl('paypal/ipn', $storeId);
+ }
+
+ /**
+ * Get cancel URL
+ *
+ * @param int $storeId
+ * @return string
+ */
+ public function getCancelUrl($storeId = null)
+ {
+ return $this->_getUrl('paypal/hostedpro/cancel', $storeId);
+ }
+
/**
* Sends API request to PayPal to get form URL, then sets this URL to $payment object.
*/
@@ -200,39 +233,6 @@ protected function _buildBasicRequest()
return $request;
}
- /**
- * Get return URL
- *
- * @param int $storeId
- * @return string
- */
- public function getReturnUrl($storeId = null)
- {
- return $this->_getUrl('paypal/hostedpro/return', $storeId);
- }
-
- /**
- * Get notify (IPN) URL
- *
- * @param int $storeId
- * @return string
- */
- public function getNotifyUrl($storeId = null)
- {
- return $this->_getUrl('paypal/ipn', $storeId);
- }
-
- /**
- * Get cancel URL
- *
- * @param int $storeId
- * @return string
- */
- public function getCancelUrl($storeId = null)
- {
- return $this->_getUrl('paypal/hostedpro/cancel', $storeId);
- }
-
/**
* Build URL for store
*
diff --git a/app/code/core/Mage/Paypal/Model/Info.php b/app/code/core/Mage/Paypal/Model/Info.php
index 2233c98bf1a..1c74cfc9b79 100644
--- a/app/code/core/Mage/Paypal/Model/Info.php
+++ b/app/code/core/Mage/Paypal/Model/Info.php
@@ -61,39 +61,6 @@ class Mage_Paypal_Model_Info
public const BUYER_TAX_ID_TYPE_CPF = 'BR_CPF';
public const BUYER_TAX_ID_TYPE_CNPJ = 'BR_CNPJ';
- /**
- * All payment information map
- *
- * @var array
- */
- protected $_paymentMap = [
- self::PAYER_ID => 'paypal_payer_id',
- self::PAYER_EMAIL => 'paypal_payer_email',
- self::PAYER_STATUS => 'paypal_payer_status',
- self::ADDRESS_ID => 'paypal_address_id',
- self::ADDRESS_STATUS => 'paypal_address_status',
- self::PROTECTION_EL => 'paypal_protection_eligibility',
- self::FRAUD_FILTERS => 'paypal_fraud_filters',
- self::CORRELATION_ID => 'paypal_correlation_id',
- self::AVS_CODE => 'paypal_avs_code',
- self::CVV2_MATCH => 'paypal_cvv2_match',
- self::CENTINEL_VPAS => self::CENTINEL_VPAS,
- self::CENTINEL_ECI => self::CENTINEL_ECI,
- self::BUYER_TAX_ID => self::BUYER_TAX_ID,
- self::BUYER_TAX_ID_TYPE => self::BUYER_TAX_ID_TYPE,
- ];
-
- /**
- * System information map
- *
- * @var array
- */
- protected $_systemMap = [
- self::PAYMENT_STATUS => self::PAYMENT_STATUS_GLOBAL,
- self::PENDING_REASON => self::PENDING_REASON_GLOBAL,
- self::IS_FRAUD => self::IS_FRAUD_GLOBAL,
- ];
-
/**
* PayPal payment status possible values
*
@@ -134,6 +101,39 @@ class Mage_Paypal_Model_Info
*/
public const ORDER_STATUS_CANCELED_REVERSAL = 'paypal_canceled_reversal';
+ /**
+ * All payment information map
+ *
+ * @var array
+ */
+ protected $_paymentMap = [
+ self::PAYER_ID => 'paypal_payer_id',
+ self::PAYER_EMAIL => 'paypal_payer_email',
+ self::PAYER_STATUS => 'paypal_payer_status',
+ self::ADDRESS_ID => 'paypal_address_id',
+ self::ADDRESS_STATUS => 'paypal_address_status',
+ self::PROTECTION_EL => 'paypal_protection_eligibility',
+ self::FRAUD_FILTERS => 'paypal_fraud_filters',
+ self::CORRELATION_ID => 'paypal_correlation_id',
+ self::AVS_CODE => 'paypal_avs_code',
+ self::CVV2_MATCH => 'paypal_cvv2_match',
+ self::CENTINEL_VPAS => self::CENTINEL_VPAS,
+ self::CENTINEL_ECI => self::CENTINEL_ECI,
+ self::BUYER_TAX_ID => self::BUYER_TAX_ID,
+ self::BUYER_TAX_ID_TYPE => self::BUYER_TAX_ID_TYPE,
+ ];
+
+ /**
+ * System information map
+ *
+ * @var array
+ */
+ protected $_systemMap = [
+ self::PAYMENT_STATUS => self::PAYMENT_STATUS_GLOBAL,
+ self::PENDING_REASON => self::PENDING_REASON_GLOBAL,
+ self::IS_FRAUD => self::IS_FRAUD_GLOBAL,
+ ];
+
/**
* Map of payment information available to customer
*
@@ -386,6 +386,22 @@ public static function isReversalDisputable($code)
}
}
+ /**
+ * Get case type label
+ *
+ * @param string $key
+ * @return string
+ */
+ public static function getCaseTypeLabel($key)
+ {
+ $labels = [
+ 'chargeback' => Mage::helper('paypal')->__('Chargeback'),
+ 'complaint' => Mage::helper('paypal')->__('Complaint'),
+ 'dispute' => Mage::helper('paypal')->__('Dispute'),
+ ];
+ return (array_key_exists($key, $labels) && !empty($labels[$key])) ? $labels[$key] : '';
+ }
+
/**
* Render info item
*
@@ -461,22 +477,6 @@ protected function _getLabel($key)
return '';
}
- /**
- * Get case type label
- *
- * @param string $key
- * @return string
- */
- public static function getCaseTypeLabel($key)
- {
- $labels = [
- 'chargeback' => Mage::helper('paypal')->__('Chargeback'),
- 'complaint' => Mage::helper('paypal')->__('Complaint'),
- 'dispute' => Mage::helper('paypal')->__('Dispute'),
- ];
- return (array_key_exists($key, $labels) && !empty($labels[$key])) ? $labels[$key] : '';
- }
-
/**
* Apply a filter upon value getting
*
@@ -612,6 +612,26 @@ protected function _getCvv2Label($value)
}
}
+ /**
+ * Retrieve buyer id type value based on code received from PayPal (Brazil only)
+ *
+ * @param string $code
+ * @return string
+ */
+ protected function _getBuyerIdTypeValue($code)
+ {
+ $value = '';
+ switch ($code) {
+ case self::BUYER_TAX_ID_TYPE_CNPJ:
+ $value = Mage::helper('paypal')->__('CNPJ');
+ break;
+ case self::BUYER_TAX_ID_TYPE_CPF:
+ $value = Mage::helper('paypal')->__('CPF');
+ break;
+ }
+ return $value;
+ }
+
/**
* Attempt to convert centinel VPAS result into label
*
@@ -667,24 +687,4 @@ private function _getCentinelEciLabel($value)
return $value;
}
}
-
- /**
- * Retrieve buyer id type value based on code received from PayPal (Brazil only)
- *
- * @param string $code
- * @return string
- */
- protected function _getBuyerIdTypeValue($code)
- {
- $value = '';
- switch ($code) {
- case self::BUYER_TAX_ID_TYPE_CNPJ:
- $value = Mage::helper('paypal')->__('CNPJ');
- break;
- case self::BUYER_TAX_ID_TYPE_CPF:
- $value = Mage::helper('paypal')->__('CPF');
- break;
- }
- return $value;
- }
}
diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php
index 28c687be827..7aafeda3039 100644
--- a/app/code/core/Mage/Paypal/Model/Ipn.php
+++ b/app/code/core/Mage/Paypal/Model/Ipn.php
@@ -116,6 +116,40 @@ public function processIpnRequest(array $request, ?Zend_Http_Client_Adapter_Inte
$this->_debug();
}
+ /**
+ * Process payment pending notification
+ *
+ * @throws Exception
+ */
+ public function _registerPaymentPending()
+ {
+ $reason = $this->getRequestData('pending_reason');
+ if ($reason === 'authorization') {
+ $this->_registerPaymentAuthorization();
+ return;
+ }
+ if ($reason === 'order') {
+ throw new Exception('The "order" authorizations are not implemented.');
+ }
+
+ // case when was placed using PayPal standard
+ if (Mage_Sales_Model_Order::STATE_PENDING_PAYMENT == $this->_order->getState()
+ && !$this->getRequestData('transaction_entity')
+ ) {
+ $this->_registerPaymentCapture();
+ return;
+ }
+
+ $this->_importPaymentInformation();
+
+ $this->_order->getPayment()
+ ->setPreparedMessage($this->_createIpnComment($this->_info::explainPendingReason($reason)))
+ ->setTransactionId($this->getRequestData('txn_id'))
+ ->setIsTransactionClosed(0)
+ ->registerPaymentReviewAction(Mage_Sales_Model_Order_Payment::REVIEW_ACTION_UPDATE, false);
+ $this->_order->save();
+ }
+
/**
* Post back to PayPal to check whether this request is a valid one
*
@@ -604,40 +638,6 @@ protected function _registerPaymentReversal()
->save();
}
- /**
- * Process payment pending notification
- *
- * @throws Exception
- */
- public function _registerPaymentPending()
- {
- $reason = $this->getRequestData('pending_reason');
- if ($reason === 'authorization') {
- $this->_registerPaymentAuthorization();
- return;
- }
- if ($reason === 'order') {
- throw new Exception('The "order" authorizations are not implemented.');
- }
-
- // case when was placed using PayPal standard
- if (Mage_Sales_Model_Order::STATE_PENDING_PAYMENT == $this->_order->getState()
- && !$this->getRequestData('transaction_entity')
- ) {
- $this->_registerPaymentCapture();
- return;
- }
-
- $this->_importPaymentInformation();
-
- $this->_order->getPayment()
- ->setPreparedMessage($this->_createIpnComment($this->_info::explainPendingReason($reason)))
- ->setTransactionId($this->getRequestData('txn_id'))
- ->setIsTransactionClosed(0)
- ->registerPaymentReviewAction(Mage_Sales_Model_Order_Payment::REVIEW_ACTION_UPDATE, false);
- $this->_order->save();
- }
-
/**
* Register authorized payment
*/
diff --git a/app/code/core/Mage/Paypal/Model/Method/Agreement.php b/app/code/core/Mage/Paypal/Model/Method/Agreement.php
index 192e74c3092..766d893e765 100644
--- a/app/code/core/Mage/Paypal/Model/Method/Agreement.php
+++ b/app/code/core/Mage/Paypal/Model/Method/Agreement.php
@@ -270,6 +270,17 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact
return $this->_pro->fetchTransactionInfo($payment, $transactionId);
}
+ /**
+ * Payment action getter compatible with payment model
+ *
+ * @see Mage_Sales_Model_Payment::place()
+ * @return string
+ */
+ public function getConfigPaymentAction()
+ {
+ return $this->_pro->getConfig()->getPaymentAction();
+ }
+
/**
* Place an order with authorization or capture action
*
@@ -319,15 +330,4 @@ protected function _isAvailable($quote)
{
return $this->_pro->getConfig()->isMethodAvailable($this->_code);
}
-
- /**
- * Payment action getter compatible with payment model
- *
- * @see Mage_Sales_Model_Payment::place()
- * @return string
- */
- public function getConfigPaymentAction()
- {
- return $this->_pro->getConfig()->getPaymentAction();
- }
}
diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php
index f783ebcd1e0..ba0136b3d3c 100644
--- a/app/code/core/Mage/Paypal/Model/Payflowlink.php
+++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php
@@ -32,6 +32,18 @@ class Mage_Paypal_Model_Payflowlink extends Mage_Paypal_Model_Payflowpro
*/
public const MOBILE_LAYOUT_TEMPLATE = 'mobile';
+ /**
+ * Gateway request URL
+ * @var string
+ */
+ public const TRANSACTION_PAYFLOW_URL = 'https://payflowlink.paypal.com/';
+
+ /**
+ * Error message
+ * @var string
+ */
+ public const RESPONSE_ERROR_MSG = 'Payment error. %s was not found.';
+
/**
* Controller for callback urls
*
@@ -89,18 +101,6 @@ class Mage_Paypal_Model_Payflowlink extends Mage_Paypal_Model_Payflowpro
*/
protected $_response;
- /**
- * Gateway request URL
- * @var string
- */
- public const TRANSACTION_PAYFLOW_URL = 'https://payflowlink.paypal.com/';
-
- /**
- * Error message
- * @var string
- */
- public const RESPONSE_ERROR_MSG = 'Payment error. %s was not found.';
-
/**
* Key for storing secure hash in additional information of payment model
*
@@ -250,6 +250,24 @@ public function process($responseData)
}
}
+ /**
+ * Check whether order review has enough data to initialize
+ *
+ * @deprecated since 1.6.2.0
+ * @param string $token
+ */
+ public function prepareOrderReview($token = null) {}
+
+ /**
+ * Get callback controller
+ *
+ * @return string
+ */
+ public function getCallbackController()
+ {
+ return $this->_callbackController;
+ }
+
/**
* Operate with order using information from silent post
*/
@@ -570,14 +588,6 @@ protected function _initialize(Varien_Object $payment, $amount)
return $this;
}
- /**
- * Check whether order review has enough data to initialize
- *
- * @deprecated since 1.6.2.0
- * @param string $token
- */
- public function prepareOrderReview($token = null) {}
-
/**
* Additional authorization logic for Account Verification
*
@@ -623,16 +633,6 @@ protected function _getDocumentFromResponse()
return null;
}
- /**
- * Get callback controller
- *
- * @return string
- */
- public function getCallbackController()
- {
- return $this->_callbackController;
- }
-
/**
* Get callback url
*
diff --git a/app/code/core/Mage/Paypal/Model/Payflowpro.php b/app/code/core/Mage/Paypal/Model/Payflowpro.php
index 0fcf420731d..ff6a4a4421f 100644
--- a/app/code/core/Mage/Paypal/Model/Payflowpro.php
+++ b/app/code/core/Mage/Paypal/Model/Payflowpro.php
@@ -163,20 +163,6 @@ public function authorize(Varien_Object $payment, $amount)
return $this;
}
- /**
- * Get capture amount
- *
- * @param float $amount
- * @return float
- */
- protected function _getCaptureAmount($amount)
- {
- $infoInstance = $this->getInfoInstance();
- $amountToPay = round($amount, 2);
- $authorizedAmount = round($infoInstance->getAmountAuthorized(), 2);
- return $amountToPay != $authorizedAmount ? $amountToPay : 0;
- }
-
/**
* Capture payment
*
@@ -327,6 +313,20 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact
return ($rawData) ? $rawData : [];
}
+ /**
+ * Get capture amount
+ *
+ * @param float $amount
+ * @return float
+ */
+ protected function _getCaptureAmount($amount)
+ {
+ $infoInstance = $this->getInfoInstance();
+ $amountToPay = round($amount, 2);
+ $authorizedAmount = round($infoInstance->getAmountAuthorized(), 2);
+ return $amountToPay != $authorizedAmount ? $amountToPay : 0;
+ }
+
/**
* Check whether the transaction is in payment review status
*
diff --git a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php
index cd1dd38a34f..1586fa6e7d8 100644
--- a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php
+++ b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php
@@ -55,15 +55,6 @@ class Mage_Paypal_Model_Payment_Transaction extends Mage_Core_Model_Abstract
*/
protected $_orderWebsiteId = null;
- /**
- * Initialize resource model
- */
- protected function _construct()
- {
- $this->_init('paypal/payment_transaction');
- parent::_construct();
- }
-
/**
* Transaction ID setter
* @param string $txnId
@@ -75,20 +66,6 @@ public function setTxnId($txnId)
return $this->setData('txn_id', $txnId);
}
- /**
- * Check object before loading by by specified transaction ID
- * @param string $txnId
- * @return $this
- */
- protected function _beforeLoadByTxnId($txnId)
- {
- Mage::dispatchEvent(
- $this->_eventPrefix . '_load_by_txn_id_before',
- $this->_getEventData() + ['txn_id' => $txnId],
- );
- return $this;
- }
-
/**
* Load self by specified transaction ID. Requires the valid payment object to be set
* @param string $txnId
@@ -105,17 +82,6 @@ public function loadByTxnId($txnId)
return $this;
}
- /**
- * Check object after loading by by specified transaction ID
- *
- * @return $this
- */
- protected function _afterLoadByTxnId()
- {
- Mage::dispatchEvent($this->_eventPrefix . '_load_by_txn_id_after', $this->_getEventData());
- return $this;
- }
-
/**
* Additional information setter
* Updates data inside the 'additional_information' array
@@ -189,6 +155,40 @@ public function isFailsafe($setFailsafe = null)
return $this;
}
+ /**
+ * Initialize resource model
+ */
+ protected function _construct()
+ {
+ $this->_init('paypal/payment_transaction');
+ parent::_construct();
+ }
+
+ /**
+ * Check object before loading by by specified transaction ID
+ * @param string $txnId
+ * @return $this
+ */
+ protected function _beforeLoadByTxnId($txnId)
+ {
+ Mage::dispatchEvent(
+ $this->_eventPrefix . '_load_by_txn_id_before',
+ $this->_getEventData() + ['txn_id' => $txnId],
+ );
+ return $this;
+ }
+
+ /**
+ * Check object after loading by by specified transaction ID
+ *
+ * @return $this
+ */
+ protected function _afterLoadByTxnId()
+ {
+ Mage::dispatchEvent($this->_eventPrefix . '_load_by_txn_id_after', $this->_getEventData());
+ return $this;
+ }
+
/**
* Verify data required for saving
* @return $this
diff --git a/app/code/core/Mage/Paypal/Model/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Report/Settlement.php
index 699006fdfb0..c9c3991f113 100644
--- a/app/code/core/Mage/Paypal/Model/Report/Settlement.php
+++ b/app/code/core/Mage/Paypal/Model/Report/Settlement.php
@@ -153,28 +153,6 @@ class Mage_Paypal_Model_Report_Settlement extends Mage_Core_Model_Abstract
],
];
- protected function _construct()
- {
- $this->_init('paypal/report_settlement');
- }
-
- /**
- * Stop saving process if file with same report date, account ID and last modified date was already ferched
- *
- * @return Mage_Core_Model_Abstract
- */
- protected function _beforeSave()
- {
- $this->_dataSaveAllowed = true;
- if ($this->getId()) {
- if ($this->getLastModified() == $this->getReportLastModified()) {
- $this->_dataSaveAllowed = false;
- }
- }
- $this->setLastModified($this->getReportLastModified());
- return parent::_beforeSave();
- }
-
/**
* Goes to specified host/path and fetches reports from there.
* Save reports to database.
@@ -407,6 +385,28 @@ public function getSftpCredentials($automaticMode = false)
return $configs;
}
+ protected function _construct()
+ {
+ $this->_init('paypal/report_settlement');
+ }
+
+ /**
+ * Stop saving process if file with same report date, account ID and last modified date was already ferched
+ *
+ * @return Mage_Core_Model_Abstract
+ */
+ protected function _beforeSave()
+ {
+ $this->_dataSaveAllowed = true;
+ if ($this->getId()) {
+ if ($this->getLastModified() == $this->getReportLastModified()) {
+ $this->_dataSaveAllowed = false;
+ }
+ }
+ $this->setLastModified($this->getReportLastModified());
+ return parent::_beforeSave();
+ }
+
/**
* Converts a filename to date of report.
*
diff --git a/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php b/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php
index 4beace06631..a61e8bb0b34 100644
--- a/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php
+++ b/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php
@@ -71,11 +71,6 @@ class Mage_Paypal_Model_Report_Settlement_Row extends Mage_Core_Model_Abstract
*/
protected $_castedAmounts = [];
- protected function _construct()
- {
- $this->_init('paypal/report_settlement_row');
- }
-
/**
* Return description of Reference ID Type
* If no code specified, return full list of codes with their description
@@ -179,6 +174,11 @@ public function _castAmount($key, $creditKey)
$this->_castedAmounts[$key] = true;
}
+ protected function _construct()
+ {
+ $this->_init('paypal/report_settlement_row');
+ }
+
/**
* Fill/translate and sort all event codes/labels
*/
diff --git a/app/code/core/Mage/Paypal/Model/Resource/Cert.php b/app/code/core/Mage/Paypal/Model/Resource/Cert.php
index af337e62046..b0114bb4c9e 100644
--- a/app/code/core/Mage/Paypal/Model/Resource/Cert.php
+++ b/app/code/core/Mage/Paypal/Model/Resource/Cert.php
@@ -22,22 +22,6 @@
*/
class Mage_Paypal_Model_Resource_Cert extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('paypal/cert', 'cert_id');
- }
-
- /**
- * Set date of last update
- *
- * @return Mage_Core_Model_Resource_Db_Abstract
- */
- protected function _beforeSave(Mage_Core_Model_Abstract $object)
- {
- $object->setUpdatedAt($this->formatDate(Mage::getSingleton('core/date')->gmtDate()));
- return parent::_beforeSave($object);
- }
-
/**
* Load model by website id
*
@@ -64,4 +48,19 @@ public function loadByWebsite($object, $strictLoad = true)
}
return $object;
}
+ protected function _construct()
+ {
+ $this->_init('paypal/cert', 'cert_id');
+ }
+
+ /**
+ * Set date of last update
+ *
+ * @return Mage_Core_Model_Resource_Db_Abstract
+ */
+ protected function _beforeSave(Mage_Core_Model_Abstract $object)
+ {
+ $object->setUpdatedAt($this->formatDate(Mage::getSingleton('core/date')->gmtDate()));
+ return parent::_beforeSave($object);
+ }
}
diff --git a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php
index aa108b9bc65..bb4e75e9724 100644
--- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php
+++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php
@@ -32,6 +32,20 @@ class Mage_Paypal_Model_Resource_Payment_Transaction extends Mage_Core_Model_Res
'additional_information' => [null, []],
];
+ /**
+ * Load the transaction object by specified txn_id
+ *
+ * @param string $txnId
+ */
+ public function loadObjectByTxnId(Mage_Paypal_Model_Payment_Transaction $transaction, $txnId)
+ {
+ $select = $this->_getLoadByUniqueKeySelect($txnId);
+ $data = $this->_getWriteAdapter()->fetchRow($select);
+ $transaction->setData($data);
+ $this->unserializeFields($transaction);
+ $this->_afterLoad($transaction);
+ }
+
/**
* Initialize main table and the primary key field name
*
@@ -61,20 +75,6 @@ protected function _unserializeField(Varien_Object $object, $field, $defaultValu
}
}
- /**
- * Load the transaction object by specified txn_id
- *
- * @param string $txnId
- */
- public function loadObjectByTxnId(Mage_Paypal_Model_Payment_Transaction $transaction, $txnId)
- {
- $select = $this->_getLoadByUniqueKeySelect($txnId);
- $data = $this->_getWriteAdapter()->fetchRow($select);
- $transaction->setData($data);
- $this->unserializeFields($transaction);
- $this->_afterLoad($transaction);
- }
-
/**
* Serialize additional information, if any
*
diff --git a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php
index 1113f8ee8e6..d1c62b7488e 100644
--- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php
+++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php
@@ -29,14 +29,6 @@ class Mage_Paypal_Model_Resource_Payment_Transaction_Collection extends Mage_Cor
* @var string
*/
protected $_createdBefore = '';
- /**
- * Initialize collection items factory class
- */
- protected function _construct()
- {
- $this->_init('paypal/payment_transaction');
- parent::_construct();
- }
/**
* CreatedAt filter setter
@@ -49,6 +41,14 @@ public function addCreatedBeforeFilter($date)
$this->_createdBefore = $date;
return $this;
}
+ /**
+ * Initialize collection items factory class
+ */
+ protected function _construct()
+ {
+ $this->_init('paypal/payment_transaction');
+ parent::_construct();
+ }
/**
* Prepare filters
diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php
index eb819bbaa9a..8dfe9d3b505 100644
--- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php
+++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php
@@ -29,6 +29,29 @@ class Mage_Paypal_Model_Resource_Report_Settlement extends Mage_Core_Model_Resou
*/
protected $_rowsTable;
+ /**
+ * Check if report with same account and report date already fetched
+ *
+ * @param string $accountId
+ * @param string $reportDate
+ * @return $this
+ */
+ public function loadByAccountAndDate(Mage_Paypal_Model_Report_Settlement $report, $accountId, $reportDate)
+ {
+ $adapter = $this->_getReadAdapter();
+ $select = $adapter->select()
+ ->from($this->getMainTable())
+ ->where('account_id = :account_id')
+ ->where('report_date = :report_date');
+
+ $data = $adapter->fetchRow($select, [':account_id' => $accountId, ':report_date' => $reportDate]);
+ if ($data) {
+ $report->addData($data);
+ }
+
+ return $this;
+ }
+
/**
* Init main table
*
@@ -87,27 +110,4 @@ protected function _afterSave(Mage_Core_Model_Abstract $object)
return $this;
}
-
- /**
- * Check if report with same account and report date already fetched
- *
- * @param string $accountId
- * @param string $reportDate
- * @return $this
- */
- public function loadByAccountAndDate(Mage_Paypal_Model_Report_Settlement $report, $accountId, $reportDate)
- {
- $adapter = $this->_getReadAdapter();
- $select = $adapter->select()
- ->from($this->getMainTable())
- ->where('account_id = :account_id')
- ->where('report_date = :report_date');
-
- $data = $adapter->fetchRow($select, [':account_id' => $accountId, ':report_date' => $reportDate]);
- if ($data) {
- $report->addData($data);
- }
-
- return $this;
- }
}
diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php
index 424e0fbae85..3cc5e4bc3c1 100644
--- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php
+++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php
@@ -22,6 +22,17 @@
*/
class Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
+ /**
+ * Filter items collection by account ID
+ *
+ * @param string $accountId
+ * @return $this
+ */
+ public function addAccountFilter($accountId)
+ {
+ $this->getSelect()->where('report.account_id = ?', $accountId);
+ return $this;
+ }
/**
* Resource initializing
*
@@ -47,16 +58,4 @@ protected function _initSelect()
);
return $this;
}
-
- /**
- * Filter items collection by account ID
- *
- * @param string $accountId
- * @return $this
- */
- public function addAccountFilter($accountId)
- {
- $this->getSelect()->where('report.account_id = ?', $accountId);
- return $this;
- }
}
diff --git a/app/code/core/Mage/Paypal/controllers/StandardController.php b/app/code/core/Mage/Paypal/controllers/StandardController.php
index b5455687a72..9de7b2192c1 100644
--- a/app/code/core/Mage/Paypal/controllers/StandardController.php
+++ b/app/code/core/Mage/Paypal/controllers/StandardController.php
@@ -37,19 +37,6 @@ public function getOrder()
return $this->_order;
}
- /**
- * Send expire header to ajax response
- *
- * @SuppressWarnings("PHPMD.ExitExpression")
- */
- protected function _expireAjax()
- {
- if (!Mage::getSingleton('checkout/session')->getQuote()->hasItems()) {
- $this->getResponse()->setHeader('HTTP/1.1', '403 Session Expired');
- exit;
- }
- }
-
/**
* Get singleton with PayPal standard order transaction information
*
@@ -103,4 +90,17 @@ public function successAction()
Mage::getSingleton('checkout/session')->getQuote()->setIsActive(false)->save();
$this->_redirect('checkout/onepage/success', ['_secure' => true]);
}
+
+ /**
+ * Send expire header to ajax response
+ *
+ * @SuppressWarnings("PHPMD.ExitExpression")
+ */
+ protected function _expireAjax()
+ {
+ if (!Mage::getSingleton('checkout/session')->getQuote()->hasItems()) {
+ $this->getResponse()->setHeader('HTTP/1.1', '403 Session Expired');
+ exit;
+ }
+ }
}
diff --git a/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php b/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php
index 1fc66915721..35a3f6312d3 100644
--- a/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php
+++ b/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php
@@ -395,6 +395,11 @@ public function getPaypalTransactionId()
return $this->getTransactionId();
}
+ /**
+ * "GetTransactionDetails" method does not exists in PaypalUK
+ */
+ public function callGetTransactionDetails() {}
+
/**
* Add method to request array
*
@@ -516,11 +521,6 @@ protected function getRequestId()
return Mage::helper('core')->uniqHash();
}
- /**
- * "GetTransactionDetails" method does not exists in PaypalUK
- */
- public function callGetTransactionDetails() {}
-
/**
* Get FMF results from response, if any
*/
diff --git a/app/code/core/Mage/PaypalUk/Model/Express.php b/app/code/core/Mage/PaypalUk/Model/Express.php
index 98043c07137..cb63b83b393 100644
--- a/app/code/core/Mage/PaypalUk/Model/Express.php
+++ b/app/code/core/Mage/PaypalUk/Model/Express.php
@@ -60,6 +60,18 @@ public function isAvailable($quote = null)
return $this->_ecInstance ? !$this->_ecInstance->isAvailable() : false;
}
+ /**
+ * Checkout redirect URL getter for onepage checkout (hardcode)
+ *
+ * @see Mage_Checkout_OnepageController::savePaymentAction()
+ * @see Mage_Sales_Model_Quote_Payment::getCheckoutRedirectUrl()
+ * @return string
+ */
+ public function getCheckoutRedirectUrl()
+ {
+ return Mage::getUrl('paypaluk/express/start');
+ }
+
/**
* Import payment info to payment
*
@@ -79,16 +91,4 @@ protected function _importToPayment($api, $payment)
$payment->setPreparedMessage(Mage::helper('paypaluk')->__('Payflow PNREF: #%s.', $api->getTransactionId()));
Mage::getModel('paypal/info')->importToPayment($api, $payment);
}
-
- /**
- * Checkout redirect URL getter for onepage checkout (hardcode)
- *
- * @see Mage_Checkout_OnepageController::savePaymentAction()
- * @see Mage_Sales_Model_Quote_Payment::getCheckoutRedirectUrl()
- * @return string
- */
- public function getCheckoutRedirectUrl()
- {
- return Mage::getUrl('paypaluk/express/start');
- }
}
diff --git a/app/code/core/Mage/PaypalUk/Model/Pro.php b/app/code/core/Mage/PaypalUk/Model/Pro.php
index fc0d3c24e44..15dabfcc163 100644
--- a/app/code/core/Mage/PaypalUk/Model/Pro.php
+++ b/app/code/core/Mage/PaypalUk/Model/Pro.php
@@ -25,25 +25,24 @@
class Mage_PaypalUk_Model_Pro extends Mage_Paypal_Model_Pro
{
/**
- * Api model type
+ * Payflow trx_id key in transaction info
*
* @var string
*/
- protected $_apiType = 'paypaluk/api_nvp';
-
+ public const TRANSPORT_PAYFLOW_TXN_ID = 'payflow_trxid';
/**
- * Config model type
+ * Api model type
*
* @var string
*/
- protected $_configType = 'paypal/config';
+ protected $_apiType = 'paypaluk/api_nvp';
/**
- * Payflow trx_id key in transaction info
+ * Config model type
*
* @var string
*/
- public const TRANSPORT_PAYFLOW_TXN_ID = 'payflow_trxid';
+ protected $_configType = 'paypal/config';
/**
* Refund a capture transaction
@@ -59,6 +58,20 @@ public function refund(Varien_Object $payment, $amount)
parent::refund($payment, $amount);
}
+ /**
+ * Fetch transaction details info method does not exists in PaypalUK
+ *
+ * @param string $transactionId
+ * @throws Mage_Core_Exception
+ * @return void
+ */
+ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transactionId)
+ {
+ Mage::throwException(
+ Mage::helper('paypaluk')->__('Fetch transaction details method does not exists in PaypalUK'),
+ );
+ }
+
/**
* Is capture request needed on this transaction
*
@@ -103,20 +116,6 @@ protected function _importCaptureResultToPayment($api, $payment)
Mage::getModel('paypal/info')->importToPayment($api, $payment);
}
- /**
- * Fetch transaction details info method does not exists in PaypalUK
- *
- * @param string $transactionId
- * @throws Mage_Core_Exception
- * @return void
- */
- public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transactionId)
- {
- Mage::throwException(
- Mage::helper('paypaluk')->__('Fetch transaction details method does not exists in PaypalUK'),
- );
- }
-
/**
* Import refund results to payment
*
diff --git a/app/code/core/Mage/Persistent/Block/Form/Remember.php b/app/code/core/Mage/Persistent/Block/Form/Remember.php
index 97a230738d1..f9f54e3c29a 100644
--- a/app/code/core/Mage/Persistent/Block/Form/Remember.php
+++ b/app/code/core/Mage/Persistent/Block/Form/Remember.php
@@ -23,26 +23,25 @@
class Mage_Persistent_Block_Form_Remember extends Mage_Core_Block_Template
{
/**
- * Prevent rendering if Persistent disabled
+ * Is "Remember Me" checked
*
- * @return string
+ * @return bool
*/
- protected function _toHtml()
+ public function isRememberMeChecked()
{
/** @var Mage_Persistent_Helper_Data $helper */
$helper = Mage::helper('persistent');
- return ($helper->isEnabled() && $helper->isRememberMeEnabled()) ? parent::_toHtml() : '';
+ return $helper->isEnabled() && $helper->isRememberMeEnabled() && $helper->isRememberMeCheckedDefault();
}
-
/**
- * Is "Remember Me" checked
+ * Prevent rendering if Persistent disabled
*
- * @return bool
+ * @return string
*/
- public function isRememberMeChecked()
+ protected function _toHtml()
{
/** @var Mage_Persistent_Helper_Data $helper */
$helper = Mage::helper('persistent');
- return $helper->isEnabled() && $helper->isRememberMeEnabled() && $helper->isRememberMeCheckedDefault();
+ return ($helper->isEnabled() && $helper->isRememberMeEnabled()) ? parent::_toHtml() : '';
}
}
diff --git a/app/code/core/Mage/Persistent/Model/Observer.php b/app/code/core/Mage/Persistent/Model/Observer.php
index f3ae96c94e5..e740fc75920 100644
--- a/app/code/core/Mage/Persistent/Model/Observer.php
+++ b/app/code/core/Mage/Persistent/Model/Observer.php
@@ -110,16 +110,6 @@ public function emulateWelcomeBlock($block)
return $this;
}
- /**
- * Emulate 'account links' block with persistent data
- */
- protected function _applyAccountLinksPersistentData()
- {
- if (!Mage::app()->getLayout()->getBlock('header.additional')) {
- Mage::app()->getLayout()->addBlock('persistent/header_additional', 'header.additional');
- }
- }
-
/**
* Emulate 'account links' block with persistent data
*
@@ -255,27 +245,6 @@ public function makePersistentQuoteGuest($observer)
$this->setQuoteGuest(true);
}
- /**
- * Check if checkout session should NOT be cleared
- *
- * @param Varien_Event_Observer $observer
- * @return bool|Mage_Persistent_IndexController
- */
- protected function _checkClearCheckoutSessionNecessity($observer)
- {
- if (!$this->_isGuestShoppingCart()) {
- return false;
- }
-
- /** @var Mage_Persistent_IndexController $action */
- $action = $observer->getEvent()->getControllerAction();
- if ($action instanceof Mage_Persistent_IndexController) {
- return $action;
- }
-
- return false;
- }
-
/**
* Reset session data when customer re-authenticates
*
@@ -353,80 +322,6 @@ public function preventExpressCheckout($observer)
}
}
- /**
- * Retrieve persistent customer instance
- *
- * @return Mage_Customer_Model_Customer
- */
- protected function _getPersistentCustomer()
- {
- return Mage::getModel('customer/customer')->load(
- $this->_getPersistentHelper()->getSession()->getCustomerId(),
- );
- }
-
- /**
- * Retrieve persistent helper
- *
- * @return Mage_Persistent_Helper_Session
- */
- protected function _getPersistentHelper()
- {
- return Mage::helper('persistent/session');
- }
-
- /**
- * Return current active quote for persistent customer
- *
- * @return Mage_Sales_Model_Quote
- */
- protected function _getQuote()
- {
- $quote = Mage::getModel('sales/quote');
- $quote->loadByCustomer($this->_getPersistentCustomer());
- return $quote;
- }
-
- /**
- * Check whether shopping cart is persistent
- *
- * @return bool
- */
- protected function _isShoppingCartPersist()
- {
- return Mage::helper('persistent')->isShoppingCartPersist();
- }
-
- /**
- * Check whether persistent mode is running
- *
- * @return bool
- */
- protected function _isPersistent()
- {
- return $this->_getPersistentHelper()->isPersistent();
- }
-
- /**
- * Check if persistent mode is running and customer is logged out
- *
- * @return bool
- */
- protected function _isLoggedOut()
- {
- return $this->_isPersistent() && !Mage::getSingleton('customer/session')->isLoggedIn();
- }
-
- /**
- * Check if shopping cart is guest while persistent session and user is logged out
- *
- * @return bool
- */
- protected function _isGuestShoppingCart()
- {
- return $this->_isLoggedOut() && !Mage::helper('persistent')->isShoppingCartPersist();
- }
-
/**
* Make quote to be guest
*
@@ -487,25 +382,6 @@ public function checkExpirePersistentQuote(Varien_Event_Observer $observer)
$customerSession->setCustomerId(null)->setCustomerGroupId(null);
}
}
- /**
- * Active Persistent Sessions
- */
- protected function _expirePersistentSession()
- {
- /** @var Mage_Checkout_Model_Session $checkoutSession */
- $checkoutSession = Mage::getSingleton('checkout/session');
-
- $quote = $checkoutSession->setLoadInactive()->getQuote();
- if ($quote->getIsActive() && $quote->getCustomerId()) {
- $checkoutSession->setCustomer(null)->unsetAll();
- } else {
- $quote
- ->setIsActive(true)
- ->setIsPersistent(false)
- ->setCustomerId(null)
- ->setCustomerGroupId(Mage_Customer_Model_Group::NOT_LOGGED_IN_ID);
- }
- }
/**
* Clear expired persistent sessions
@@ -585,4 +461,128 @@ public function emulateCustomer($observer)
}
return $this;
}
+
+ /**
+ * Emulate 'account links' block with persistent data
+ */
+ protected function _applyAccountLinksPersistentData()
+ {
+ if (!Mage::app()->getLayout()->getBlock('header.additional')) {
+ Mage::app()->getLayout()->addBlock('persistent/header_additional', 'header.additional');
+ }
+ }
+
+ /**
+ * Check if checkout session should NOT be cleared
+ *
+ * @param Varien_Event_Observer $observer
+ * @return bool|Mage_Persistent_IndexController
+ */
+ protected function _checkClearCheckoutSessionNecessity($observer)
+ {
+ if (!$this->_isGuestShoppingCart()) {
+ return false;
+ }
+
+ /** @var Mage_Persistent_IndexController $action */
+ $action = $observer->getEvent()->getControllerAction();
+ if ($action instanceof Mage_Persistent_IndexController) {
+ return $action;
+ }
+
+ return false;
+ }
+
+ /**
+ * Retrieve persistent customer instance
+ *
+ * @return Mage_Customer_Model_Customer
+ */
+ protected function _getPersistentCustomer()
+ {
+ return Mage::getModel('customer/customer')->load(
+ $this->_getPersistentHelper()->getSession()->getCustomerId(),
+ );
+ }
+
+ /**
+ * Retrieve persistent helper
+ *
+ * @return Mage_Persistent_Helper_Session
+ */
+ protected function _getPersistentHelper()
+ {
+ return Mage::helper('persistent/session');
+ }
+
+ /**
+ * Return current active quote for persistent customer
+ *
+ * @return Mage_Sales_Model_Quote
+ */
+ protected function _getQuote()
+ {
+ $quote = Mage::getModel('sales/quote');
+ $quote->loadByCustomer($this->_getPersistentCustomer());
+ return $quote;
+ }
+
+ /**
+ * Check whether shopping cart is persistent
+ *
+ * @return bool
+ */
+ protected function _isShoppingCartPersist()
+ {
+ return Mage::helper('persistent')->isShoppingCartPersist();
+ }
+
+ /**
+ * Check whether persistent mode is running
+ *
+ * @return bool
+ */
+ protected function _isPersistent()
+ {
+ return $this->_getPersistentHelper()->isPersistent();
+ }
+
+ /**
+ * Check if persistent mode is running and customer is logged out
+ *
+ * @return bool
+ */
+ protected function _isLoggedOut()
+ {
+ return $this->_isPersistent() && !Mage::getSingleton('customer/session')->isLoggedIn();
+ }
+
+ /**
+ * Check if shopping cart is guest while persistent session and user is logged out
+ *
+ * @return bool
+ */
+ protected function _isGuestShoppingCart()
+ {
+ return $this->_isLoggedOut() && !Mage::helper('persistent')->isShoppingCartPersist();
+ }
+ /**
+ * Active Persistent Sessions
+ */
+ protected function _expirePersistentSession()
+ {
+ /** @var Mage_Checkout_Model_Session $checkoutSession */
+ $checkoutSession = Mage::getSingleton('checkout/session');
+
+ $quote = $checkoutSession->setLoadInactive()->getQuote();
+ if ($quote->getIsActive() && $quote->getCustomerId()) {
+ $checkoutSession->setCustomer(null)->unsetAll();
+ } else {
+ $quote
+ ->setIsActive(true)
+ ->setIsPersistent(false)
+ ->setCustomerId(null)
+ ->setCustomerGroupId(Mage_Customer_Model_Group::NOT_LOGGED_IN_ID);
+ }
+ }
}
diff --git a/app/code/core/Mage/Persistent/Model/Resource/Session.php b/app/code/core/Mage/Persistent/Model/Resource/Session.php
index 90b765b2cb6..b477785f14b 100644
--- a/app/code/core/Mage/Persistent/Model/Resource/Session.php
+++ b/app/code/core/Mage/Persistent/Model/Resource/Session.php
@@ -29,33 +29,6 @@ class Mage_Persistent_Model_Resource_Session extends Mage_Core_Model_Resource_Db
*/
protected $_useIsObjectNew = true;
- protected function _construct()
- {
- $this->_init('persistent/session', 'persistent_id');
- }
-
- /**
- * Add expiration date filter to select
- *
- * @param string $field
- * @param mixed $value
- * @param Mage_Persistent_Model_Session $object
- * @return Zend_Db_Select
- */
- protected function _getLoadSelect($field, $value, $object)
- {
- $select = parent::_getLoadSelect($field, $value, $object);
- if (!$object->getLoadExpired()) {
- $tableName = $this->getMainTable();
- $select->join(
- ['customer' => $this->getTable('customer/entity')],
- 'customer.entity_id = ' . $tableName . '.customer_id',
- )->where($tableName . '.updated_at >= ?', $object->getExpiredBefore());
- }
-
- return $select;
- }
-
/**
* Delete customer persistent session by customer id
*
@@ -99,4 +72,31 @@ public function deleteExpired($websiteId, $expiredBefore)
);
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('persistent/session', 'persistent_id');
+ }
+
+ /**
+ * Add expiration date filter to select
+ *
+ * @param string $field
+ * @param mixed $value
+ * @param Mage_Persistent_Model_Session $object
+ * @return Zend_Db_Select
+ */
+ protected function _getLoadSelect($field, $value, $object)
+ {
+ $select = parent::_getLoadSelect($field, $value, $object);
+ if (!$object->getLoadExpired()) {
+ $tableName = $this->getMainTable();
+ $select->join(
+ ['customer' => $this->getTable('customer/entity')],
+ 'customer.entity_id = ' . $tableName . '.customer_id',
+ )->where($tableName . '.updated_at >= ?', $object->getExpiredBefore());
+ }
+
+ return $select;
+ }
}
diff --git a/app/code/core/Mage/Persistent/Model/Session.php b/app/code/core/Mage/Persistent/Model/Session.php
index 3138355bd7e..82550060d87 100644
--- a/app/code/core/Mage/Persistent/Model/Session.php
+++ b/app/code/core/Mage/Persistent/Model/Session.php
@@ -48,14 +48,6 @@ class Mage_Persistent_Model_Session extends Mage_Core_Model_Abstract
*/
protected $_loadExpired = false;
- /**
- * Define resource model
- */
- protected function _construct()
- {
- $this->_init('persistent/session');
- }
-
/**
* Set if load expired persistent session
*
@@ -92,53 +84,6 @@ public function getExpiredBefore($store = null)
);
}
- /**
- * Serialize info for Resource Model to save
- * For new model check and set available cookie key
- *
- * @return $this
- */
- protected function _beforeSave()
- {
- parent::_beforeSave();
-
- // Setting info
- $info = [];
- foreach ($this->getData() as $index => $value) {
- if (!in_array($index, $this->_unserializableFields)) {
- $info[$index] = $value;
- }
- }
- $this->setInfo(Mage::helper('core')->jsonEncode($info));
-
- if ($this->isObjectNew()) {
- $this->setWebsiteId(Mage::app()->getStore()->getWebsiteId());
- // Setting cookie key
- do {
- $this->setKey(Mage::helper('core')->getRandomString(self::KEY_LENGTH));
- } while (!$this->getResource()->isKeyAllowed($this->getKey()));
- }
-
- return $this;
- }
-
- /**
- * Set model data from info field
- *
- * @return $this
- */
- protected function _afterLoad()
- {
- parent::_afterLoad();
- $info = Mage::helper('core')->jsonDecode($this->getInfo());
- if (is_array($info)) {
- foreach ($info as $key => $value) {
- $this->setData($key, $value);
- }
- }
- return $this;
- }
-
/**
* Get persistent session by cookie key
*
@@ -224,24 +169,79 @@ public function deleteExpired($websiteId = null)
}
/**
- * Delete 'persistent' cookie
+ * Set `updated_at` to be always changed
*
* @inheritDoc
*/
- protected function _afterDeleteCommit()
+ public function save()
{
- Mage::getSingleton('core/cookie')->delete(Mage_Persistent_Model_Session::COOKIE_NAME);
- return parent::_afterDeleteCommit();
+ $this->setUpdatedAt(gmdate(Varien_Date::DATETIME_PHP_FORMAT));
+ return parent::save();
}
/**
- * Set `updated_at` to be always changed
+ * Define resource model
+ */
+ protected function _construct()
+ {
+ $this->_init('persistent/session');
+ }
+
+ /**
+ * Serialize info for Resource Model to save
+ * For new model check and set available cookie key
+ *
+ * @return $this
+ */
+ protected function _beforeSave()
+ {
+ parent::_beforeSave();
+
+ // Setting info
+ $info = [];
+ foreach ($this->getData() as $index => $value) {
+ if (!in_array($index, $this->_unserializableFields)) {
+ $info[$index] = $value;
+ }
+ }
+ $this->setInfo(Mage::helper('core')->jsonEncode($info));
+
+ if ($this->isObjectNew()) {
+ $this->setWebsiteId(Mage::app()->getStore()->getWebsiteId());
+ // Setting cookie key
+ do {
+ $this->setKey(Mage::helper('core')->getRandomString(self::KEY_LENGTH));
+ } while (!$this->getResource()->isKeyAllowed($this->getKey()));
+ }
+
+ return $this;
+ }
+
+ /**
+ * Set model data from info field
+ *
+ * @return $this
+ */
+ protected function _afterLoad()
+ {
+ parent::_afterLoad();
+ $info = Mage::helper('core')->jsonDecode($this->getInfo());
+ if (is_array($info)) {
+ foreach ($info as $key => $value) {
+ $this->setData($key, $value);
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * Delete 'persistent' cookie
*
* @inheritDoc
*/
- public function save()
+ protected function _afterDeleteCommit()
{
- $this->setUpdatedAt(gmdate(Varien_Date::DATETIME_PHP_FORMAT));
- return parent::save();
+ Mage::getSingleton('core/cookie')->delete(Mage_Persistent_Model_Session::COOKIE_NAME);
+ return parent::_afterDeleteCommit();
}
}
diff --git a/app/code/core/Mage/Persistent/controllers/IndexController.php b/app/code/core/Mage/Persistent/controllers/IndexController.php
index 24dc52ded3f..c1dcec68469 100644
--- a/app/code/core/Mage/Persistent/controllers/IndexController.php
+++ b/app/code/core/Mage/Persistent/controllers/IndexController.php
@@ -41,16 +41,6 @@ public function setClearCheckoutSession($clear = true)
return $this;
}
- /**
- * Retrieve 'persistent session' helper instance
- *
- * @return Mage_Persistent_Helper_Session
- */
- protected function _getHelper()
- {
- return Mage::helper('persistent/session');
- }
-
/**
* Unset persistent cookie action
*/
@@ -62,25 +52,6 @@ public function unsetCookieAction()
$this->_redirect('customer/account/login');
}
- /**
- * Revert all persistent data
- *
- * @return $this
- */
- protected function _cleanup()
- {
- Mage::dispatchEvent('persistent_session_expired');
- $customerSession = Mage::getSingleton('customer/session');
- $customerSession
- ->setCustomerId(null)
- ->setCustomerGroupId(null);
- if ($this->_clearCheckoutSession) {
- Mage::getSingleton('checkout/session')->unsetAll();
- }
- $this->_getHelper()->getSession()->removePersistentCookie();
- return $this;
- }
-
/**
* Save onepage checkout method to be register
*/
@@ -113,4 +84,33 @@ public function expressCheckoutAction()
);
$this->_redirect('checkout/cart');
}
+
+ /**
+ * Retrieve 'persistent session' helper instance
+ *
+ * @return Mage_Persistent_Helper_Session
+ */
+ protected function _getHelper()
+ {
+ return Mage::helper('persistent/session');
+ }
+
+ /**
+ * Revert all persistent data
+ *
+ * @return $this
+ */
+ protected function _cleanup()
+ {
+ Mage::dispatchEvent('persistent_session_expired');
+ $customerSession = Mage::getSingleton('customer/session');
+ $customerSession
+ ->setCustomerId(null)
+ ->setCustomerGroupId(null);
+ if ($this->_clearCheckoutSession) {
+ Mage::getSingleton('checkout/session')->unsetAll();
+ }
+ $this->_getHelper()->getSession()->removePersistentCookie();
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php b/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php
index ec804a616c1..54cc2d6f135 100644
--- a/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php
+++ b/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php
@@ -109,19 +109,6 @@ public function getProducts()
return $this->_products;
}
- /**
- * Get store url params
- *
- * @return array
- */
- protected function _getUrlParams()
- {
- return [
- '_store' => $this->getStore(),
- '_store_to_url' => true,
- ];
- }
-
/**
* Get filtered product short description to be inserted into mail
*
@@ -135,4 +122,17 @@ public function _getFilteredProductShortDescription(Mage_Catalog_Model_Product $
}
return $shortDescription;
}
+
+ /**
+ * Get store url params
+ *
+ * @return array
+ */
+ protected function _getUrlParams()
+ {
+ return [
+ '_store' => $this->getStore(),
+ '_store_to_url' => true,
+ ];
+ }
}
diff --git a/app/code/core/Mage/ProductAlert/Model/Email.php b/app/code/core/Mage/ProductAlert/Model/Email.php
index 398cf8c46dc..313c6eaf633 100644
--- a/app/code/core/Mage/ProductAlert/Model/Email.php
+++ b/app/code/core/Mage/ProductAlert/Model/Email.php
@@ -177,34 +177,6 @@ public function addStockProduct(Mage_Catalog_Model_Product $product)
return $this;
}
- /**
- * Retrieve price block
- *
- * @return Mage_ProductAlert_Block_Email_Price
- */
- protected function _getPriceBlock()
- {
- if (is_null($this->_priceBlock)) {
- $this->_priceBlock = Mage::helper('productalert')
- ->createBlock('productalert/email_price');
- }
- return $this->_priceBlock;
- }
-
- /**
- * Retrieve stock block
- *
- * @return Mage_ProductAlert_Block_Email_Stock
- */
- protected function _getStockBlock()
- {
- if (is_null($this->_stockBlock)) {
- $this->_stockBlock = Mage::helper('productalert')
- ->createBlock('productalert/email_stock');
- }
- return $this->_stockBlock;
- }
-
/**
* Send customer email
*
@@ -281,4 +253,32 @@ public function send()
return true;
}
+
+ /**
+ * Retrieve price block
+ *
+ * @return Mage_ProductAlert_Block_Email_Price
+ */
+ protected function _getPriceBlock()
+ {
+ if (is_null($this->_priceBlock)) {
+ $this->_priceBlock = Mage::helper('productalert')
+ ->createBlock('productalert/email_price');
+ }
+ return $this->_priceBlock;
+ }
+
+ /**
+ * Retrieve stock block
+ *
+ * @return Mage_ProductAlert_Block_Email_Stock
+ */
+ protected function _getStockBlock()
+ {
+ if (is_null($this->_stockBlock)) {
+ $this->_stockBlock = Mage::helper('productalert')
+ ->createBlock('productalert/email_stock');
+ }
+ return $this->_stockBlock;
+ }
}
diff --git a/app/code/core/Mage/ProductAlert/Model/Observer.php b/app/code/core/Mage/ProductAlert/Model/Observer.php
index 7a35f2f79d7..ac07097f095 100644
--- a/app/code/core/Mage/ProductAlert/Model/Observer.php
+++ b/app/code/core/Mage/ProductAlert/Model/Observer.php
@@ -63,6 +63,21 @@ class Mage_ProductAlert_Model_Observer
*/
protected $_errors = [];
+ /**
+ * Run process send product alerts
+ *
+ * @return $this
+ */
+ public function process()
+ {
+ $email = Mage::getModel('productalert/email');
+ $this->_processPrice($email);
+ $this->_processStock($email);
+ $this->_sendErrorEmail();
+
+ return $this;
+ }
+
/**
* Retrieve website collection array
*
@@ -283,19 +298,4 @@ protected function _sendErrorEmail()
}
return $this;
}
-
- /**
- * Run process send product alerts
- *
- * @return $this
- */
- public function process()
- {
- $email = Mage::getModel('productalert/email');
- $this->_processPrice($email);
- $this->_processStock($email);
- $this->_sendErrorEmail();
-
- return $this;
- }
}
diff --git a/app/code/core/Mage/ProductAlert/Model/Price.php b/app/code/core/Mage/ProductAlert/Model/Price.php
index e560b53e8c6..14a3e573cfd 100644
--- a/app/code/core/Mage/ProductAlert/Model/Price.php
+++ b/app/code/core/Mage/ProductAlert/Model/Price.php
@@ -43,11 +43,6 @@
*/
class Mage_ProductAlert_Model_Price extends Mage_Core_Model_Abstract
{
- protected function _construct()
- {
- $this->_init('productalert/price');
- }
-
/**
* @return Mage_ProductAlert_Model_Resource_Price_Customer_Collection
*/
@@ -77,4 +72,8 @@ public function deleteCustomer($customerId, $websiteId = 0)
$this->getResource()->deleteCustomer($this, $customerId, $websiteId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('productalert/price');
+ }
}
diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php b/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php
index 5eec667217d..8520c0c2b11 100644
--- a/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php
+++ b/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php
@@ -22,30 +22,6 @@
*/
abstract class Mage_ProductAlert_Model_Resource_Abstract extends Mage_Core_Model_Resource_Db_Abstract
{
- /**
- * Retrieve alert row by object parameters
- *
- * @return array|false
- */
- protected function _getAlertRow(Mage_Core_Model_Abstract $object)
- {
- $adapter = $this->_getReadAdapter();
- if ($object->getCustomerId() && $object->getProductId() && $object->getWebsiteId()) {
- $select = $adapter->select()
- ->from($this->getMainTable())
- ->where('customer_id = :customer_id')
- ->where('product_id = :product_id')
- ->where('website_id = :website_id');
- $bind = [
- ':customer_id' => $object->getCustomerId(),
- ':product_id' => $object->getProductId(),
- ':website_id' => $object->getWebsiteId(),
- ];
- return $adapter->fetchRow($select, $bind);
- }
- return false;
- }
-
/**
* Load object data by parameters
*
@@ -78,4 +54,27 @@ public function deleteCustomer(Mage_Core_Model_Abstract $object, $customerId, $w
$adapter->delete($this->getMainTable(), $where);
return $this;
}
+ /**
+ * Retrieve alert row by object parameters
+ *
+ * @return array|false
+ */
+ protected function _getAlertRow(Mage_Core_Model_Abstract $object)
+ {
+ $adapter = $this->_getReadAdapter();
+ if ($object->getCustomerId() && $object->getProductId() && $object->getWebsiteId()) {
+ $select = $adapter->select()
+ ->from($this->getMainTable())
+ ->where('customer_id = :customer_id')
+ ->where('product_id = :product_id')
+ ->where('website_id = :website_id');
+ $bind = [
+ ':customer_id' => $object->getCustomerId(),
+ ':product_id' => $object->getProductId(),
+ ':website_id' => $object->getWebsiteId(),
+ ];
+ return $adapter->fetchRow($select, $bind);
+ }
+ return false;
+ }
}
diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php
index acfaa7e55e9..1fb14f61638 100644
--- a/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php
+++ b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php
@@ -22,15 +22,6 @@
*/
class Mage_ProductAlert_Model_Resource_Price_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Define price collection
- *
- */
- protected function _construct()
- {
- $this->_init('productalert/price');
- }
-
/**
* Add customer filter
*
@@ -83,4 +74,12 @@ public function setCustomerOrder($sort = 'ASC')
$this->getSelect()->order('customer_id ' . $sort);
return $this;
}
+ /**
+ * Define price collection
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('productalert/price');
+ }
}
diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php
index ec107dc8871..46cc26821c6 100644
--- a/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php
+++ b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php
@@ -22,15 +22,6 @@
*/
class Mage_ProductAlert_Model_Resource_Stock_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Define stock collection
- *
- */
- protected function _construct()
- {
- $this->_init('productalert/stock');
- }
-
/**
* Add customer filter
*
@@ -98,4 +89,12 @@ public function setCustomerOrder($sort = 'ASC')
$this->getSelect()->order('customer_id ' . $sort);
return $this;
}
+ /**
+ * Define stock collection
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('productalert/stock');
+ }
}
diff --git a/app/code/core/Mage/ProductAlert/Model/Stock.php b/app/code/core/Mage/ProductAlert/Model/Stock.php
index 63506dcf013..ddba38da66b 100644
--- a/app/code/core/Mage/ProductAlert/Model/Stock.php
+++ b/app/code/core/Mage/ProductAlert/Model/Stock.php
@@ -41,11 +41,6 @@
*/
class Mage_ProductAlert_Model_Stock extends Mage_Core_Model_Abstract
{
- protected function _construct()
- {
- $this->_init('productalert/stock');
- }
-
/**
* @return Mage_ProductAlert_Model_Resource_Stock_Customer_Collection
*/
@@ -75,4 +70,8 @@ public function deleteCustomer($customerId, $websiteId = 0)
$this->getResource()->deleteCustomer($this, $customerId, $websiteId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('productalert/stock');
+ }
}
diff --git a/app/code/core/Mage/Rating/Model/Rating.php b/app/code/core/Mage/Rating/Model/Rating.php
index 58a7d8ab94e..66a416ce1ea 100644
--- a/app/code/core/Mage/Rating/Model/Rating.php
+++ b/app/code/core/Mage/Rating/Model/Rating.php
@@ -59,14 +59,6 @@ class Mage_Rating_Model_Rating extends Mage_Core_Model_Abstract
public const ENTITY_PRODUCT_REVIEW_CODE = 'product_review';
public const ENTITY_REVIEW_CODE = 'review';
- /**
- * Define resource model
- */
- protected function _construct()
- {
- $this->_init('rating/rating');
- }
-
/**
* @param int $optionId
* @param string $entityPkValue
@@ -152,4 +144,12 @@ public function getEntityIdByCode($entityCode)
{
return $this->getResource()->getEntityIdByCode($entityCode);
}
+
+ /**
+ * Define resource model
+ */
+ protected function _construct()
+ {
+ $this->_init('rating/rating');
+ }
}
diff --git a/app/code/core/Mage/Rating/Model/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Rating/Entity.php
index 9bf4a40bc81..fa21e310971 100644
--- a/app/code/core/Mage/Rating/Model/Rating/Entity.php
+++ b/app/code/core/Mage/Rating/Model/Rating/Entity.php
@@ -27,11 +27,6 @@
*/
class Mage_Rating_Model_Rating_Entity extends Mage_Core_Model_Abstract
{
- protected function _construct()
- {
- $this->_init('rating/rating_entity');
- }
-
/**
* @param string $entityCode
* @return int
@@ -40,4 +35,8 @@ public function getIdByCode($entityCode)
{
return $this->_getResource()->getIdByCode($entityCode);
}
+ protected function _construct()
+ {
+ $this->_init('rating/rating_entity');
+ }
}
diff --git a/app/code/core/Mage/Rating/Model/Rating/Option.php b/app/code/core/Mage/Rating/Model/Rating/Option.php
index 334ceeccfca..38870354b10 100644
--- a/app/code/core/Mage/Rating/Model/Rating/Option.php
+++ b/app/code/core/Mage/Rating/Model/Rating/Option.php
@@ -43,11 +43,6 @@
*/
class Mage_Rating_Model_Rating_Option extends Mage_Core_Model_Abstract
{
- protected function _construct()
- {
- $this->_init('rating/rating_option');
- }
-
/**
* @return $this
* @throws Exception
@@ -67,4 +62,8 @@ public function setId($id)
$this->setOptionId($id);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('rating/rating_option');
+ }
}
diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating.php b/app/code/core/Mage/Rating/Model/Resource/Rating.php
index b126713b904..60154b60c50 100644
--- a/app/code/core/Mage/Rating/Model/Resource/Rating.php
+++ b/app/code/core/Mage/Rating/Model/Resource/Rating.php
@@ -24,6 +24,190 @@ class Mage_Rating_Model_Resource_Rating extends Mage_Core_Model_Resource_Db_Abst
{
public const RATING_STATUS_APPROVED = 'Approved';
+ /**
+ * Retrieve store IDs related to given rating
+ *
+ * @param int $ratingId
+ * @return array
+ */
+ public function getStores($ratingId)
+ {
+ $select = $this->_getReadAdapter()->select()
+ ->from($this->getTable('rating/rating_store'), 'store_id')
+ ->where('rating_id = ?', $ratingId);
+ return $this->_getReadAdapter()->fetchCol($select);
+ }
+
+ /**
+ * Return array of rating summary
+ *
+ * @param Mage_Rating_Model_Rating $object
+ * @param bool $onlyForCurrentStore
+ * @return array|Mage_Rating_Model_Rating
+ */
+ public function getEntitySummary($object, $onlyForCurrentStore = true)
+ {
+ $data = $this->_getEntitySummaryData($object);
+
+ if ($onlyForCurrentStore) {
+ foreach ($data as $row) {
+ if ($row['store_id'] == Mage::app()->getStore()->getId()) {
+ $object->addData($row);
+ }
+ }
+ return $object;
+ }
+
+ $result = [];
+
+ //$stores = Mage::app()->getStore()->getResourceCollection()->load();
+ $stores = Mage::getModel('core/store')->getResourceCollection()->load();
+
+ foreach ($data as $row) {
+ $clone = clone $object;
+ $clone->addData($row);
+ $result[$clone->getStoreId()] = $clone;
+ }
+
+ $usedStoresId = array_keys($result);
+
+ /** @var Mage_Core_Model_Store $store */
+ foreach ($stores as $store) {
+ if (!in_array($store->getId(), $usedStoresId)) {
+ $clone = clone $object;
+ $clone->setCount(0);
+ $clone->setSum(0);
+ $clone->setStoreId($store->getId());
+ $result[$store->getId()] = $clone;
+ }
+ }
+
+ if (empty($result[0])) {
+ // when you unapprove the latest comment and save
+ // store_id = 0 is missing and not updated in review_entity_summary
+ $clone = clone $object;
+ $clone->setCount(0);
+ $clone->setSum(0);
+ $clone->setStoreId(0);
+ $result[0] = $clone;
+ }
+
+ return array_values($result);
+ }
+
+ /**
+ * Review summary
+ *
+ * @param Mage_Rating_Model_Rating $object
+ * @param bool $onlyForCurrentStore
+ * @return array|Mage_Rating_Model_Rating
+ */
+ public function getReviewSummary($object, $onlyForCurrentStore = true)
+ {
+ $adapter = $this->_getReadAdapter();
+
+ $sumColumn = new Zend_Db_Expr("SUM(rating_vote.{$adapter->quoteIdentifier('percent')})");
+ $countColumn = new Zend_Db_Expr('COUNT(*)');
+ $select = $adapter->select()
+ ->from(
+ ['rating_vote' => $this->getTable('rating/rating_option_vote')],
+ [
+ 'sum' => $sumColumn,
+ 'count' => $countColumn,
+ ],
+ )
+ ->joinLeft(
+ ['review_store' => $this->getTable('review/review_store')],
+ 'rating_vote.review_id = review_store.review_id',
+ ['review_store.store_id'],
+ )
+ ->join(
+ ['rating_store' => $this->getTable('rating/rating_store')],
+ 'rating_store.rating_id = rating_vote.rating_id AND rating_store.store_id = review_store.store_id',
+ [],
+ )
+ ->where('rating_vote.review_id = :review_id')
+ ->group('rating_vote.review_id')
+ ->group('review_store.store_id');
+
+ $data = $adapter->fetchAll($select, [':review_id' => $object->getReviewId()]);
+
+ if ($onlyForCurrentStore) {
+ foreach ($data as $row) {
+ if ($row['store_id'] == Mage::app()->getStore()->getId()) {
+ $object->addData($row);
+ }
+ }
+ return $object;
+ }
+
+ $result = [];
+
+ $stores = Mage::app()->getStore()->getResourceCollection()->load();
+
+ foreach ($data as $row) {
+ $clone = clone $object;
+ $clone->addData($row);
+ $result[$clone->getStoreId()] = $clone;
+ }
+
+ $usedStoresId = array_keys($result);
+
+ /** @var Mage_Core_Model_Store $store */
+ foreach ($stores as $store) {
+ if (!in_array($store->getId(), $usedStoresId)) {
+ $clone = clone $object;
+ $clone->setCount(0);
+ $clone->setSum(0);
+ $clone->setStoreId($store->getId());
+ $result[$store->getId()] = $clone;
+ }
+ }
+
+ return array_values($result);
+ }
+
+ /**
+ * Get rating entity type id by code
+ *
+ * @param string $entityCode
+ * @return int
+ */
+ public function getEntityIdByCode($entityCode)
+ {
+ $select = $this->_getReadAdapter()->select()
+ ->from($this->getTable('rating/rating_entity'), ['entity_id'])
+ ->where('entity_code = :entity_code');
+
+ return $this->_getReadAdapter()->fetchOne($select, [':entity_code' => $entityCode]);
+ }
+
+ /**
+ * Delete ratings by product id
+ *
+ * @param int $productId
+ * @return $this
+ */
+ public function deleteAggregatedRatingsByProductId($productId)
+ {
+ $entityId = $this->getEntityIdByCode(Mage_Rating_Model_Rating::ENTITY_PRODUCT_CODE);
+ $adapter = $this->_getWriteAdapter();
+ $select = $adapter->select()
+ ->from($this->getMainTable(), 'rating_id')
+ ->where('entity_id = :entity_id');
+ $ratingIds = $adapter->fetchCol($select, [':entity_id' => $entityId]);
+
+ if ($ratingIds) {
+ $where = [
+ 'entity_pk_value = ?' => (int) $productId,
+ 'rating_id IN(?)' => $ratingIds,
+ ];
+ $adapter->delete($this->getTable('rating/rating_vote_aggregated'), $where);
+ }
+
+ return $this;
+ }
+
protected function _construct()
{
$this->_init('rating/rating', 'rating_id');
@@ -100,20 +284,6 @@ protected function _afterLoad(Mage_Core_Model_Abstract $object)
return $this;
}
- /**
- * Retrieve store IDs related to given rating
- *
- * @param int $ratingId
- * @return array
- */
- public function getStores($ratingId)
- {
- $select = $this->_getReadAdapter()->select()
- ->from($this->getTable('rating/rating_store'), 'store_id')
- ->where('rating_id = ?', $ratingId);
- return $this->_getReadAdapter()->fetchCol($select);
- }
-
/**
* Actions after save
*
@@ -230,63 +400,6 @@ protected function _afterDelete(Mage_Core_Model_Abstract $object)
return $this;
}
- /**
- * Return array of rating summary
- *
- * @param Mage_Rating_Model_Rating $object
- * @param bool $onlyForCurrentStore
- * @return array|Mage_Rating_Model_Rating
- */
- public function getEntitySummary($object, $onlyForCurrentStore = true)
- {
- $data = $this->_getEntitySummaryData($object);
-
- if ($onlyForCurrentStore) {
- foreach ($data as $row) {
- if ($row['store_id'] == Mage::app()->getStore()->getId()) {
- $object->addData($row);
- }
- }
- return $object;
- }
-
- $result = [];
-
- //$stores = Mage::app()->getStore()->getResourceCollection()->load();
- $stores = Mage::getModel('core/store')->getResourceCollection()->load();
-
- foreach ($data as $row) {
- $clone = clone $object;
- $clone->addData($row);
- $result[$clone->getStoreId()] = $clone;
- }
-
- $usedStoresId = array_keys($result);
-
- /** @var Mage_Core_Model_Store $store */
- foreach ($stores as $store) {
- if (!in_array($store->getId(), $usedStoresId)) {
- $clone = clone $object;
- $clone->setCount(0);
- $clone->setSum(0);
- $clone->setStoreId($store->getId());
- $result[$store->getId()] = $clone;
- }
- }
-
- if (empty($result[0])) {
- // when you unapprove the latest comment and save
- // store_id = 0 is missing and not updated in review_entity_summary
- $clone = clone $object;
- $clone->setCount(0);
- $clone->setSum(0);
- $clone->setStoreId(0);
- $result[0] = $clone;
- }
-
- return array_values($result);
- }
-
/**
* Return data of rating summary
*
@@ -341,117 +454,4 @@ protected function _getEntitySummaryData($object)
return $adapter->fetchAll($select, $bind);
}
-
- /**
- * Review summary
- *
- * @param Mage_Rating_Model_Rating $object
- * @param bool $onlyForCurrentStore
- * @return array|Mage_Rating_Model_Rating
- */
- public function getReviewSummary($object, $onlyForCurrentStore = true)
- {
- $adapter = $this->_getReadAdapter();
-
- $sumColumn = new Zend_Db_Expr("SUM(rating_vote.{$adapter->quoteIdentifier('percent')})");
- $countColumn = new Zend_Db_Expr('COUNT(*)');
- $select = $adapter->select()
- ->from(
- ['rating_vote' => $this->getTable('rating/rating_option_vote')],
- [
- 'sum' => $sumColumn,
- 'count' => $countColumn,
- ],
- )
- ->joinLeft(
- ['review_store' => $this->getTable('review/review_store')],
- 'rating_vote.review_id = review_store.review_id',
- ['review_store.store_id'],
- )
- ->join(
- ['rating_store' => $this->getTable('rating/rating_store')],
- 'rating_store.rating_id = rating_vote.rating_id AND rating_store.store_id = review_store.store_id',
- [],
- )
- ->where('rating_vote.review_id = :review_id')
- ->group('rating_vote.review_id')
- ->group('review_store.store_id');
-
- $data = $adapter->fetchAll($select, [':review_id' => $object->getReviewId()]);
-
- if ($onlyForCurrentStore) {
- foreach ($data as $row) {
- if ($row['store_id'] == Mage::app()->getStore()->getId()) {
- $object->addData($row);
- }
- }
- return $object;
- }
-
- $result = [];
-
- $stores = Mage::app()->getStore()->getResourceCollection()->load();
-
- foreach ($data as $row) {
- $clone = clone $object;
- $clone->addData($row);
- $result[$clone->getStoreId()] = $clone;
- }
-
- $usedStoresId = array_keys($result);
-
- /** @var Mage_Core_Model_Store $store */
- foreach ($stores as $store) {
- if (!in_array($store->getId(), $usedStoresId)) {
- $clone = clone $object;
- $clone->setCount(0);
- $clone->setSum(0);
- $clone->setStoreId($store->getId());
- $result[$store->getId()] = $clone;
- }
- }
-
- return array_values($result);
- }
-
- /**
- * Get rating entity type id by code
- *
- * @param string $entityCode
- * @return int
- */
- public function getEntityIdByCode($entityCode)
- {
- $select = $this->_getReadAdapter()->select()
- ->from($this->getTable('rating/rating_entity'), ['entity_id'])
- ->where('entity_code = :entity_code');
-
- return $this->_getReadAdapter()->fetchOne($select, [':entity_code' => $entityCode]);
- }
-
- /**
- * Delete ratings by product id
- *
- * @param int $productId
- * @return $this
- */
- public function deleteAggregatedRatingsByProductId($productId)
- {
- $entityId = $this->getEntityIdByCode(Mage_Rating_Model_Rating::ENTITY_PRODUCT_CODE);
- $adapter = $this->_getWriteAdapter();
- $select = $adapter->select()
- ->from($this->getMainTable(), 'rating_id')
- ->where('entity_id = :entity_id');
- $ratingIds = $adapter->fetchCol($select, [':entity_id' => $entityId]);
-
- if ($ratingIds) {
- $where = [
- 'entity_pk_value = ?' => (int) $productId,
- 'rating_id IN(?)' => $ratingIds,
- ];
- $adapter->delete($this->getTable('rating/rating_vote_aggregated'), $where);
- }
-
- return $this;
- }
}
diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php
index 15c859b3186..3306d3878fe 100644
--- a/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php
+++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php
@@ -29,11 +29,6 @@ class Mage_Rating_Model_Resource_Rating_Collection extends Mage_Core_Model_Resou
*/
protected $_isStoreJoined = false;
- protected function _construct()
- {
- $this->_init('rating/rating');
- }
-
/**
* Add entity filter
*
@@ -257,4 +252,9 @@ public function addStoresToCollection()
}
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('rating/rating');
+ }
}
diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php
index dfe44f4b344..e886bfea5d9 100644
--- a/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php
+++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php
@@ -22,15 +22,6 @@
*/
class Mage_Rating_Model_Resource_Rating_Entity extends Mage_Core_Model_Resource_Db_Abstract
{
- /**
- * Rating entity resource initialization
- *
- */
- protected function _construct()
- {
- $this->_init('rating/rating_entity', 'entity_id');
- }
-
/**
* Return entity_id by entityCode
*
@@ -46,4 +37,12 @@ public function getIdByCode($entityCode)
->where('entity_code = :entity_code');
return $adapter->fetchOne($select, [':entity_code' => $entityCode]);
}
+ /**
+ * Rating entity resource initialization
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('rating/rating_entity', 'entity_id');
+ }
}
diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php
index 14ba4dc0b61..ca24d49cdb2 100644
--- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php
+++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php
@@ -78,18 +78,6 @@ class Mage_Rating_Model_Resource_Rating_Option extends Mage_Core_Model_Resource_
*/
protected $_optionId;
- protected function _construct()
- {
- $this->_init('rating/rating_option', 'option_id');
-
- $this->_reviewTable = $this->getTable('review/review');
- $this->_ratingOptionTable = $this->getTable('rating/rating_option');
- $this->_ratingVoteTable = $this->getTable('rating/rating_option_vote');
- $this->_aggregateTable = $this->getTable('rating/rating_vote_aggregated');
- $this->_reviewStoreTable = $this->getTable('review/review_store');
- $this->_ratingStoreTable = $this->getTable('rating/rating_store');
- }
-
/**
* Add vote
*
@@ -257,4 +245,16 @@ public function loadDataById($optionId)
return $this->_optionData;
}
+
+ protected function _construct()
+ {
+ $this->_init('rating/rating_option', 'option_id');
+
+ $this->_reviewTable = $this->getTable('review/review');
+ $this->_ratingOptionTable = $this->getTable('rating/rating_option');
+ $this->_ratingVoteTable = $this->getTable('rating/rating_option_vote');
+ $this->_aggregateTable = $this->getTable('rating/rating_vote_aggregated');
+ $this->_reviewStoreTable = $this->getTable('review/review_store');
+ $this->_ratingStoreTable = $this->getTable('rating/rating_store');
+ }
}
diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php
index 7dcff7956c3..8dc9e40870f 100644
--- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php
+++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php
@@ -37,17 +37,6 @@ class Mage_Rating_Model_Resource_Rating_Option_Collection extends Mage_Core_Mode
*/
protected $_ratingVoteTable;
- /**
- * Define model
- *
- */
- protected function _construct()
- {
- $this->_init('rating/rating_option');
- $this->_ratingOptionTable = $this->getTable('rating/rating_option');
- $this->_ratingVoteTable = $this->getTable('rating/rating_option_vote');
- }
-
/**
* Add rating filter
*
@@ -75,4 +64,15 @@ public function setPositionOrder($dir = 'ASC')
$this->setOrder('main_table.position', $dir);
return $this;
}
+
+ /**
+ * Define model
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('rating/rating_option');
+ $this->_ratingOptionTable = $this->getTable('rating/rating_option');
+ $this->_ratingVoteTable = $this->getTable('rating/rating_option_vote');
+ }
}
diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php
index f0300ef7cc0..adc56fc0c1d 100644
--- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php
+++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php
@@ -24,15 +24,6 @@
*/
class Mage_Rating_Model_Resource_Rating_Option_Vote_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Define model
- *
- */
- protected function _construct()
- {
- $this->_init('rating/rating_option_vote');
- }
-
/**
* Set review filter
*
@@ -164,4 +155,12 @@ public function addRatingOptions()
}
return $this;
}
+ /**
+ * Define model
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('rating/rating_option_vote');
+ }
}
diff --git a/app/code/core/Mage/Reports/Block/Product/Abstract.php b/app/code/core/Mage/Reports/Block/Product/Abstract.php
index d7da626b2c6..4f32e738c64 100644
--- a/app/code/core/Mage/Reports/Block/Product/Abstract.php
+++ b/app/code/core/Mage/Reports/Block/Product/Abstract.php
@@ -73,34 +73,6 @@ public function getPageSize()
return 5;
}
- /**
- * Retrieve product ids, that must not be included in collection
- *
- * @return array
- */
- protected function _getProductsToSkip()
- {
- return [];
- }
-
- /**
- * Retrieve Product Index model instance
- *
- * @return Mage_Core_Model_Abstract|Mage_Reports_Model_Product_Index_Abstract
- */
- protected function _getModel()
- {
- if (is_null($this->_indexModel)) {
- if (is_null($this->_indexName)) {
- Mage::throwException(Mage::helper('reports')->__('Index model name must be defined'));
- }
-
- $this->_indexModel = Mage::getModel($this->_indexName);
- }
-
- return $this->_indexModel;
- }
-
/**
* Public method for retrieve Product Index model
*
@@ -180,6 +152,34 @@ public function getCount()
return $this->getItemsCollection()->count();
}
+ /**
+ * Retrieve product ids, that must not be included in collection
+ *
+ * @return array
+ */
+ protected function _getProductsToSkip()
+ {
+ return [];
+ }
+
+ /**
+ * Retrieve Product Index model instance
+ *
+ * @return Mage_Core_Model_Abstract|Mage_Reports_Model_Product_Index_Abstract
+ */
+ protected function _getModel()
+ {
+ if (is_null($this->_indexModel)) {
+ if (is_null($this->_indexName)) {
+ Mage::throwException(Mage::helper('reports')->__('Index model name must be defined'));
+ }
+
+ $this->_indexModel = Mage::getModel($this->_indexName);
+ }
+
+ return $this->_indexModel;
+ }
+
/**
* Get products collection and apply recent events log to it
*
diff --git a/app/code/core/Mage/Reports/Block/Product/Compared.php b/app/code/core/Mage/Reports/Block/Product/Compared.php
index 52e05f43cee..aa3601e4e7f 100644
--- a/app/code/core/Mage/Reports/Block/Product/Compared.php
+++ b/app/code/core/Mage/Reports/Block/Product/Compared.php
@@ -46,6 +46,19 @@ public function getPageSize()
return Mage::getStoreConfig(self::XML_PATH_RECENTLY_COMPARED_COUNT);
}
+ /**
+ * Retrieve block cache tags
+ *
+ * @return array
+ */
+ public function getCacheTags()
+ {
+ return array_merge(
+ parent::getCacheTags(),
+ $this->getItemsTags($this->getItemsCollection()),
+ );
+ }
+
/**
* Prepare to html
* Check has compared products
@@ -62,17 +75,4 @@ protected function _toHtml()
return parent::_toHtml();
}
-
- /**
- * Retrieve block cache tags
- *
- * @return array
- */
- public function getCacheTags()
- {
- return array_merge(
- parent::getCacheTags(),
- $this->getItemsTags($this->getItemsCollection()),
- );
- }
}
diff --git a/app/code/core/Mage/Reports/Block/Product/Viewed.php b/app/code/core/Mage/Reports/Block/Product/Viewed.php
index 1f0ba6a16c9..16c7cd04ed9 100644
--- a/app/code/core/Mage/Reports/Block/Product/Viewed.php
+++ b/app/code/core/Mage/Reports/Block/Product/Viewed.php
@@ -58,6 +58,19 @@ public function getCount()
return parent::getCount();
}
+ /**
+ * Retrieve block cache tags
+ *
+ * @return array
+ */
+ public function getCacheTags()
+ {
+ return array_merge(
+ parent::getCacheTags(),
+ $this->getItemsTags($this->getItemsCollection()),
+ );
+ }
+
/**
* Prepare to html
* check has viewed products
@@ -72,17 +85,4 @@ protected function _toHtml()
$this->setRecentlyViewedProducts($this->getItemsCollection());
return parent::_toHtml();
}
-
- /**
- * Retrieve block cache tags
- *
- * @return array
- */
- public function getCacheTags()
- {
- return array_merge(
- parent::getCacheTags(),
- $this->getItemsTags($this->getItemsCollection()),
- );
- }
}
diff --git a/app/code/core/Mage/Reports/Model/Event.php b/app/code/core/Mage/Reports/Model/Event.php
index 715c00b2ebb..657c52f2909 100644
--- a/app/code/core/Mage/Reports/Model/Event.php
+++ b/app/code/core/Mage/Reports/Model/Event.php
@@ -45,26 +45,6 @@ class Mage_Reports_Model_Event extends Mage_Core_Model_Abstract
public const EVENT_PRODUCT_TO_WISHLIST = 5;
public const EVENT_WISHLIST_SHARE = 6;
- /**
- * Initialize resource
- *
- */
- protected function _construct()
- {
- $this->_init('reports/event');
- }
-
- /**
- * Before Event save process
- *
- * @inheritDoc
- */
- protected function _beforeSave()
- {
- $this->setLoggedAt(Mage::getModel('core/date')->gmtDate());
- return parent::_beforeSave();
- }
-
/**
* Update customer type after customer login
*
@@ -97,4 +77,24 @@ public function clean()
$this->getResource()->clean($this);
return $this;
}
+
+ /**
+ * Initialize resource
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('reports/event');
+ }
+
+ /**
+ * Before Event save process
+ *
+ * @inheritDoc
+ */
+ protected function _beforeSave()
+ {
+ $this->setLoggedAt(Mage::getModel('core/date')->gmtDate());
+ return parent::_beforeSave();
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Event/Observer.php b/app/code/core/Mage/Reports/Model/Event/Observer.php
index 60542a40562..0e605d33665 100644
--- a/app/code/core/Mage/Reports/Model/Event/Observer.php
+++ b/app/code/core/Mage/Reports/Model/Event/Observer.php
@@ -32,42 +32,6 @@ public function __construct()
$this->_enabledReports = Mage::helper('reports')->isReportsEnabled();
}
- /**
- * Abstract Event obeserver logic
- *
- * Save event
- *
- * @param int $eventTypeId
- * @param int $objectId
- * @param int $subjectId
- * @param int $subtype
- * @return $this
- */
- protected function _event($eventTypeId, $objectId, $subjectId = null, $subtype = 0)
- {
- if (is_null($subjectId)) {
- if (Mage::getSingleton('customer/session')->isLoggedIn()) {
- $customer = Mage::getSingleton('customer/session')->getCustomer();
- $subjectId = $customer->getId();
- } else {
- $subjectId = Mage::getSingleton('log/visitor')->getId();
- $subtype = 1;
- }
- }
-
- $eventModel = Mage::getModel('reports/event');
- $storeId = Mage::app()->getStore()->getId();
- $eventModel
- ->setEventTypeId($eventTypeId)
- ->setObjectId($objectId)
- ->setSubjectId($subjectId)
- ->setSubtype($subtype)
- ->setStoreId($storeId);
- $eventModel->save();
-
- return $this;
- }
-
/**
* Customer login action
*
@@ -277,4 +241,40 @@ public function eventClean(Varien_Event_Observer $observer)
return $this;
}
+
+ /**
+ * Abstract Event obeserver logic
+ *
+ * Save event
+ *
+ * @param int $eventTypeId
+ * @param int $objectId
+ * @param int $subjectId
+ * @param int $subtype
+ * @return $this
+ */
+ protected function _event($eventTypeId, $objectId, $subjectId = null, $subtype = 0)
+ {
+ if (is_null($subjectId)) {
+ if (Mage::getSingleton('customer/session')->isLoggedIn()) {
+ $customer = Mage::getSingleton('customer/session')->getCustomer();
+ $subjectId = $customer->getId();
+ } else {
+ $subjectId = Mage::getSingleton('log/visitor')->getId();
+ $subtype = 1;
+ }
+ }
+
+ $eventModel = Mage::getModel('reports/event');
+ $storeId = Mage::app()->getStore()->getId();
+ $eventModel
+ ->setEventTypeId($eventTypeId)
+ ->setObjectId($objectId)
+ ->setSubjectId($subjectId)
+ ->setSubtype($subtype)
+ ->setStoreId($storeId);
+ $eventModel->save();
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php
index 8ff5ff2606c..4a685f2ea70 100644
--- a/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php
+++ b/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php
@@ -146,16 +146,6 @@ public function purgeVisitorByCustomer()
return $this;
}
- /**
- * Retrieve Reports Session instance
- *
- * @return Mage_Reports_Model_Session
- */
- protected function _getSession()
- {
- return Mage::getSingleton('reports/session');
- }
-
/**
* Calculate count of product index items cache
*
@@ -234,4 +224,14 @@ public function registerIds($productIds)
$this->_getSession()->unsData($this->_countCacheKey);
return $this;
}
+
+ /**
+ * Retrieve Reports Session instance
+ *
+ * @return Mage_Reports_Model_Session
+ */
+ protected function _getSession()
+ {
+ return Mage::getSingleton('reports/session');
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Product/Index/Compared.php b/app/code/core/Mage/Reports/Model/Product/Index/Compared.php
index 4216ae1221f..b1192de4e04 100644
--- a/app/code/core/Mage/Reports/Model/Product/Index/Compared.php
+++ b/app/code/core/Mage/Reports/Model/Product/Index/Compared.php
@@ -39,11 +39,6 @@ class Mage_Reports_Model_Product_Index_Compared extends Mage_Reports_Model_Produ
*/
protected $_countCacheKey = 'product_index_compared_count';
- protected function _construct()
- {
- $this->_init('reports/product_index_compared');
- }
-
/**
* Retrieve Exclude Product Ids List for Collection
*
@@ -68,4 +63,9 @@ public function getExcludeProductIds()
return array_unique($productIds);
}
+
+ protected function _construct()
+ {
+ $this->_init('reports/product_index_compared');
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php
index e32caffcd5e..82d8e99881b 100644
--- a/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php
+++ b/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php
@@ -39,15 +39,6 @@ class Mage_Reports_Model_Product_Index_Viewed extends Mage_Reports_Model_Product
*/
protected $_countCacheKey = 'product_index_viewed_count';
- /**
- * Initialize resource model
- *
- */
- protected function _construct()
- {
- $this->_init('reports/product_index_viewed');
- }
-
/**
* Retrieve Exclude Product Ids List for Collection
*
@@ -63,4 +54,13 @@ public function getExcludeProductIds()
return $productIds;
}
+
+ /**
+ * Initialize resource model
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('reports/product_index_viewed');
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php
index 7bb80420cb2..f7571c73402 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php
@@ -22,24 +22,6 @@
*/
class Mage_Reports_Model_Resource_Accounts_Collection extends Mage_Reports_Model_Resource_Customer_Collection
{
- /**
- * Join created_at and accounts fields
- *
- * @param string $from
- * @param string $to
- * @return $this
- */
- protected function _joinFields($from = '', $to = '')
- {
- $this->getSelect()->reset(Zend_Db_Select::COLUMNS);
- $this->addAttributeToFilter('created_at', ['from' => $from, 'to' => $to, 'datetime' => true])
- ->addExpressionAttributeToSelect('accounts', 'COUNT({{entity_id}})', ['entity_id']);
-
- $this->getSelect()->having("{$this->_joinFields['accounts']['field']} > ?", 0);
-
- return $this;
- }
-
/**
* Set date range
*
@@ -67,4 +49,21 @@ public function setStoreIds($storeIds)
}
return $this;
}
+ /**
+ * Join created_at and accounts fields
+ *
+ * @param string $from
+ * @param string $to
+ * @return $this
+ */
+ protected function _joinFields($from = '', $to = '')
+ {
+ $this->getSelect()->reset(Zend_Db_Select::COLUMNS);
+ $this->addAttributeToFilter('created_at', ['from' => $from, 'to' => $to, 'datetime' => true])
+ ->addExpressionAttributeToSelect('accounts', 'COUNT({{entity_id}})', ['entity_id']);
+
+ $this->getSelect()->having("{$this->_joinFields['accounts']['field']} > ?", 0);
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php
index 31a56046d2e..06eeb870d38 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php
@@ -191,6 +191,37 @@ public function addOrdersStatistics($isFilter = false)
return $this;
}
+ /**
+ * Order by customer registration
+ *
+ * @param string $dir
+ * @return $this
+ */
+ public function orderByCustomerRegistration($dir = self::SORT_ORDER_DESC)
+ {
+ $this->addAttributeToSort('entity_id', $dir);
+ return $this;
+ }
+
+ /**
+ * Get select count sql
+ *
+ * @return Varien_Db_Select
+ */
+ public function getSelectCountSql()
+ {
+ $countSelect = clone $this->getSelect();
+ $countSelect->reset(Zend_Db_Select::ORDER);
+ $countSelect->reset(Zend_Db_Select::LIMIT_COUNT);
+ $countSelect->reset(Zend_Db_Select::LIMIT_OFFSET);
+ $countSelect->reset(Zend_Db_Select::COLUMNS);
+ $countSelect->reset(Zend_Db_Select::GROUP);
+ $countSelect->reset(Zend_Db_Select::HAVING);
+ $countSelect->columns('count(DISTINCT e.entity_id)');
+
+ return $countSelect;
+ }
+
/**
* Add orders statistics to collection items
*
@@ -245,35 +276,4 @@ protected function _afterLoad()
$this->_addOrdersStatistics();
return $this;
}
-
- /**
- * Order by customer registration
- *
- * @param string $dir
- * @return $this
- */
- public function orderByCustomerRegistration($dir = self::SORT_ORDER_DESC)
- {
- $this->addAttributeToSort('entity_id', $dir);
- return $this;
- }
-
- /**
- * Get select count sql
- *
- * @return Varien_Db_Select
- */
- public function getSelectCountSql()
- {
- $countSelect = clone $this->getSelect();
- $countSelect->reset(Zend_Db_Select::ORDER);
- $countSelect->reset(Zend_Db_Select::LIMIT_COUNT);
- $countSelect->reset(Zend_Db_Select::LIMIT_OFFSET);
- $countSelect->reset(Zend_Db_Select::COLUMNS);
- $countSelect->reset(Zend_Db_Select::GROUP);
- $countSelect->reset(Zend_Db_Select::HAVING);
- $countSelect->columns('count(DISTINCT e.entity_id)');
-
- return $countSelect;
- }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php
index 8ac785f3b53..a1b12148fd4 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php
@@ -22,27 +22,6 @@
*/
class Mage_Reports_Model_Resource_Customer_Orders_Collection extends Mage_Reports_Model_Resource_Order_Collection
{
- protected function _construct()
- {
- parent::_construct();
- $this->_useAnalyticFunction = true;
- }
- /**
- * Join fields
- *
- * @param string $from
- * @param string $to
- * @return $this
- */
- protected function _joinFields($from = '', $to = '')
- {
- $this->joinCustomerName()
- ->groupByCustomer()
- ->addOrdersCount()
- ->addAttributeToFilter('created_at', ['from' => $from, 'to' => $to, 'datetime' => true]);
- return $this;
- }
-
/**
* Set date range
*
@@ -76,4 +55,24 @@ public function setStoreIds($storeIds)
return $this;
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_useAnalyticFunction = true;
+ }
+ /**
+ * Join fields
+ *
+ * @param string $from
+ * @param string $to
+ * @return $this
+ */
+ protected function _joinFields($from = '', $to = '')
+ {
+ $this->joinCustomerName()
+ ->groupByCustomer()
+ ->addOrdersCount()
+ ->addAttributeToFilter('created_at', ['from' => $from, 'to' => $to, 'datetime' => true]);
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php
index 399e38d31ad..4a773248447 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php
@@ -22,27 +22,6 @@
*/
class Mage_Reports_Model_Resource_Customer_Totals_Collection extends Mage_Reports_Model_Resource_Order_Collection
{
- protected function _construct()
- {
- parent::_construct();
- $this->_useAnalyticFunction = true;
- }
- /**
- * Join fields
- *
- * @param string $from
- * @param string $to
- * @return $this
- */
- protected function _joinFields($from = '', $to = '')
- {
- $this->joinCustomerName()
- ->groupByCustomer()
- ->addOrdersCount()
- ->addAttributeToFilter('created_at', ['from' => $from, 'to' => $to, 'datetime' => true]);
- return $this;
- }
-
/**
* Set date range
*
@@ -76,4 +55,24 @@ public function setStoreIds($storeIds)
return $this;
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_useAnalyticFunction = true;
+ }
+ /**
+ * Join fields
+ *
+ * @param string $from
+ * @param string $to
+ * @return $this
+ */
+ protected function _joinFields($from = '', $to = '')
+ {
+ $this->joinCustomerName()
+ ->groupByCustomer()
+ ->addOrdersCount()
+ ->addAttributeToFilter('created_at', ['from' => $from, 'to' => $to, 'datetime' => true]);
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Event.php b/app/code/core/Mage/Reports/Model/Resource/Event.php
index a01096ba97f..4fef4cdf895 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Event.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Event.php
@@ -22,15 +22,6 @@
*/
class Mage_Reports_Model_Resource_Event extends Mage_Core_Model_Resource_Db_Abstract
{
- /**
- * Initialize main table and identifier field.
- * Set main entity table name and primary key field name.
- */
- protected function _construct()
- {
- $this->_init('reports/event', 'event_id');
- }
-
/**
* Update customer type after customer login
*
@@ -174,4 +165,12 @@ public function clean(Mage_Reports_Model_Event $object)
}
return $this;
}
+ /**
+ * Initialize main table and identifier field.
+ * Set main entity table name and primary key field name.
+ */
+ protected function _construct()
+ {
+ $this->_init('reports/event', 'event_id');
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php
index 79fa55e7179..7afdc3ff5be 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php
@@ -40,11 +40,6 @@ class Mage_Reports_Model_Resource_Event_Collection extends Mage_Core_Model_Resou
*/
protected $_useAnalyticFunction = true;
- protected function _construct()
- {
- $this->_init('reports/event');
- }
-
/**
* Add store ids filter
*
@@ -85,4 +80,9 @@ public function addRecentlyFiler($typeId, $subjectId, $subtype = 0, $ignore = nu
->limit($limit);
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('reports/event');
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php
index ce9e8a31e3a..bf20a8354d2 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Reports_Model_Resource_Event_Type_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('reports/event_type');
- }
-
/**
* Return option array
*
@@ -36,4 +31,8 @@ public function toOptionArray()
{
return parent::_toOptionArray('event_type_id', 'event_name');
}
+ protected function _construct()
+ {
+ $this->_init('reports/event_type');
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php
index 867ffd517af..89661906560 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php
@@ -81,228 +81,6 @@ public function prepareSummary($range, $customStart, $customEnd, $isFilter = 0)
return $this;
}
- /**
- * Get sales amount expression
- *
- * @return string
- */
- protected function _getSalesAmountExpression()
- {
- if (is_null($this->_salesAmountExpression)) {
- $adapter = $this->getConnection();
- $expressionTransferObject = new Varien_Object([
- 'expression' => '%s - %s - %s - (%s - %s - %s)',
- 'arguments' => [
- $adapter->getIfNullSql('main_table.base_total_invoiced', 0),
- $adapter->getIfNullSql('main_table.base_tax_invoiced', 0),
- $adapter->getIfNullSql('main_table.base_shipping_invoiced', 0),
- $adapter->getIfNullSql('main_table.base_total_refunded', 0),
- $adapter->getIfNullSql('main_table.base_tax_refunded', 0),
- $adapter->getIfNullSql('main_table.base_shipping_refunded', 0),
- ],
- ]);
-
- Mage::dispatchEvent('sales_prepare_amount_expression', [
- 'collection' => $this,
- 'expression_object' => $expressionTransferObject,
- ]);
- $this->_salesAmountExpression = vsprintf(
- $expressionTransferObject->getExpression(),
- $expressionTransferObject->getArguments(),
- );
- }
-
- return $this->_salesAmountExpression;
- }
-
- /**
- * Prepare report summary from live data
- *
- * @param string $range
- * @param mixed $customStart
- * @param mixed $customEnd
- * @param int $isFilter
- * @return $this
- */
- protected function _prepareSummaryLive($range, $customStart, $customEnd, $isFilter = 0)
- {
- $this->setMainTable('sales/order');
- $adapter = $this->getConnection();
-
- /**
- * Reset all columns, because result will group only by 'created_at' field
- */
- $this->getSelect()->reset(Zend_Db_Select::COLUMNS);
-
- $expression = $this->_getSalesAmountExpression();
- if ($isFilter == 0) {
- $this->getSelect()->columns([
- 'revenue' => new Zend_Db_Expr(
- sprintf(
- 'SUM((%s) * %s)',
- $expression,
- $adapter->getIfNullSql('main_table.base_to_global_rate', 0),
- ),
- ),
- ]);
- } else {
- $this->getSelect()->columns([
- 'revenue' => new Zend_Db_Expr(sprintf('SUM(%s)', $expression)),
- ]);
- }
-
- $dateRange = $this->getDateRange($range, $customStart, $customEnd);
-
- $tzRangeOffsetExpression = $this->_getTZRangeOffsetExpression(
- $range,
- 'created_at',
- $dateRange['from'],
- $dateRange['to'],
- );
-
- $this->getSelect()
- ->columns([
- 'quantity' => new Zend_Db_Expr('COUNT(main_table.entity_id)'),
- 'range' => $tzRangeOffsetExpression,
- ])
- ->where('main_table.state NOT IN (?)', [
- Mage_Sales_Model_Order::STATE_PENDING_PAYMENT,
- Mage_Sales_Model_Order::STATE_NEW])
- ->order('range ' . Zend_Db_Select::SQL_ASC)
- ->group($tzRangeOffsetExpression);
-
- $this->addFieldToFilter('created_at', $dateRange);
-
- return $this;
- }
-
- /**
- * Prepare report summary from aggregated data
- *
- * @param string $range
- * @param mixed $customStart
- * @param mixed $customEnd
- * @return $this
- */
- protected function _prepareSummaryAggregated($range, $customStart, $customEnd)
- {
- $this->setMainTable('sales/order_aggregated_created');
- /**
- * Reset all columns, because result will group only by 'created_at' field
- */
- $this->getSelect()->reset(Zend_Db_Select::COLUMNS);
- $rangePeriod = $this->_getRangeExpressionForAttribute($range, 'main_table.period');
-
- $tableName = $this->getConnection()->quoteIdentifier('main_table.period');
- $rangePeriod2 = str_replace($tableName, "MIN($tableName)", $rangePeriod);
-
- $this->getSelect()->columns([
- 'revenue' => new Zend_Db_Expr('SUM(main_table.total_revenue_amount)'),
- 'quantity' => new Zend_Db_Expr('SUM(main_table.orders_count)'),
- 'range' => $rangePeriod2,
- ])
- ->order('range')
- ->group($rangePeriod);
-
- $this->getSelect()->where(
- $this->_getConditionSql('main_table.period', $this->getDateRange($range, $customStart, $customEnd)),
- );
-
- $statuses = Mage::getSingleton('sales/config')
- ->getOrderStatusesForState(Mage_Sales_Model_Order::STATE_CANCELED);
-
- if (empty($statuses)) {
- $statuses = [0];
- }
- $this->addFieldToFilter('main_table.order_status', ['nin' => $statuses]);
-
- return $this;
- }
-
- /**
- * Get range expression
- *
- * @param string $range
- * @return Zend_Db_Expr
- */
- protected function _getRangeExpression($range)
- {
- switch ($range) {
- case '24h':
- $expression = $this->getConnection()->getConcatSql([
- $this->getConnection()->getDateFormatSql('{{attribute}}', '%Y-%m-%d %H:'),
- $this->getConnection()->quote('00'),
- ]);
- break;
- case '7d':
- case '1m':
- $expression = $this->getConnection()->getDateFormatSql('{{attribute}}', '%Y-%m-%d');
- break;
- case '1y':
- case '2y':
- case 'custom':
- default:
- $expression = $this->getConnection()->getDateFormatSql('{{attribute}}', '%Y-%m');
- break;
- }
-
- return $expression;
- }
-
- /**
- * Retrieve range expression adapted for attribute
- *
- * @param string $range
- * @param string $attribute
- * @return string
- */
- protected function _getRangeExpressionForAttribute($range, $attribute)
- {
- $expression = $this->_getRangeExpression($range);
- return str_replace('{{attribute}}', $this->getConnection()->quoteIdentifier($attribute), $expression);
- }
-
- /**
- * Retrieve query for attribute with timezone conversion
- *
- * @param string $range
- * @param string $attribute
- * @param mixed $from
- * @param mixed $to
- * @return string
- */
- protected function _getTZRangeOffsetExpression($range, $attribute, $from = null, $to = null)
- {
- return str_replace(
- '{{attribute}}',
- Mage::getResourceModel('sales/report_order')
- ->getStoreTZOffsetQuery($this->getMainTable(), $attribute, $from, $to),
- $this->_getRangeExpression($range),
- );
- }
-
- /**
- * Retrieve range expression with timezone conversion adapted for attribute
- *
- * @param string $range
- * @param string $attribute
- * @param string $tzFrom
- * @param string $tzTo
- * @return string
- */
- protected function _getTZRangeExpressionForAttribute($range, $attribute, $tzFrom = '+00:00', $tzTo = null)
- {
- if ($tzTo == null) {
- $tzTo = Mage::app()->getLocale()->storeDate()->toString(Zend_Date::GMT_DIFF_SEP);
- }
- $adapter = $this->getConnection();
- $expression = $this->_getRangeExpression($range);
- $attribute = $adapter->quoteIdentifier($attribute);
- $periodExpr = $adapter->getDateAddSql($attribute, $tzTo, Varien_Db_Adapter_Interface::INTERVAL_HOUR);
-
- return str_replace('{{attribute}}', $periodExpr, $expression);
- }
-
/**
* Calculate From and To dates (or times) by given period
*
@@ -401,114 +179,33 @@ public function calculateTotals($isFilter = 0)
}
/**
- * Calculate totals live report
+ * Calculate lifitime sales
*
- * @param int $isFilter
+ * @param bool|int $isFilter
* @return $this
*/
- protected function _calculateTotalsLive($isFilter = 0)
+ public function calculateSales($isFilter = 0)
{
- $this->setMainTable('sales/order');
- $this->removeAllFieldsFromSelect();
+ $statuses = Mage::getSingleton('sales/config')
+ ->getOrderStatusesForState(Mage_Sales_Model_Order::STATE_CANCELED);
+ if (empty($statuses)) {
+ $statuses = [0];
+ }
$adapter = $this->getConnection();
- $baseTaxInvoiced = $adapter->getIfNullSql('main_table.base_tax_invoiced', 0);
- $baseTaxRefunded = $adapter->getIfNullSql('main_table.base_tax_refunded', 0);
- $baseShippingInvoiced = $adapter->getIfNullSql('main_table.base_shipping_invoiced', 0);
- $baseShippingRefunded = $adapter->getIfNullSql('main_table.base_shipping_refunded', 0);
-
- $revenueExp = $this->_getSalesAmountExpression();
- $taxExp = sprintf('%s - %s', $baseTaxInvoiced, $baseTaxRefunded);
- $shippingExp = sprintf('%s - %s', $baseShippingInvoiced, $baseShippingRefunded);
-
- if ($isFilter == 0) {
- $rateExp = $adapter->getIfNullSql('main_table.base_to_global_rate', 0);
- $this->getSelect()->columns(
- [
- 'revenue' => new Zend_Db_Expr(sprintf('SUM((%s) * %s)', $revenueExp, $rateExp)),
- 'tax' => new Zend_Db_Expr(sprintf('SUM((%s) * %s)', $taxExp, $rateExp)),
- 'shipping' => new Zend_Db_Expr(sprintf('SUM((%s) * %s)', $shippingExp, $rateExp)),
- ],
- );
- } else {
- $this->getSelect()->columns(
- [
- 'revenue' => new Zend_Db_Expr(sprintf('SUM(%s)', $revenueExp)),
- 'tax' => new Zend_Db_Expr(sprintf('SUM(%s)', $taxExp)),
- 'shipping' => new Zend_Db_Expr(sprintf('SUM(%s)', $shippingExp)),
- ],
- );
- }
-
- $this->getSelect()->columns([
- 'quantity' => 'COUNT(main_table.entity_id)',
- ])
- ->where('main_table.state NOT IN (?)', [
- Mage_Sales_Model_Order::STATE_PENDING_PAYMENT,
- Mage_Sales_Model_Order::STATE_NEW]);
-
- return $this;
- }
-
- /**
- * Calculate totals aggregated report
- *
- * @param int $isFilter
- * @return $this
- */
- protected function _calculateTotalsAggregated($isFilter = 0)
- {
- $this->setMainTable('sales/order_aggregated_created');
- $this->removeAllFieldsFromSelect();
-
- $this->getSelect()->columns([
- 'revenue' => 'SUM(main_table.total_revenue_amount)',
- 'tax' => 'SUM(main_table.total_tax_amount_actual)',
- 'shipping' => 'SUM(main_table.total_shipping_amount_actual)',
- 'quantity' => 'SUM(orders_count)',
- ]);
-
- $statuses = Mage::getSingleton('sales/config')
- ->getOrderStatusesForState(Mage_Sales_Model_Order::STATE_CANCELED);
-
- if (empty($statuses)) {
- $statuses = [0];
- }
-
- $this->getSelect()->where('main_table.order_status NOT IN(?)', $statuses);
-
- return $this;
- }
-
- /**
- * Calculate lifitime sales
- *
- * @param bool|int $isFilter
- * @return $this
- */
- public function calculateSales($isFilter = 0)
- {
- $statuses = Mage::getSingleton('sales/config')
- ->getOrderStatusesForState(Mage_Sales_Model_Order::STATE_CANCELED);
-
- if (empty($statuses)) {
- $statuses = [0];
- }
- $adapter = $this->getConnection();
-
- if (Mage::getStoreConfig('sales/dashboard/use_aggregated_data')) {
- $this->setMainTable('sales/order_aggregated_created');
- $this->removeAllFieldsFromSelect();
- $averageExpr = $adapter->getCheckSql(
- 'SUM(main_table.orders_count) > 0',
- 'SUM(main_table.total_revenue_amount)/SUM(main_table.orders_count)',
- '0',
- );
- $this->getSelect()->columns([
- 'lifetime' => new Zend_Db_Expr('SUM(main_table.total_revenue_amount)'),
- 'average' => $averageExpr,
- ]);
+ if (Mage::getStoreConfig('sales/dashboard/use_aggregated_data')) {
+ $this->setMainTable('sales/order_aggregated_created');
+ $this->removeAllFieldsFromSelect();
+ $averageExpr = $adapter->getCheckSql(
+ 'SUM(main_table.orders_count) > 0',
+ 'SUM(main_table.total_revenue_amount)/SUM(main_table.orders_count)',
+ '0',
+ );
+ $this->getSelect()->columns([
+ 'lifetime' => new Zend_Db_Expr('SUM(main_table.total_revenue_amount)'),
+ 'average' => $averageExpr,
+ ]);
if (!$isFilter) {
$this->addFieldToFilter(
@@ -778,17 +475,6 @@ public function getSelectCountSql()
return $countSelect;
}
- /**
- * Initialize initial fields to select
- *
- * @return $this
- */
- protected function _initInitialFieldsToSelect()
- {
- // No fields should be initialized
- return $this;
- }
-
/**
* Add period filter by created_at attribute
*
@@ -814,4 +500,318 @@ public function addCreateAtPeriodFilter($period)
return $this;
}
+
+ /**
+ * Get sales amount expression
+ *
+ * @return string
+ */
+ protected function _getSalesAmountExpression()
+ {
+ if (is_null($this->_salesAmountExpression)) {
+ $adapter = $this->getConnection();
+ $expressionTransferObject = new Varien_Object([
+ 'expression' => '%s - %s - %s - (%s - %s - %s)',
+ 'arguments' => [
+ $adapter->getIfNullSql('main_table.base_total_invoiced', 0),
+ $adapter->getIfNullSql('main_table.base_tax_invoiced', 0),
+ $adapter->getIfNullSql('main_table.base_shipping_invoiced', 0),
+ $adapter->getIfNullSql('main_table.base_total_refunded', 0),
+ $adapter->getIfNullSql('main_table.base_tax_refunded', 0),
+ $adapter->getIfNullSql('main_table.base_shipping_refunded', 0),
+ ],
+ ]);
+
+ Mage::dispatchEvent('sales_prepare_amount_expression', [
+ 'collection' => $this,
+ 'expression_object' => $expressionTransferObject,
+ ]);
+ $this->_salesAmountExpression = vsprintf(
+ $expressionTransferObject->getExpression(),
+ $expressionTransferObject->getArguments(),
+ );
+ }
+
+ return $this->_salesAmountExpression;
+ }
+
+ /**
+ * Prepare report summary from live data
+ *
+ * @param string $range
+ * @param mixed $customStart
+ * @param mixed $customEnd
+ * @param int $isFilter
+ * @return $this
+ */
+ protected function _prepareSummaryLive($range, $customStart, $customEnd, $isFilter = 0)
+ {
+ $this->setMainTable('sales/order');
+ $adapter = $this->getConnection();
+
+ /**
+ * Reset all columns, because result will group only by 'created_at' field
+ */
+ $this->getSelect()->reset(Zend_Db_Select::COLUMNS);
+
+ $expression = $this->_getSalesAmountExpression();
+ if ($isFilter == 0) {
+ $this->getSelect()->columns([
+ 'revenue' => new Zend_Db_Expr(
+ sprintf(
+ 'SUM((%s) * %s)',
+ $expression,
+ $adapter->getIfNullSql('main_table.base_to_global_rate', 0),
+ ),
+ ),
+ ]);
+ } else {
+ $this->getSelect()->columns([
+ 'revenue' => new Zend_Db_Expr(sprintf('SUM(%s)', $expression)),
+ ]);
+ }
+
+ $dateRange = $this->getDateRange($range, $customStart, $customEnd);
+
+ $tzRangeOffsetExpression = $this->_getTZRangeOffsetExpression(
+ $range,
+ 'created_at',
+ $dateRange['from'],
+ $dateRange['to'],
+ );
+
+ $this->getSelect()
+ ->columns([
+ 'quantity' => new Zend_Db_Expr('COUNT(main_table.entity_id)'),
+ 'range' => $tzRangeOffsetExpression,
+ ])
+ ->where('main_table.state NOT IN (?)', [
+ Mage_Sales_Model_Order::STATE_PENDING_PAYMENT,
+ Mage_Sales_Model_Order::STATE_NEW])
+ ->order('range ' . Zend_Db_Select::SQL_ASC)
+ ->group($tzRangeOffsetExpression);
+
+ $this->addFieldToFilter('created_at', $dateRange);
+
+ return $this;
+ }
+
+ /**
+ * Prepare report summary from aggregated data
+ *
+ * @param string $range
+ * @param mixed $customStart
+ * @param mixed $customEnd
+ * @return $this
+ */
+ protected function _prepareSummaryAggregated($range, $customStart, $customEnd)
+ {
+ $this->setMainTable('sales/order_aggregated_created');
+ /**
+ * Reset all columns, because result will group only by 'created_at' field
+ */
+ $this->getSelect()->reset(Zend_Db_Select::COLUMNS);
+ $rangePeriod = $this->_getRangeExpressionForAttribute($range, 'main_table.period');
+
+ $tableName = $this->getConnection()->quoteIdentifier('main_table.period');
+ $rangePeriod2 = str_replace($tableName, "MIN($tableName)", $rangePeriod);
+
+ $this->getSelect()->columns([
+ 'revenue' => new Zend_Db_Expr('SUM(main_table.total_revenue_amount)'),
+ 'quantity' => new Zend_Db_Expr('SUM(main_table.orders_count)'),
+ 'range' => $rangePeriod2,
+ ])
+ ->order('range')
+ ->group($rangePeriod);
+
+ $this->getSelect()->where(
+ $this->_getConditionSql('main_table.period', $this->getDateRange($range, $customStart, $customEnd)),
+ );
+
+ $statuses = Mage::getSingleton('sales/config')
+ ->getOrderStatusesForState(Mage_Sales_Model_Order::STATE_CANCELED);
+
+ if (empty($statuses)) {
+ $statuses = [0];
+ }
+ $this->addFieldToFilter('main_table.order_status', ['nin' => $statuses]);
+
+ return $this;
+ }
+
+ /**
+ * Get range expression
+ *
+ * @param string $range
+ * @return Zend_Db_Expr
+ */
+ protected function _getRangeExpression($range)
+ {
+ switch ($range) {
+ case '24h':
+ $expression = $this->getConnection()->getConcatSql([
+ $this->getConnection()->getDateFormatSql('{{attribute}}', '%Y-%m-%d %H:'),
+ $this->getConnection()->quote('00'),
+ ]);
+ break;
+ case '7d':
+ case '1m':
+ $expression = $this->getConnection()->getDateFormatSql('{{attribute}}', '%Y-%m-%d');
+ break;
+ case '1y':
+ case '2y':
+ case 'custom':
+ default:
+ $expression = $this->getConnection()->getDateFormatSql('{{attribute}}', '%Y-%m');
+ break;
+ }
+
+ return $expression;
+ }
+
+ /**
+ * Retrieve range expression adapted for attribute
+ *
+ * @param string $range
+ * @param string $attribute
+ * @return string
+ */
+ protected function _getRangeExpressionForAttribute($range, $attribute)
+ {
+ $expression = $this->_getRangeExpression($range);
+ return str_replace('{{attribute}}', $this->getConnection()->quoteIdentifier($attribute), $expression);
+ }
+
+ /**
+ * Retrieve query for attribute with timezone conversion
+ *
+ * @param string $range
+ * @param string $attribute
+ * @param mixed $from
+ * @param mixed $to
+ * @return string
+ */
+ protected function _getTZRangeOffsetExpression($range, $attribute, $from = null, $to = null)
+ {
+ return str_replace(
+ '{{attribute}}',
+ Mage::getResourceModel('sales/report_order')
+ ->getStoreTZOffsetQuery($this->getMainTable(), $attribute, $from, $to),
+ $this->_getRangeExpression($range),
+ );
+ }
+
+ /**
+ * Retrieve range expression with timezone conversion adapted for attribute
+ *
+ * @param string $range
+ * @param string $attribute
+ * @param string $tzFrom
+ * @param string $tzTo
+ * @return string
+ */
+ protected function _getTZRangeExpressionForAttribute($range, $attribute, $tzFrom = '+00:00', $tzTo = null)
+ {
+ if ($tzTo == null) {
+ $tzTo = Mage::app()->getLocale()->storeDate()->toString(Zend_Date::GMT_DIFF_SEP);
+ }
+ $adapter = $this->getConnection();
+ $expression = $this->_getRangeExpression($range);
+ $attribute = $adapter->quoteIdentifier($attribute);
+ $periodExpr = $adapter->getDateAddSql($attribute, $tzTo, Varien_Db_Adapter_Interface::INTERVAL_HOUR);
+
+ return str_replace('{{attribute}}', $periodExpr, $expression);
+ }
+
+ /**
+ * Calculate totals live report
+ *
+ * @param int $isFilter
+ * @return $this
+ */
+ protected function _calculateTotalsLive($isFilter = 0)
+ {
+ $this->setMainTable('sales/order');
+ $this->removeAllFieldsFromSelect();
+
+ $adapter = $this->getConnection();
+
+ $baseTaxInvoiced = $adapter->getIfNullSql('main_table.base_tax_invoiced', 0);
+ $baseTaxRefunded = $adapter->getIfNullSql('main_table.base_tax_refunded', 0);
+ $baseShippingInvoiced = $adapter->getIfNullSql('main_table.base_shipping_invoiced', 0);
+ $baseShippingRefunded = $adapter->getIfNullSql('main_table.base_shipping_refunded', 0);
+
+ $revenueExp = $this->_getSalesAmountExpression();
+ $taxExp = sprintf('%s - %s', $baseTaxInvoiced, $baseTaxRefunded);
+ $shippingExp = sprintf('%s - %s', $baseShippingInvoiced, $baseShippingRefunded);
+
+ if ($isFilter == 0) {
+ $rateExp = $adapter->getIfNullSql('main_table.base_to_global_rate', 0);
+ $this->getSelect()->columns(
+ [
+ 'revenue' => new Zend_Db_Expr(sprintf('SUM((%s) * %s)', $revenueExp, $rateExp)),
+ 'tax' => new Zend_Db_Expr(sprintf('SUM((%s) * %s)', $taxExp, $rateExp)),
+ 'shipping' => new Zend_Db_Expr(sprintf('SUM((%s) * %s)', $shippingExp, $rateExp)),
+ ],
+ );
+ } else {
+ $this->getSelect()->columns(
+ [
+ 'revenue' => new Zend_Db_Expr(sprintf('SUM(%s)', $revenueExp)),
+ 'tax' => new Zend_Db_Expr(sprintf('SUM(%s)', $taxExp)),
+ 'shipping' => new Zend_Db_Expr(sprintf('SUM(%s)', $shippingExp)),
+ ],
+ );
+ }
+
+ $this->getSelect()->columns([
+ 'quantity' => 'COUNT(main_table.entity_id)',
+ ])
+ ->where('main_table.state NOT IN (?)', [
+ Mage_Sales_Model_Order::STATE_PENDING_PAYMENT,
+ Mage_Sales_Model_Order::STATE_NEW]);
+
+ return $this;
+ }
+
+ /**
+ * Calculate totals aggregated report
+ *
+ * @param int $isFilter
+ * @return $this
+ */
+ protected function _calculateTotalsAggregated($isFilter = 0)
+ {
+ $this->setMainTable('sales/order_aggregated_created');
+ $this->removeAllFieldsFromSelect();
+
+ $this->getSelect()->columns([
+ 'revenue' => 'SUM(main_table.total_revenue_amount)',
+ 'tax' => 'SUM(main_table.total_tax_amount_actual)',
+ 'shipping' => 'SUM(main_table.total_shipping_amount_actual)',
+ 'quantity' => 'SUM(orders_count)',
+ ]);
+
+ $statuses = Mage::getSingleton('sales/config')
+ ->getOrderStatusesForState(Mage_Sales_Model_Order::STATE_CANCELED);
+
+ if (empty($statuses)) {
+ $statuses = [0];
+ }
+
+ $this->getSelect()->where('main_table.order_status NOT IN(?)', $statuses);
+
+ return $this;
+ }
+
+ /**
+ * Initialize initial fields to select
+ *
+ * @return $this
+ */
+ protected function _initInitialFieldsToSelect()
+ {
+ // No fields should be initialized
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php
index 915f3ad6aaf..21502225e32 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php
@@ -143,20 +143,6 @@ public function getProductEntityTypeId()
return $this->_productEntityTypeId;
}
- /**
- * Join fields
- *
- * @return $this
- */
- protected function _joinFields()
- {
- $this->addAttributeToSelect('entity_id')
- ->addAttributeToSelect('name')
- ->addAttributeToSelect('price');
-
- return $this;
- }
-
/**
* Get select count sql
*
@@ -381,24 +367,6 @@ public function addViewsCount($from = '', $to = '')
return $this;
}
- /**
- * Prepare between sql
- *
- * @param string $fieldName Field name with table suffix ('created_at' or 'main_table.created_at')
- * @param string $from
- * @param string $to
- * @return string Formatted sql string
- */
- protected function _prepareBetweenSql($fieldName, $from, $to)
- {
- return sprintf(
- '(%s BETWEEN %s AND %s)',
- $fieldName,
- $this->getConnection()->quote($from),
- $this->getConnection()->quote($to),
- );
- }
-
/**
* Add store restrictions to product collection
*
@@ -428,4 +396,36 @@ public function addStoreRestrictions($storeIds, $websiteIds)
return $this;
}
+
+ /**
+ * Join fields
+ *
+ * @return $this
+ */
+ protected function _joinFields()
+ {
+ $this->addAttributeToSelect('entity_id')
+ ->addAttributeToSelect('name')
+ ->addAttributeToSelect('price');
+
+ return $this;
+ }
+
+ /**
+ * Prepare between sql
+ *
+ * @param string $fieldName Field name with table suffix ('created_at' or 'main_table.created_at')
+ * @param string $from
+ * @param string $to
+ * @return string Formatted sql string
+ */
+ protected function _prepareBetweenSql($fieldName, $from, $to)
+ {
+ return sprintf(
+ '(%s BETWEEN %s AND %s)',
+ $fieldName,
+ $this->getConnection()->quote($from),
+ $this->getConnection()->quote($to),
+ );
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php
index 7d2589e6531..8fa125f180c 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php
@@ -37,35 +37,6 @@ abstract class Mage_Reports_Model_Resource_Product_Index_Collection_Abstract ext
*/
protected $_sortIds = [];
- /**
- * Retrieve Product Index table name
- *
- */
- abstract protected function _getTableName();
-
- /**
- * Join index table
- *
- * @return Mage_Reports_Model_Resource_Product_Index_Collection_Abstract
- */
- protected function _joinIdxTable()
- {
- if (!$this->getFlag('is_idx_table_joined')) {
- $this->joinTable(
- ['idx_table' => $this->_getTableName()],
- 'product_id=entity_id',
- [
- 'product_id' => 'product_id',
- 'item_store_id' => 'store_id',
- 'added_at' => 'added_at',
- ],
- $this->_getWhereCondition(),
- );
- $this->setFlag('is_idx_table_joined', true);
- }
- return $this;
- }
-
/**
* Add Viewed Products Index to Collection
*
@@ -96,26 +67,6 @@ public function addFilterByIds($ids)
return $this;
}
- /**
- * Retrieve Where Condition to Index table
- *
- * @return array
- */
- protected function _getWhereCondition()
- {
- $condition = [];
-
- if (Mage::getSingleton('customer/session')->isLoggedIn()) {
- $condition['customer_id'] = Mage::getSingleton('customer/session')->getCustomerId();
- } elseif ($this->_customerId) {
- $condition['customer_id'] = $this->_customerId;
- } else {
- $condition['visitor_id'] = Mage::getSingleton('log/visitor')->getId();
- }
-
- return $condition;
- }
-
/**
* Set customer id, that will be used in 'whereCondition'
*
@@ -153,6 +104,71 @@ public function setSortIds(array $ids)
return $this;
}
+ /**
+ * Add exclude Product Ids
+ *
+ * @param int|array $productIds
+ * @return Mage_Reports_Model_Resource_Product_Index_Collection_Abstract
+ */
+ public function excludeProductIds($productIds)
+ {
+ if (empty($productIds)) {
+ return $this;
+ }
+ $this->_joinIdxTable();
+ $this->getSelect()->where('idx_table.product_id NOT IN(?)', $productIds);
+ return $this;
+ }
+
+ /**
+ * Retrieve Product Index table name
+ *
+ */
+ abstract protected function _getTableName();
+
+ /**
+ * Join index table
+ *
+ * @return Mage_Reports_Model_Resource_Product_Index_Collection_Abstract
+ */
+ protected function _joinIdxTable()
+ {
+ if (!$this->getFlag('is_idx_table_joined')) {
+ $this->joinTable(
+ ['idx_table' => $this->_getTableName()],
+ 'product_id=entity_id',
+ [
+ 'product_id' => 'product_id',
+ 'item_store_id' => 'store_id',
+ 'added_at' => 'added_at',
+ ],
+ $this->_getWhereCondition(),
+ );
+ $this->setFlag('is_idx_table_joined', true);
+ }
+ return $this;
+ }
+
+ /**
+ * Retrieve Where Condition to Index table
+ *
+ * @return array
+ */
+ protected function _getWhereCondition()
+ {
+ $condition = [];
+
+ if (Mage::getSingleton('customer/session')->isLoggedIn()) {
+ $condition['customer_id'] = Mage::getSingleton('customer/session')->getCustomerId();
+ } elseif ($this->_customerId) {
+ $condition['customer_id'] = $this->_customerId;
+ } else {
+ $condition['visitor_id'] = Mage::getSingleton('log/visitor')->getId();
+ }
+
+ return $condition;
+ }
+
/**
* Sort loaded collection by predefined items ids
*
@@ -183,20 +199,4 @@ protected function _afterLoad()
$this->_sort();
return $result;
}
-
- /**
- * Add exclude Product Ids
- *
- * @param int|array $productIds
- * @return Mage_Reports_Model_Resource_Product_Index_Collection_Abstract
- */
- public function excludeProductIds($productIds)
- {
- if (empty($productIds)) {
- return $this;
- }
- $this->_joinIdxTable();
- $this->getSelect()->where('idx_table.product_id NOT IN(?)', $productIds);
- return $this;
- }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php
index a4122f7f5e5..0a8ec125a08 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php
@@ -43,86 +43,6 @@ class Mage_Reports_Model_Resource_Product_Lowstock_Collection extends Mage_Repor
*/
protected $_inventoryItemTableAlias = 'lowstock_inventory_item';
- /**
- * Retrieve CatalogInventory Stock Item Resource instance
- *
- * @return Mage_CatalogInventory_Model_Resource_Stock_Item
- */
- protected function _getInventoryItemResource()
- {
- if ($this->_inventoryItemResource === null) {
- $this->_inventoryItemResource = Mage::getResourceSingleton('cataloginventory/stock_item');
- }
- return $this->_inventoryItemResource;
- }
-
- /**
- * Retrieve CatalogInventory Stock Item Table
- *
- * @return string
- */
- protected function _getInventoryItemTable()
- {
- return $this->_getInventoryItemResource()->getMainTable();
- }
-
- /**
- * Retrieve CatalogInventory Stock Item Table Id field name
- *
- * @return string
- */
- protected function _getInventoryItemIdField()
- {
- return $this->_getInventoryItemResource()->getIdFieldName();
- }
-
- /**
- * Retrieve alias for CatalogInventory Stock Item Table
- *
- * @return string
- */
- protected function _getInventoryItemTableAlias()
- {
- return $this->_inventoryItemTableAlias;
- }
-
- /**
- * Add catalog inventory stock item field to select
- *
- * @param string $field
- * @param string $alias
- * @return $this
- */
- protected function _addInventoryItemFieldToSelect($field, $alias = null)
- {
- if (empty($alias)) {
- $alias = $field;
- }
-
- if (isset($this->_joinFields[$alias])) {
- return $this;
- }
-
- $this->_joinFields[$alias] = [
- 'table' => $this->_getInventoryItemTableAlias(),
- 'field' => $field,
- ];
-
- $this->getSelect()->columns([$alias => $field], $this->_getInventoryItemTableAlias());
- return $this;
- }
-
- /**
- * Retrieve catalog inventory stock item field correlation name
- *
- * @param string $field
- * @return string
- */
- protected function _getInventoryItemField($field)
- {
- return sprintf('%s.%s', $this->_getInventoryItemTableAlias(), $field);
- }
-
/**
* Join catalog inventory stock item table for further stock_item values filters
*
@@ -229,4 +149,84 @@ public function useNotifyStockQtyFilter($storeId = null)
$this->getSelect()->where('qty < ?', $notifyStockExpr);
return $this;
}
+
+ /**
+ * Retrieve CatalogInventory Stock Item Resource instance
+ *
+ * @return Mage_CatalogInventory_Model_Resource_Stock_Item
+ */
+ protected function _getInventoryItemResource()
+ {
+ if ($this->_inventoryItemResource === null) {
+ $this->_inventoryItemResource = Mage::getResourceSingleton('cataloginventory/stock_item');
+ }
+ return $this->_inventoryItemResource;
+ }
+
+ /**
+ * Retrieve CatalogInventory Stock Item Table
+ *
+ * @return string
+ */
+ protected function _getInventoryItemTable()
+ {
+ return $this->_getInventoryItemResource()->getMainTable();
+ }
+
+ /**
+ * Retrieve CatalogInventory Stock Item Table Id field name
+ *
+ * @return string
+ */
+ protected function _getInventoryItemIdField()
+ {
+ return $this->_getInventoryItemResource()->getIdFieldName();
+ }
+
+ /**
+ * Retrieve alias for CatalogInventory Stock Item Table
+ *
+ * @return string
+ */
+ protected function _getInventoryItemTableAlias()
+ {
+ return $this->_inventoryItemTableAlias;
+ }
+
+ /**
+ * Add catalog inventory stock item field to select
+ *
+ * @param string $field
+ * @param string $alias
+ * @return $this
+ */
+ protected function _addInventoryItemFieldToSelect($field, $alias = null)
+ {
+ if (empty($alias)) {
+ $alias = $field;
+ }
+
+ if (isset($this->_joinFields[$alias])) {
+ return $this;
+ }
+
+ $this->_joinFields[$alias] = [
+ 'table' => $this->_getInventoryItemTableAlias(),
+ 'field' => $field,
+ ];
+
+ $this->getSelect()->columns([$alias => $field], $this->_getInventoryItemTableAlias());
+ return $this;
+ }
+
+ /**
+ * Retrieve catalog inventory stock item field correlation name
+ *
+ * @param string $field
+ * @return string
+ */
+ protected function _getInventoryItemField($field)
+ {
+ return sprintf('%s.%s', $this->_getInventoryItemTableAlias(), $field);
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php
index 66fd53aa588..65cbb6cab7c 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php
@@ -22,22 +22,6 @@
*/
class Mage_Reports_Model_Resource_Product_Ordered_Collection extends Mage_Reports_Model_Resource_Product_Collection
{
- /**
- * Join fields
- *
- * @param string $from
- * @param string $to
- * @return $this
- */
- protected function _joinFields($from = '', $to = '')
- {
- $this->addAttributeToSelect('*')
- ->addOrderedQty($from, $to)
- ->setOrder('ordered_qty', self::SORT_ORDER_DESC);
-
- return $this;
- }
-
/**
* @param int $from
* @param int $to
@@ -63,4 +47,19 @@ public function setStoreIds($storeIds)
$this->addStoreFilter($storeId);
return $this;
}
+ /**
+ * Join fields
+ *
+ * @param string $from
+ * @param string $to
+ * @return $this
+ */
+ protected function _joinFields($from = '', $to = '')
+ {
+ $this->addAttributeToSelect('*')
+ ->addOrderedQty($from, $to)
+ ->setOrder('ordered_qty', self::SORT_ORDER_DESC);
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php
index d34b20df032..0124f9a10fa 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php
@@ -22,17 +22,6 @@
*/
class Mage_Reports_Model_Resource_Product_Sold_Collection extends Mage_Reports_Model_Resource_Product_Collection
{
- /**
- * Initialize resources
- *
- */
- protected function _construct()
- {
- parent::_construct();
- $this->_useAnalyticFunction = true;
- // skip adding stock information to collection for performance reasons
- $this->setFlag('no_stock_data', true);
- }
/**
* Set Date range to collection
*
@@ -61,6 +50,17 @@ public function setStoreIds($storeIds)
}
return $this;
}
+ /**
+ * Initialize resources
+ *
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_useAnalyticFunction = true;
+ // skip adding stock information to collection for performance reasons
+ $this->setFlag('no_stock_data', true);
+ }
/**
* Add website product limitation
diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php
index b686cdfbb5d..70c3e02cde8 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php
@@ -29,20 +29,6 @@ class Mage_Reports_Model_Resource_Product_Viewed_Collection extends Mage_Reports
*/
protected $_storeIds = [];
- /**
- * Join fields
- *
- * @param string $from
- * @param string $to
- * @return $this
- */
- protected function _joinFields($from = '', $to = '')
- {
- $this->addAttributeToSelect('*')
- ->addViewsCount($from, $to);
- return $this;
- }
-
/**
* Set date range
*
@@ -88,6 +74,20 @@ public function addStoreIds($storeIds)
return $this;
}
+ /**
+ * Join fields
+ *
+ * @param string $from
+ * @param string $to
+ * @return $this
+ */
+ protected function _joinFields($from = '', $to = '')
+ {
+ $this->addAttributeToSelect('*')
+ ->addViewsCount($from, $to);
+ return $this;
+ }
+
/**
* Apply store filter
*
diff --git a/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php
index d6c7631f949..7483ed7c546 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php
@@ -52,15 +52,6 @@ public function setSelectCountSqlType($type)
return $this;
}
- protected function _construct()
- {
- parent::_construct();
- /**
- * Allow to use analytic function
- */
- $this->_useAnalyticFunction = true;
- }
-
/**
* Prepare for abandoned report
*
@@ -296,4 +287,13 @@ public function getSelectCountSql()
return $countSelect;
}
+
+ protected function _construct()
+ {
+ parent::_construct();
+ /**
+ * Allow to use analytic function
+ */
+ $this->_useAnalyticFunction = true;
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php
index 71b1a6713cf..ea5a3d01f5d 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php
@@ -29,6 +29,57 @@ abstract class Mage_Reports_Model_Resource_Report_Abstract extends Mage_Core_Mod
*/
protected $_flag = null;
+ /**
+ * Retrieve query for attribute with timezone conversion
+ *
+ * @param string|array $table
+ * @param string $column
+ * @param mixed $from
+ * @param mixed $to
+ * @param int|string|Mage_Core_Model_Store|null $store
+ * @return string
+ */
+ public function getStoreTZOffsetQuery($table, $column, $from = null, $to = null, $store = null)
+ {
+ $column = $this->_getWriteAdapter()->quoteIdentifier($column);
+
+ if (is_null($from)) {
+ $selectOldest = $this->_getWriteAdapter()->select()
+ ->from(
+ $table,
+ ["MIN($column)"],
+ );
+ $from = $this->_getWriteAdapter()->fetchOne($selectOldest);
+ }
+
+ $periods = $this->_getTZOffsetTransitions(
+ Mage::app()->getLocale()->storeDate($store)->toString(Zend_Date::TIMEZONE_NAME),
+ $from,
+ $to,
+ );
+ if (empty($periods)) {
+ return $column;
+ }
+
+ $query = '';
+ $periodsCount = count($periods);
+
+ $i = 0;
+ foreach ($periods as $offset => $timestamps) {
+ $subParts = [];
+ foreach ($timestamps as $ts) {
+ $subParts[] = "($column between {$ts['from']} and {$ts['to']})";
+ }
+
+ $then = $this->_getWriteAdapter()
+ ->getDateAddSql($column, $offset, Varien_Db_Adapter_Interface::INTERVAL_SECOND);
+
+ $query .= (++$i == $periodsCount) ? $then : 'CASE WHEN ' . implode(' OR ', $subParts) . " THEN $then ELSE ";
+ }
+
+ return $query . str_repeat('END ', count($periods) - 1);
+ }
+
/**
* Retrieve flag object
*
@@ -343,57 +394,6 @@ protected function _checkDates(&$from, &$to)
return $this;
}
- /**
- * Retrieve query for attribute with timezone conversion
- *
- * @param string|array $table
- * @param string $column
- * @param mixed $from
- * @param mixed $to
- * @param int|string|Mage_Core_Model_Store|null $store
- * @return string
- */
- public function getStoreTZOffsetQuery($table, $column, $from = null, $to = null, $store = null)
- {
- $column = $this->_getWriteAdapter()->quoteIdentifier($column);
-
- if (is_null($from)) {
- $selectOldest = $this->_getWriteAdapter()->select()
- ->from(
- $table,
- ["MIN($column)"],
- );
- $from = $this->_getWriteAdapter()->fetchOne($selectOldest);
- }
-
- $periods = $this->_getTZOffsetTransitions(
- Mage::app()->getLocale()->storeDate($store)->toString(Zend_Date::TIMEZONE_NAME),
- $from,
- $to,
- );
- if (empty($periods)) {
- return $column;
- }
-
- $query = '';
- $periodsCount = count($periods);
-
- $i = 0;
- foreach ($periods as $offset => $timestamps) {
- $subParts = [];
- foreach ($timestamps as $ts) {
- $subParts[] = "($column between {$ts['from']} and {$ts['to']})";
- }
-
- $then = $this->_getWriteAdapter()
- ->getDateAddSql($column, $offset, Varien_Db_Adapter_Interface::INTERVAL_SECOND);
-
- $query .= (++$i == $periodsCount) ? $then : 'CASE WHEN ' . implode(' OR ', $subParts) . " THEN $then ELSE ";
- }
-
- return $query . str_repeat('END ', count($periods) - 1);
- }
-
/**
* Retrieve transitions for offsets of given timezone
*
diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
index ac754b5b074..aece9e0b61b 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
@@ -71,8 +71,6 @@ class Mage_Reports_Model_Resource_Report_Collection
*/
protected $_storeIds;
- protected function _construct() {}
-
/**
* Set period
*
@@ -290,4 +288,6 @@ public function timeShift($datetime)
->utcDate(null, $datetime, true, Varien_Date::DATETIME_INTERNAL_FORMAT)
->toString(Varien_Date::DATETIME_INTERNAL_FORMAT);
}
+
+ protected function _construct() {}
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php
index b502f0a6e38..8f79c5a99c5 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php
@@ -125,24 +125,6 @@ public function setPeriod($period)
return $this;
}
- /**
- * Apply date range filter
- *
- * @return $this
- */
- protected function _applyDateRangeFilter()
- {
- // Remember that field PERIOD is a DATE(YYYY-MM-DD) in all databases including Oracle
- if ($this->_from !== null) {
- $this->getSelect()->where('period >= ?', $this->_from);
- }
- if ($this->_to !== null) {
- $this->getSelect()->where('period <= ?', $this->_to);
- }
-
- return $this;
- }
-
/**
* Set store ids
*
@@ -155,48 +137,6 @@ public function addStoreFilter($storeIds)
return $this;
}
- /**
- * Apply stores filter to select object
- *
- * @return $this
- */
- protected function _applyStoresFilterToSelect(Zend_Db_Select $select)
- {
- $nullCheck = false;
- $storeIds = $this->_storesIds;
-
- if (!is_array($storeIds)) {
- $storeIds = [$storeIds];
- }
-
- $storeIds = array_unique($storeIds);
-
- if ($index = array_search(null, $storeIds)) {
- unset($storeIds[$index]);
- $nullCheck = true;
- }
-
- $storeIds[0] = ($storeIds[0] == '') ? 0 : $storeIds[0];
-
- if ($nullCheck) {
- $select->where('store_id IN(?) OR store_id IS NULL', $storeIds);
- } else {
- $select->where('store_id IN(?)', $storeIds);
- }
-
- return $this;
- }
-
- /**
- * Apply stores filter
- *
- * @return $this
- */
- protected function _applyStoresFilter()
- {
- return $this->_applyStoresFilterToSelect($this->getSelect());
- }
-
/**
* Set apply filters flag
*
@@ -239,16 +179,6 @@ public function isSubTotals($flag = null)
return $this;
}
- /**
- * Custom filters application ability
- *
- * @return $this
- */
- protected function _applyCustomFilter()
- {
- return $this;
- }
-
/**
* Load data
* Redeclare parent load method just for adding method _beforeLoad
@@ -268,4 +198,74 @@ public function load($printQuery = false, $logQuery = false)
}
return parent::load($printQuery, $logQuery);
}
+
+ /**
+ * Apply date range filter
+ *
+ * @return $this
+ */
+ protected function _applyDateRangeFilter()
+ {
+ // Remember that field PERIOD is a DATE(YYYY-MM-DD) in all databases including Oracle
+ if ($this->_from !== null) {
+ $this->getSelect()->where('period >= ?', $this->_from);
+ }
+ if ($this->_to !== null) {
+ $this->getSelect()->where('period <= ?', $this->_to);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Apply stores filter to select object
+ *
+ * @return $this
+ */
+ protected function _applyStoresFilterToSelect(Zend_Db_Select $select)
+ {
+ $nullCheck = false;
+ $storeIds = $this->_storesIds;
+
+ if (!is_array($storeIds)) {
+ $storeIds = [$storeIds];
+ }
+
+ $storeIds = array_unique($storeIds);
+
+ if ($index = array_search(null, $storeIds)) {
+ unset($storeIds[$index]);
+ $nullCheck = true;
+ }
+
+ $storeIds[0] = ($storeIds[0] == '') ? 0 : $storeIds[0];
+
+ if ($nullCheck) {
+ $select->where('store_id IN(?) OR store_id IS NULL', $storeIds);
+ } else {
+ $select->where('store_id IN(?)', $storeIds);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Apply stores filter
+ *
+ * @return $this
+ */
+ protected function _applyStoresFilter()
+ {
+ return $this->_applyStoresFilterToSelect($this->getSelect());
+ }
+
+ /**
+ * Custom filters application ability
+ *
+ * @return $this
+ */
+ protected function _applyCustomFilter()
+ {
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php
index 6ef0b3d2ab1..0ef41e81149 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php
@@ -26,11 +26,6 @@ class Mage_Reports_Model_Resource_Report_Product_Viewed extends Mage_Sales_Model
public const AGGREGATION_MONTHLY = 'reports/viewed_aggregated_monthly';
public const AGGREGATION_YEARLY = 'reports/viewed_aggregated_yearly';
- protected function _construct()
- {
- $this->_init(self::AGGREGATION_DAILY, 'id');
- }
-
/**
* Aggregate products view data
*
@@ -212,4 +207,9 @@ public function aggregate($from = null, $to = null)
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init(self::AGGREGATION_DAILY, 'id');
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php
index dbe8d77391d..ea378c07b4a 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php
@@ -51,6 +51,45 @@ public function __construct()
$this->_applyFilters = false;
}
+ /**
+ * Get SQL for get record count
+ *
+ * @return Varien_Db_Select
+ */
+ public function getSelectCountSql()
+ {
+ $this->_renderFilters();
+ $select = clone $this->getSelect();
+ $select->reset(Zend_Db_Select::ORDER);
+ return $this->getConnection()->select()->from($select, 'COUNT(*)');
+ }
+
+ /**
+ * Set ids for store restrictions
+ *
+ * @param array $storeIds
+ * @return $this
+ */
+ public function addStoreRestrictions($storeIds)
+ {
+ if (!is_array($storeIds)) {
+ $storeIds = [$storeIds];
+ }
+ $currentStoreIds = $this->_storesIds;
+ if (isset($currentStoreIds) && $currentStoreIds != Mage_Core_Model_App::ADMIN_STORE_ID
+ && $currentStoreIds != [Mage_Core_Model_App::ADMIN_STORE_ID]
+ ) {
+ if (!is_array($currentStoreIds)) {
+ $currentStoreIds = [$currentStoreIds];
+ }
+ $this->_storesIds = array_intersect($currentStoreIds, $storeIds);
+ } else {
+ $this->_storesIds = $storeIds;
+ }
+
+ return $this;
+ }
+
/**
* Retrieve selected columns
*
@@ -157,45 +196,6 @@ protected function _initSelect()
return $this;
}
- /**
- * Get SQL for get record count
- *
- * @return Varien_Db_Select
- */
- public function getSelectCountSql()
- {
- $this->_renderFilters();
- $select = clone $this->getSelect();
- $select->reset(Zend_Db_Select::ORDER);
- return $this->getConnection()->select()->from($select, 'COUNT(*)');
- }
-
- /**
- * Set ids for store restrictions
- *
- * @param array $storeIds
- * @return $this
- */
- public function addStoreRestrictions($storeIds)
- {
- if (!is_array($storeIds)) {
- $storeIds = [$storeIds];
- }
- $currentStoreIds = $this->_storesIds;
- if (isset($currentStoreIds) && $currentStoreIds != Mage_Core_Model_App::ADMIN_STORE_ID
- && $currentStoreIds != [Mage_Core_Model_App::ADMIN_STORE_ID]
- ) {
- if (!is_array($currentStoreIds)) {
- $currentStoreIds = [$currentStoreIds];
- }
- $this->_storesIds = array_intersect($currentStoreIds, $storeIds);
- } else {
- $this->_storesIds = $storeIds;
- }
-
- return $this;
- }
-
/**
* Redeclare parent method for applying filters after parent method
* but before adding unions and calculating totals
diff --git a/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php
index 125751e9e26..d65ebcd0cce 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Reports_Model_Resource_Review_Collection extends Mage_Review_Model_Resource_Review_Collection
{
- protected function _construct()
- {
- $this->_init('review/review');
- }
-
/**
* @param string|int $productId
* @return $this
@@ -84,4 +79,8 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('review/review');
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php
index bd278c7e146..0bca92cbf31 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Reports_Model_Resource_Review_Product_Collection extends Mage_Catalog_Model_Resource_Product_Collection
{
- protected function _construct()
- {
- parent::_construct();
- $this->_useAnalyticFunction = true;
- }
/**
* Join review table to result
*
@@ -116,4 +111,9 @@ public function getSelectCountSql()
return $countSelect;
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_useAnalyticFunction = true;
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php
index 3d56c8c1dfc..d1422f5bacc 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php
@@ -23,30 +23,29 @@
class Mage_Reports_Model_Resource_Shopcart_Product_Collection extends Mage_Reports_Model_Resource_Product_Collection
{
/**
- * Join fields
+ * Set date range
*
+ * @param string $from
+ * @param string $to
* @return $this
*/
- protected function _joinFields()
+ public function setDateRange($from, $to)
{
- parent::_joinFields();
- $this->addAttributeToSelect('price')
- ->addCartsCount()
- ->addOrdersCount();
-
+ $this->getSelect()->reset();
return $this;
}
-
/**
- * Set date range
+ * Join fields
*
- * @param string $from
- * @param string $to
* @return $this
*/
- public function setDateRange($from, $to)
+ protected function _joinFields()
{
- $this->getSelect()->reset();
+ parent::_joinFields();
+ $this->addAttributeToSelect('price')
+ ->addCartsCount()
+ ->addOrdersCount();
+
return $this;
}
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php
index 998ac3a7f5f..8cd77fd492b 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Reports_Model_Resource_Tag_Customer_Collection extends Mage_Tag_Model_Resource_Customer_Collection
{
- protected function _construct()
- {
- parent::_construct();
- $this->_useAnalyticFunction = true;
- }
/**
* Add target count
*
@@ -56,4 +51,9 @@ public function getSelectCountSql()
return $countSelect;
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_useAnalyticFunction = true;
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php
index b225dedf8d7..9b9ed83a7b5 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php
@@ -22,14 +22,6 @@
*/
class Mage_Reports_Model_Resource_Tag_Product_Collection extends Mage_Tag_Model_Resource_Product_Collection
{
- protected function _construct()
- {
- parent::_construct();
- /**
- * Allow to use analytic function
- */
- $this->_useAnalyticFunction = true;
- }
/**
* Add unique target count to result
*
@@ -131,6 +123,14 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
return $this;
}
+ protected function _construct()
+ {
+ parent::_construct();
+ /**
+ * Allow to use analytic function
+ */
+ $this->_useAnalyticFunction = true;
+ }
/**
* Join fields
diff --git a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php
index 89527da9aaa..a63a7b5e95f 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php
@@ -28,12 +28,6 @@ class Mage_Reports_Model_Resource_Wishlist_Collection extends Mage_Core_Model_Re
* @var string
*/
protected $_wishlistTable;
-
- protected function _construct()
- {
- $this->_init('wishlist/wishlist');
- $this->setWishlistTable($this->getTable('wishlist/wishlist'));
- }
/**
* Set wishlist table name
*
@@ -102,4 +96,10 @@ public function getSharedCount()
->group('wt.wishlist_id');
return $countSelect->getAdapter()->fetchOne($countSelect);
}
+
+ protected function _construct()
+ {
+ $this->_init('wishlist/wishlist');
+ $this->setWishlistTable($this->getTable('wishlist/wishlist'));
+ }
}
diff --git a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php
index eb7cff24923..f46d6b750c3 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Reports_Model_Resource_Wishlist_Product_Collection extends Mage_Wishlist_Model_Resource_Product_Collection
{
- protected function _construct()
- {
- $this->_init('wishlist/wishlist');
- }
-
/**
* @return $this
*/
@@ -106,4 +101,8 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('wishlist/wishlist');
+ }
}
diff --git a/app/code/core/Mage/Review/Block/Customer/List.php b/app/code/core/Mage/Review/Block/Customer/List.php
index 435624b02a0..48e5b22db8b 100644
--- a/app/code/core/Mage/Review/Block/Customer/List.php
+++ b/app/code/core/Mage/Review/Block/Customer/List.php
@@ -29,18 +29,6 @@ class Mage_Review_Block_Customer_List extends Mage_Customer_Block_Account_Dashbo
*/
protected $_collection;
- /**
- * Initializes collection
- */
- protected function _construct()
- {
- $this->_collection = Mage::getModel('review/review')->getProductCollection();
- $this->_collection
- ->addStoreFilter(Mage::app()->getStore()->getId())
- ->addCustomerFilter(Mage::getSingleton('customer/session')->getCustomerId())
- ->setDateOrder();
- }
-
/**
* Gets collection items count
*
@@ -61,30 +49,6 @@ public function getToolbarHtml()
return $this->getChildHtml('toolbar');
}
- /**
- * Initializes toolbar
- *
- * @return Mage_Core_Block_Abstract
- */
- protected function _prepareLayout()
- {
- $toolbar = $this->getLayout()->createBlock('page/html_pager', 'customer_review_list.toolbar')
- ->setCollection($this->getCollection());
-
- $this->setChild('toolbar', $toolbar);
- return parent::_prepareLayout();
- }
-
- /**
- * Get collection
- *
- * @return Mage_Review_Model_Resource_Review_Product_Collection
- */
- protected function _getCollection()
- {
- return $this->_collection;
- }
-
/**
* Get collection
*
@@ -126,6 +90,42 @@ public function dateFormat($date)
return $this->formatDate($date, Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
}
+ /**
+ * Initializes collection
+ */
+ protected function _construct()
+ {
+ $this->_collection = Mage::getModel('review/review')->getProductCollection();
+ $this->_collection
+ ->addStoreFilter(Mage::app()->getStore()->getId())
+ ->addCustomerFilter(Mage::getSingleton('customer/session')->getCustomerId())
+ ->setDateOrder();
+ }
+
+ /**
+ * Initializes toolbar
+ *
+ * @return Mage_Core_Block_Abstract
+ */
+ protected function _prepareLayout()
+ {
+ $toolbar = $this->getLayout()->createBlock('page/html_pager', 'customer_review_list.toolbar')
+ ->setCollection($this->getCollection());
+
+ $this->setChild('toolbar', $toolbar);
+ return parent::_prepareLayout();
+ }
+
+ /**
+ * Get collection
+ *
+ * @return Mage_Review_Model_Resource_Review_Product_Collection
+ */
+ protected function _getCollection()
+ {
+ return $this->_collection;
+ }
+
/**
* @return Mage_Core_Block_Abstract
*/
diff --git a/app/code/core/Mage/Review/Block/Customer/Recent.php b/app/code/core/Mage/Review/Block/Customer/Recent.php
index 8be5f909d59..9f2910929d8 100644
--- a/app/code/core/Mage/Review/Block/Customer/Recent.php
+++ b/app/code/core/Mage/Review/Block/Customer/Recent.php
@@ -51,14 +51,6 @@ public function count()
return $this->_collection->getSize();
}
- /**
- * @return Mage_Review_Model_Resource_Review_Product_Collection
- */
- protected function _getCollection()
- {
- return $this->_collection;
- }
-
/**
* @return Mage_Review_Model_Resource_Review_Product_Collection
*/
@@ -108,4 +100,12 @@ public function getReviewUrl($id)
{
return Mage::getUrl('review/customer/view', ['id' => $id]);
}
+
+ /**
+ * @return Mage_Review_Model_Resource_Review_Product_Collection
+ */
+ protected function _getCollection()
+ {
+ return $this->_collection;
+ }
}
diff --git a/app/code/core/Mage/Review/Block/Product/View.php b/app/code/core/Mage/Review/Block/Product/View.php
index 3bc9638c625..c9cfba8f4e1 100644
--- a/app/code/core/Mage/Review/Block/Product/View.php
+++ b/app/code/core/Mage/Review/Block/Product/View.php
@@ -24,19 +24,6 @@ class Mage_Review_Block_Product_View extends Mage_Catalog_Block_Product_View
{
protected $_reviewsCollection;
- /**
- * Render block HTML
- *
- * @inheritDoc
- * @throws Mage_Core_Exception
- */
- protected function _toHtml()
- {
- $this->getProduct()->setShortDescription(null);
-
- return parent::_toHtml();
- }
-
/**
* Replace review summary html with more detailed review summary
* Reviews collection count will be jerked here
@@ -86,4 +73,17 @@ public function hasOptions()
{
return false;
}
+
+ /**
+ * Render block HTML
+ *
+ * @inheritDoc
+ * @throws Mage_Core_Exception
+ */
+ protected function _toHtml()
+ {
+ $this->getProduct()->setShortDescription(null);
+
+ return parent::_toHtml();
+ }
}
diff --git a/app/code/core/Mage/Review/Block/Product/View/List.php b/app/code/core/Mage/Review/Block/Product/View/List.php
index 6866a5205fc..4c94dadfabd 100644
--- a/app/code/core/Mage/Review/Block/Product/View/List.php
+++ b/app/code/core/Mage/Review/Block/Product/View/List.php
@@ -32,6 +32,15 @@ public function getProductId()
return Mage::registry('product')->getId();
}
+ /**
+ * @param int $id
+ * @return string
+ */
+ public function getReviewUrl($id)
+ {
+ return Mage::getUrl('review/product/view', ['id' => $id]);
+ }
+
/**
* @return $this
* @throws Mage_Core_Model_Store_Exception
@@ -59,13 +68,4 @@ protected function _beforeToHtml()
->addRateVotes();
return parent::_beforeToHtml();
}
-
- /**
- * @param int $id
- * @return string
- */
- public function getReviewUrl($id)
- {
- return Mage::getUrl('review/product/view', ['id' => $id]);
- }
}
diff --git a/app/code/core/Mage/Review/Model/Resource/Review.php b/app/code/core/Mage/Review/Model/Resource/Review.php
index 5bf7e3b039b..fe29b4d1f4f 100644
--- a/app/code/core/Mage/Review/Model/Resource/Review.php
+++ b/app/code/core/Mage/Review/Model/Resource/Review.php
@@ -72,6 +72,189 @@ class Mage_Review_Model_Resource_Review extends Mage_Core_Model_Resource_Db_Abst
// phpcs:ignore Ecg.PHP.PrivateClassMember.PrivateClassMemberError
private $_deleteCache = [];
+ /**
+ * Perform actions after object delete
+ *
+ * @return $this
+ */
+ public function afterDeleteCommit(Mage_Core_Model_Abstract $object)
+ {
+ $readAdapter = $this->_getReadAdapter();
+ $select = $readAdapter->select()
+ ->from(
+ $this->_reviewTable,
+ [
+ 'review_count' => new Zend_Db_Expr('COUNT(*)'),
+ ],
+ )
+ ->where('entity_id = ?', $object->getEntityId())
+ ->where('entity_pk_value = ?', $object->getEntityPkValue());
+ $totalReviews = $readAdapter->fetchOne($select);
+ if ($totalReviews == 0) {
+ $this->_getWriteAdapter()->delete($this->_aggregateTable, [
+ 'entity_type = ?' => $object->getEntityId(),
+ 'entity_pk_value = ?' => $object->getEntityPkValue(),
+ ]);
+ return $this;
+ }
+
+ $this->aggregate($object);
+
+ // re-aggregate ratings, that depended on this review
+ $this->_aggregateRatings(
+ $this->_deleteCache['ratingIds'],
+ $this->_deleteCache['entityPkValue'],
+ );
+ $this->_deleteCache = [];
+
+ return $this;
+ }
+
+ /**
+ * Retrieves total reviews
+ *
+ * @param int $entityPkValue
+ * @param bool $approvedOnly
+ * @param int $storeId
+ * @return int
+ */
+ public function getTotalReviews($entityPkValue, $approvedOnly = false, $storeId = 0)
+ {
+ $adapter = $this->_getReadAdapter();
+ $select = $adapter->select()
+ ->from(
+ $this->_reviewTable,
+ [
+ 'review_count' => new Zend_Db_Expr('COUNT(*)'),
+ ],
+ )
+ ->where("{$this->_reviewTable}.entity_pk_value = :pk_value");
+ $bind = [':pk_value' => $entityPkValue];
+ if ($storeId > 0) {
+ $select->join(
+ ['store' => $this->_reviewStoreTable],
+ $this->_reviewTable . '.review_id=store.review_id AND store.store_id = :store_id',
+ [],
+ );
+ $bind[':store_id'] = (int) $storeId;
+ }
+ if ($approvedOnly) {
+ $select->where("{$this->_reviewTable}.status_id = :status_id");
+ $bind[':status_id'] = Mage_Review_Model_Review::STATUS_APPROVED;
+ }
+ return $adapter->fetchOne($select, $bind);
+ }
+
+ /**
+ * Aggregate
+ *
+ * @param Mage_Core_Model_Abstract|Mage_Review_Model_Review $object
+ */
+ public function aggregate($object)
+ {
+ $readAdapter = $this->_getReadAdapter();
+ $writeAdapter = $this->_getWriteAdapter();
+ $ratingModel = Mage::getModel('rating/rating');
+
+ if (!$object->getEntityPkValue() && $object->getId()) {
+ $object->load($object->getReviewId());
+ }
+
+ $ratingSummaries = $ratingModel->getEntitySummary($object->getEntityPkValue(), false);
+
+ foreach ($ratingSummaries as $ratingSummaryObject) {
+ if ($ratingSummaryObject->getCount()) {
+ $ratingSummary = round($ratingSummaryObject->getSum() / $ratingSummaryObject->getCount());
+ } else {
+ $ratingSummary = $ratingSummaryObject->getSum();
+ }
+
+ $reviewsCount = $this->getTotalReviews(
+ $object->getEntityPkValue(),
+ true,
+ $ratingSummaryObject->getStoreId(),
+ );
+ $select = $readAdapter->select()
+ ->from($this->_aggregateTable)
+ ->where('entity_pk_value = :pk_value')
+ ->where('entity_type = :entity_type')
+ ->where('store_id = :store_id');
+ $bind = [
+ ':pk_value' => $object->getEntityPkValue(),
+ ':entity_type' => $object->getEntityId(),
+ ':store_id' => $ratingSummaryObject->getStoreId(),
+ ];
+ $oldData = $readAdapter->fetchRow($select, $bind);
+
+ $data = new Varien_Object();
+
+ $data->setReviewsCount($reviewsCount)
+ ->setEntityPkValue($object->getEntityPkValue())
+ ->setEntityType($object->getEntityId())
+ ->setRatingSummary(($ratingSummary > 0) ? $ratingSummary : 0)
+ ->setStoreId($ratingSummaryObject->getStoreId());
+
+ $writeAdapter->beginTransaction();
+ try {
+ if (isset($oldData['primary_id']) && $oldData['primary_id'] > 0) {
+ $condition = ["{$this->_aggregateTable}.primary_id = ?" => $oldData['primary_id']];
+ $writeAdapter->update($this->_aggregateTable, $data->getData(), $condition);
+ } else {
+ $writeAdapter->insert($this->_aggregateTable, $data->getData());
+ }
+ $writeAdapter->commit();
+ } catch (Exception $e) {
+ $writeAdapter->rollBack();
+ }
+ }
+ }
+
+ /**
+ * Reaggregate this review's ratings.
+ *
+ * @param int $reviewId
+ * @param int $entityPkValue
+ */
+ public function reAggregateReview($reviewId, $entityPkValue)
+ {
+ $this->_aggregateRatings($this->_loadVotedRatingIds($reviewId), $entityPkValue);
+ }
+
+ /**
+ * Get review entity type id by code
+ *
+ * @param string $entityCode
+ * @return int|bool
+ */
+ public function getEntityIdByCode($entityCode)
+ {
+ $adapter = $this->_getReadAdapter();
+ $select = $adapter->select()
+ ->from($this->_reviewEntityTable, ['entity_id'])
+ ->where('entity_code = :entity_code');
+ return $adapter->fetchOne($select, [':entity_code' => $entityCode]);
+ }
+
+ /**
+ * Delete reviews by product id.
+ * Better to call this method in transaction, because operation performed on two separated tables
+ *
+ * @param int $productId
+ * @return $this
+ */
+ public function deleteReviewsByProductId($productId)
+ {
+ $this->_getWriteAdapter()->delete($this->_reviewTable, [
+ 'entity_pk_value=?' => $productId,
+ 'entity_id=?' => $this->getEntityIdByCode(Mage_Review_Model_Review::ENTITY_PRODUCT_CODE),
+ ]);
+ $this->_getWriteAdapter()->delete($this->getTable('review/review_aggregate'), [
+ 'entity_pk_value=?' => $productId,
+ 'entity_type=?' => $this->getEntityIdByCode(Mage_Review_Model_Review::ENTITY_PRODUCT_CODE),
+ ]);
+ return $this;
+ }
+
/**
* Define main table. Define other tables name
*/
@@ -224,143 +407,6 @@ protected function _beforeDelete(Mage_Core_Model_Abstract $object)
return $this;
}
- /**
- * Perform actions after object delete
- *
- * @return $this
- */
- public function afterDeleteCommit(Mage_Core_Model_Abstract $object)
- {
- $readAdapter = $this->_getReadAdapter();
- $select = $readAdapter->select()
- ->from(
- $this->_reviewTable,
- [
- 'review_count' => new Zend_Db_Expr('COUNT(*)'),
- ],
- )
- ->where('entity_id = ?', $object->getEntityId())
- ->where('entity_pk_value = ?', $object->getEntityPkValue());
- $totalReviews = $readAdapter->fetchOne($select);
- if ($totalReviews == 0) {
- $this->_getWriteAdapter()->delete($this->_aggregateTable, [
- 'entity_type = ?' => $object->getEntityId(),
- 'entity_pk_value = ?' => $object->getEntityPkValue(),
- ]);
- return $this;
- }
-
- $this->aggregate($object);
-
- // re-aggregate ratings, that depended on this review
- $this->_aggregateRatings(
- $this->_deleteCache['ratingIds'],
- $this->_deleteCache['entityPkValue'],
- );
- $this->_deleteCache = [];
-
- return $this;
- }
-
- /**
- * Retrieves total reviews
- *
- * @param int $entityPkValue
- * @param bool $approvedOnly
- * @param int $storeId
- * @return int
- */
- public function getTotalReviews($entityPkValue, $approvedOnly = false, $storeId = 0)
- {
- $adapter = $this->_getReadAdapter();
- $select = $adapter->select()
- ->from(
- $this->_reviewTable,
- [
- 'review_count' => new Zend_Db_Expr('COUNT(*)'),
- ],
- )
- ->where("{$this->_reviewTable}.entity_pk_value = :pk_value");
- $bind = [':pk_value' => $entityPkValue];
- if ($storeId > 0) {
- $select->join(
- ['store' => $this->_reviewStoreTable],
- $this->_reviewTable . '.review_id=store.review_id AND store.store_id = :store_id',
- [],
- );
- $bind[':store_id'] = (int) $storeId;
- }
- if ($approvedOnly) {
- $select->where("{$this->_reviewTable}.status_id = :status_id");
- $bind[':status_id'] = Mage_Review_Model_Review::STATUS_APPROVED;
- }
- return $adapter->fetchOne($select, $bind);
- }
-
- /**
- * Aggregate
- *
- * @param Mage_Core_Model_Abstract|Mage_Review_Model_Review $object
- */
- public function aggregate($object)
- {
- $readAdapter = $this->_getReadAdapter();
- $writeAdapter = $this->_getWriteAdapter();
- $ratingModel = Mage::getModel('rating/rating');
-
- if (!$object->getEntityPkValue() && $object->getId()) {
- $object->load($object->getReviewId());
- }
-
- $ratingSummaries = $ratingModel->getEntitySummary($object->getEntityPkValue(), false);
-
- foreach ($ratingSummaries as $ratingSummaryObject) {
- if ($ratingSummaryObject->getCount()) {
- $ratingSummary = round($ratingSummaryObject->getSum() / $ratingSummaryObject->getCount());
- } else {
- $ratingSummary = $ratingSummaryObject->getSum();
- }
-
- $reviewsCount = $this->getTotalReviews(
- $object->getEntityPkValue(),
- true,
- $ratingSummaryObject->getStoreId(),
- );
- $select = $readAdapter->select()
- ->from($this->_aggregateTable)
- ->where('entity_pk_value = :pk_value')
- ->where('entity_type = :entity_type')
- ->where('store_id = :store_id');
- $bind = [
- ':pk_value' => $object->getEntityPkValue(),
- ':entity_type' => $object->getEntityId(),
- ':store_id' => $ratingSummaryObject->getStoreId(),
- ];
- $oldData = $readAdapter->fetchRow($select, $bind);
-
- $data = new Varien_Object();
-
- $data->setReviewsCount($reviewsCount)
- ->setEntityPkValue($object->getEntityPkValue())
- ->setEntityType($object->getEntityId())
- ->setRatingSummary(($ratingSummary > 0) ? $ratingSummary : 0)
- ->setStoreId($ratingSummaryObject->getStoreId());
-
- $writeAdapter->beginTransaction();
- try {
- if (isset($oldData['primary_id']) && $oldData['primary_id'] > 0) {
- $condition = ["{$this->_aggregateTable}.primary_id = ?" => $oldData['primary_id']];
- $writeAdapter->update($this->_aggregateTable, $data->getData(), $condition);
- } else {
- $writeAdapter->insert($this->_aggregateTable, $data->getData());
- }
- $writeAdapter->commit();
- } catch (Exception $e) {
- $writeAdapter->rollBack();
- }
- }
- }
-
/**
* Get rating IDs from review votes
*
@@ -405,50 +451,4 @@ protected function _aggregateRatings($ratingIds, $entityPkValue)
}
return $this;
}
-
- /**
- * Reaggregate this review's ratings.
- *
- * @param int $reviewId
- * @param int $entityPkValue
- */
- public function reAggregateReview($reviewId, $entityPkValue)
- {
- $this->_aggregateRatings($this->_loadVotedRatingIds($reviewId), $entityPkValue);
- }
-
- /**
- * Get review entity type id by code
- *
- * @param string $entityCode
- * @return int|bool
- */
- public function getEntityIdByCode($entityCode)
- {
- $adapter = $this->_getReadAdapter();
- $select = $adapter->select()
- ->from($this->_reviewEntityTable, ['entity_id'])
- ->where('entity_code = :entity_code');
- return $adapter->fetchOne($select, [':entity_code' => $entityCode]);
- }
-
- /**
- * Delete reviews by product id.
- * Better to call this method in transaction, because operation performed on two separated tables
- *
- * @param int $productId
- * @return $this
- */
- public function deleteReviewsByProductId($productId)
- {
- $this->_getWriteAdapter()->delete($this->_reviewTable, [
- 'entity_pk_value=?' => $productId,
- 'entity_id=?' => $this->getEntityIdByCode(Mage_Review_Model_Review::ENTITY_PRODUCT_CODE),
- ]);
- $this->_getWriteAdapter()->delete($this->getTable('review/review_aggregate'), [
- 'entity_pk_value=?' => $productId,
- 'entity_type=?' => $this->getEntityIdByCode(Mage_Review_Model_Review::ENTITY_PRODUCT_CODE),
- ]);
- return $this;
- }
}
diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Collection.php
index f0e333d1f36..029e2436364 100644
--- a/app/code/core/Mage/Review/Model/Resource/Review/Collection.php
+++ b/app/code/core/Mage/Review/Model/Resource/Review/Collection.php
@@ -65,37 +65,6 @@ class Mage_Review_Model_Resource_Review_Collection extends Mage_Core_Model_Resou
*/
protected $_addStoreDataFlag = false;
- /**
- * Define module
- *
- */
- protected function _construct()
- {
- $this->_init('review/review');
- $this->_reviewTable = $this->getTable('review/review');
- $this->_reviewDetailTable = $this->getTable('review/review_detail');
- $this->_reviewStatusTable = $this->getTable('review/review_status');
- $this->_reviewEntityTable = $this->getTable('review/review_entity');
- $this->_reviewStoreTable = $this->getTable('review/review_store');
- }
-
- /**
- * init select
- *
- * @return Mage_Review_Model_Resource_Review_Collection
- */
- protected function _initSelect()
- {
- parent::_initSelect();
- $this->getSelect()
- ->join(
- ['detail' => $this->_reviewDetailTable],
- 'main_table.review_id = detail.review_id',
- ['detail_id', 'title', 'detail', 'nickname', 'customer_id'],
- );
- return $this;
- }
-
/**
* @param int $customerId
* @return $this
@@ -273,6 +242,37 @@ public function load($printQuery = false, $logQuery = false)
return $this;
}
+ /**
+ * Define module
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('review/review');
+ $this->_reviewTable = $this->getTable('review/review');
+ $this->_reviewDetailTable = $this->getTable('review/review_detail');
+ $this->_reviewStatusTable = $this->getTable('review/review_status');
+ $this->_reviewEntityTable = $this->getTable('review/review_entity');
+ $this->_reviewStoreTable = $this->getTable('review/review_store');
+ }
+
+ /**
+ * init select
+ *
+ * @return Mage_Review_Model_Resource_Review_Collection
+ */
+ protected function _initSelect()
+ {
+ parent::_initSelect();
+ $this->getSelect()
+ ->join(
+ ['detail' => $this->_reviewDetailTable],
+ 'main_table.review_id = detail.review_id',
+ ['detail_id', 'title', 'detail', 'nickname', 'customer_id'],
+ );
+ return $this;
+ }
+
/**
* Add store data
*
diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php
index d4a4b646583..f5b9223d47d 100644
--- a/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php
+++ b/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php
@@ -50,30 +50,6 @@ class Mage_Review_Model_Resource_Review_Product_Collection extends Mage_Catalog_
*/
protected $_storesIds = [];
- /**
- * Define module
- *
- */
- protected function _construct()
- {
- $this->_init('catalog/product');
- $this->setRowIdFieldName('review_id');
- $this->_reviewStoreTable = Mage::getSingleton('core/resource')->getTableName('review/review_store');
- $this->_initTables();
- }
-
- /**
- * init select
- *
- * @return $this
- */
- protected function _initSelect()
- {
- parent::_initSelect();
- $this->_joinFields();
- return $this;
- }
-
/**
* Adds store filter into array
*
@@ -126,44 +102,6 @@ public function setStoreFilter($storeId)
return $this;
}
- /**
- * Applies all store filters in one place to prevent multiple joins in select
- *
- * @return $this
- */
- protected function _applyStoresFilterToSelect(?Zend_Db_Select $select = null)
- {
- $adapter = $this->getConnection();
- $storesIds = $this->_storesIds;
- if (is_null($select)) {
- $select = $this->getSelect();
- }
-
- if (is_array($storesIds) && (count($storesIds) == 1)) {
- $storesIds = array_shift($storesIds);
- }
-
- if (is_array($storesIds) && !empty($storesIds)) {
- $inCond = $adapter->prepareSqlCondition('store.store_id', ['in' => $storesIds]);
- $select->join(
- ['store' => $this->_reviewStoreTable],
- 'rt.review_id=store.review_id AND ' . $inCond,
- [],
- )
- ->group('rt.review_id');
-
- $this->_useAnalyticFunction = true;
- } else {
- $select->join(
- ['store' => $this->_reviewStoreTable],
- $adapter->quoteInto('rt.review_id=store.review_id AND store.store_id = ?', (int) $storesIds),
- [],
- );
- }
-
- return $this;
- }
-
/**
* Add stores data
*
@@ -259,33 +197,6 @@ public function addRateVotes()
return $this;
}
- /**
- * join fields to entity
- *
- * @return $this
- */
- protected function _joinFields()
- {
- $reviewTable = Mage::getSingleton('core/resource')->getTableName('review/review');
- $reviewDetailTable = Mage::getSingleton('core/resource')->getTableName('review/review_detail');
-
- $this->addAttributeToSelect('name')
- ->addAttributeToSelect('sku');
-
- $this->getSelect()
- ->join(
- ['rt' => $reviewTable],
- 'rt.entity_pk_value = e.entity_id',
- ['rt.review_id', 'review_created_at' => 'rt.created_at', 'rt.entity_pk_value', 'rt.status_id'],
- )
- ->join(
- ['rdt' => $reviewDetailTable],
- 'rdt.review_id = rt.review_id',
- ['rdt.title','rdt.nickname', 'rdt.detail', 'rdt.customer_id', 'rdt.store_id'],
- );
- return $this;
- }
-
/**
* Retrieve all ids for collection
*
@@ -411,6 +322,95 @@ public function getColumnValues($colName)
return $col;
}
+ /**
+ * Define module
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('catalog/product');
+ $this->setRowIdFieldName('review_id');
+ $this->_reviewStoreTable = Mage::getSingleton('core/resource')->getTableName('review/review_store');
+ $this->_initTables();
+ }
+
+ /**
+ * init select
+ *
+ * @return $this
+ */
+ protected function _initSelect()
+ {
+ parent::_initSelect();
+ $this->_joinFields();
+ return $this;
+ }
+
+ /**
+ * Applies all store filters in one place to prevent multiple joins in select
+ *
+ * @return $this
+ */
+ protected function _applyStoresFilterToSelect(?Zend_Db_Select $select = null)
+ {
+ $adapter = $this->getConnection();
+ $storesIds = $this->_storesIds;
+ if (is_null($select)) {
+ $select = $this->getSelect();
+ }
+
+ if (is_array($storesIds) && (count($storesIds) == 1)) {
+ $storesIds = array_shift($storesIds);
+ }
+
+ if (is_array($storesIds) && !empty($storesIds)) {
+ $inCond = $adapter->prepareSqlCondition('store.store_id', ['in' => $storesIds]);
+ $select->join(
+ ['store' => $this->_reviewStoreTable],
+ 'rt.review_id=store.review_id AND ' . $inCond,
+ [],
+ )
+ ->group('rt.review_id');
+
+ $this->_useAnalyticFunction = true;
+ } else {
+ $select->join(
+ ['store' => $this->_reviewStoreTable],
+ $adapter->quoteInto('rt.review_id=store.review_id AND store.store_id = ?', (int) $storesIds),
+ [],
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * join fields to entity
+ *
+ * @return $this
+ */
+ protected function _joinFields()
+ {
+ $reviewTable = Mage::getSingleton('core/resource')->getTableName('review/review');
+ $reviewDetailTable = Mage::getSingleton('core/resource')->getTableName('review/review_detail');
+
+ $this->addAttributeToSelect('name')
+ ->addAttributeToSelect('sku');
+
+ $this->getSelect()
+ ->join(
+ ['rt' => $reviewTable],
+ 'rt.entity_pk_value = e.entity_id',
+ ['rt.review_id', 'review_created_at' => 'rt.created_at', 'rt.entity_pk_value', 'rt.status_id'],
+ )
+ ->join(
+ ['rdt' => $reviewDetailTable],
+ 'rdt.review_id = rt.review_id',
+ ['rdt.title','rdt.nickname', 'rdt.detail', 'rdt.customer_id', 'rdt.store_id'],
+ );
+ return $this;
+ }
+
/**
* Action after load
*
diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php
index bb03a956cc9..e3216e5c661 100644
--- a/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php
+++ b/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php
@@ -30,21 +30,21 @@ class Mage_Review_Model_Resource_Review_Status_Collection extends Mage_Core_Mode
protected $_reviewStatusTable;
/**
- * Collection model initialization
+ * Convert items array to array for select options
*
+ * @return array
*/
- protected function _construct()
+ public function toOptionArray()
{
- $this->_init('review/review_status');
+ return parent::_toOptionArray('status_id', 'status_code');
}
/**
- * Convert items array to array for select options
+ * Collection model initialization
*
- * @return array
*/
- public function toOptionArray()
+ protected function _construct()
{
- return parent::_toOptionArray('status_id', 'status_code');
+ $this->_init('review/review_status');
}
}
diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Summary.php b/app/code/core/Mage/Review/Model/Resource/Review/Summary.php
index d7277fd7e35..d5a1e36c830 100644
--- a/app/code/core/Mage/Review/Model/Resource/Review/Summary.php
+++ b/app/code/core/Mage/Review/Model/Resource/Review/Summary.php
@@ -22,30 +22,6 @@
*/
class Mage_Review_Model_Resource_Review_Summary extends Mage_Core_Model_Resource_Db_Abstract
{
- /**
- * Define module
- *
- */
- protected function _construct()
- {
- $this->_init('review/review_aggregate', 'entity_pk_value');
- }
-
- /**
- * Retrieve select object for load object data
- *
- * @param string $field
- * @param mixed $value
- * @param Mage_Core_Model_Abstract $object
- * @return Varien_Db_Select
- */
- protected function _getLoadSelect($field, $value, $object)
- {
- $select = parent::_getLoadSelect($field, $value, $object);
- $select->where('store_id = ?', (int) $object->getStoreId());
- return $select;
- }
-
/**
* Reaggregate all data by rating summary
*
@@ -84,4 +60,27 @@ public function reAggregate($summary)
}
return $this;
}
+ /**
+ * Define module
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('review/review_aggregate', 'entity_pk_value');
+ }
+
+ /**
+ * Retrieve select object for load object data
+ *
+ * @param string $field
+ * @param mixed $value
+ * @param Mage_Core_Model_Abstract $object
+ * @return Varien_Db_Select
+ */
+ protected function _getLoadSelect($field, $value, $object)
+ {
+ $select = parent::_getLoadSelect($field, $value, $object);
+ $select->where('store_id = ?', (int) $object->getStoreId());
+ return $select;
+ }
}
diff --git a/app/code/core/Mage/Review/Model/Review.php b/app/code/core/Mage/Review/Model/Review.php
index a20d94d943b..14b97a5bd4d 100644
--- a/app/code/core/Mage/Review/Model/Review.php
+++ b/app/code/core/Mage/Review/Model/Review.php
@@ -45,13 +45,6 @@
*/
class Mage_Review_Model_Review extends Mage_Core_Model_Abstract
{
- /**
- * Event prefix for observer
- *
- * @var string
- */
- protected $_eventPrefix = 'review';
-
/**
* @deprecated after 1.3.2.4
*
@@ -69,11 +62,12 @@ class Mage_Review_Model_Review extends Mage_Core_Model_Abstract
public const STATUS_APPROVED = 1;
public const STATUS_PENDING = 2;
public const STATUS_NOT_APPROVED = 3;
-
- protected function _construct()
- {
- $this->_init('review/review');
- }
+ /**
+ * Event prefix for observer
+ *
+ * @var string
+ */
+ protected $_eventPrefix = 'review';
/**
* @return Mage_Review_Model_Resource_Review_Product_Collection
@@ -162,17 +156,6 @@ public function validate()
return $errors;
}
- /**
- * Perform actions after object delete
- *
- * @return Mage_Core_Model_Abstract
- */
- protected function _afterDeleteCommit()
- {
- $this->getResource()->afterDeleteCommit($this);
- return parent::_afterDeleteCommit();
- }
-
/**
* Append review summary to product collection
*
@@ -205,16 +188,6 @@ public function appendSummary($collection)
return $this;
}
- /**
- * @return Mage_Core_Model_Abstract
- * @throws Mage_Core_Exception
- */
- protected function _beforeDelete()
- {
- $this->_protectFromNonAdmin();
- return parent::_beforeDelete();
- }
-
/**
* Check if current review approved or not
*
@@ -251,4 +224,30 @@ public function getEntityIdByCode($entityCode)
{
return $this->getResource()->getEntityIdByCode($entityCode);
}
+
+ protected function _construct()
+ {
+ $this->_init('review/review');
+ }
+
+ /**
+ * Perform actions after object delete
+ *
+ * @return Mage_Core_Model_Abstract
+ */
+ protected function _afterDeleteCommit()
+ {
+ $this->getResource()->afterDeleteCommit($this);
+ return parent::_afterDeleteCommit();
+ }
+
+ /**
+ * @return Mage_Core_Model_Abstract
+ * @throws Mage_Core_Exception
+ */
+ protected function _beforeDelete()
+ {
+ $this->_protectFromNonAdmin();
+ return parent::_beforeDelete();
+ }
}
diff --git a/app/code/core/Mage/Review/controllers/CustomerController.php b/app/code/core/Mage/Review/controllers/CustomerController.php
index 4590121ea55..12956208328 100644
--- a/app/code/core/Mage/Review/controllers/CustomerController.php
+++ b/app/code/core/Mage/Review/controllers/CustomerController.php
@@ -36,28 +36,6 @@ public function preDispatch()
return $this;
}
- /**
- * Load review model with data by passed id.
- * Return false if review was not loaded or was not created by customer
- *
- * @param int $reviewId
- * @return bool|Mage_Review_Model_Review
- */
- protected function _loadReview($reviewId)
- {
- if (!$reviewId) {
- return false;
- }
-
- /** @var Mage_Review_Model_Review $review */
- $review = Mage::getModel('review/review')->load($reviewId);
- if (!$review->getId() || $review->getCustomerId() != Mage::getSingleton('customer/session')->getCustomerId()) {
- return false;
- }
-
- return $review;
- }
-
public function indexAction()
{
$this->loadLayout();
@@ -90,4 +68,26 @@ public function viewAction()
$this->getLayout()->getBlock('head')->setTitle($this->__('Review Details'));
$this->renderLayout();
}
+
+ /**
+ * Load review model with data by passed id.
+ * Return false if review was not loaded or was not created by customer
+ *
+ * @param int $reviewId
+ * @return bool|Mage_Review_Model_Review
+ */
+ protected function _loadReview($reviewId)
+ {
+ if (!$reviewId) {
+ return false;
+ }
+
+ /** @var Mage_Review_Model_Review $review */
+ $review = Mage::getModel('review/review')->load($reviewId);
+ if (!$review->getId() || $review->getCustomerId() != Mage::getSingleton('customer/session')->getCustomerId()) {
+ return false;
+ }
+
+ return $review;
+ }
}
diff --git a/app/code/core/Mage/Review/controllers/ProductController.php b/app/code/core/Mage/Review/controllers/ProductController.php
index c389c97602d..240f44bddd5 100644
--- a/app/code/core/Mage/Review/controllers/ProductController.php
+++ b/app/code/core/Mage/Review/controllers/ProductController.php
@@ -54,91 +54,6 @@ public function preDispatch()
return $this;
}
- /**
- * Initialize and check product
- *
- * @return Mage_Catalog_Model_Product|false
- */
- protected function _initProduct()
- {
- Mage::dispatchEvent('review_controller_product_init_before', ['controller_action' => $this]);
- $categoryId = (int) $this->getRequest()->getParam('category', false);
- $productId = (int) $this->getRequest()->getParam('id');
-
- $product = $this->_loadProduct($productId);
- if (!$product) {
- return false;
- }
-
- if ($categoryId) {
- $category = Mage::getModel('catalog/category')->load($categoryId);
- Mage::register('current_category', $category);
- }
-
- try {
- Mage::dispatchEvent('review_controller_product_init', ['product' => $product]);
- Mage::dispatchEvent('review_controller_product_init_after', [
- 'product' => $product,
- 'controller_action' => $this,
- ]);
- } catch (Mage_Core_Exception $e) {
- Mage::logException($e);
- return false;
- }
-
- return $product;
- }
-
- /**
- * Load product model with data by passed id.
- * Return false if product was not loaded or has incorrect status.
- *
- * @param int $productId
- * @return bool|Mage_Catalog_Model_Product
- */
- protected function _loadProduct($productId)
- {
- if (!$productId) {
- return false;
- }
-
- $product = Mage::getModel('catalog/product')
- ->setStoreId(Mage::app()->getStore()->getId())
- ->load($productId);
- /** @var Mage_Catalog_Model_Product $product */
- if (!$product->getId() || !$product->isVisibleInCatalog() || !$product->isVisibleInSiteVisibility()) {
- return false;
- }
-
- Mage::register('current_product', $product);
- Mage::register('product', $product);
-
- return $product;
- }
-
- /**
- * Load review model with data by passed id.
- * Return false if review was not loaded or review is not approved.
- *
- * @param int $reviewId
- * @return bool|Mage_Review_Model_Review
- */
- protected function _loadReview($reviewId)
- {
- if (!$reviewId) {
- return false;
- }
-
- $review = Mage::getModel('review/review')->load($reviewId);
- /** @var Mage_Review_Model_Review $review */
- if (!$review->getId() || !$review->isApproved() || !$review->isAvailableOnStore(Mage::app()->getStore())) {
- return false;
- }
-
- Mage::register('current_review', $review);
-
- return $review;
- }
/**
* Submit new review action
@@ -269,6 +184,91 @@ public function viewAction()
$this->_initLayoutMessages('catalog/session');
$this->renderLayout();
}
+ /**
+ * Initialize and check product
+ *
+ * @return Mage_Catalog_Model_Product|false
+ */
+ protected function _initProduct()
+ {
+ Mage::dispatchEvent('review_controller_product_init_before', ['controller_action' => $this]);
+ $categoryId = (int) $this->getRequest()->getParam('category', false);
+ $productId = (int) $this->getRequest()->getParam('id');
+
+ $product = $this->_loadProduct($productId);
+ if (!$product) {
+ return false;
+ }
+
+ if ($categoryId) {
+ $category = Mage::getModel('catalog/category')->load($categoryId);
+ Mage::register('current_category', $category);
+ }
+
+ try {
+ Mage::dispatchEvent('review_controller_product_init', ['product' => $product]);
+ Mage::dispatchEvent('review_controller_product_init_after', [
+ 'product' => $product,
+ 'controller_action' => $this,
+ ]);
+ } catch (Mage_Core_Exception $e) {
+ Mage::logException($e);
+ return false;
+ }
+
+ return $product;
+ }
+
+ /**
+ * Load product model with data by passed id.
+ * Return false if product was not loaded or has incorrect status.
+ *
+ * @param int $productId
+ * @return bool|Mage_Catalog_Model_Product
+ */
+ protected function _loadProduct($productId)
+ {
+ if (!$productId) {
+ return false;
+ }
+
+ $product = Mage::getModel('catalog/product')
+ ->setStoreId(Mage::app()->getStore()->getId())
+ ->load($productId);
+ /** @var Mage_Catalog_Model_Product $product */
+ if (!$product->getId() || !$product->isVisibleInCatalog() || !$product->isVisibleInSiteVisibility()) {
+ return false;
+ }
+
+ Mage::register('current_product', $product);
+ Mage::register('product', $product);
+
+ return $product;
+ }
+
+ /**
+ * Load review model with data by passed id.
+ * Return false if review was not loaded or review is not approved.
+ *
+ * @param int $reviewId
+ * @return bool|Mage_Review_Model_Review
+ */
+ protected function _loadReview($reviewId)
+ {
+ if (!$reviewId) {
+ return false;
+ }
+
+ $review = Mage::getModel('review/review')->load($reviewId);
+ /** @var Mage_Review_Model_Review $review */
+ if (!$review->getId() || !$review->isApproved() || !$review->isAvailableOnStore(Mage::app()->getStore())) {
+ return false;
+ }
+
+ Mage::register('current_review', $review);
+
+ return $review;
+ }
/**
* Load specific layout handles by product type id
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Abstract.php b/app/code/core/Mage/Rss/Block/Catalog/Abstract.php
index 07c386494e7..6f60aedccd9 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Abstract.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Abstract.php
@@ -52,42 +52,6 @@ class Mage_Rss_Block_Catalog_Abstract extends Mage_Rss_Block_Abstract
*/
protected $_mapRenderer = 'msrp_rss';
- /**
- * Return Price Block renderer for specified product type
- *
- * @param string $productTypeId Catalog Product type
- * @return Mage_Core_Block_Abstract
- */
- protected function _getPriceBlock($productTypeId)
- {
- if (!isset($this->_priceBlock[$productTypeId])) {
- $block = $this->_priceBlockDefaultType;
- if (isset($this->_priceBlockTypes[$productTypeId])) {
- if ($this->_priceBlockTypes[$productTypeId]['block'] != '') {
- $block = $this->_priceBlockTypes[$productTypeId]['block'];
- }
- }
- $this->_priceBlock[$productTypeId] = $this->getLayout()->createBlock($block);
- }
- 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;
- }
-
/**
* Returns product price html for RSS feed
*
@@ -128,4 +92,40 @@ public function addPriceBlockType($type, $block = '', $template = '')
];
}
}
+
+ /**
+ * Return Price Block renderer for specified product type
+ *
+ * @param string $productTypeId Catalog Product type
+ * @return Mage_Core_Block_Abstract
+ */
+ protected function _getPriceBlock($productTypeId)
+ {
+ if (!isset($this->_priceBlock[$productTypeId])) {
+ $block = $this->_priceBlockDefaultType;
+ if (isset($this->_priceBlockTypes[$productTypeId])) {
+ if ($this->_priceBlockTypes[$productTypeId]['block'] != '') {
+ $block = $this->_priceBlockTypes[$productTypeId]['block'];
+ }
+ }
+ $this->_priceBlock[$productTypeId] = $this->getLayout()->createBlock($block);
+ }
+ 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;
+ }
}
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Category.php b/app/code/core/Mage/Rss/Block/Catalog/Category.php
index ec5a5f8f9b8..3aafb89a86a 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Category.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Category.php
@@ -22,6 +22,46 @@
*/
class Mage_Rss_Block_Catalog_Category extends Mage_Rss_Block_Catalog_Abstract
{
+ /**
+ * Preparing data and adding to rss object
+ *
+ * @param array $args
+ */
+ public function addNewItemXmlCallback($args)
+ {
+ $product = $args['product'];
+ $product->setAllowedInRss(true);
+ $product->setAllowedPriceInRss(true);
+
+ Mage::dispatchEvent('rss_catalog_category_xml_callback', $args);
+
+ if (!$product->getAllowedInRss()) {
+ return;
+ }
+
+ /** @var Mage_Catalog_Helper_Image $helper */
+ $helper = $this->helper('catalog/image');
+
+ $description = ''
+ . '->resize(75, 75)
+ . ') | '
+ . '' . $product->getDescription();
+
+ if ($product->getAllowedPriceInRss()) {
+ $description .= $this->getPriceHtml($product, true);
+ }
+
+ $description .= ' |
';
+ $rssObj = $args['rssObj'];
+ $data = [
+ 'title' => $product->getName(),
+ 'link' => $product->getProductUrl(),
+ 'description' => $description,
+ ];
+
+ $rssObj->_addEntry($data);
+ }
/**
* @throws Exception
*/
@@ -104,45 +144,4 @@ protected function _toHtml()
}
return $rssObj->createRssXml();
}
-
- /**
- * Preparing data and adding to rss object
- *
- * @param array $args
- */
- public function addNewItemXmlCallback($args)
- {
- $product = $args['product'];
- $product->setAllowedInRss(true);
- $product->setAllowedPriceInRss(true);
-
- Mage::dispatchEvent('rss_catalog_category_xml_callback', $args);
-
- if (!$product->getAllowedInRss()) {
- return;
- }
-
- /** @var Mage_Catalog_Helper_Image $helper */
- $helper = $this->helper('catalog/image');
-
- $description = ''
- . '->resize(75, 75)
- . ') | '
- . '' . $product->getDescription();
-
- if ($product->getAllowedPriceInRss()) {
- $description .= $this->getPriceHtml($product, true);
- }
-
- $description .= ' |
';
- $rssObj = $args['rssObj'];
- $data = [
- 'title' => $product->getName(),
- 'link' => $product->getProductUrl(),
- 'description' => $description,
- ];
-
- $rssObj->_addEntry($data);
- }
}
diff --git a/app/code/core/Mage/Rss/Block/Catalog/New.php b/app/code/core/Mage/Rss/Block/Catalog/New.php
index e970ff22bf3..ad677096623 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/New.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/New.php
@@ -22,6 +22,51 @@
*/
class Mage_Rss_Block_Catalog_New extends Mage_Rss_Block_Catalog_Abstract
{
+ /**
+ * Preparing data and adding to rss object
+ *
+ * @param array $args
+ */
+ public function addNewItemXmlCallback($args)
+ {
+ $product = $args['product'];
+
+ $product->setAllowedInRss(true);
+ $product->setAllowedPriceInRss(true);
+ Mage::dispatchEvent('rss_catalog_new_xml_callback', $args);
+
+ if (!$product->getAllowedInRss()) {
+ //Skip adding product to RSS
+ return;
+ }
+
+ $allowedPriceInRss = $product->getAllowedPriceInRss();
+
+ /** @var Mage_Catalog_Helper_Image $helper */
+ $helper = $this->helper('catalog/image');
+
+ $product->setData($args['row']);
+ $description = ''
+ . '->resize(75, 75)
+ . ') | ' .
+ '' . $product->getDescription();
+
+ if ($allowedPriceInRss) {
+ $description .= $this->getPriceHtml($product, true);
+ }
+
+ $description .= ' | ' .
+ '
';
+
+ $rssObj = $args['rssObj'];
+ $data = [
+ 'title' => $product->getName(),
+ 'link' => $product->getProductUrl(),
+ 'description' => $description,
+ ];
+ $rssObj->_addEntry($data);
+ }
protected function _construct() {}
/**
@@ -101,50 +146,4 @@ protected function _toHtml()
return $rssObj->createRssXml();
}
-
- /**
- * Preparing data and adding to rss object
- *
- * @param array $args
- */
- public function addNewItemXmlCallback($args)
- {
- $product = $args['product'];
-
- $product->setAllowedInRss(true);
- $product->setAllowedPriceInRss(true);
- Mage::dispatchEvent('rss_catalog_new_xml_callback', $args);
-
- if (!$product->getAllowedInRss()) {
- //Skip adding product to RSS
- return;
- }
-
- $allowedPriceInRss = $product->getAllowedPriceInRss();
-
- /** @var Mage_Catalog_Helper_Image $helper */
- $helper = $this->helper('catalog/image');
-
- $product->setData($args['row']);
- $description = ''
- . '->resize(75, 75)
- . ') | ' .
- '' . $product->getDescription();
-
- if ($allowedPriceInRss) {
- $description .= $this->getPriceHtml($product, true);
- }
-
- $description .= ' | ' .
- '
';
-
- $rssObj = $args['rssObj'];
- $data = [
- 'title' => $product->getName(),
- 'link' => $product->getProductUrl(),
- 'description' => $description,
- ];
- $rssObj->_addEntry($data);
- }
}
diff --git a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php
index 94b723f4882..a34dd043a0b 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php
@@ -29,6 +29,30 @@ class Mage_Rss_Block_Catalog_NotifyStock extends Mage_Rss_Block_Abstract
*/
public const CACHE_TAG = 'block_html_rss_catalog_notifystock';
+ /**
+ * Adds single product to feed
+ *
+ * @param array $args
+ */
+ public function addNotifyItemXmlCallback($args)
+ {
+ $product = $args['product'];
+ $product->setData($args['row']);
+ $url = Mage::helper('adminhtml')->getUrl(
+ 'adminhtml/catalog_product/edit/',
+ ['id' => $product->getId(), '_secure' => true, '_nosecret' => true],
+ );
+ $qty = 1 * $product->getQty();
+ $description = Mage::helper('rss')->__('%s has reached a quantity of %s.', $product->getName(), $qty);
+ $rssObj = $args['rssObj'];
+ $data = [
+ 'title' => $product->getName(),
+ 'link' => $url,
+ 'description' => $description,
+ ];
+ $rssObj->_addEntry($data);
+ }
+
protected function _construct()
{
$this->setCacheTags([self::CACHE_TAG]);
@@ -92,28 +116,4 @@ protected function _toHtml()
return $rssObj->createRssXml();
}
-
- /**
- * Adds single product to feed
- *
- * @param array $args
- */
- public function addNotifyItemXmlCallback($args)
- {
- $product = $args['product'];
- $product->setData($args['row']);
- $url = Mage::helper('adminhtml')->getUrl(
- 'adminhtml/catalog_product/edit/',
- ['id' => $product->getId(), '_secure' => true, '_nosecret' => true],
- );
- $qty = 1 * $product->getQty();
- $description = Mage::helper('rss')->__('%s has reached a quantity of %s.', $product->getName(), $qty);
- $rssObj = $args['rssObj'];
- $data = [
- 'title' => $product->getName(),
- 'link' => $url,
- 'description' => $description,
- ];
- $rssObj->_addEntry($data);
- }
}
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Review.php b/app/code/core/Mage/Rss/Block/Catalog/Review.php
index c458c6a25a1..15a6540549f 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Review.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Review.php
@@ -29,6 +29,40 @@ class Mage_Rss_Block_Catalog_Review extends Mage_Rss_Block_Abstract
*/
public const CACHE_TAG = 'block_html_rss_catalog_review';
+ /**
+ * Format single RSS element
+ *
+ * @param array $args
+ */
+ public function addReviewItemXmlCallback($args)
+ {
+ $rssObj = $args['rssObj'];
+ $row = $args['row'];
+
+ $store = Mage::app()->getStore($row['store_id']);
+ $urlModel = Mage::getModel('core/url')->setStore($store);
+ $productUrl = $urlModel->getUrl('catalog/product/view', ['id' => $row['entity_id']]);
+ $reviewUrl = Mage::helper('adminhtml')->getUrl(
+ 'adminhtml/catalog_product_review/edit/',
+ ['id' => $row['review_id'], '_secure' => true, '_nosecret' => true],
+ );
+ $storeName = $store->getName();
+
+ $description = ''
+ . $this->__('Product: %s
', $productUrl, $row['name'])
+ . $this->__('Summary of review: %s
', $row['title'])
+ . $this->__('Review: %s
', $row['detail'])
+ . $this->__('Store: %s
', $storeName)
+ . $this->__('click here to view the review', $reviewUrl)
+ . '
';
+ $data = [
+ 'title' => $this->__('Product: "%s" review By: %s', $row['name'], $row['nickname']),
+ 'link' => 'test',
+ 'description' => $description,
+ ];
+ $rssObj->_addEntry($data);
+ }
+
/**
* Initialize cache
*/
@@ -78,38 +112,4 @@ protected function _toHtml()
);
return $rssObj->createRssXml();
}
-
- /**
- * Format single RSS element
- *
- * @param array $args
- */
- public function addReviewItemXmlCallback($args)
- {
- $rssObj = $args['rssObj'];
- $row = $args['row'];
-
- $store = Mage::app()->getStore($row['store_id']);
- $urlModel = Mage::getModel('core/url')->setStore($store);
- $productUrl = $urlModel->getUrl('catalog/product/view', ['id' => $row['entity_id']]);
- $reviewUrl = Mage::helper('adminhtml')->getUrl(
- 'adminhtml/catalog_product_review/edit/',
- ['id' => $row['review_id'], '_secure' => true, '_nosecret' => true],
- );
- $storeName = $store->getName();
-
- $description = ''
- . $this->__('Product: %s
', $productUrl, $row['name'])
- . $this->__('Summary of review: %s
', $row['title'])
- . $this->__('Review: %s
', $row['detail'])
- . $this->__('Store: %s
', $storeName)
- . $this->__('click here to view the review', $reviewUrl)
- . '
';
- $data = [
- 'title' => $this->__('Product: "%s" review By: %s', $row['name'], $row['nickname']),
- 'link' => 'test',
- 'description' => $description,
- ];
- $rssObj->_addEntry($data);
- }
}
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Special.php b/app/code/core/Mage/Rss/Block/Catalog/Special.php
index 977de87dc80..9f33295daca 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Special.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Special.php
@@ -29,6 +29,54 @@ class Mage_Rss_Block_Catalog_Special extends Mage_Rss_Block_Catalog_Abstract
*/
protected static $_currentDate = null;
+ /**
+ * Preparing data and adding to rss object
+ *
+ * @param array $args
+ * @throws Zend_Date_Exception
+ */
+ public function addSpecialXmlCallback($args)
+ {
+ if (!isset(self::$_currentDate)) {
+ self::$_currentDate = new Zend_Date();
+ }
+
+ // dispatch event to determine whether the product will eventually get to the result
+ $product = new Varien_Object(['allowed_in_rss' => true, 'allowed_price_in_rss' => true]);
+ $args['product'] = $product;
+ Mage::dispatchEvent('rss_catalog_special_xml_callback', $args);
+ if (!$product->getAllowedInRss()) {
+ return;
+ }
+
+ // add row to result and determine whether special price is active (less or equal to the final price)
+ $row = $args['row'];
+ $row['use_special'] = false;
+ $row['allowed_price_in_rss'] = $product->getAllowedPriceInRss();
+ if (isset($row['special_to_date']) && $row['final_price'] <= $row['special_price']
+ && $row['allowed_price_in_rss']
+ ) {
+ $compareDate = self::$_currentDate->compareDate($row['special_to_date'], Varien_Date::DATE_INTERNAL_FORMAT);
+ if ($compareDate === -1 || $compareDate === 0) {
+ $row['use_special'] = true;
+ }
+ }
+
+ $args['results'][] = $row;
+ }
+
+ /**
+ * Function for comparing two items in collection
+ *
+ * @param Varien_Object $a
+ * @param Varien_Object $b
+ * @return int
+ */
+ public function sortByStartDate($a, $b)
+ {
+ return $a['start_date'] > $b['start_date'] ? -1 : ($a['start_date'] < $b['start_date'] ? 1 : 0);
+ }
+
/**
* @throws Mage_Core_Model_Store_Exception
* @throws Exception
@@ -154,52 +202,4 @@ protected function _toHtml()
}
return $rssObj->createRssXml();
}
-
- /**
- * Preparing data and adding to rss object
- *
- * @param array $args
- * @throws Zend_Date_Exception
- */
- public function addSpecialXmlCallback($args)
- {
- if (!isset(self::$_currentDate)) {
- self::$_currentDate = new Zend_Date();
- }
-
- // dispatch event to determine whether the product will eventually get to the result
- $product = new Varien_Object(['allowed_in_rss' => true, 'allowed_price_in_rss' => true]);
- $args['product'] = $product;
- Mage::dispatchEvent('rss_catalog_special_xml_callback', $args);
- if (!$product->getAllowedInRss()) {
- return;
- }
-
- // add row to result and determine whether special price is active (less or equal to the final price)
- $row = $args['row'];
- $row['use_special'] = false;
- $row['allowed_price_in_rss'] = $product->getAllowedPriceInRss();
- if (isset($row['special_to_date']) && $row['final_price'] <= $row['special_price']
- && $row['allowed_price_in_rss']
- ) {
- $compareDate = self::$_currentDate->compareDate($row['special_to_date'], Varien_Date::DATE_INTERNAL_FORMAT);
- if ($compareDate === -1 || $compareDate === 0) {
- $row['use_special'] = true;
- }
- }
-
- $args['results'][] = $row;
- }
-
- /**
- * Function for comparing two items in collection
- *
- * @param Varien_Object $a
- * @param Varien_Object $b
- * @return int
- */
- public function sortByStartDate($a, $b)
- {
- return $a['start_date'] > $b['start_date'] ? -1 : ($a['start_date'] < $b['start_date'] ? 1 : 0);
- }
}
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Tag.php b/app/code/core/Mage/Rss/Block/Catalog/Tag.php
index 297f4ab9fa1..c6512fb29db 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Tag.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Tag.php
@@ -22,6 +22,49 @@
*/
class Mage_Rss_Block_Catalog_Tag extends Mage_Rss_Block_Catalog_Abstract
{
+ /**
+ * Preparing data and adding to rss object
+ *
+ * @param array $args
+ */
+ public function addTaggedItemXml($args)
+ {
+ $product = $args['product'];
+
+ $product->setAllowedInRss(true);
+ $product->setAllowedPriceInRss(true);
+ Mage::dispatchEvent('rss_catalog_tagged_item_xml_callback', $args);
+
+ if (!$product->getAllowedInRss()) {
+ //Skip adding product to RSS
+ return;
+ }
+
+ $allowedPriceInRss = $product->getAllowedPriceInRss();
+
+ /** @var Mage_Catalog_Helper_Image $helper */
+ $helper = $this->helper('catalog/image');
+
+ $product->unsetData()->load($args['row']['entity_id']);
+ $description = ''
+ . '->resize(75, 75)
+ . ') | '
+ . '' . $product->getDescription();
+
+ if ($allowedPriceInRss) {
+ $description .= $this->getPriceHtml($product, true);
+ }
+
+ $description .= ' |
';
+
+ $rssObj = $args['rssObj'];
+ $data = [
+ 'title' => $product->getName(),
+ 'link' => $product->getProductUrl(),
+ 'description' => $description,
+ ];
+ $rssObj->_addEntry($data);
+ }
protected function _construct()
{
/*
@@ -75,48 +118,4 @@ protected function _toHtml()
return $rssObj->createRssXml();
}
-
- /**
- * Preparing data and adding to rss object
- *
- * @param array $args
- */
- public function addTaggedItemXml($args)
- {
- $product = $args['product'];
-
- $product->setAllowedInRss(true);
- $product->setAllowedPriceInRss(true);
- Mage::dispatchEvent('rss_catalog_tagged_item_xml_callback', $args);
-
- if (!$product->getAllowedInRss()) {
- //Skip adding product to RSS
- return;
- }
-
- $allowedPriceInRss = $product->getAllowedPriceInRss();
-
- /** @var Mage_Catalog_Helper_Image $helper */
- $helper = $this->helper('catalog/image');
-
- $product->unsetData()->load($args['row']['entity_id']);
- $description = ''
- . '->resize(75, 75)
- . ') | '
- . '' . $product->getDescription();
-
- if ($allowedPriceInRss) {
- $description .= $this->getPriceHtml($product, true);
- }
-
- $description .= ' |
';
-
- $rssObj = $args['rssObj'];
- $data = [
- 'title' => $product->getName(),
- 'link' => $product->getProductUrl(),
- 'description' => $description,
- ];
- $rssObj->_addEntry($data);
- }
}
diff --git a/app/code/core/Mage/Rss/Block/List.php b/app/code/core/Mage/Rss/Block/List.php
index 00fecd43992..6e31a337213 100644
--- a/app/code/core/Mage/Rss/Block/List.php
+++ b/app/code/core/Mage/Rss/Block/List.php
@@ -26,25 +26,6 @@ class Mage_Rss_Block_List extends Mage_Core_Block_Template
protected $_rssFeeds = [];
- /**
- * Add Link elements to head
- *
- * @return $this
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _prepareLayout()
- {
- /** @var Mage_Page_Block_Html_Head $head */
- $head = $this->getLayout()->getBlock('head');
- $feeds = $this->getRssMiscFeeds();
- if ($head && !empty($feeds)) {
- foreach ($feeds as $feed) {
- $head->addItem('rss', $feed['url'], 'title="' . $feed['label'] . '"');
- }
- }
- return parent::_prepareLayout();
- }
-
/**
* Retrieve rss feeds
*
@@ -196,4 +177,23 @@ public function categoriesRssFeed()
}
}
}
+
+ /**
+ * Add Link elements to head
+ *
+ * @return $this
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ protected function _prepareLayout()
+ {
+ /** @var Mage_Page_Block_Html_Head $head */
+ $head = $this->getLayout()->getBlock('head');
+ $feeds = $this->getRssMiscFeeds();
+ if ($head && !empty($feeds)) {
+ foreach ($feeds as $feed) {
+ $head->addItem('rss', $feed['url'], 'title="' . $feed['label'] . '"');
+ }
+ }
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Rss/Block/Order/New.php b/app/code/core/Mage/Rss/Block/Order/New.php
index e070359aae6..e5fe4e5acc9 100644
--- a/app/code/core/Mage/Rss/Block/Order/New.php
+++ b/app/code/core/Mage/Rss/Block/Order/New.php
@@ -29,6 +29,28 @@ class Mage_Rss_Block_Order_New extends Mage_Core_Block_Template
*/
public const CACHE_TAG = 'block_html_rss_order_new';
+ /**
+ * @param array $args
+ */
+ public function addNewOrderXmlCallback($args)
+ {
+ $rssObj = $args['rssObj'];
+ $order = $args['order'];
+ $detailBlock = $args['detailBlock'];
+ $order->reset()->load($args['row']['entity_id']);
+ if ($order && $order->getId()) {
+ $title = Mage::helper('rss')->__('Order #%s created at %s', $order->getIncrementId(), $this->formatDate($order->getCreatedAt()));
+ $url = Mage::helper('adminhtml')->getUrl('adminhtml/sales_order/view', ['_secure' => true, 'order_id' => $order->getId(), '_nosecret' => true]);
+ $detailBlock->setOrder($order);
+ $data = [
+ 'title' => $title,
+ 'link' => $url,
+ 'description' => $detailBlock->toHtml(),
+ ];
+ $rssObj->_addEntry($data);
+ }
+ }
+
protected function _construct()
{
$this->setCacheTags([self::CACHE_TAG]);
@@ -81,26 +103,4 @@ protected function _toHtml()
return $rssObj->createRssXml();
}
-
- /**
- * @param array $args
- */
- public function addNewOrderXmlCallback($args)
- {
- $rssObj = $args['rssObj'];
- $order = $args['order'];
- $detailBlock = $args['detailBlock'];
- $order->reset()->load($args['row']['entity_id']);
- if ($order && $order->getId()) {
- $title = Mage::helper('rss')->__('Order #%s created at %s', $order->getIncrementId(), $this->formatDate($order->getCreatedAt()));
- $url = Mage::helper('adminhtml')->getUrl('adminhtml/sales_order/view', ['_secure' => true, 'order_id' => $order->getId(), '_nosecret' => true]);
- $detailBlock->setOrder($order);
- $data = [
- 'title' => $title,
- 'link' => $url,
- 'description' => $detailBlock->toHtml(),
- ];
- $rssObj->_addEntry($data);
- }
- }
}
diff --git a/app/code/core/Mage/Rss/Block/Wishlist.php b/app/code/core/Mage/Rss/Block/Wishlist.php
index aa650f287ee..08c22de2728 100644
--- a/app/code/core/Mage/Rss/Block/Wishlist.php
+++ b/app/code/core/Mage/Rss/Block/Wishlist.php
@@ -36,6 +36,36 @@ class Mage_Rss_Block_Wishlist extends Mage_Wishlist_Block_Abstract
*/
protected $_mapRenderer = 'msrp_rss';
+ /**
+ * Retrieve Product View URL
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @param array $additional
+ * @return string
+ */
+ public function getProductUrl($product, $additional = [])
+ {
+ $additional['_rss'] = true;
+ return parent::getProductUrl($product, $additional);
+ }
+
+ /**
+ * 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] = [
+ 'block' => $block,
+ 'template' => $template,
+ ];
+ }
+ }
+
/**
* Retrieve Wishlist model
*
@@ -178,34 +208,4 @@ protected function _toHtml()
return $rssObj->createRssXml();
}
-
- /**
- * Retrieve Product View URL
- *
- * @param Mage_Catalog_Model_Product $product
- * @param array $additional
- * @return string
- */
- public function getProductUrl($product, $additional = [])
- {
- $additional['_rss'] = true;
- return parent::getProductUrl($product, $additional);
- }
-
- /**
- * 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] = [
- 'block' => $block,
- 'template' => $template,
- ];
- }
- }
}
diff --git a/app/code/core/Mage/Rule/Model/Abstract.php b/app/code/core/Mage/Rule/Model/Abstract.php
index 4a8a6d6eea8..c62d09a551f 100644
--- a/app/code/core/Mage/Rule/Model/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Abstract.php
@@ -103,58 +103,6 @@ public function getProductFlatSelect($storeId)
return $resource->getProductFlatSelect($storeId, $this->getConditions());
}
- /**
- * Prepare data before saving
- *
- * @return Mage_Rule_Model_Abstract
- */
- protected function _beforeSave()
- {
- // Check if discount amount not negative
- if ($this->hasDiscountAmount()) {
- if ((int) $this->getDiscountAmount() < 0) {
- Mage::throwException(Mage::helper('rule')->__('Invalid discount amount.'));
- }
- }
-
- // Serialize conditions
- if ($this->getConditions()) {
- $this->setConditionsSerialized(serialize($this->getConditions()->asArray()));
- $this->unsConditions();
- }
-
- // Serialize actions
- if ($this->getActions()) {
- $this->setActionsSerialized(serialize($this->getActions()->asArray()));
- $this->unsActions();
- }
-
- /**
- * Prepare website Ids if applicable and if they were set as string in comma separated format.
- * Backwards compatibility.
- */
- if ($this->hasWebsiteIds()) {
- $websiteIds = $this->getWebsiteIds();
- if (is_string($websiteIds) && !empty($websiteIds)) {
- $this->setWebsiteIds(explode(',', $websiteIds));
- }
- }
-
- /**
- * Prepare customer group Ids if applicable and if they were set as string in comma separated format.
- * Backwards compatibility.
- */
- if ($this->hasCustomerGroupIds()) {
- $groupIds = $this->getCustomerGroupIds();
- if (is_string($groupIds) && !empty($groupIds)) {
- $this->setCustomerGroupIds(explode(',', $groupIds));
- }
- }
-
- parent::_beforeSave();
- return $this;
- }
-
/**
* Set rule combine conditions model
*
@@ -233,42 +181,6 @@ public function getActions()
return $this->_actions;
}
- /**
- * Reset rule combine conditions
- *
- * @param null|Mage_Rule_Model_Condition_Combine $conditions
- *
- * @return Mage_Rule_Model_Abstract
- */
- protected function _resetConditions($conditions = null)
- {
- if (is_null($conditions)) {
- $conditions = $this->getConditionsInstance();
- }
- $conditions->setRule($this)->setId('1')->setPrefix('conditions');
- $this->setConditions($conditions);
-
- return $this;
- }
-
- /**
- * Reset rule actions
- *
- * @param null|Mage_Rule_Model_Action_Collection $actions
- *
- * @return Mage_Rule_Model_Abstract
- */
- protected function _resetActions($actions = null)
- {
- if (is_null($actions)) {
- $actions = $this->getActionsInstance();
- }
- $actions->setRule($this)->setId('1')->setPrefix('actions');
- $this->setActions($actions);
-
- return $this;
- }
-
/**
* Rule form getter
*
@@ -301,48 +213,6 @@ public function loadPost(array $data)
return $this;
}
- /**
- * Set specified data to current rule.
- * Set conditions and actions recursively.
- * Convert dates into Zend_Date.
- *
- *
- * @return array
- */
- protected function _convertFlatToRecursive(array $data)
- {
- $arr = [];
- foreach ($data as $key => $value) {
- if (($key === 'conditions' || $key === 'actions') && is_array($value)) {
- foreach ($value as $id => $data) {
- $path = explode('--', $id);
- $node = & $arr;
- for ($i = 0, $l = count($path); $i < $l; $i++) {
- $node = & $node[$key][$path[$i]] ?? [];
- }
- foreach ($data as $k => $v) {
- $node[$k] = $v;
- }
- }
- } else {
- /**
- * Convert dates into Zend_Date
- */
- if (in_array($key, ['from_date', 'to_date']) && $value) {
- $value = Mage::app()->getLocale()->date(
- $value,
- Varien_Date::DATE_INTERNAL_FORMAT,
- null,
- false,
- );
- }
- $this->setData($key, $value);
- }
- }
-
- return $arr;
- }
-
/**
* Validate rule conditions to determine if rule can run
*
@@ -490,6 +360,136 @@ public function asArray(array $arrAttributes = [])
return [];
}
+ /**
+ * Prepare data before saving
+ *
+ * @return Mage_Rule_Model_Abstract
+ */
+ protected function _beforeSave()
+ {
+ // Check if discount amount not negative
+ if ($this->hasDiscountAmount()) {
+ if ((int) $this->getDiscountAmount() < 0) {
+ Mage::throwException(Mage::helper('rule')->__('Invalid discount amount.'));
+ }
+ }
+
+ // Serialize conditions
+ if ($this->getConditions()) {
+ $this->setConditionsSerialized(serialize($this->getConditions()->asArray()));
+ $this->unsConditions();
+ }
+
+ // Serialize actions
+ if ($this->getActions()) {
+ $this->setActionsSerialized(serialize($this->getActions()->asArray()));
+ $this->unsActions();
+ }
+
+ /**
+ * Prepare website Ids if applicable and if they were set as string in comma separated format.
+ * Backwards compatibility.
+ */
+ if ($this->hasWebsiteIds()) {
+ $websiteIds = $this->getWebsiteIds();
+ if (is_string($websiteIds) && !empty($websiteIds)) {
+ $this->setWebsiteIds(explode(',', $websiteIds));
+ }
+ }
+
+ /**
+ * Prepare customer group Ids if applicable and if they were set as string in comma separated format.
+ * Backwards compatibility.
+ */
+ if ($this->hasCustomerGroupIds()) {
+ $groupIds = $this->getCustomerGroupIds();
+ if (is_string($groupIds) && !empty($groupIds)) {
+ $this->setCustomerGroupIds(explode(',', $groupIds));
+ }
+ }
+
+ parent::_beforeSave();
+ return $this;
+ }
+
+ /**
+ * Reset rule combine conditions
+ *
+ * @param null|Mage_Rule_Model_Condition_Combine $conditions
+ *
+ * @return Mage_Rule_Model_Abstract
+ */
+ protected function _resetConditions($conditions = null)
+ {
+ if (is_null($conditions)) {
+ $conditions = $this->getConditionsInstance();
+ }
+ $conditions->setRule($this)->setId('1')->setPrefix('conditions');
+ $this->setConditions($conditions);
+
+ return $this;
+ }
+
+ /**
+ * Reset rule actions
+ *
+ * @param null|Mage_Rule_Model_Action_Collection $actions
+ *
+ * @return Mage_Rule_Model_Abstract
+ */
+ protected function _resetActions($actions = null)
+ {
+ if (is_null($actions)) {
+ $actions = $this->getActionsInstance();
+ }
+ $actions->setRule($this)->setId('1')->setPrefix('actions');
+ $this->setActions($actions);
+
+ return $this;
+ }
+
+ /**
+ * Set specified data to current rule.
+ * Set conditions and actions recursively.
+ * Convert dates into Zend_Date.
+ *
+ *
+ * @return array
+ */
+ protected function _convertFlatToRecursive(array $data)
+ {
+ $arr = [];
+ foreach ($data as $key => $value) {
+ if (($key === 'conditions' || $key === 'actions') && is_array($value)) {
+ foreach ($value as $id => $data) {
+ $path = explode('--', $id);
+ $node = & $arr;
+ for ($i = 0, $l = count($path); $i < $l; $i++) {
+ $node = & $node[$key][$path[$i]] ?? [];
+ }
+ foreach ($data as $k => $v) {
+ $node[$k] = $v;
+ }
+ }
+ } else {
+ /**
+ * Convert dates into Zend_Date
+ */
+ if (in_array($key, ['from_date', 'to_date']) && $value) {
+ $value = Mage::app()->getLocale()->date(
+ $value,
+ Varien_Date::DATE_INTERNAL_FORMAT,
+ null,
+ false,
+ );
+ }
+ $this->setData($key, $value);
+ }
+ }
+
+ return $arr;
+ }
+
/**
* Combine website ids to string
*
diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
index 6971636b985..24fb686c1a6 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
@@ -811,6 +811,24 @@ public function validateAttribute($validatedValue)
return $result;
}
+ /**
+ * @return bool
+ */
+ public function validate(Varien_Object $object)
+ {
+ return $this->validateAttribute($object->getData($this->getAttribute()));
+ }
+
+ /**
+ * Retrieve operator for php validation
+ *
+ * @return string
+ */
+ public function getOperatorForValidate()
+ {
+ return $this->getOperator();
+ }
+
/**
* Case and type insensitive comparison of values
*
@@ -832,22 +850,4 @@ protected function _compareValues($validatedValue, $value, $strict = true)
return (bool) preg_match('~' . $validatePattern . '~iu', $value);
}
}
-
- /**
- * @return bool
- */
- public function validate(Varien_Object $object)
- {
- return $this->validateAttribute($object->getData($this->getAttribute()));
- }
-
- /**
- * Retrieve operator for php validation
- *
- * @return string
- */
- public function getOperatorForValidate()
- {
- return $this->getOperator();
- }
}
diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php
index a462a0fc075..a603c60e0bd 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Combine.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Combine.php
@@ -36,6 +36,24 @@ class Mage_Rule_Model_Condition_Combine extends Mage_Rule_Model_Condition_Abstra
*/
protected static $_conditionModels = [];
+ public function __construct()
+ {
+ parent::__construct();
+ $this->setType('rule/condition_combine')
+ ->setAggregator('all')
+ ->setValue(true)
+ ->setConditions([])
+ ->setActions([]);
+
+ $this->loadAggregatorOptions();
+ if ($options = $this->getAggregatorOptions()) {
+ foreach (array_keys($options) as $aggregator) {
+ $this->setAggregator($aggregator);
+ break;
+ }
+ }
+ }
+
/**
* Prepare sql where by condition
*
@@ -55,53 +73,6 @@ public function prepareConditionSql()
$delimiter = $this->getAggregator() == 'all' ? ' AND ' : ' OR ';
return ' (' . implode($delimiter, $wheres) . ') ';
}
-
- /**
- * Retrieve new object for each requested model.
- * If model is requested first time, store it at static array.
- *
- * It's made by performance reasons to avoid initialization of same models each time when rules are being processed.
- *
- * @param string $modelClass
- * @return Mage_Rule_Model_Condition_Abstract|bool
- */
- protected function _getNewConditionModelInstance($modelClass)
- {
- if (empty($modelClass)) {
- return false;
- }
-
- if (!array_key_exists($modelClass, self::$_conditionModels)) {
- $model = Mage::getModel($modelClass);
- self::$_conditionModels[$modelClass] = $model;
- } else {
- $model = self::$_conditionModels[$modelClass];
- }
-
- if (!$model) {
- return false;
- }
-
- return clone $model;
- }
-
- public function __construct()
- {
- parent::__construct();
- $this->setType('rule/condition_combine')
- ->setAggregator('all')
- ->setValue(true)
- ->setConditions([])
- ->setActions([]);
-
- $this->loadAggregatorOptions();
- if ($options = $this->getAggregatorOptions()) {
- foreach (array_keys($options) as $aggregator) {
- $this->setAggregator($aggregator);
- break;
- }
- }
- }
/* start aggregator methods */
/**
* @return $this
@@ -414,6 +385,35 @@ public function setConditions($conditions)
return $this->setData($key, $conditions);
}
+ /**
+ * Retrieve new object for each requested model.
+ * If model is requested first time, store it at static array.
+ *
+ * It's made by performance reasons to avoid initialization of same models each time when rules are being processed.
+ *
+ * @param string $modelClass
+ * @return Mage_Rule_Model_Condition_Abstract|bool
+ */
+ protected function _getNewConditionModelInstance($modelClass)
+ {
+ if (empty($modelClass)) {
+ return false;
+ }
+
+ if (!array_key_exists($modelClass, self::$_conditionModels)) {
+ $model = Mage::getModel($modelClass);
+ self::$_conditionModels[$modelClass] = $model;
+ } else {
+ $model = self::$_conditionModels[$modelClass];
+ }
+
+ if (!$model) {
+ return false;
+ }
+
+ return clone $model;
+ }
+
/**
* Getter for "Conditions Combination" select option for recursive combines
*/
diff --git a/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php
index db1d868e1e4..6b331724d51 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php
@@ -153,15 +153,6 @@ public function getAttributeObject()
return $obj;
}
- /**
- * Add special attributes
- */
- protected function _addSpecialAttributes(array &$attributes)
- {
- $attributes['attribute_set_id'] = Mage::helper('catalogrule')->__('Attribute Set');
- $attributes['category_ids'] = Mage::helper('catalogrule')->__('Category');
- }
-
/**
* Load attribute options
*
@@ -192,65 +183,6 @@ public function loadAttributeOptions()
return $this;
}
- /**
- * Prepares values options to be used as select options or hashed array
- * Result is stored in following keys:
- * 'value_select_options' - normal select array: array(array('value' => $value, 'label' => $label), ...)
- * 'value_option' - hashed array: array($value => $label, ...),
- *
- * @return $this
- */
- protected function _prepareValueOptions()
- {
- // Check that both keys exist. Maybe somehow only one was set not in this routine, but externally.
- $selectReady = $this->getData('value_select_options');
- $hashedReady = $this->getData('value_option');
- if ($selectReady && $hashedReady) {
- return $this;
- }
-
- // Get array of select options. It will be used as source for hashed options
- $selectOptions = null;
- if ($this->getAttribute() === 'attribute_set_id') {
- $entityTypeId = Mage::getSingleton('eav/config')
- ->getEntityType(Mage_Catalog_Model_Product::ENTITY)->getId();
- $selectOptions = Mage::getResourceModel('eav/entity_attribute_set_collection')
- ->setEntityTypeFilter($entityTypeId)
- ->load()
- ->toOptionArray();
- } elseif (is_object($this->getAttributeObject())) {
- $attributeObject = $this->getAttributeObject();
- if ($attributeObject->usesSource()) {
- if ($attributeObject->getFrontendInput() == 'multiselect') {
- $addEmptyOption = false;
- } else {
- $addEmptyOption = true;
- }
- $selectOptions = $attributeObject->getSource()->getAllOptions($addEmptyOption);
- }
- }
-
- // Set new values only if we really got them
- if ($selectOptions !== null) {
- // Overwrite only not already existing values
- if (!$selectReady) {
- $this->setData('value_select_options', $selectOptions);
- }
- if (!$hashedReady) {
- $hashedOptions = [];
- foreach ($selectOptions as $o) {
- if (is_array($o['value'])) {
- continue; // We cannot use array as index
- }
- $hashedOptions[$o['value']] = $o['label'];
- }
- $this->setData('value_option', $hashedOptions);
- }
- }
-
- return $this;
- }
-
/**
* Retrieve value by option
*
@@ -588,4 +520,72 @@ public function correctOperator($operator, $inputType)
return $operator;
}
+
+ /**
+ * Add special attributes
+ */
+ protected function _addSpecialAttributes(array &$attributes)
+ {
+ $attributes['attribute_set_id'] = Mage::helper('catalogrule')->__('Attribute Set');
+ $attributes['category_ids'] = Mage::helper('catalogrule')->__('Category');
+ }
+
+ /**
+ * Prepares values options to be used as select options or hashed array
+ * Result is stored in following keys:
+ * 'value_select_options' - normal select array: array(array('value' => $value, 'label' => $label), ...)
+ * 'value_option' - hashed array: array($value => $label, ...),
+ *
+ * @return $this
+ */
+ protected function _prepareValueOptions()
+ {
+ // Check that both keys exist. Maybe somehow only one was set not in this routine, but externally.
+ $selectReady = $this->getData('value_select_options');
+ $hashedReady = $this->getData('value_option');
+ if ($selectReady && $hashedReady) {
+ return $this;
+ }
+
+ // Get array of select options. It will be used as source for hashed options
+ $selectOptions = null;
+ if ($this->getAttribute() === 'attribute_set_id') {
+ $entityTypeId = Mage::getSingleton('eav/config')
+ ->getEntityType(Mage_Catalog_Model_Product::ENTITY)->getId();
+ $selectOptions = Mage::getResourceModel('eav/entity_attribute_set_collection')
+ ->setEntityTypeFilter($entityTypeId)
+ ->load()
+ ->toOptionArray();
+ } elseif (is_object($this->getAttributeObject())) {
+ $attributeObject = $this->getAttributeObject();
+ if ($attributeObject->usesSource()) {
+ if ($attributeObject->getFrontendInput() == 'multiselect') {
+ $addEmptyOption = false;
+ } else {
+ $addEmptyOption = true;
+ }
+ $selectOptions = $attributeObject->getSource()->getAllOptions($addEmptyOption);
+ }
+ }
+
+ // Set new values only if we really got them
+ if ($selectOptions !== null) {
+ // Overwrite only not already existing values
+ if (!$selectReady) {
+ $this->setData('value_select_options', $selectOptions);
+ }
+ if (!$hashedReady) {
+ $hashedOptions = [];
+ foreach ($selectOptions as $o) {
+ if (is_array($o['value'])) {
+ continue; // We cannot use array as index
+ }
+ $hashedOptions[$o['value']] = $o['label'];
+ }
+ $this->setData('value_option', $hashedOptions);
+ }
+ }
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php
index 1d911f71dc5..141c8997cce 100644
--- a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php
@@ -53,24 +53,6 @@ abstract class Mage_Rule_Model_Resource_Rule_Collection_Abstract extends Mage_Co
*/
protected $_env;
- /**
- * Add website ids to rules data
- *
- * @return Mage_Rule_Model_Resource_Rule_Collection_Abstract
- */
- protected function _afterLoad()
- {
- parent::_afterLoad();
- if ($this->getFlag('add_websites_to_result') && $this->_items) {
- /** @var Mage_Rule_Model_Abstract $item */
- foreach ($this->_items as $item) {
- $item->afterLoad();
- }
- }
-
- return $this;
- }
-
/**
* Init flag for adding rule website ids to collection result
*
@@ -146,26 +128,6 @@ public function addIsActiveFilter($isActive = 1)
return $this;
}
- /**
- * Retrieve correspondent entity information (associations table name, columns names)
- * of rule's associated entity by specified entity type
- *
- * @param string $entityType
- *
- * @return array
- */
- protected function _getAssociatedEntityInfo($entityType)
- {
- if (isset($this->_associatedEntitiesMap[$entityType])) {
- return $this->_associatedEntitiesMap[$entityType];
- }
-
- throw Mage::exception(
- 'Mage_Core',
- Mage::helper('rule')->__('There is no information about associated entity type "%s".', $entityType),
- );
- }
-
/**
* Set environment for all rules in collection
*
@@ -214,4 +176,42 @@ public function process()
{
return $this;
}
+
+ /**
+ * Add website ids to rules data
+ *
+ * @return Mage_Rule_Model_Resource_Rule_Collection_Abstract
+ */
+ protected function _afterLoad()
+ {
+ parent::_afterLoad();
+ if ($this->getFlag('add_websites_to_result') && $this->_items) {
+ /** @var Mage_Rule_Model_Abstract $item */
+ foreach ($this->_items as $item) {
+ $item->afterLoad();
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Retrieve correspondent entity information (associations table name, columns names)
+ * of rule's associated entity by specified entity type
+ *
+ * @param string $entityType
+ *
+ * @return array
+ */
+ protected function _getAssociatedEntityInfo($entityType)
+ {
+ if (isset($this->_associatedEntitiesMap[$entityType])) {
+ return $this->_associatedEntitiesMap[$entityType];
+ }
+
+ throw Mage::exception(
+ 'Mage_Core',
+ Mage::helper('rule')->__('There is no information about associated entity type "%s".', $entityType),
+ );
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
index 520a89c23b2..9e42f21a814 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
@@ -29,15 +29,6 @@
*/
class Mage_Sales_Block_Adminhtml_Billing_Agreement_View_Tab_Info extends Mage_Adminhtml_Block_Abstract implements Mage_Adminhtml_Block_Widget_Tab_Interface
{
- /**
- * Set custom template
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('sales/billing/agreement/view/tab/info.phtml');
- }
-
/**
* Return Tab label
*
@@ -77,6 +68,14 @@ public function isHidden()
{
return false;
}
+ /**
+ * Set custom template
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('sales/billing/agreement/view/tab/info.phtml');
+ }
/**
* Retrieve billing agreement model
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php
index ac7b94d9c5c..f332c8aa7c7 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php
@@ -32,19 +32,6 @@ public function __construct()
$this->setId('billing_agreement_orders');
}
- /**
- * Prepare related orders collection
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareCollection()
- {
- $collection = Mage::getResourceModel('sales/order_grid_collection');
- $collection->addBillingAgreementsFilter(Mage::registry('current_billing_agreement')->getId());
- $this->setCollection($collection);
- return Mage_Adminhtml_Block_Widget_Grid::_prepareCollection();
- }
-
/**
* Return Tab label
*
@@ -105,6 +92,19 @@ public function getExportTypes()
return false;
}
+ /**
+ * Prepare related orders collection
+ *
+ * @return Mage_Adminhtml_Block_Widget_Grid
+ */
+ protected function _prepareCollection()
+ {
+ $collection = Mage::getResourceModel('sales/order_grid_collection');
+ $collection->addBillingAgreementsFilter(Mage::registry('current_billing_agreement')->getId());
+ $this->setCollection($collection);
+ return Mage_Adminhtml_Block_Widget_Grid::_prepareCollection();
+ }
+
/**
* Disable massaction in grid
*
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php
index c079412e0bb..3242974cdaa 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php
@@ -73,22 +73,6 @@ public function isHidden()
return false;
}
- /**
- * Prepare collection for grid
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareCollection()
- {
- $collection = Mage::getResourceModel('sales/recurring_profile_collection')
- ->addFieldToFilter('customer_id', Mage::registry('current_customer')->getId());
- if (!$this->getParam($this->getVarNameSort())) {
- $collection->setOrder('profile_id', 'desc');
- }
- $this->setCollection($collection);
- return Mage_Adminhtml_Block_Widget_Grid::_prepareCollection();
- }
-
/**
* Defines after which tab, this tab should be rendered
*
@@ -108,4 +92,20 @@ public function getGridUrl()
{
return $this->getUrl('*/sales_recurring_profile/customerGrid', ['_current' => true]);
}
+
+ /**
+ * Prepare collection for grid
+ *
+ * @return Mage_Adminhtml_Block_Widget_Grid
+ */
+ protected function _prepareCollection()
+ {
+ $collection = Mage::getResourceModel('sales/recurring_profile_collection')
+ ->addFieldToFilter('customer_id', Mage::registry('current_customer')->getId());
+ if (!$this->getParam($this->getVarNameSort())) {
+ $collection->setOrder('profile_id', 'desc');
+ }
+ $this->setCollection($collection);
+ return Mage_Adminhtml_Block_Widget_Grid::_prepareCollection();
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
index 6a45277464e..c55177cd3b3 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
@@ -72,6 +72,28 @@ public function setProductEntity(Mage_Catalog_Model_Product $product)
return $this;
}
+ /**
+ * Set readonly flag
+ *
+ * @param bool $isReadonly
+ * @return $this
+ */
+ public function setIsReadonly($isReadonly)
+ {
+ $this->_isReadOnly = $isReadonly;
+ return $this;
+ }
+
+ /**
+ * Get readonly flag
+ *
+ * @return bool
+ */
+ public function getIsReadonly()
+ {
+ return $this->_isReadOnly;
+ }
+
/**
* Instantiate a recurring payment profile to use it as a helper
*/
@@ -215,26 +237,4 @@ protected function _getPeriodUnitOptions($emptyLabel)
$this->_profile->getAllPeriodUnits(),
);
}
-
- /**
- * Set readonly flag
- *
- * @param bool $isReadonly
- * @return $this
- */
- public function setIsReadonly($isReadonly)
- {
- $this->_isReadOnly = $isReadonly;
- return $this;
- }
-
- /**
- * Get readonly flag
- *
- * @return bool
- */
- public function getIsReadonly()
- {
- return $this->_isReadOnly;
- }
}
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php
index 022799e9782..e4213a93e85 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php
@@ -31,6 +31,27 @@ public function __construct()
$this->setSaveParametersInSession(true);
}
+ /**
+ * Return row url for js event handlers
+ *
+ * @param Varien_Object $row
+ * @return string
+ */
+ public function getRowUrl($row)
+ {
+ return $this->getUrl('*/sales_recurring_profile/view', ['profile' => $row->getId()]);
+ }
+
+ /**
+ * Return grid url
+ *
+ * @return string
+ */
+ public function getGridUrl()
+ {
+ return $this->getUrl('*/*/grid', ['_current' => true]);
+ }
+
/**
* Prepare grid collection object
*
@@ -113,25 +134,4 @@ protected function _prepareColumns()
return parent::_prepareColumns();
}
-
- /**
- * Return row url for js event handlers
- *
- * @param Varien_Object $row
- * @return string
- */
- public function getRowUrl($row)
- {
- return $this->getUrl('*/sales_recurring_profile/view', ['profile' => $row->getId()]);
- }
-
- /**
- * Return grid url
- *
- * @return string
- */
- public function getGridUrl()
- {
- return $this->getUrl('*/*/grid', ['_current' => true]);
- }
}
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php
index ebaf38f772c..bbb3ffd7468 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php
@@ -22,17 +22,6 @@
*/
class Mage_Adminhtml_Block_Sales_Recurring_Profile_View_Items extends Mage_Adminhtml_Block_Sales_Items_Abstract
{
- /**
- * Retrieve required options from parent
- */
- protected function _beforeToHtml()
- {
- if (!$this->getParentBlock()) {
- Mage::throwException(Mage::helper('adminhtml')->__('Invalid parent block for this block'));
- }
- return parent::_beforeToHtml();
- }
-
/**
* Return current recurring profile
*
@@ -64,4 +53,14 @@ public function formatPrice($value)
$store = Mage::app()->getStore($this->_getRecurringProfile()->getStore());
return $store->formatPrice($value);
}
+ /**
+ * Retrieve required options from parent
+ */
+ protected function _beforeToHtml()
+ {
+ if (!$this->getParentBlock()) {
+ Mage::throwException(Mage::helper('adminhtml')->__('Invalid parent block for this block'));
+ }
+ return parent::_beforeToHtml();
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php
index 556d89085a4..106117262fa 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php
@@ -34,6 +34,83 @@ public function __construct()
;
}
+ /**
+ * Return row url for js event handlers
+ *
+ * @param Varien_Object $row
+ * @return string
+ */
+ public function getRowUrl($row)
+ {
+ return $this->getUrl('*/sales_order/view', ['order_id' => $row->getId()]);
+ }
+
+ /**
+ * Url for ajax grid submission
+ *
+ * @return string
+ */
+ public function getGridUrl()
+ {
+ return $this->getTabUrl();
+ }
+
+ /**
+ * Url for ajax tab
+ *
+ * @return string
+ */
+ public function getTabUrl()
+ {
+ return $this->getUrl('*/*/orders', ['profile' => Mage::registry('current_recurring_profile')->getId()]);
+ }
+
+ /**
+ * Class for ajax tab
+ *
+ * @return string
+ */
+ public function getTabClass()
+ {
+ return 'ajax';
+ }
+
+ /**
+ * Label getter
+ *
+ * @return string
+ */
+ public function getTabLabel()
+ {
+ return Mage::helper('sales')->__('Related Orders');
+ }
+
+ /**
+ * Same as label getter
+ *
+ * @return string
+ */
+ public function getTabTitle()
+ {
+ return $this->getTabLabel();
+ }
+
+ /**
+ * @return bool
+ */
+ public function canShowTab()
+ {
+ return true;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isHidden()
+ {
+ return false;
+ }
+
/**
* Prepare grid collection object
*
@@ -132,81 +209,4 @@ protected function _prepareColumns()
return parent::_prepareColumns();
}
-
- /**
- * Return row url for js event handlers
- *
- * @param Varien_Object $row
- * @return string
- */
- public function getRowUrl($row)
- {
- return $this->getUrl('*/sales_order/view', ['order_id' => $row->getId()]);
- }
-
- /**
- * Url for ajax grid submission
- *
- * @return string
- */
- public function getGridUrl()
- {
- return $this->getTabUrl();
- }
-
- /**
- * Url for ajax tab
- *
- * @return string
- */
- public function getTabUrl()
- {
- return $this->getUrl('*/*/orders', ['profile' => Mage::registry('current_recurring_profile')->getId()]);
- }
-
- /**
- * Class for ajax tab
- *
- * @return string
- */
- public function getTabClass()
- {
- return 'ajax';
- }
-
- /**
- * Label getter
- *
- * @return string
- */
- public function getTabLabel()
- {
- return Mage::helper('sales')->__('Related Orders');
- }
-
- /**
- * Same as label getter
- *
- * @return string
- */
- public function getTabTitle()
- {
- return $this->getTabLabel();
- }
-
- /**
- * @return bool
- */
- public function canShowTab()
- {
- return true;
- }
-
- /**
- * @return bool
- */
- public function isHidden()
- {
- return false;
- }
}
diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreements.php b/app/code/core/Mage/Sales/Block/Billing/Agreements.php
index 0acb7e2029f..c71fff57cc8 100644
--- a/app/code/core/Mage/Sales/Block/Billing/Agreements.php
+++ b/app/code/core/Mage/Sales/Block/Billing/Agreements.php
@@ -37,22 +37,6 @@ class Mage_Sales_Block_Billing_Agreements extends Mage_Core_Block_Template
*/
protected $_billingAgreements = null;
- /**
- * Set Billing Agreement instance
- *
- * @return Mage_Core_Block_Abstract
- */
- protected function _prepareLayout()
- {
- parent::_prepareLayout();
- $pager = $this->getLayout()->createBlock('page/html_pager')
- ->setCollection($this->getBillingAgreements())->setIsOutputRequired(false);
- $this->setChild('pager', $pager)
- ->setBackUrl($this->getUrl('customer/account/'));
- $this->getBillingAgreements()->load();
- return $this;
- }
-
/**
* Retrieve billing agreements collection
*
@@ -98,23 +82,6 @@ public function getItemValue(Mage_Sales_Model_Billing_Agreement $item, $key)
return $this->escapeHtml($value);
}
- /**
- * Load available billing agreement methods
- *
- * @return array
- */
- protected function _loadPaymentMethods()
- {
- if (!$this->_paymentMethods) {
- /** @var Mage_Payment_Helper_Data $helper */
- $helper = $this->helper('payment');
- foreach ($helper->getBillingAgreementMethods() as $paymentMethod) {
- $this->_paymentMethods[$paymentMethod->getCode()] = $paymentMethod->getTitle();
- }
- }
- return $this->_paymentMethods;
- }
-
/**
* Retrieve wizard payment options array
*
@@ -133,6 +100,39 @@ public function getWizardPaymentMethodOptions()
return $paymentMethodOptions;
}
+ /**
+ * Set Billing Agreement instance
+ *
+ * @return Mage_Core_Block_Abstract
+ */
+ protected function _prepareLayout()
+ {
+ parent::_prepareLayout();
+ $pager = $this->getLayout()->createBlock('page/html_pager')
+ ->setCollection($this->getBillingAgreements())->setIsOutputRequired(false);
+ $this->setChild('pager', $pager)
+ ->setBackUrl($this->getUrl('customer/account/'));
+ $this->getBillingAgreements()->load();
+ return $this;
+ }
+
+ /**
+ * Load available billing agreement methods
+ *
+ * @return array
+ */
+ protected function _loadPaymentMethods()
+ {
+ if (!$this->_paymentMethods) {
+ /** @var Mage_Payment_Helper_Data $helper */
+ $helper = $this->helper('payment');
+ foreach ($helper->getBillingAgreementMethods() as $paymentMethod) {
+ $this->_paymentMethods[$paymentMethod->getCode()] = $paymentMethod->getTitle();
+ }
+ }
+ return $this->_paymentMethods;
+ }
+
/**
* Set data to block
*
diff --git a/app/code/core/Mage/Sales/Block/Items/Abstract.php b/app/code/core/Mage/Sales/Block/Items/Abstract.php
index a707d029736..493e3ebad21 100644
--- a/app/code/core/Mage/Sales/Block/Items/Abstract.php
+++ b/app/code/core/Mage/Sales/Block/Items/Abstract.php
@@ -32,15 +32,6 @@ class Mage_Sales_Block_Items_Abstract extends Mage_Core_Block_Template
*/
protected $_itemRenders = [];
- /**
- * Initialize default item renderer
- */
- protected function _construct()
- {
- parent::_construct();
- $this->addItemRender('default', 'checkout/cart_item_renderer', 'checkout/cart/item/default.phtml');
- }
-
/**
* Add renderer for item product type
*
@@ -81,6 +72,30 @@ public function getItemRenderer($type)
return $this->_itemRenders[$type]['renderer'];
}
+ /**
+ * Get item row html
+ *
+ * @return string
+ */
+ public function getItemHtml(Varien_Object $item)
+ {
+ $type = $this->_getItemType($item);
+
+ $block = $this->getItemRenderer($type)
+ ->setItem($item);
+ $this->_prepareItem($block);
+ return $block->toHtml();
+ }
+
+ /**
+ * Initialize default item renderer
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->addItemRender('default', 'checkout/cart_item_renderer', 'checkout/cart/item/default.phtml');
+ }
+
/**
* Prepare item before output
*
@@ -107,19 +122,4 @@ protected function _getItemType(Varien_Object $item)
}
return $type;
}
-
- /**
- * Get item row html
- *
- * @return string
- */
- public function getItemHtml(Varien_Object $item)
- {
- $type = $this->_getItemType($item);
-
- $block = $this->getItemRenderer($type)
- ->setItem($item);
- $this->_prepareItem($block);
- return $block->toHtml();
- }
}
diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo.php
index cb5a195e537..56460ebf8cc 100644
--- a/app/code/core/Mage/Sales/Block/Order/Creditmemo.php
+++ b/app/code/core/Mage/Sales/Block/Order/Creditmemo.php
@@ -22,33 +22,6 @@
*/
class Mage_Sales_Block_Order_Creditmemo extends Mage_Sales_Block_Order_Creditmemo_Items
{
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('sales/order/creditmemo.phtml');
- }
-
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- /** @var Mage_Page_Block_Html_Head $headBlock */
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
- }
-
- /** @var Mage_Payment_Helper_Data $helper */
- $helper = $this->helper('payment');
- $this->setChild(
- 'payment_info',
- $helper->getInfoBlock($this->getOrder()->getPayment()),
- );
-
- return parent::_prepareLayout();
- }
-
/**
* @return string
*/
@@ -147,4 +120,30 @@ public function canDisplayGiftmessage(): bool
$helper = $this->helper('giftmessage/message');
return $helper->getIsMessagesAvailable($helper::TYPE_ORDER, $this->getOrder());
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('sales/order/creditmemo.phtml');
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ /** @var Mage_Page_Block_Html_Head $headBlock */
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
+ }
+
+ /** @var Mage_Payment_Helper_Data $helper */
+ $helper = $this->helper('payment');
+ $this->setChild(
+ 'payment_info',
+ $helper->getInfoBlock($this->getOrder()->getPayment()),
+ );
+
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Order/History.php b/app/code/core/Mage/Sales/Block/Order/History.php
index 11bb4e93155..c6f88d9a045 100644
--- a/app/code/core/Mage/Sales/Block/Order/History.php
+++ b/app/code/core/Mage/Sales/Block/Order/History.php
@@ -42,20 +42,6 @@ public function __construct()
Mage::app()->getFrontController()->getAction()->getLayout()->getBlock('root')->setHeaderTitle(Mage::helper('sales')->__('My Orders'));
}
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- parent::_prepareLayout();
-
- $pager = $this->getLayout()->createBlock('page/html_pager', 'sales.order.history.pager')
- ->setCollection($this->getOrders());
- $this->setChild('pager', $pager);
- $this->getOrders()->load();
- return $this;
- }
-
/**
* @return string
*/
@@ -98,4 +84,18 @@ public function getBackUrl()
{
return $this->getUrl('customer/account/');
}
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ parent::_prepareLayout();
+
+ $pager = $this->getLayout()->createBlock('page/html_pager', 'sales.order.history.pager')
+ ->setCollection($this->getOrders());
+ $this->setChild('pager', $pager);
+ $this->getOrders()->load();
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Order/Info.php b/app/code/core/Mage/Sales/Block/Order/Info.php
index 1d8cbffdab0..b57c6ba9267 100644
--- a/app/code/core/Mage/Sales/Block/Order/Info.php
+++ b/app/code/core/Mage/Sales/Block/Order/Info.php
@@ -24,33 +24,6 @@ class Mage_Sales_Block_Order_Info extends Mage_Core_Block_Template
{
protected $_links = [];
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('sales/order/info.phtml');
- }
-
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- /** @var Mage_Page_Block_Html_Head $headBlock */
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
- }
-
- /** @var Mage_Payment_Helper_Data $helper */
- $helper = $this->helper('payment');
- $this->setChild(
- 'payment_info',
- $helper->getInfoBlock($this->getOrder()->getPayment()),
- );
-
- return parent::_prepareLayout();
- }
-
/**
* @return string
*/
@@ -108,20 +81,6 @@ public function getLinks()
return $this->_links;
}
- private function checkLinks()
- {
- $order = $this->getOrder();
- if (!$order->hasInvoices()) {
- unset($this->_links['invoice']);
- }
- if (!$order->hasShipments()) {
- unset($this->_links['shipment']);
- }
- if (!$order->hasCreditmemos()) {
- unset($this->_links['creditmemo']);
- }
- }
-
/**
* Get url for reorder action
*
@@ -151,4 +110,45 @@ public function getPrintUrl($order)
}
return $this->getUrl('sales/order/print', ['order_id' => $order->getId()]);
}
+
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('sales/order/info.phtml');
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ /** @var Mage_Page_Block_Html_Head $headBlock */
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
+ }
+
+ /** @var Mage_Payment_Helper_Data $helper */
+ $helper = $this->helper('payment');
+ $this->setChild(
+ 'payment_info',
+ $helper->getInfoBlock($this->getOrder()->getPayment()),
+ );
+
+ return parent::_prepareLayout();
+ }
+
+ private function checkLinks()
+ {
+ $order = $this->getOrder();
+ if (!$order->hasInvoices()) {
+ unset($this->_links['invoice']);
+ }
+ if (!$order->hasShipments()) {
+ unset($this->_links['shipment']);
+ }
+ if (!$order->hasCreditmemos()) {
+ unset($this->_links['creditmemo']);
+ }
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php b/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php
index 89ad7145e14..540438e08de 100644
--- a/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php
+++ b/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php
@@ -22,12 +22,6 @@
*/
class Mage_Sales_Block_Order_Info_Buttons extends Mage_Core_Block_Template
{
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('sales/order/info/buttons.phtml');
- }
-
/**
* Retrieve current order model instance
*
@@ -65,4 +59,9 @@ public function getReorderUrl($order)
}
return $this->getUrl('sales/order/reorder', ['order_id' => $order->getId()]);
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('sales/order/info/buttons.phtml');
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice.php b/app/code/core/Mage/Sales/Block/Order/Invoice.php
index 48c3d8e82eb..e51a19738b5 100644
--- a/app/code/core/Mage/Sales/Block/Order/Invoice.php
+++ b/app/code/core/Mage/Sales/Block/Order/Invoice.php
@@ -22,33 +22,6 @@
*/
class Mage_Sales_Block_Order_Invoice extends Mage_Sales_Block_Order_Invoice_Items
{
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('sales/order/invoice.phtml');
- }
-
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- /** @var Mage_Page_Block_Html_Head $headBlock */
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
- }
-
- /** @var Mage_Payment_Helper_Data $helper */
- $helper = $this->helper('payment');
- $this->setChild(
- 'payment_info',
- $helper->getInfoBlock($this->getOrder()->getPayment()),
- );
-
- return parent::_prepareLayout();
- }
-
/**
* @return string
*/
@@ -147,4 +120,30 @@ public function canDisplayGiftmessage(): bool
$helper = $this->helper('giftmessage/message');
return $helper->getIsMessagesAvailable($helper::TYPE_ORDER, $this->getOrder());
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('sales/order/invoice.phtml');
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ /** @var Mage_Page_Block_Html_Head $headBlock */
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
+ }
+
+ /** @var Mage_Payment_Helper_Data $helper */
+ $helper = $this->helper('payment');
+ $this->setChild(
+ 'payment_info',
+ $helper->getInfoBlock($this->getOrder()->getPayment()),
+ );
+
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Order/Print.php b/app/code/core/Mage/Sales/Block/Order/Print.php
index d07b5f07fc3..7f2efb5bf61 100644
--- a/app/code/core/Mage/Sales/Block/Order/Print.php
+++ b/app/code/core/Mage/Sales/Block/Order/Print.php
@@ -22,6 +22,21 @@
*/
class Mage_Sales_Block_Order_Print extends Mage_Sales_Block_Items_Abstract
{
+ /**
+ * @return string
+ */
+ public function getPaymentInfoHtml()
+ {
+ return $this->getChildHtml('payment_info');
+ }
+
+ /**
+ * @return Mage_Sales_Model_Order
+ */
+ public function getOrder()
+ {
+ return Mage::registry('current_order');
+ }
/**
* @inheritDoc
*/
@@ -43,22 +58,6 @@ protected function _prepareLayout()
return parent::_prepareLayout();
}
- /**
- * @return string
- */
- public function getPaymentInfoHtml()
- {
- return $this->getChildHtml('payment_info');
- }
-
- /**
- * @return Mage_Sales_Model_Order
- */
- public function getOrder()
- {
- return Mage::registry('current_order');
- }
-
/**
* @return Mage_Sales_Block_Items_Abstract
*/
diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php b/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php
index eac0b07407f..33aedf423a1 100644
--- a/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php
+++ b/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php
@@ -22,27 +22,6 @@
*/
class Mage_Sales_Block_Order_Print_Creditmemo extends Mage_Sales_Block_Items_Abstract
{
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- /** @var Mage_Page_Block_Html_Head $headBlock */
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
- }
-
- /** @var Mage_Payment_Helper_Data $helper */
- $helper = $this->helper('payment');
- $this->setChild(
- 'payment_info',
- $helper->getInfoBlock($this->getOrder()->getPayment()),
- );
-
- return parent::_prepareLayout();
- }
-
/**
* @return string
*/
@@ -83,15 +62,6 @@ public function getCreditmemo()
return Mage::registry('current_creditmemo');
}
- /**
- * @return Mage_Sales_Block_Items_Abstract
- */
- protected function _prepareItem(Mage_Core_Block_Abstract $renderer)
- {
- $renderer->setPrintStatus(true);
- return parent::_prepareItem($renderer);
- }
-
/**
* Get Creditmemo totals block html gor specific creditmemo
*
@@ -108,4 +78,33 @@ public function getTotalsHtml($creditmemo)
}
return $html;
}
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ /** @var Mage_Page_Block_Html_Head $headBlock */
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
+ }
+
+ /** @var Mage_Payment_Helper_Data $helper */
+ $helper = $this->helper('payment');
+ $this->setChild(
+ 'payment_info',
+ $helper->getInfoBlock($this->getOrder()->getPayment()),
+ );
+
+ return parent::_prepareLayout();
+ }
+
+ /**
+ * @return Mage_Sales_Block_Items_Abstract
+ */
+ protected function _prepareItem(Mage_Core_Block_Abstract $renderer)
+ {
+ $renderer->setPrintStatus(true);
+ return parent::_prepareItem($renderer);
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php b/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php
index 6abf66c693e..27c313a5fb1 100644
--- a/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php
+++ b/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php
@@ -22,27 +22,6 @@
*/
class Mage_Sales_Block_Order_Print_Invoice extends Mage_Sales_Block_Items_Abstract
{
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- /** @var Mage_Page_Block_Html_Head $headBlock */
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
- }
-
- /** @var Mage_Payment_Helper_Data $helper */
- $helper = $this->helper('payment');
- $this->setChild(
- 'payment_info',
- $helper->getInfoBlock($this->getOrder()->getPayment()),
- );
-
- return parent::_prepareLayout();
- }
-
/**
* @return string
*/
@@ -83,15 +62,6 @@ public function getInvoice()
return Mage::registry('current_invoice');
}
- /**
- * @return Mage_Sales_Block_Items_Abstract
- */
- protected function _prepareItem(Mage_Core_Block_Abstract $renderer)
- {
- $renderer->setPrintStatus(true);
- return parent::_prepareItem($renderer);
- }
-
/**
* Get html of invoice totlas block
*
@@ -108,4 +78,33 @@ public function getInvoiceTotalsHtml($invoice)
}
return $html;
}
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ /** @var Mage_Page_Block_Html_Head $headBlock */
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
+ }
+
+ /** @var Mage_Payment_Helper_Data $helper */
+ $helper = $this->helper('payment');
+ $this->setChild(
+ 'payment_info',
+ $helper->getInfoBlock($this->getOrder()->getPayment()),
+ );
+
+ return parent::_prepareLayout();
+ }
+
+ /**
+ * @return Mage_Sales_Block_Items_Abstract
+ */
+ protected function _prepareItem(Mage_Core_Block_Abstract $renderer)
+ {
+ $renderer->setPrintStatus(true);
+ return parent::_prepareItem($renderer);
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php
index d50a6b35d8d..f2f1c0db5c5 100644
--- a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php
+++ b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php
@@ -36,51 +36,6 @@ class Mage_Sales_Block_Order_Print_Shipment extends Mage_Sales_Block_Items_Abstr
*/
protected $_shipmentsCollection;
- /**
- * Load all tracks and save it to local cache by shipments
- *
- * @inheritDoc
- */
- protected function _beforeToHtml()
- {
- $tracksCollection = $this->getOrder()->getTracksCollection();
-
- foreach ($tracksCollection->getItems() as $track) {
- $shipmentId = $track->getParentId();
- $this->_tracks[$shipmentId][] = $track;
- }
-
- $shipment = Mage::registry('current_shipment');
- if ($shipment) {
- $this->_shipmentsCollection = [$shipment];
- } else {
- $this->_shipmentsCollection = $this->getOrder()->getShipmentsCollection();
- }
-
- return parent::_beforeToHtml();
- }
-
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- /** @var Mage_Page_Block_Html_Head $headBlock */
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
- }
-
- /** @var Mage_Payment_Helper_Data $helper */
- $helper = $this->helper('payment');
- $this->setChild(
- 'payment_info',
- $helper->getInfoBlock($this->getOrder()->getPayment()),
- );
-
- return parent::_prepareLayout();
- }
-
/**
* @return string
*/
@@ -121,16 +76,6 @@ public function getShipment()
return Mage::registry('current_shipment');
}
- /**
- * @inheritDoc
- */
- protected function _prepareItem(Mage_Core_Block_Abstract $renderer)
- {
- $renderer->setPrintStatus(true);
-
- return parent::_prepareItem($renderer);
- }
-
/**
* Retrieve order shipments collection
*
@@ -202,4 +147,59 @@ public function getShipmentItems($shipment)
}
return $res;
}
+
+ /**
+ * Load all tracks and save it to local cache by shipments
+ *
+ * @inheritDoc
+ */
+ protected function _beforeToHtml()
+ {
+ $tracksCollection = $this->getOrder()->getTracksCollection();
+
+ foreach ($tracksCollection->getItems() as $track) {
+ $shipmentId = $track->getParentId();
+ $this->_tracks[$shipmentId][] = $track;
+ }
+
+ $shipment = Mage::registry('current_shipment');
+ if ($shipment) {
+ $this->_shipmentsCollection = [$shipment];
+ } else {
+ $this->_shipmentsCollection = $this->getOrder()->getShipmentsCollection();
+ }
+
+ return parent::_beforeToHtml();
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ /** @var Mage_Page_Block_Html_Head $headBlock */
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
+ }
+
+ /** @var Mage_Payment_Helper_Data $helper */
+ $helper = $this->helper('payment');
+ $this->setChild(
+ 'payment_info',
+ $helper->getInfoBlock($this->getOrder()->getPayment()),
+ );
+
+ return parent::_prepareLayout();
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareItem(Mage_Core_Block_Abstract $renderer)
+ {
+ $renderer->setPrintStatus(true);
+
+ return parent::_prepareItem($renderer);
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Order/Recent.php b/app/code/core/Mage/Sales/Block/Order/Recent.php
index 1304ad5f721..6d7f56860a2 100644
--- a/app/code/core/Mage/Sales/Block/Order/Recent.php
+++ b/app/code/core/Mage/Sales/Block/Order/Recent.php
@@ -88,22 +88,22 @@ public function getTrackUrl($order)
}
/**
+ * @param Mage_Sales_Model_Order $order
* @return string
*/
- protected function _toHtml()
+ public function getReorderUrl($order)
{
- if ($this->getOrders()->getSize() > 0) {
- return parent::_toHtml();
- }
- return '';
+ return $this->getUrl('sales/order/reorder', ['order_id' => $order->getId()]);
}
/**
- * @param Mage_Sales_Model_Order $order
* @return string
*/
- public function getReorderUrl($order)
+ protected function _toHtml()
{
- return $this->getUrl('sales/order/reorder', ['order_id' => $order->getId()]);
+ if ($this->getOrders()->getSize() > 0) {
+ return parent::_toHtml();
+ }
+ return '';
}
}
diff --git a/app/code/core/Mage/Sales/Block/Order/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Shipment.php
index c64c583e8ad..060342fb15e 100644
--- a/app/code/core/Mage/Sales/Block/Order/Shipment.php
+++ b/app/code/core/Mage/Sales/Block/Order/Shipment.php
@@ -22,33 +22,6 @@
*/
class Mage_Sales_Block_Order_Shipment extends Mage_Core_Block_Template
{
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('sales/order/shipment.phtml');
- }
-
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- /** @var Mage_Page_Block_Html_Head $headBlock */
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
- }
-
- /** @var Mage_Payment_Helper_Data $helper */
- $helper = $this->helper('payment');
- $this->setChild(
- 'payment_info',
- $helper->getInfoBlock($this->getOrder()->getPayment()),
- );
-
- return parent::_prepareLayout();
- }
-
/**
* @return string
*/
@@ -147,4 +120,30 @@ public function canDisplayGiftmessage(): bool
$helper = $this->helper('giftmessage/message');
return $helper->getIsMessagesAvailable($helper::TYPE_ORDER, $this->getOrder());
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('sales/order/shipment.phtml');
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ /** @var Mage_Page_Block_Html_Head $headBlock */
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
+ }
+
+ /** @var Mage_Payment_Helper_Data $helper */
+ $helper = $this->helper('payment');
+ $this->setChild(
+ 'payment_info',
+ $helper->getInfoBlock($this->getOrder()->getPayment()),
+ );
+
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Order/Totals.php b/app/code/core/Mage/Sales/Block/Order/Totals.php
index 8da72dca755..8f9340ef505 100644
--- a/app/code/core/Mage/Sales/Block/Order/Totals.php
+++ b/app/code/core/Mage/Sales/Block/Order/Totals.php
@@ -31,22 +31,6 @@ class Mage_Sales_Block_Order_Totals extends Mage_Core_Block_Template
protected $_totals;
protected $_order = null;
- /**
- * Initialize self totals and children blocks totals before html building
- *
- * @inheritDoc
- */
- protected function _beforeToHtml()
- {
- $this->_initTotals();
- foreach ($this->getChild() as $child) {
- if (method_exists($child, 'initTotals')) {
- $child->initTotals();
- }
- }
- return parent::_beforeToHtml();
- }
-
/**
* Get order object
*
@@ -86,73 +70,6 @@ public function getSource()
return $this->getOrder();
}
- /**
- * Initialize order totals array
- *
- * @return $this
- */
- protected function _initTotals()
- {
- $source = $this->getSource();
-
- $this->_totals = [];
- $this->_totals['subtotal'] = new Varien_Object([
- 'code' => 'subtotal',
- 'value' => $source->getSubtotal(),
- 'label' => $this->__('Subtotal'),
- ]);
-
- /**
- * Add shipping
- */
- if (!$source->getIsVirtual() && ((float) $source->getShippingAmount() || $source->getShippingDescription())) {
- $this->_totals['shipping'] = new Varien_Object([
- 'code' => 'shipping',
- 'field' => 'shipping_amount',
- 'value' => $this->getSource()->getShippingAmount(),
- 'label' => $this->__('Shipping & Handling'),
- ]);
- }
-
- /**
- * Add discount
- */
- if ((float) $this->getSource()->getDiscountAmount() != 0) {
- if ($this->getSource()->getDiscountDescription()) {
- $discountLabel = $this->__('Discount (%s)', $source->getDiscountDescription());
- } else {
- $discountLabel = $this->__('Discount');
- }
- $this->_totals['discount'] = new Varien_Object([
- 'code' => 'discount',
- 'field' => 'discount_amount',
- 'value' => $source->getDiscountAmount(),
- 'label' => $discountLabel,
- ]);
- }
-
- $this->_totals['grand_total'] = new Varien_Object([
- 'code' => 'grand_total',
- 'field' => 'grand_total',
- 'strong' => true,
- 'value' => $source->getGrandTotal(),
- 'label' => $this->__('Grand Total'),
- ]);
-
- /**
- * Base grandtotal
- */
- if ($this->getOrder()->isCurrencyDifferent()) {
- $this->_totals['base_grandtotal'] = new Varien_Object([
- 'code' => 'base_grandtotal',
- 'value' => $this->getOrder()->formatBasePrice($source->getBaseGrandTotal()),
- 'label' => $this->__('Grand Total to be Charged'),
- 'is_formated' => true,
- ]);
- }
- return $this;
- }
-
/**
* Add new total to totals array after specific total or before last total by default
*
@@ -302,4 +219,87 @@ public function formatValue($total)
}
return $total->getValue();
}
+
+ /**
+ * Initialize self totals and children blocks totals before html building
+ *
+ * @inheritDoc
+ */
+ protected function _beforeToHtml()
+ {
+ $this->_initTotals();
+ foreach ($this->getChild() as $child) {
+ if (method_exists($child, 'initTotals')) {
+ $child->initTotals();
+ }
+ }
+ return parent::_beforeToHtml();
+ }
+
+ /**
+ * Initialize order totals array
+ *
+ * @return $this
+ */
+ protected function _initTotals()
+ {
+ $source = $this->getSource();
+
+ $this->_totals = [];
+ $this->_totals['subtotal'] = new Varien_Object([
+ 'code' => 'subtotal',
+ 'value' => $source->getSubtotal(),
+ 'label' => $this->__('Subtotal'),
+ ]);
+
+ /**
+ * Add shipping
+ */
+ if (!$source->getIsVirtual() && ((float) $source->getShippingAmount() || $source->getShippingDescription())) {
+ $this->_totals['shipping'] = new Varien_Object([
+ 'code' => 'shipping',
+ 'field' => 'shipping_amount',
+ 'value' => $this->getSource()->getShippingAmount(),
+ 'label' => $this->__('Shipping & Handling'),
+ ]);
+ }
+
+ /**
+ * Add discount
+ */
+ if ((float) $this->getSource()->getDiscountAmount() != 0) {
+ if ($this->getSource()->getDiscountDescription()) {
+ $discountLabel = $this->__('Discount (%s)', $source->getDiscountDescription());
+ } else {
+ $discountLabel = $this->__('Discount');
+ }
+ $this->_totals['discount'] = new Varien_Object([
+ 'code' => 'discount',
+ 'field' => 'discount_amount',
+ 'value' => $source->getDiscountAmount(),
+ 'label' => $discountLabel,
+ ]);
+ }
+
+ $this->_totals['grand_total'] = new Varien_Object([
+ 'code' => 'grand_total',
+ 'field' => 'grand_total',
+ 'strong' => true,
+ 'value' => $source->getGrandTotal(),
+ 'label' => $this->__('Grand Total'),
+ ]);
+
+ /**
+ * Base grandtotal
+ */
+ if ($this->getOrder()->isCurrencyDifferent()) {
+ $this->_totals['base_grandtotal'] = new Varien_Object([
+ 'code' => 'base_grandtotal',
+ 'value' => $this->getOrder()->formatBasePrice($source->getBaseGrandTotal()),
+ 'label' => $this->__('Grand Total to be Charged'),
+ 'is_formated' => true,
+ ]);
+ }
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Order/View.php b/app/code/core/Mage/Sales/Block/Order/View.php
index 76aa4b43742..a49c0bb8bdf 100644
--- a/app/code/core/Mage/Sales/Block/Order/View.php
+++ b/app/code/core/Mage/Sales/Block/Order/View.php
@@ -22,33 +22,6 @@
*/
class Mage_Sales_Block_Order_View extends Mage_Core_Block_Template
{
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('sales/order/view.phtml');
- }
-
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- /** @var Mage_Page_Block_Html_Head $headBlock */
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
- }
-
- /** @var Mage_Payment_Helper_Data $helper */
- $helper = $this->helper('payment');
- $this->setChild(
- 'payment_info',
- $helper->getInfoBlock($this->getOrder()->getPayment()),
- );
-
- return parent::_prepareLayout();
- }
-
/**
* @return string
*/
@@ -142,4 +115,30 @@ public function canDisplayGiftmessageOrder(): bool
$this->getOrder(),
) && $this->getOrder()->getGiftMessageId();
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('sales/order/view.phtml');
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ /** @var Mage_Page_Block_Html_Head $headBlock */
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
+ }
+
+ /** @var Mage_Payment_Helper_Data $helper */
+ $helper = $this->helper('payment');
+ $this->setChild(
+ 'payment_info',
+ $helper->getInfoBlock($this->getOrder()->getPayment()),
+ );
+
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
index 43f330533b7..5ed9665fe71 100644
--- a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
+++ b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
@@ -124,6 +124,19 @@ public function getLastOrder()
return false;
}
+ /**
+ * Retrieve block cache tags
+ *
+ * @return array
+ */
+ public function getCacheTags()
+ {
+ return array_merge(
+ parent::getCacheTags(),
+ $this->getItemsTags($this->_getItemProducts()),
+ );
+ }
+
/**
* Render "My Orders" sidebar block
*
@@ -144,19 +157,6 @@ protected function _getCustomerSession()
return Mage::getSingleton('customer/session');
}
- /**
- * Retrieve block cache tags
- *
- * @return array
- */
- public function getCacheTags()
- {
- return array_merge(
- parent::getCacheTags(),
- $this->getItemsTags($this->_getItemProducts()),
- );
- }
-
/**
* Retrieve products list from items
*
diff --git a/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php b/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php
index a7241658f87..f97cbc78dbb 100644
--- a/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php
+++ b/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php
@@ -50,6 +50,16 @@ public function getTypeSelectHtml()
return $select->getHtml();
}
+ /**
+ * Return quick search form action url
+ *
+ * @return string
+ */
+ public function getActionUrl()
+ {
+ return $this->getUrl('sales/guest/view', ['_secure' => $this->_isSecure()]);
+ }
+
/**
* Get Form Options for Guest
*
@@ -73,14 +83,4 @@ protected function _getFormOptions()
return $options;
}
-
- /**
- * Return quick search form action url
- *
- * @return string
- */
- public function getActionUrl()
- {
- return $this->getUrl('sales/guest/view', ['_secure' => $this->_isSecure()]);
- }
}
diff --git a/app/code/core/Mage/Sales/Controller/Abstract.php b/app/code/core/Mage/Sales/Controller/Abstract.php
index 318f4389fad..53e4181ad02 100644
--- a/app/code/core/Mage/Sales/Controller/Abstract.php
+++ b/app/code/core/Mage/Sales/Controller/Abstract.php
@@ -22,70 +22,6 @@
*/
abstract class Mage_Sales_Controller_Abstract extends Mage_Core_Controller_Front_Action
{
- /**
- * Check order view availability
- *
- * @param Mage_Sales_Model_Order $order
- * @return bool
- */
- protected function _canViewOrder($order)
- {
- $customerId = Mage::getSingleton('customer/session')->getCustomerId();
- $availableStates = Mage::getSingleton('sales/order_config')->getVisibleOnFrontStates();
- if ($order->getId() && $order->getCustomerId() && ($order->getCustomerId() == $customerId)
- && in_array($order->getState(), $availableStates, $strict = true)
- ) {
- return true;
- }
- return false;
- }
-
- /**
- * Init layout, messages and set active block for customer
- */
- protected function _viewAction()
- {
- if (!$this->_loadValidOrder()) {
- return;
- }
-
- $this->loadLayout();
- $this->_initLayoutMessages('catalog/session');
-
- $navigationBlock = $this->getLayout()->getBlock('customer_account_navigation');
- if ($navigationBlock) {
- $navigationBlock->setActive('sales/order/history');
- }
- $this->renderLayout();
- }
-
- /**
- * Try to load valid order by order_id and register it
- *
- * @param int $orderId
- * @return bool
- */
- protected function _loadValidOrder($orderId = null)
- {
- if ($orderId === null) {
- $orderId = (int) $this->getRequest()->getParam('order_id');
- }
- if (!$orderId) {
- $this->_forward('noRoute');
- return false;
- }
-
- $order = Mage::getModel('sales/order')->load($orderId);
-
- if ($this->_canViewOrder($order)) {
- Mage::register('current_order', $order);
- return true;
- } else {
- $this->_redirect('*/*/history');
- }
- return false;
- }
-
/**
* Order view page
*/
@@ -254,4 +190,67 @@ public function printCreditmemoAction()
}
}
}
+ /**
+ * Check order view availability
+ *
+ * @param Mage_Sales_Model_Order $order
+ * @return bool
+ */
+ protected function _canViewOrder($order)
+ {
+ $customerId = Mage::getSingleton('customer/session')->getCustomerId();
+ $availableStates = Mage::getSingleton('sales/order_config')->getVisibleOnFrontStates();
+ if ($order->getId() && $order->getCustomerId() && ($order->getCustomerId() == $customerId)
+ && in_array($order->getState(), $availableStates, $strict = true)
+ ) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Init layout, messages and set active block for customer
+ */
+ protected function _viewAction()
+ {
+ if (!$this->_loadValidOrder()) {
+ return;
+ }
+
+ $this->loadLayout();
+ $this->_initLayoutMessages('catalog/session');
+
+ $navigationBlock = $this->getLayout()->getBlock('customer_account_navigation');
+ if ($navigationBlock) {
+ $navigationBlock->setActive('sales/order/history');
+ }
+ $this->renderLayout();
+ }
+
+ /**
+ * Try to load valid order by order_id and register it
+ *
+ * @param int $orderId
+ * @return bool
+ */
+ protected function _loadValidOrder($orderId = null)
+ {
+ if ($orderId === null) {
+ $orderId = (int) $this->getRequest()->getParam('order_id');
+ }
+ if (!$orderId) {
+ $this->_forward('noRoute');
+ return false;
+ }
+
+ $order = Mage::getModel('sales/order')->load($orderId);
+
+ if ($this->_canViewOrder($order)) {
+ Mage::register('current_order', $order);
+ return true;
+ } else {
+ $this->_redirect('*/*/history');
+ }
+ return false;
+ }
}
diff --git a/app/code/core/Mage/Sales/Helper/Guest.php b/app/code/core/Mage/Sales/Helper/Guest.php
index c3de548655c..2cda76ede56 100644
--- a/app/code/core/Mage/Sales/Helper/Guest.php
+++ b/app/code/core/Mage/Sales/Helper/Guest.php
@@ -150,6 +150,16 @@ public function getBreadcrumbs($controller)
);
}
+ /**
+ * Getter for $this->_cookieName
+ *
+ * @return string
+ */
+ public function getCookieName()
+ {
+ return $this->_cookieName;
+ }
+
/**
* Try to load order by cookie hash
*
@@ -175,14 +185,4 @@ protected function _loadOrderByCookie($cookie = null)
}
return null;
}
-
- /**
- * Getter for $this->_cookieName
- *
- * @return string
- */
- public function getCookieName()
- {
- return $this->_cookieName;
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Api2/Order.php b/app/code/core/Mage/Sales/Model/Api2/Order.php
index c29a0c65068..d1aeeaaf350 100644
--- a/app/code/core/Mage/Sales/Model/Api2/Order.php
+++ b/app/code/core/Mage/Sales/Model/Api2/Order.php
@@ -31,6 +31,56 @@ class Mage_Sales_Model_Api2_Order extends Mage_Api2_Model_Resource
public const PARAM_TAX_NAME = '_tax_name';
public const PARAM_TAX_RATE = '_tax_rate';
+ /**
+ * Check gift messages information is allowed
+ *
+ * @return bool
+ */
+ public function _isGiftMessageAllowed()
+ {
+ return in_array(self::PARAM_GIFT_MESSAGE, $this->getFilter()->getAllowedAttributes());
+ }
+
+ /**
+ * Check order comments information is allowed
+ *
+ * @return bool
+ */
+ public function _isOrderCommentsAllowed()
+ {
+ return in_array(self::PARAM_ORDER_COMMENTS, $this->getFilter()->getAllowedAttributes());
+ }
+
+ /**
+ * Check payment method information is allowed
+ *
+ * @return bool
+ */
+ public function _isPaymentMethodAllowed()
+ {
+ return in_array(self::PARAM_PAYMENT_METHOD, $this->getFilter()->getAllowedAttributes());
+ }
+
+ /**
+ * Check tax name information is allowed
+ *
+ * @return bool
+ */
+ public function _isTaxNameAllowed()
+ {
+ return in_array(self::PARAM_TAX_NAME, $this->getFilter()->getAllowedAttributes());
+ }
+
+ /**
+ * Check tax rate information is allowed
+ *
+ * @return bool
+ */
+ public function _isTaxRateAllowed()
+ {
+ return in_array(self::PARAM_TAX_RATE, $this->getFilter()->getAllowedAttributes());
+ }
+
/**
* Add gift message info to select
*
@@ -213,56 +263,6 @@ protected function _getItems(array $orderIds)
return $items;
}
- /**
- * Check gift messages information is allowed
- *
- * @return bool
- */
- public function _isGiftMessageAllowed()
- {
- return in_array(self::PARAM_GIFT_MESSAGE, $this->getFilter()->getAllowedAttributes());
- }
-
- /**
- * Check order comments information is allowed
- *
- * @return bool
- */
- public function _isOrderCommentsAllowed()
- {
- return in_array(self::PARAM_ORDER_COMMENTS, $this->getFilter()->getAllowedAttributes());
- }
-
- /**
- * Check payment method information is allowed
- *
- * @return bool
- */
- public function _isPaymentMethodAllowed()
- {
- return in_array(self::PARAM_PAYMENT_METHOD, $this->getFilter()->getAllowedAttributes());
- }
-
- /**
- * Check tax name information is allowed
- *
- * @return bool
- */
- public function _isTaxNameAllowed()
- {
- return in_array(self::PARAM_TAX_NAME, $this->getFilter()->getAllowedAttributes());
- }
-
- /**
- * Check tax rate information is allowed
- *
- * @return bool
- */
- public function _isTaxRateAllowed()
- {
- return in_array(self::PARAM_TAX_RATE, $this->getFilter()->getAllowedAttributes());
- }
-
/**
* Get orders list
*
diff --git a/app/code/core/Mage/Sales/Model/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Billing/Agreement.php
index 1d1e21c583c..4e821bdaf9c 100644
--- a/app/code/core/Mage/Sales/Model/Billing/Agreement.php
+++ b/app/code/core/Mage/Sales/Model/Billing/Agreement.php
@@ -62,43 +62,6 @@ class Mage_Sales_Model_Billing_Agreement extends Mage_Payment_Model_Billing_Agre
*/
protected $_relatedOrders = [];
- /**
- * Init model
- */
- protected function _construct()
- {
- $this->_init('sales/billing_agreement');
- }
-
- /**
- * Set created_at parameter
- *
- * @inheritdoc
- */
- protected function _beforeSave()
- {
- $date = Mage::getModel('core/date')->gmtDate();
- if ($this->isObjectNew() && !$this->getCreatedAt()) {
- $this->setCreatedAt($date);
- } else {
- $this->setUpdatedAt($date);
- }
- return parent::_beforeSave();
- }
-
- /**
- * Save agreement order relations
- *
- * @return Mage_Core_Model_Abstract
- */
- protected function _afterSave()
- {
- if (!empty($this->_relatedOrders)) {
- $this->_saveOrderRelations();
- }
- return parent::_afterSave();
- }
-
/**
* Retrieve billing agreement status label
*
@@ -289,6 +252,43 @@ public function addOrderRelation($orderId)
return $this;
}
+ /**
+ * Init model
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/billing_agreement');
+ }
+
+ /**
+ * Set created_at parameter
+ *
+ * @inheritdoc
+ */
+ protected function _beforeSave()
+ {
+ $date = Mage::getModel('core/date')->gmtDate();
+ if ($this->isObjectNew() && !$this->getCreatedAt()) {
+ $this->setCreatedAt($date);
+ } else {
+ $this->setUpdatedAt($date);
+ }
+ return parent::_beforeSave();
+ }
+
+ /**
+ * Save agreement order relations
+ *
+ * @return Mage_Core_Model_Abstract
+ */
+ protected function _afterSave()
+ {
+ if (!empty($this->_relatedOrders)) {
+ $this->_saveOrderRelations();
+ }
+ return parent::_afterSave();
+ }
+
/**
* Save related orders
*/
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php
index 4fff197f5ef..2db2c25beba 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Address_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_address');
- }
-
/**
* @param int $orderId
* @return $this
@@ -36,4 +31,8 @@ public function setOrderFilter($orderId)
$this->addAttributeToFilter('parent_id', $orderId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_address');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php
index 2b08f332df9..a6284967286 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order');
- }
-
/**
* @return $this
* @throws Mage_Core_Exception
@@ -43,4 +38,8 @@ public function addItemCountExpr()
->group('e.entity_id');
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php
index a77672eec0a..c73991353b6 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Creditmemo_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_creditmemo');
- }
-
/**
* @param Mage_Sales_Model_Order $order
* @return $this
@@ -41,4 +36,8 @@ public function setOrderFilter($order)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_creditmemo');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php
index d5aa2ca14f6..1a061c0a9a7 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_creditmemo_comment');
- }
-
/**
* @param int $creditmemoId
* @return $this
@@ -46,4 +41,8 @@ public function setCreatedAtOrder($order = 'desc')
$this->setOrder('created_at', $order);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_creditmemo_comment');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php
index c919bba7b2e..54f8ea15e9c 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_creditmemo_item');
- }
-
/**
* @param int $creditmemoId
* @return $this
@@ -36,4 +31,8 @@ public function setCreditmemoFilter($creditmemoId)
$this->addAttributeToFilter('parent_id', $creditmemoId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_creditmemo_item');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php
index bc358105ee0..9cbddf57067 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Invoice_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_invoice');
- }
-
/**
* @param Mage_Sales_Model_Order $order
* @return $this
@@ -41,4 +36,8 @@ public function setOrderFilter($order)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_invoice');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php
index 3af1ffaef83..c2da348e8d2 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_invoice_comment');
- }
-
/**
* @param int $invoiceId
* @return $this
@@ -46,4 +41,8 @@ public function setCreatedAtOrder($order = 'desc')
$this->setOrder('created_at', $order);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_invoice_comment');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php
index d81edc8d80b..deadc94cba0 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Invoice_Item_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_invoice_item');
- }
-
/**
* @param int $invoiceId
* @return $this
@@ -36,4 +31,8 @@ public function setInvoiceFilter($invoiceId)
$this->addAttributeToFilter('parent_id', $invoiceId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_invoice_item');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php
index e540967f3f4..e4bfb2e4adb 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Payment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_payment');
- }
-
/**
* @param int $orderId
* @return $this
@@ -36,4 +31,8 @@ public function setOrderFilter($orderId)
$this->addAttributeToFilter('parent_id', $orderId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_payment');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php
index 1ad46d64a25..70765b732d6 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Shipment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_shipment');
- }
-
/**
* @param Mage_Sales_Model_Order $order
* @return $this
@@ -41,4 +36,8 @@ public function setOrderFilter($order)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_shipment');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php
index 48aa0350eb6..5132eb2a7f0 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_shipment_comment');
- }
-
/**
* @param int $shipmentId
* @return $this
@@ -46,4 +41,8 @@ public function setCreatedAtOrder($order = 'desc')
$this->setOrder('created_at', $order);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_shipment_comment');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php
index 3d0327c210f..97a22f85797 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Shipment_Item_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_shipment_item');
- }
-
/**
* @param int $shipmentId
* @return $this
@@ -36,4 +31,8 @@ public function setShipmentFilter($shipmentId)
$this->addAttributeToFilter('parent_id', $shipmentId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_shipment_item');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php
index 2064fad930f..e4681c42285 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Order_Status_History_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_status_history');
- }
-
/**
* @param int $orderId
* @return $this
@@ -36,4 +31,8 @@ public function setOrderFilter($orderId)
$this->addAttributeToFilter('parent_id', $orderId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_status_history');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote.php b/app/code/core/Mage/Sales/Model/Entity/Quote.php
index 46766a38111..4cfb533820a 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote.php
@@ -31,22 +31,6 @@ public function __construct()
);
}
- /**
- * Retrieve select object for loading base entity row
- *
- * @param Varien_Object|Mage_Sales_Model_Quote $object
- * @param int $rowId
- * @return Zend_Db_Select
- */
- protected function _getLoadRowSelect($object, $rowId)
- {
- $select = parent::_getLoadRowSelect($object, $rowId);
- if ($object->getSharedStoreIds()) {
- $select->where('store_id IN (?)', $object->getSharedStoreIds());
- }
- return $select;
- }
-
/**
* Loading quote by customer identifier
*
@@ -112,4 +96,20 @@ public function getReservedOrderId($quote)
{
return Mage::getSingleton('eav/config')->getEntityType(Mage_Sales_Model_Order::ENTITY)->fetchNewIncrementId($quote->getStoreId());
}
+
+ /**
+ * Retrieve select object for loading base entity row
+ *
+ * @param Varien_Object|Mage_Sales_Model_Quote $object
+ * @param int $rowId
+ * @return Zend_Db_Select
+ */
+ protected function _getLoadRowSelect($object, $rowId)
+ {
+ $select = parent::_getLoadRowSelect($object, $rowId);
+ if ($object->getSharedStoreIds()) {
+ $select->where('store_id IN (?)', $object->getSharedStoreIds());
+ }
+ return $select;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php
index 5b414bd55fd..4613d0600e7 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Quote_Address_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/quote_address');
- }
-
/**
* @param int $quoteId
* @return $this
@@ -36,4 +31,8 @@ public function setQuoteFilter($quoteId)
$this->addAttributeToFilter('parent_id', $quoteId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/quote_address');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php
index e6ef2271822..97c7390f802 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Quote_Address_Item_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/quote_address_item');
- }
-
/**
* @param int $addressId
* @return $this
@@ -36,4 +31,8 @@ public function setAddressFilter($addressId)
$this->addAttributeToFilter('parent_id', $addressId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/quote_address_item');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php
index 4bfcf5f4d7d..87a9cbfe93c 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Quote_Address_Rate_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/quote_address_rate');
- }
-
/**
* @param int $addressId
* @return $this
@@ -36,4 +31,8 @@ public function setAddressFilter($addressId)
$this->addAttributeToFilter('parent_id', $addressId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/quote_address_rate');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php
index 2f64ad50256..0c297fb7f58 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php
@@ -29,11 +29,6 @@ class Mage_Sales_Model_Entity_Quote_Item_Collection extends Mage_Eav_Model_Entit
*/
protected $_quote;
- protected function _construct()
- {
- $this->_init('sales/quote_item');
- }
-
/**
* @return int
*/
@@ -53,6 +48,11 @@ public function setQuote($quote)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/quote_item');
+ }
+
/**
* @return $this
*/
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php
index 628ade38b1e..5259ce15a6a 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Entity_Quote_Payment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/quote_payment');
- }
-
/**
* @param int $quoteId
* @return $this
@@ -36,4 +31,8 @@ public function setQuoteFilter($quoteId)
$this->addAttributeToFilter('parent_id', $quoteId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/quote_payment');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php
index 6863e0111bc..d62766efec8 100644
--- a/app/code/core/Mage/Sales/Model/Observer.php
+++ b/app/code/core/Mage/Sales/Model/Observer.php
@@ -374,47 +374,6 @@ public function addVatRequestParamsOrderComment(Varien_Event_Observer $observer)
}
}
- /**
- * Retrieve sales address (order or quote) on which tax calculation must be based
- *
- * @param Mage_Core_Model_Abstract $salesModel
- * @param Mage_Core_Model_Store|string|int|null $store
- * @return Mage_Customer_Model_Address_Abstract|null
- */
- protected function _getVatRequiredSalesAddress($salesModel, $store = null)
- {
- $configAddressType = Mage::helper('customer/address')->getTaxCalculationAddressType($store);
- $requiredAddress = null;
- switch ($configAddressType) {
- case Mage_Customer_Model_Address_Abstract::TYPE_SHIPPING:
- $requiredAddress = $salesModel->getShippingAddress();
- break;
- default:
- $requiredAddress = $salesModel->getBillingAddress();
- }
- return $requiredAddress;
- }
-
- /**
- * Retrieve customer address (default billing or default shipping) ID on which tax calculation must be based
- *
- * @param Mage_Core_Model_Store|string|int|null $store
- * @return int|string
- */
- protected function _getVatRequiredCustomerAddress(Mage_Customer_Model_Customer $customer, $store = null)
- {
- $configAddressType = Mage::helper('customer/address')->getTaxCalculationAddressType($store);
- $requiredAddress = null;
- switch ($configAddressType) {
- case Mage_Customer_Model_Address_Abstract::TYPE_SHIPPING:
- $requiredAddress = $customer->getDefaultShipping();
- break;
- default:
- $requiredAddress = $customer->getDefaultBilling();
- }
- return $requiredAddress;
- }
-
/**
* Handle customer VAT number if needed on collect_totals_before event of quote address
*/
@@ -531,4 +490,45 @@ public function restoreQuoteCustomerGroupId($observer)
$quoteAddress->unsPrevQuoteCustomerGroupId();
}
}
+
+ /**
+ * Retrieve sales address (order or quote) on which tax calculation must be based
+ *
+ * @param Mage_Core_Model_Abstract $salesModel
+ * @param Mage_Core_Model_Store|string|int|null $store
+ * @return Mage_Customer_Model_Address_Abstract|null
+ */
+ protected function _getVatRequiredSalesAddress($salesModel, $store = null)
+ {
+ $configAddressType = Mage::helper('customer/address')->getTaxCalculationAddressType($store);
+ $requiredAddress = null;
+ switch ($configAddressType) {
+ case Mage_Customer_Model_Address_Abstract::TYPE_SHIPPING:
+ $requiredAddress = $salesModel->getShippingAddress();
+ break;
+ default:
+ $requiredAddress = $salesModel->getBillingAddress();
+ }
+ return $requiredAddress;
+ }
+
+ /**
+ * Retrieve customer address (default billing or default shipping) ID on which tax calculation must be based
+ *
+ * @param Mage_Core_Model_Store|string|int|null $store
+ * @return int|string
+ */
+ protected function _getVatRequiredCustomerAddress(Mage_Customer_Model_Customer $customer, $store = null)
+ {
+ $configAddressType = Mage::helper('customer/address')->getTaxCalculationAddressType($store);
+ $requiredAddress = null;
+ switch ($configAddressType) {
+ case Mage_Customer_Model_Address_Abstract::TYPE_SHIPPING:
+ $requiredAddress = $customer->getDefaultShipping();
+ break;
+ default:
+ $requiredAddress = $customer->getDefaultBilling();
+ }
+ return $requiredAddress;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php
index 46cd0b0c403..903c0d439ef 100644
--- a/app/code/core/Mage/Sales/Model/Order.php
+++ b/app/code/core/Mage/Sales/Model/Order.php
@@ -499,28 +499,6 @@ class Mage_Sales_Model_Order extends Mage_Sales_Model_Abstract
*/
protected $_historyEntityName = self::HISTORY_ENTITY_NAME;
- protected function _construct()
- {
- $this->_init('sales/order');
- }
-
- /**
- * Init mapping array of short fields to
- * its full names
- *
- * @return Varien_Object
- */
- protected function _initOldFieldsMap()
- {
- // pre 1.6 fields names, old => new
- $this->_oldFieldsMap = [
- 'payment_authorization_expiration' => 'payment_auth_expiration',
- 'forced_do_shipment_with_invoice' => 'forced_shipment_with_invoice',
- 'base_shipping_hidden_tax_amount' => 'base_shipping_hidden_tax_amnt',
- ];
- return $this;
- }
-
/**
* Clear order object data
*
@@ -675,19 +653,6 @@ public function canVoidPayment()
return $this->_canVoidOrder() ? $this->getPayment()->canVoid($this->getPayment()) : false;
}
- /**
- * Check whether order could be canceled by states and flags
- *
- * @return bool
- */
- protected function _canVoidOrder()
- {
- if ($this->canUnhold() || $this->isPaymentReview()) {
- return false;
- }
- return true;
- }
-
/**
* Retrieve order invoice availability
*
@@ -873,61 +838,6 @@ public function canReorderIgnoreSalable()
return $this->_canReorder(true);
}
- /**
- * Retrieve order reorder availability
- *
- * @param bool $ignoreSalable
- * @return bool
- */
- protected function _canReorder($ignoreSalable = false)
- {
- if ($this->canUnhold() || $this->isPaymentReview()) {
- return false;
- }
-
- if ($this->getActionFlag(self::ACTION_FLAG_REORDER) === false) {
- return false;
- }
-
- $products = [];
- foreach ($this->getItemsCollection() as $item) {
- $products[] = $item->getProductId();
- }
-
- if (!empty($products)) {
- /*
- * @TODO ACPAOC: Use product collection here, but ensure that product
- * is loaded with order store id, otherwise there'll be problems with isSalable()
- * for configurables, bundles and other composites
- *
- */
- /*
- $productsCollection = Mage::getModel('catalog/product')->getCollection()
- ->setStoreId($this->getStoreId())
- ->addIdFilter($products)
- ->addAttributeToSelect('status')
- ->load();
-
- foreach ($productsCollection as $product) {
- if (!$product->isSalable()) {
- return false;
- }
- }
- */
-
- foreach ($products as $productId) {
- $product = Mage::getModel('catalog/product')
- ->setStoreId($this->getStoreId())
- ->load($productId);
- if (!$product->getId() || (!$ignoreSalable && !$product->isSalable())) {
- return false;
- }
- }
- }
-
- return true;
- }
-
/**
* Check whether the payment is in payment review state
* In this state order cannot be normally processed. Possible actions can be:
@@ -971,17 +881,6 @@ public function getConfig()
return Mage::getSingleton('sales/order_config');
}
- /**
- * Place order payments
- *
- * @return $this
- */
- protected function _placePayment()
- {
- $this->getPayment()->place();
- return $this;
- }
-
/**
* Retrieve order payment model object
*
@@ -1073,47 +972,6 @@ public function setState($state, $status = false, $comment = '', $isCustomerNoti
return $this->_setState($state, $status, $comment, $isCustomerNotified, true);
}
- /**
- * Order state protected setter.
- * By default allows to set any state. Can also update status to default or specified value
- * Сomplete and closed states are encapsulated intentionally, see the _checkState()
- *
- * @param string $state
- * @param string|bool $status
- * @param string $comment
- * @param bool $isCustomerNotified
- * @param bool $shouldProtectState
- * @return $this
- */
- protected function _setState(
- $state,
- $status = false,
- $comment = '',
- $isCustomerNotified = null,
- $shouldProtectState = false
- ) {
- // attempt to set the specified state
- if ($shouldProtectState) {
- if ($this->isStateProtected($state)) {
- Mage::throwException(
- Mage::helper('sales')->__('The Order State "%s" must not be set manually.', $state),
- );
- }
- }
- $this->setData('state', $state);
-
- // add status history
- if ($status) {
- if ($status === true) {
- $status = $this->getConfig()->getStateDefaultStatus($state);
- }
- $this->setStatus($status);
- $history = $this->addStatusHistoryComment($comment, false); // no sense to set $status again
- $history->setIsCustomerNotified($isCustomerNotified); // for backwards compatibility
- }
- return $this;
- }
-
/**
* Whether specified state can be set from outside
* @param string $state
@@ -1586,19 +1444,6 @@ public function sendOrderUpdateEmail($notifyCustomer = true, $comment = '')
return $this;
}
- /**
- * @param string $configPath
- * @return array|false
- */
- protected function _getEmails($configPath)
- {
- $data = Mage::getStoreConfig($configPath, $this->getStoreId());
- if (!empty($data)) {
- return explode(',', $data);
- }
- return false;
- }
-
/*********************** ADDRESSES ***************************/
/**
@@ -1696,47 +1541,6 @@ public function getParentItemsRandomCollection($limit = 1)
return $this->_getItemsRandomCollection($limit, true);
}
- /**
- * Get random items collection with or without related children
- *
- * @param int $limit
- * @param bool $nonChildrenOnly
- * @return Mage_Sales_Model_Resource_Order_Item_Collection
- */
- protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false)
- {
- $collection = Mage::getModel('sales/order_item')->getCollection()
- ->setOrderFilter($this)
- ->setRandomOrder();
-
- if ($nonChildrenOnly) {
- $collection->filterByParent();
- }
- $products = [];
- /** @var Mage_Sales_Model_Order_Item $item */
- foreach ($collection as $item) {
- $products[] = $item->getProductId();
- }
-
- $productsCollection = Mage::getModel('catalog/product')
- ->getCollection()
- ->addIdFilter($products)
- ->setVisibility(Mage::getSingleton('catalog/product_visibility')->getVisibleInSiteIds())
- /* Price data is added to consider item stock status using price index */
- ->addPriceData()
- ->setPageSize($limit)
- ->load();
-
- foreach ($collection as $item) {
- $product = $productsCollection->getItemById($item->getProductId());
- if ($product) {
- $item->setProduct($product);
- }
- }
-
- return $collection;
- }
-
/**
* @return Mage_Sales_Model_Order_Item[]
*/
@@ -2315,43 +2119,325 @@ public function getEmailCustomerNote()
}
/**
- * Processing object before save data
- *
- * @return Mage_Core_Model_Abstract
+ * @return string
*/
- protected function _beforeSave()
+ public function getStoreGroupName()
{
- parent::_beforeSave();
- $this->_checkState();
- if (!$this->getId()) {
- $store = $this->getStore();
- $name = [$store->getWebsite()->getName(),$store->getGroup()->getName(),$store->getName()];
- $this->setStoreName(implode("\n", $name));
+ $storeId = $this->getStoreId();
+ if (is_null($storeId)) {
+ return $this->getStoreName(1); // 0 - website name, 1 - store group name, 2 - store name
}
+ return $this->getStore()->getGroup()->getName();
+ }
- if (!$this->getIncrementId()) {
- $incrementId = Mage::getSingleton('eav/config')
- ->getEntityType('order')
- ->fetchNewIncrementId($this->getStoreId());
- $this->setIncrementId($incrementId);
- }
+ /**
+ * Resets all data in object
+ * so after another load it will be complete new object
+ *
+ * @return $this
+ */
+ public function reset()
+ {
+ $this->unsetData();
+ $this->_actionFlag = [];
+ $this->_addresses = null;
+ $this->_items = null;
+ $this->_payments = null;
+ $this->_statusHistory = null;
+ $this->_invoices = null;
+ $this->_tracks = null;
+ $this->_shipments = null;
+ $this->_creditmemos = null;
+ $this->_relatedObjects = [];
+ $this->_orderCurrency = null;
+ $this->_baseCurrency = null;
- /**
- * Process items dependency for new order
- */
- if (!$this->getId()) {
- $itemsCount = 0;
- foreach ($this->getAllItems() as $item) {
- $parent = $item->getQuoteParentItemId();
- if ($parent && !$item->getParentItem()) {
- $item->setParentItem($this->getItemByQuoteItemId($parent));
- } elseif (!$parent) {
- $itemsCount++;
- }
- }
- // Set items count
- $this->setTotalItemCount($itemsCount);
- }
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function getIsNotVirtual()
+ {
+ return !$this->getIsVirtual();
+ }
+
+ /**
+ * @return mixed
+ */
+ public function getFullTaxInfo()
+ {
+ $rates = Mage::getModel('tax/sales_order_tax')->getCollection()->loadByOrder($this)->toArray();
+ return Mage::getSingleton('tax/calculation')->reproduceProcess($rates['items']);
+ }
+
+ /**
+ * Create new invoice with maximum qty for invoice for each item
+ *
+ * @param array $qtys
+ * @return Mage_Sales_Model_Order_Invoice
+ */
+ public function prepareInvoice($qtys = [])
+ {
+ return Mage::getModel('sales/service_order', $this)->prepareInvoice($qtys);
+ }
+
+ /**
+ * Create new shipment with maximum qty for shipping for each item
+ *
+ * @param array $qtys
+ * @return Mage_Sales_Model_Order_Shipment
+ */
+ public function prepareShipment($qtys = [])
+ {
+ return Mage::getModel('sales/service_order', $this)->prepareShipment($qtys);
+ }
+
+ /**
+ * Check whether order is canceled
+ *
+ * @return bool
+ */
+ public function isCanceled()
+ {
+ return ($this->getState() === self::STATE_CANCELED);
+ }
+
+ protected function _construct()
+ {
+ $this->_init('sales/order');
+ }
+
+ /**
+ * Init mapping array of short fields to
+ * its full names
+ *
+ * @return Varien_Object
+ */
+ protected function _initOldFieldsMap()
+ {
+ // pre 1.6 fields names, old => new
+ $this->_oldFieldsMap = [
+ 'payment_authorization_expiration' => 'payment_auth_expiration',
+ 'forced_do_shipment_with_invoice' => 'forced_shipment_with_invoice',
+ 'base_shipping_hidden_tax_amount' => 'base_shipping_hidden_tax_amnt',
+ ];
+ return $this;
+ }
+
+ /**
+ * Check whether order could be canceled by states and flags
+ *
+ * @return bool
+ */
+ protected function _canVoidOrder()
+ {
+ if ($this->canUnhold() || $this->isPaymentReview()) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Retrieve order reorder availability
+ *
+ * @param bool $ignoreSalable
+ * @return bool
+ */
+ protected function _canReorder($ignoreSalable = false)
+ {
+ if ($this->canUnhold() || $this->isPaymentReview()) {
+ return false;
+ }
+
+ if ($this->getActionFlag(self::ACTION_FLAG_REORDER) === false) {
+ return false;
+ }
+
+ $products = [];
+ foreach ($this->getItemsCollection() as $item) {
+ $products[] = $item->getProductId();
+ }
+
+ if (!empty($products)) {
+ /*
+ * @TODO ACPAOC: Use product collection here, but ensure that product
+ * is loaded with order store id, otherwise there'll be problems with isSalable()
+ * for configurables, bundles and other composites
+ *
+ */
+ /*
+ $productsCollection = Mage::getModel('catalog/product')->getCollection()
+ ->setStoreId($this->getStoreId())
+ ->addIdFilter($products)
+ ->addAttributeToSelect('status')
+ ->load();
+
+ foreach ($productsCollection as $product) {
+ if (!$product->isSalable()) {
+ return false;
+ }
+ }
+ */
+
+ foreach ($products as $productId) {
+ $product = Mage::getModel('catalog/product')
+ ->setStoreId($this->getStoreId())
+ ->load($productId);
+ if (!$product->getId() || (!$ignoreSalable && !$product->isSalable())) {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Place order payments
+ *
+ * @return $this
+ */
+ protected function _placePayment()
+ {
+ $this->getPayment()->place();
+ return $this;
+ }
+
+ /**
+ * Order state protected setter.
+ * By default allows to set any state. Can also update status to default or specified value
+ * Сomplete and closed states are encapsulated intentionally, see the _checkState()
+ *
+ * @param string $state
+ * @param string|bool $status
+ * @param string $comment
+ * @param bool $isCustomerNotified
+ * @param bool $shouldProtectState
+ * @return $this
+ */
+ protected function _setState(
+ $state,
+ $status = false,
+ $comment = '',
+ $isCustomerNotified = null,
+ $shouldProtectState = false
+ ) {
+ // attempt to set the specified state
+ if ($shouldProtectState) {
+ if ($this->isStateProtected($state)) {
+ Mage::throwException(
+ Mage::helper('sales')->__('The Order State "%s" must not be set manually.', $state),
+ );
+ }
+ }
+ $this->setData('state', $state);
+
+ // add status history
+ if ($status) {
+ if ($status === true) {
+ $status = $this->getConfig()->getStateDefaultStatus($state);
+ }
+ $this->setStatus($status);
+ $history = $this->addStatusHistoryComment($comment, false); // no sense to set $status again
+ $history->setIsCustomerNotified($isCustomerNotified); // for backwards compatibility
+ }
+ return $this;
+ }
+
+ /**
+ * @param string $configPath
+ * @return array|false
+ */
+ protected function _getEmails($configPath)
+ {
+ $data = Mage::getStoreConfig($configPath, $this->getStoreId());
+ if (!empty($data)) {
+ return explode(',', $data);
+ }
+ return false;
+ }
+
+ /**
+ * Get random items collection with or without related children
+ *
+ * @param int $limit
+ * @param bool $nonChildrenOnly
+ * @return Mage_Sales_Model_Resource_Order_Item_Collection
+ */
+ protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false)
+ {
+ $collection = Mage::getModel('sales/order_item')->getCollection()
+ ->setOrderFilter($this)
+ ->setRandomOrder();
+
+ if ($nonChildrenOnly) {
+ $collection->filterByParent();
+ }
+ $products = [];
+ /** @var Mage_Sales_Model_Order_Item $item */
+ foreach ($collection as $item) {
+ $products[] = $item->getProductId();
+ }
+
+ $productsCollection = Mage::getModel('catalog/product')
+ ->getCollection()
+ ->addIdFilter($products)
+ ->setVisibility(Mage::getSingleton('catalog/product_visibility')->getVisibleInSiteIds())
+ /* Price data is added to consider item stock status using price index */
+ ->addPriceData()
+ ->setPageSize($limit)
+ ->load();
+
+ foreach ($collection as $item) {
+ $product = $productsCollection->getItemById($item->getProductId());
+ if ($product) {
+ $item->setProduct($product);
+ }
+ }
+
+ return $collection;
+ }
+
+ /**
+ * Processing object before save data
+ *
+ * @return Mage_Core_Model_Abstract
+ */
+ protected function _beforeSave()
+ {
+ parent::_beforeSave();
+ $this->_checkState();
+ if (!$this->getId()) {
+ $store = $this->getStore();
+ $name = [$store->getWebsite()->getName(),$store->getGroup()->getName(),$store->getName()];
+ $this->setStoreName(implode("\n", $name));
+ }
+
+ if (!$this->getIncrementId()) {
+ $incrementId = Mage::getSingleton('eav/config')
+ ->getEntityType('order')
+ ->fetchNewIncrementId($this->getStoreId());
+ $this->setIncrementId($incrementId);
+ }
+
+ /**
+ * Process items dependency for new order
+ */
+ if (!$this->getId()) {
+ $itemsCount = 0;
+ foreach ($this->getAllItems() as $item) {
+ $parent = $item->getQuoteParentItemId();
+ if ($parent && !$item->getParentItem()) {
+ $item->setParentItem($this->getItemByQuoteItemId($parent));
+ } elseif (!$parent) {
+ $itemsCount++;
+ }
+ }
+ // Set items count
+ $this->setTotalItemCount($itemsCount);
+ }
if ($this->getCustomer()) {
$this->setCustomerId($this->getCustomer()->getId());
}
@@ -2455,92 +2541,6 @@ protected function _afterSave()
return parent::_afterSave();
}
- /**
- * @return string
- */
- public function getStoreGroupName()
- {
- $storeId = $this->getStoreId();
- if (is_null($storeId)) {
- return $this->getStoreName(1); // 0 - website name, 1 - store group name, 2 - store name
- }
- return $this->getStore()->getGroup()->getName();
- }
-
- /**
- * Resets all data in object
- * so after another load it will be complete new object
- *
- * @return $this
- */
- public function reset()
- {
- $this->unsetData();
- $this->_actionFlag = [];
- $this->_addresses = null;
- $this->_items = null;
- $this->_payments = null;
- $this->_statusHistory = null;
- $this->_invoices = null;
- $this->_tracks = null;
- $this->_shipments = null;
- $this->_creditmemos = null;
- $this->_relatedObjects = [];
- $this->_orderCurrency = null;
- $this->_baseCurrency = null;
-
- return $this;
- }
-
- /**
- * @return bool
- */
- public function getIsNotVirtual()
- {
- return !$this->getIsVirtual();
- }
-
- /**
- * @return mixed
- */
- public function getFullTaxInfo()
- {
- $rates = Mage::getModel('tax/sales_order_tax')->getCollection()->loadByOrder($this)->toArray();
- return Mage::getSingleton('tax/calculation')->reproduceProcess($rates['items']);
- }
-
- /**
- * Create new invoice with maximum qty for invoice for each item
- *
- * @param array $qtys
- * @return Mage_Sales_Model_Order_Invoice
- */
- public function prepareInvoice($qtys = [])
- {
- return Mage::getModel('sales/service_order', $this)->prepareInvoice($qtys);
- }
-
- /**
- * Create new shipment with maximum qty for shipping for each item
- *
- * @param array $qtys
- * @return Mage_Sales_Model_Order_Shipment
- */
- public function prepareShipment($qtys = [])
- {
- return Mage::getModel('sales/service_order', $this)->prepareShipment($qtys);
- }
-
- /**
- * Check whether order is canceled
- *
- * @return bool
- */
- public function isCanceled()
- {
- return ($this->getState() === self::STATE_CANCELED);
- }
-
/**
* Protect order delete from not admin scope
* @inheritDoc
diff --git a/app/code/core/Mage/Sales/Model/Order/Address.php b/app/code/core/Mage/Sales/Model/Order/Address.php
index 2552e88d8af..138d0947429 100644
--- a/app/code/core/Mage/Sales/Model/Order/Address.php
+++ b/app/code/core/Mage/Sales/Model/Order/Address.php
@@ -86,24 +86,6 @@ class Mage_Sales_Model_Order_Address extends Mage_Customer_Model_Address_Abstrac
protected $_eventPrefix = 'sales_order_address';
protected $_eventObject = 'address';
- /**
- * Initialize resource
- */
- protected function _construct()
- {
- $this->_init('sales/order_address');
- }
-
- /**
- * Init mapping array of short fields to its full names
- *
- * @return $this
- */
- protected function _initOldFieldsMap()
- {
- return $this;
- }
-
/**
* Set order
*
@@ -128,6 +110,24 @@ public function getOrder()
return $this->_order;
}
+ /**
+ * Initialize resource
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/order_address');
+ }
+
+ /**
+ * Init mapping array of short fields to its full names
+ *
+ * @return $this
+ */
+ protected function _initOldFieldsMap()
+ {
+ return $this;
+ }
+
/**
* Before object save manipulations
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Api.php b/app/code/core/Mage/Sales/Model/Order/Api.php
index 1e6cc562857..138c6e5ad94 100644
--- a/app/code/core/Mage/Sales/Model/Order/Api.php
+++ b/app/code/core/Mage/Sales/Model/Order/Api.php
@@ -34,27 +34,6 @@ public function __construct()
];
}
- /**
- * Initialize basic order model
- *
- * @param mixed $orderIncrementId
- * @return Mage_Sales_Model_Order
- */
- protected function _initOrder($orderIncrementId)
- {
- $order = Mage::getModel('sales/order');
-
- /** @var Mage_Sales_Model_Order $order */
-
- $order->loadByIncrementId($orderIncrementId);
-
- if (!$order->getId()) {
- $this->_fault('not_exists');
- }
-
- return $order;
- }
-
/**
* Retrieve list of orders. Filtration could be applied
*
@@ -267,4 +246,25 @@ public function cancel($orderIncrementId)
}
return true;
}
+
+ /**
+ * Initialize basic order model
+ *
+ * @param mixed $orderIncrementId
+ * @return Mage_Sales_Model_Order
+ */
+ protected function _initOrder($orderIncrementId)
+ {
+ $order = Mage::getModel('sales/order');
+
+ /** @var Mage_Sales_Model_Order $order */
+
+ $order->loadByIncrementId($orderIncrementId);
+
+ if (!$order->getId()) {
+ $this->_fault('not_exists');
+ }
+
+ return $order;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Config.php b/app/code/core/Mage/Sales/Model/Order/Config.php
index 8c692e89d5d..8b8ecf1bd4c 100644
--- a/app/code/core/Mage/Sales/Model/Order/Config.php
+++ b/app/code/core/Mage/Sales/Model/Order/Config.php
@@ -48,24 +48,6 @@ public function __construct()
parent::__construct(Mage::getConfig()->getNode('global/sales/order'));
}
- /**
- * @param string $status
- * @return Varien_Simplexml_Element
- */
- protected function _getStatus($status)
- {
- return $this->getNode('statuses/' . $status);
- }
-
- /**
- * @param string $state
- * @return Varien_Simplexml_Element
- */
- protected function _getState($state)
- {
- return $this->getNode('states/' . $state);
- }
-
/**
* Retrieve default status for state
*
@@ -225,6 +207,24 @@ public function getInvisibleOnFrontStates()
return $this->_states['invisible'];
}
+ /**
+ * @param string $status
+ * @return Varien_Simplexml_Element
+ */
+ protected function _getStatus($status)
+ {
+ return $this->getNode('statuses/' . $status);
+ }
+
+ /**
+ * @param string $state
+ * @return Varien_Simplexml_Element
+ */
+ protected function _getState($state)
+ {
+ return $this->getNode('states/' . $state);
+ }
+
/**
* If not yet initialized, loads the "_states" array object.
*/
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
index 1e41b6915ab..a429404e202 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
@@ -199,24 +199,6 @@ class Mage_Sales_Model_Order_Creditmemo extends Mage_Sales_Model_Abstract
protected $_eventPrefix = 'sales_order_creditmemo';
protected $_eventObject = 'creditmemo';
- /**
- * Initialize creditmemo resource model
- */
- protected function _construct()
- {
- $this->_init('sales/order_creditmemo');
- }
-
- /**
- * Init mapping array of short fields to its full names
- *
- * @return $this
- */
- protected function _initOldFieldsMap()
- {
- return $this;
- }
-
/**
* Retrieve Creditmemo configuration model
*
@@ -906,6 +888,50 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '')
return $this;
}
+ /**
+ * Get creditmemos collection filtered by $filter
+ *
+ * @param array|null $filter
+ * @return Mage_Sales_Model_Resource_Order_Creditmemo_Collection
+ */
+ public function getFilteredCollectionItems($filter = null)
+ {
+ return $this->getResourceCollection()->getFiltered($filter);
+ }
+
+ /**
+ * Checking if the credit memo is last
+ *
+ * @return bool
+ */
+ public function isLast()
+ {
+ foreach ($this->getAllItems() as $item) {
+ if (!$item->isLast()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Initialize creditmemo resource model
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/order_creditmemo');
+ }
+
+ /**
+ * Init mapping array of short fields to its full names
+ *
+ * @return $this
+ */
+ protected function _initOldFieldsMap()
+ {
+ return $this;
+ }
+
/**
* @param string $configPath
* @return array|bool
@@ -967,30 +993,4 @@ protected function _beforeSave()
return $this;
}
-
- /**
- * Get creditmemos collection filtered by $filter
- *
- * @param array|null $filter
- * @return Mage_Sales_Model_Resource_Order_Creditmemo_Collection
- */
- public function getFilteredCollectionItems($filter = null)
- {
- return $this->getResourceCollection()->getFiltered($filter);
- }
-
- /**
- * Checking if the credit memo is last
- *
- * @return bool
- */
- public function isLast()
- {
- foreach ($this->getAllItems() as $item) {
- if (!$item->isLast()) {
- return false;
- }
- }
- return true;
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php
index 3649df842f9..697073dccf2 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php
@@ -59,27 +59,6 @@ public function items($filters = null)
return $creditmemos;
}
- /**
- * Make filter of appropriate format for list method
- *
- * @deprecated since 1.7.0.1
- * @param array|null $filter
- * @return array|null
- */
- protected function _prepareListFilter($filter = null)
- {
- // prepare filter, map field creditmemo_id to entity_id
- if (is_array($filter)) {
- foreach ($filter as $field => $value) {
- if (isset($this->_attributesMap['creditmemo'][$field])) {
- $filter[$this->_attributesMap['creditmemo'][$field]] = $value;
- unset($filter[$field]);
- }
- }
- }
- return $filter;
- }
-
/**
* Retrieve credit memo information
*
@@ -225,6 +204,27 @@ public function cancel($creditmemoIncrementId)
return true;
}
+ /**
+ * Make filter of appropriate format for list method
+ *
+ * @deprecated since 1.7.0.1
+ * @param array|null $filter
+ * @return array|null
+ */
+ protected function _prepareListFilter($filter = null)
+ {
+ // prepare filter, map field creditmemo_id to entity_id
+ if (is_array($filter)) {
+ foreach ($filter as $field => $value) {
+ if (isset($this->_attributesMap['creditmemo'][$field])) {
+ $filter[$this->_attributesMap['creditmemo'][$field]] = $value;
+ unset($filter[$field]);
+ }
+ }
+ }
+ return $filter;
+ }
+
/**
* Hook method, could be replaced in derived classes
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php
index 822d99bf1cb..4e2ce7ebc43 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php
@@ -41,11 +41,6 @@ class Mage_Sales_Model_Order_Creditmemo_Comment extends Mage_Sales_Model_Abstrac
*/
protected $_creditmemo;
- protected function _construct()
- {
- $this->_init('sales/order_creditmemo_comment');
- }
-
/**
* Declare Creditmemo instance
*
@@ -80,6 +75,11 @@ public function getStore()
return Mage::app()->getStore();
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_creditmemo_comment');
+ }
+
/**
* Before object save
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php
index 7f12752de69..02843c291ec 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php
@@ -128,21 +128,6 @@ public function setCreditmemo(Mage_Sales_Model_Order_Creditmemo $creditmemo)
return $this;
}
- /**
- * Init mapping array of short fields to
- * its full names
- *
- * @return Varien_Object
- */
- protected function _initOldFieldsMap()
- {
- // pre 1.6 fields names, old => new
- $this->_oldFieldsMap = [
- 'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',
- ];
- return $this;
- }
-
/**
* Retrieve creditmemo instance
*
@@ -305,6 +290,21 @@ public function isLast()
return false;
}
+ /**
+ * Init mapping array of short fields to
+ * its full names
+ *
+ * @return Varien_Object
+ */
+ protected function _initOldFieldsMap()
+ {
+ // pre 1.6 fields names, old => new
+ $this->_oldFieldsMap = [
+ 'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',
+ ];
+ return $this;
+ }
+
/**
* Before object save
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Invoice.php
index 6198f7d434f..836342219ce 100644
--- a/app/code/core/Mage/Sales/Model/Order/Invoice.php
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice.php
@@ -194,24 +194,6 @@ public function destruct()
}
}
- /**
- * Initialize invoice resource model
- */
- protected function _construct()
- {
- $this->_init('sales/order_invoice');
- }
-
- /**
- * Init mapping array of short fields to its full names
- *
- * @return $this
- */
- protected function _initOldFieldsMap()
- {
- return $this;
- }
-
/**
* Load invoice by increment id
*
@@ -938,6 +920,41 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '')
return $this;
}
+ /**
+ * Reset invoice object
+ *
+ * @return $this
+ */
+ public function reset()
+ {
+ $this->unsetData();
+ $this->_origData = null;
+ $this->_items = null;
+ $this->_comments = null;
+ $this->_order = null;
+ $this->_saveBeforeDestruct = false;
+ $this->_wasPayCalled = false;
+ return $this;
+ }
+
+ /**
+ * Initialize invoice resource model
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/order_invoice');
+ }
+
+ /**
+ * Init mapping array of short fields to its full names
+ *
+ * @return $this
+ */
+ protected function _initOldFieldsMap()
+ {
+ return $this;
+ }
+
/**
* @param string $configPath
* @return array|bool
@@ -961,23 +978,6 @@ protected function _beforeDelete()
return parent::_beforeDelete();
}
- /**
- * Reset invoice object
- *
- * @return $this
- */
- public function reset()
- {
- $this->unsetData();
- $this->_origData = null;
- $this->_items = null;
- $this->_comments = null;
- $this->_order = null;
- $this->_saveBeforeDestruct = false;
- $this->_wasPayCalled = false;
- return $this;
- }
-
/**
* Before object save manipulations
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php
index ae7035dfc54..14e005f5401 100644
--- a/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php
@@ -41,11 +41,6 @@ class Mage_Sales_Model_Order_Invoice_Comment extends Mage_Sales_Model_Abstract
*/
protected $_invoice;
- protected function _construct()
- {
- $this->_init('sales/order_invoice_comment');
- }
-
/**
* Declare invoice instance
*
@@ -80,6 +75,11 @@ public function getStore()
return Mage::app()->getStore();
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_invoice_comment');
+ }
+
/**
* Before object save
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php
index 3ee7ab5916d..8f95bf9490c 100644
--- a/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php
@@ -104,21 +104,6 @@ public function _construct()
{
$this->_init('sales/order_invoice_item');
}
-
- /**
- * Init mapping array of short fields to
- * its full names
- *
- * @return $this
- */
- protected function _initOldFieldsMap()
- {
- // pre 1.6 fields names, old => new
- $this->_oldFieldsMap = [
- 'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',
- ];
- return $this;
- }
/**
* Declare invoice instance
*
@@ -292,6 +277,21 @@ public function isLast()
return false;
}
+ /**
+ * Init mapping array of short fields to
+ * its full names
+ *
+ * @return $this
+ */
+ protected function _initOldFieldsMap()
+ {
+ // pre 1.6 fields names, old => new
+ $this->_oldFieldsMap = [
+ 'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',
+ ];
+ return $this;
+ }
+
/**
* Before object save
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Item.php b/app/code/core/Mage/Sales/Model/Order/Item.php
index 79c3e5f4bd1..712722d0cac 100644
--- a/app/code/core/Mage/Sales/Model/Order/Item.php
+++ b/app/code/core/Mage/Sales/Model/Order/Item.php
@@ -219,46 +219,6 @@ class Mage_Sales_Model_Order_Item extends Mage_Core_Model_Abstract
protected $_parentItem = null;
protected $_children = [];
- /**
- * Init resource model
- */
- protected function _construct()
- {
- $this->_init('sales/order_item');
- }
-
- /**
- * Init mapping array of short fields to
- * its full names
- *
- * @return Varien_Object
- */
- protected function _initOldFieldsMap()
- {
- // pre 1.6 fields names, old => new
- $this->_oldFieldsMap = [
- 'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',
- ];
- return $this;
- }
-
- /**
- * Prepare data before save
- *
- * @return $this
- */
- protected function _beforeSave()
- {
- parent::_beforeSave();
- if (!$this->getOrderId() && $this->getOrder()) {
- $this->setOrderId($this->getOrder()->getId());
- }
- if ($this->getParentItem()) {
- $this->setParentItemId($this->getParentItem()->getId());
- }
- return $this;
- }
-
/**
* Set parent item
*
@@ -501,21 +461,6 @@ public function getStatusId()
return self::STATUS_MIXED;
}
- /**
- * Retrieve backordered qty of children items
- *
- * @return float|null
- */
- protected function _getQtyChildrenBackordered()
- {
- $backordered = null;
- foreach ($this->_children as $childItem) {
- $backordered += (float) $childItem->getQtyBackordered();
- }
-
- return $backordered;
- }
-
/**
* Retrieve status
*
@@ -856,4 +801,59 @@ public function getDiscountAppliedForWeeeTax()
}
return $totalDiscount;
}
+
+ /**
+ * Init resource model
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/order_item');
+ }
+
+ /**
+ * Init mapping array of short fields to
+ * its full names
+ *
+ * @return Varien_Object
+ */
+ protected function _initOldFieldsMap()
+ {
+ // pre 1.6 fields names, old => new
+ $this->_oldFieldsMap = [
+ 'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',
+ ];
+ return $this;
+ }
+
+ /**
+ * Prepare data before save
+ *
+ * @return $this
+ */
+ protected function _beforeSave()
+ {
+ parent::_beforeSave();
+ if (!$this->getOrderId() && $this->getOrder()) {
+ $this->setOrderId($this->getOrder()->getId());
+ }
+ if ($this->getParentItem()) {
+ $this->setParentItemId($this->getParentItem()->getId());
+ }
+ return $this;
+ }
+
+ /**
+ * Retrieve backordered qty of children items
+ *
+ * @return float|null
+ */
+ protected function _getQtyChildrenBackordered()
+ {
+ $backordered = null;
+ foreach ($this->_children as $childItem) {
+ $backordered += (float) $childItem->getQtyBackordered();
+ }
+
+ return $backordered;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php
index 08fb53a7556..52c1730dc4f 100644
--- a/app/code/core/Mage/Sales/Model/Order/Payment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Payment.php
@@ -256,11 +256,6 @@ class Mage_Sales_Model_Order_Payment extends Mage_Payment_Model_Info
*/
protected $_transactionAdditionalInfo = [];
- protected function _construct()
- {
- $this->_init('sales/order_payment');
- }
-
/**
* Declare order model object
*
@@ -628,25 +623,6 @@ public function cancelInvoice($invoice)
return $this;
}
- /**
- * Create new invoice with maximum qty for invoice for each item
- * register this invoice and capture
- *
- * @return Mage_Sales_Model_Order_Invoice
- */
- protected function _invoice()
- {
- $invoice = $this->getOrder()->prepareInvoice();
-
- $invoice->register();
- if ($this->getMethodInstance()->canCapture()) {
- $invoice->capture();
- }
-
- $this->getOrder()->addRelatedObject($invoice);
- return $invoice;
- }
-
/**
* Check order payment void availability
*
@@ -1055,6 +1031,168 @@ public function registerPaymentReviewAction($action, $isOnline)
return $this;
}
+ /**
+ * Public access to _authorize method
+ * @param bool $isOnline
+ * @param float $amount
+ * @return $this
+ */
+ public function authorize($isOnline, $amount)
+ {
+ return $this->_authorize($isOnline, $amount);
+ }
+
+ /**
+ * Public access to _addTransaction method
+ *
+ * @param string $type
+ * @param Mage_Sales_Model_Abstract $salesDocument
+ * @param bool $failsafe
+ * @param string|false $message
+ * @return null|Mage_Sales_Model_Order_Payment_Transaction
+ */
+ public function addTransaction($type, $salesDocument = null, $failsafe = false, $message = false)
+ {
+ $transaction = $this->_addTransaction($type, $salesDocument, $failsafe);
+
+ if ($message) {
+ $order = $this->getOrder();
+ $message = $this->_appendTransactionToMessage($transaction, $message);
+ $order->addStatusHistoryComment($message);
+ }
+
+ return $transaction;
+ }
+
+ /**
+ * Import details data of specified transaction
+ *
+ * @return $this
+ */
+ public function importTransactionInfo(Mage_Sales_Model_Order_Payment_Transaction $transactionTo)
+ {
+ $data = $this->getMethodInstance()
+ ->setStore($this->getOrder()->getStoreId())
+ ->fetchTransactionInfo($this, $transactionTo->getTxnId());
+ if ($data) {
+ $transactionTo->setAdditionalInformation(Mage_Sales_Model_Order_Payment_Transaction::RAW_DETAILS, $data);
+ }
+ return $this;
+ }
+
+ /**
+ * Get the billing agreement, if any
+ *
+ * @return Mage_Sales_Model_Billing_Agreement|null
+ */
+ public function getBillingAgreement()
+ {
+ return $this->_billingAgreement;
+ }
+
+ /**
+ * Find one transaction by ID or type
+ * @param string|false $txnId
+ * @param string|false $txnType
+ * @return Mage_Sales_Model_Order_Payment_Transaction|false
+ */
+ public function lookupTransaction($txnId, $txnType = false)
+ {
+ return $this->_lookupTransaction($txnId, $txnType);
+ }
+
+ /**
+ * Lookup an authorization transaction using parent transaction id, if set
+ * @return Mage_Sales_Model_Order_Payment_Transaction|false
+ */
+ public function getAuthorizationTransaction()
+ {
+ if ($this->getParentTransactionId()) {
+ $txn = $this->_lookupTransaction($this->getParentTransactionId());
+ } else {
+ $txn = false;
+ }
+
+ if (!$txn) {
+ $txn = $this->_lookupTransaction(false, Mage_Sales_Model_Order_Payment_Transaction::TYPE_AUTH);
+ }
+ return $txn;
+ }
+
+ /**
+ * Lookup the transaction by id
+ * @param string $transactionId
+ * @return Mage_Sales_Model_Order_Payment_Transaction|false
+ */
+ public function getTransaction($transactionId)
+ {
+ return $this->_lookupTransaction($transactionId);
+ }
+
+ /**
+ * Additional transaction info setter
+ *
+ * @param string $key
+ * @param string $value
+ */
+ public function setTransactionAdditionalInfo($key, $value)
+ {
+ if (is_array($key)) {
+ $this->_transactionAdditionalInfo = $key;
+ } else {
+ $this->_transactionAdditionalInfo[$key] = $value;
+ }
+ }
+
+ /**
+ * Additional transaction info getter
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function getTransactionAdditionalInfo($key = null)
+ {
+ if (is_null($key)) {
+ return $this->_transactionAdditionalInfo;
+ }
+ return $this->_transactionAdditionalInfo[$key] ?? null;
+ }
+
+ /**
+ * Reset transaction additional info property
+ *
+ * @return $this
+ */
+ public function resetTransactionAdditionalInfo()
+ {
+ $this->_transactionAdditionalInfo = [];
+ return $this;
+ }
+
+ protected function _construct()
+ {
+ $this->_init('sales/order_payment');
+ }
+
+ /**
+ * Create new invoice with maximum qty for invoice for each item
+ * register this invoice and capture
+ *
+ * @return Mage_Sales_Model_Order_Invoice
+ */
+ protected function _invoice()
+ {
+ $invoice = $this->getOrder()->prepareInvoice();
+
+ $invoice->register();
+ if ($this->getMethodInstance()->canCapture()) {
+ $invoice->capture();
+ }
+
+ $this->getOrder()->addRelatedObject($invoice);
+ return $invoice;
+ }
+
/**
* Order payment either online
* Updates transactions hierarchy, if required
@@ -1160,17 +1298,6 @@ protected function _authorize($isOnline, $amount)
return $this;
}
- /**
- * Public access to _authorize method
- * @param bool $isOnline
- * @param float $amount
- * @return $this
- */
- public function authorize($isOnline, $amount)
- {
- return $this->_authorize($isOnline, $amount);
- }
-
/**
* Void payment either online or offline (process void notification)
* NOTE: that in some cases authorization can be voided after a capture. In such case it makes sense to use
@@ -1316,54 +1443,6 @@ protected function _addTransaction($type, $salesDocument = null, $failsafe = fal
}
}
- /**
- * Public access to _addTransaction method
- *
- * @param string $type
- * @param Mage_Sales_Model_Abstract $salesDocument
- * @param bool $failsafe
- * @param string|false $message
- * @return null|Mage_Sales_Model_Order_Payment_Transaction
- */
- public function addTransaction($type, $salesDocument = null, $failsafe = false, $message = false)
- {
- $transaction = $this->_addTransaction($type, $salesDocument, $failsafe);
-
- if ($message) {
- $order = $this->getOrder();
- $message = $this->_appendTransactionToMessage($transaction, $message);
- $order->addStatusHistoryComment($message);
- }
-
- return $transaction;
- }
-
- /**
- * Import details data of specified transaction
- *
- * @return $this
- */
- public function importTransactionInfo(Mage_Sales_Model_Order_Payment_Transaction $transactionTo)
- {
- $data = $this->getMethodInstance()
- ->setStore($this->getOrder()->getStoreId())
- ->fetchTransactionInfo($this, $transactionTo->getTxnId());
- if ($data) {
- $transactionTo->setAdditionalInformation(Mage_Sales_Model_Order_Payment_Transaction::RAW_DETAILS, $data);
- }
- return $this;
- }
-
- /**
- * Get the billing agreement, if any
- *
- * @return Mage_Sales_Model_Billing_Agreement|null
- */
- public function getBillingAgreement()
- {
- return $this->_billingAgreement;
- }
-
/**
* Totals updater utility method
* Updates self totals by keys in data array('key' => $delta)
@@ -1517,45 +1596,6 @@ protected function _lookupTransaction($txnId, $txnType = false)
return $this->_transactionsLookup[$txnId];
}
- /**
- * Find one transaction by ID or type
- * @param string|false $txnId
- * @param string|false $txnType
- * @return Mage_Sales_Model_Order_Payment_Transaction|false
- */
- public function lookupTransaction($txnId, $txnType = false)
- {
- return $this->_lookupTransaction($txnId, $txnType);
- }
-
- /**
- * Lookup an authorization transaction using parent transaction id, if set
- * @return Mage_Sales_Model_Order_Payment_Transaction|false
- */
- public function getAuthorizationTransaction()
- {
- if ($this->getParentTransactionId()) {
- $txn = $this->_lookupTransaction($this->getParentTransactionId());
- } else {
- $txn = false;
- }
-
- if (!$txn) {
- $txn = $this->_lookupTransaction(false, Mage_Sales_Model_Order_Payment_Transaction::TYPE_AUTH);
- }
- return $txn;
- }
-
- /**
- * Lookup the transaction by id
- * @param string $transactionId
- * @return Mage_Sales_Model_Order_Payment_Transaction|false
- */
- public function getTransaction($transactionId)
- {
- return $this->_lookupTransaction($transactionId);
- }
-
/**
* Update transaction ids for further processing
* If no transactions were set before invoking, may generate an "offline" transaction id
@@ -1640,46 +1680,6 @@ protected function _createBillingAgreement()
}
}
- /**
- * Additional transaction info setter
- *
- * @param string $key
- * @param string $value
- */
- public function setTransactionAdditionalInfo($key, $value)
- {
- if (is_array($key)) {
- $this->_transactionAdditionalInfo = $key;
- } else {
- $this->_transactionAdditionalInfo[$key] = $value;
- }
- }
-
- /**
- * Additional transaction info getter
- *
- * @param string $key
- * @return mixed
- */
- public function getTransactionAdditionalInfo($key = null)
- {
- if (is_null($key)) {
- return $this->_transactionAdditionalInfo;
- }
- return $this->_transactionAdditionalInfo[$key] ?? null;
- }
-
- /**
- * Reset transaction additional info property
- *
- * @return $this
- */
- public function resetTransactionAdditionalInfo()
- {
- $this->_transactionAdditionalInfo = [];
- return $this;
- }
-
/**
* Return invoice model for transaction
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php
index 66807a4cb48..d02b73376e5 100644
--- a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php
@@ -128,12 +128,6 @@ class Mage_Sales_Model_Order_Payment_Transaction extends Mage_Core_Model_Abstrac
*/
protected $_orderWebsiteId = null;
- protected function _construct()
- {
- $this->_init('sales/order_payment_transaction');
- parent::_construct();
- }
-
/**
* Payment instance setter
* @return $this
@@ -387,21 +381,6 @@ public function hasChildTransaction($whetherHasChild = null)
return $this->_hasChild;
}
- /**
- * Check object before loading by by specified transaction ID
- * @param int $txnId
- * @return $this
- */
- protected function _beforeLoadByTxnId($txnId)
- {
- $this->_verifyPaymentObject();
- Mage::dispatchEvent(
- $this->_eventPrefix . '_load_by_txn_id_before',
- $this->_getEventData() + ['txn_id' => $txnId],
- );
- return $this;
- }
-
/**
* Load self by specified transaction ID. Requires the valid payment object to be set
* @param string $txnId
@@ -420,16 +399,6 @@ public function loadByTxnId($txnId)
return $this;
}
- /**
- * Check object after loading by by specified transaction ID
- * @return $this
- */
- protected function _afterLoadByTxnId()
- {
- Mage::dispatchEvent($this->_eventPrefix . '_load_by_txn_id_after', $this->_getEventData());
- return $this;
- }
-
/**
* Additional information setter
* Updates data inside the 'additional_information' array
@@ -612,6 +581,86 @@ public function isFailsafe($setFailsafe = null)
return $this;
}
+ /**
+ * Check whether this transaction is voided
+ * @return bool
+ */
+ public function isVoided()
+ {
+ return $this->_isVoided();
+ }
+
+ /**
+ * Retrieve transaction types
+ *
+ * @return array
+ */
+ public function getTransactionTypes()
+ {
+ return [
+ self::TYPE_ORDER => Mage::helper('sales')->__('Order'),
+ self::TYPE_AUTH => Mage::helper('sales')->__('Authorization'),
+ self::TYPE_CAPTURE => Mage::helper('sales')->__('Capture'),
+ self::TYPE_VOID => Mage::helper('sales')->__('Void'),
+ self::TYPE_REFUND => Mage::helper('sales')->__('Refund'),
+ ];
+ }
+
+ /**
+ * Retrieve order website id
+ *
+ * @return int
+ */
+ public function getOrderWebsiteId()
+ {
+ if (is_null($this->_orderWebsiteId)) {
+ $this->_orderWebsiteId = (int) $this->getResource()->getOrderWebsiteId($this->getOrderId());
+ }
+ return $this->_orderWebsiteId;
+ }
+
+ /**
+ * Get HTML format for transaction id
+ *
+ * @return string
+ */
+ public function getHtmlTxnId()
+ {
+ Mage::dispatchEvent('sales_html_txn_id', ['transaction' => $this, 'payment' => $this->_paymentObject]);
+ return $this->_data['html_txn_id'] ?? $this->getTxnId();
+ }
+
+ protected function _construct()
+ {
+ $this->_init('sales/order_payment_transaction');
+ parent::_construct();
+ }
+
+ /**
+ * Check object before loading by by specified transaction ID
+ * @param int $txnId
+ * @return $this
+ */
+ protected function _beforeLoadByTxnId($txnId)
+ {
+ $this->_verifyPaymentObject();
+ Mage::dispatchEvent(
+ $this->_eventPrefix . '_load_by_txn_id_before',
+ $this->_getEventData() + ['txn_id' => $txnId],
+ );
+ return $this;
+ }
+
+ /**
+ * Check object after loading by by specified transaction ID
+ * @return $this
+ */
+ protected function _afterLoadByTxnId()
+ {
+ Mage::dispatchEvent($this->_eventPrefix . '_load_by_txn_id_after', $this->_getEventData());
+ return $this;
+ }
+
/**
* Verify data required for saving
* @inheritDoc
@@ -699,44 +748,6 @@ protected function _isVoided()
&& (bool) count($this->getChildTransactions(self::TYPE_VOID));
}
- /**
- * Check whether this transaction is voided
- * @return bool
- */
- public function isVoided()
- {
- return $this->_isVoided();
- }
-
- /**
- * Retrieve transaction types
- *
- * @return array
- */
- public function getTransactionTypes()
- {
- return [
- self::TYPE_ORDER => Mage::helper('sales')->__('Order'),
- self::TYPE_AUTH => Mage::helper('sales')->__('Authorization'),
- self::TYPE_CAPTURE => Mage::helper('sales')->__('Capture'),
- self::TYPE_VOID => Mage::helper('sales')->__('Void'),
- self::TYPE_REFUND => Mage::helper('sales')->__('Refund'),
- ];
- }
-
- /**
- * Retrieve order website id
- *
- * @return int
- */
- public function getOrderWebsiteId()
- {
- if (is_null($this->_orderWebsiteId)) {
- $this->_orderWebsiteId = (int) $this->getResource()->getOrderWebsiteId($this->getOrderId());
- }
- return $this->_orderWebsiteId;
- }
-
/**
* Check whether specified or set transaction type is supported
* @param string $txnType
@@ -801,15 +812,4 @@ protected function _verifyThisTransactionExists()
}
$this->_verifyTxnType();
}
-
- /**
- * Get HTML format for transaction id
- *
- * @return string
- */
- public function getHtmlTxnId()
- {
- Mage::dispatchEvent('sales_html_txn_id', ['transaction' => $this, 'payment' => $this->_paymentObject]);
- return $this->_data['html_txn_id'] ?? $this->getTxnId();
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php
index f4552a9a245..caacd475fe1 100644
--- a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php
@@ -22,6 +22,12 @@
*/
abstract class Mage_Sales_Model_Order_Pdf_Abstract extends Varien_Object
{
+ /**
+ * Predefined constants
+ */
+ public const XML_PATH_SALES_PDF_INVOICE_PUT_ORDER_ID = 'sales_pdf/invoice/put_order_id';
+ public const XML_PATH_SALES_PDF_SHIPMENT_PUT_ORDER_ID = 'sales_pdf/shipment/put_order_id';
+ public const XML_PATH_SALES_PDF_CREDITMEMO_PUT_ORDER_ID = 'sales_pdf/creditmemo/put_order_id';
/**
* Y coordinate
*
@@ -39,13 +45,6 @@ abstract class Mage_Sales_Model_Order_Pdf_Abstract extends Varien_Object
*/
protected $_renderers = [];
- /**
- * Predefined constants
- */
- public const XML_PATH_SALES_PDF_INVOICE_PUT_ORDER_ID = 'sales_pdf/invoice/put_order_id';
- public const XML_PATH_SALES_PDF_SHIPMENT_PUT_ORDER_ID = 'sales_pdf/shipment/put_order_id';
- public const XML_PATH_SALES_PDF_CREDITMEMO_PUT_ORDER_ID = 'sales_pdf/creditmemo/put_order_id';
-
/**
* Zend PDF object
*
@@ -129,6 +128,185 @@ public function getAlignCenter($string, $x, $columnWidth, Zend_Pdf_Resource_Font
return $x + round(($columnWidth - $width) / 2);
}
+ /**
+ * Insert title and number for concrete document type
+ *
+ * @param string $text
+ */
+ public function insertDocumentNumber(Zend_Pdf_Page $page, $text)
+ {
+ $page->setFillColor(new Zend_Pdf_Color_GrayScale(1));
+ $this->_setFontRegular($page, 10);
+ $docHeader = $this->getDocHeaderCoordinates();
+ $page->drawText($text, 35, $docHeader[1] - 15, 'UTF-8');
+ }
+
+ /**
+ * Public method of protected @see _getRenderer()
+ *
+ * Retrieve renderer model
+ *
+ * @param string $type
+ * @return Mage_Sales_Model_Order_Pdf_Items_Abstract
+ */
+ public function getRenderer($type)
+ {
+ return $this->_getRenderer($type);
+ }
+
+ /**
+ * Render item
+ *
+ * @param Mage_Sales_Model_Order_Pdf_Items_Abstract $renderer
+ *
+ * @return Mage_Sales_Model_Order_Pdf_Abstract
+ */
+ public function renderItem(Varien_Object $item, Zend_Pdf_Page $page, Mage_Sales_Model_Order $order, $renderer)
+ {
+ $renderer->setOrder($order)
+ ->setItem($item)
+ ->setPdf($this)
+ ->setPage($page)
+ ->setRenderedModel($this)
+ ->draw();
+
+ return $this;
+ }
+
+ /**
+ * Create new page and assign to PDF object
+ *
+ * @return Zend_Pdf_Page
+ */
+ public function newPage(array $settings = [])
+ {
+ $pageSize = !empty($settings['page_size']) ? $settings['page_size'] : Zend_Pdf_Page::SIZE_A4;
+ $page = $this->_getPdf()->newPage($pageSize);
+ $this->_getPdf()->pages[] = $page;
+ $this->y = 800;
+
+ return $page;
+ }
+
+ /**
+ * Draw lines
+ *
+ * draw items array format:
+ * lines array;array of line blocks (required)
+ * shift int; full line height (optional)
+ * height int;line spacing (default 10)
+ *
+ * line block has line columns array
+ *
+ * column array format
+ * text string|array; draw text (required)
+ * feed int; x position (required)
+ * font string; font style, optional: bold, italic, regular
+ * font_file string; path to font file (optional for use your custom font)
+ * font_size int; font size (default 7)
+ * align string; text align (also see feed parameter), optional left, right
+ * height int;line spacing (default 10)
+ *
+ * @throws Mage_Core_Exception
+ * @return Zend_Pdf_Page
+ */
+ public function drawLineBlocks(Zend_Pdf_Page $page, array $draw, array $pageSettings = [])
+ {
+ foreach ($draw as $itemsProp) {
+ if (!isset($itemsProp['lines']) || !is_array($itemsProp['lines'])) {
+ Mage::throwException(Mage::helper('sales')->__('Invalid draw line data. Please define "lines" array.'));
+ }
+ $lines = $itemsProp['lines'];
+ $height = $itemsProp['height'] ?? 10;
+
+ if (empty($itemsProp['shift'])) {
+ $shift = 0;
+ foreach ($lines as $line) {
+ $maxHeight = 0;
+ foreach ($line as $column) {
+ $lineSpacing = !empty($column['height']) ? $column['height'] : $height;
+ if (!is_array($column['text'])) {
+ $column['text'] = [$column['text']];
+ }
+ $top = 0;
+ foreach ($column['text'] as $part) {
+ $top += $lineSpacing;
+ }
+
+ $maxHeight = $top > $maxHeight ? $top : $maxHeight;
+ }
+ $shift += $maxHeight;
+ }
+ $itemsProp['shift'] = $shift;
+ }
+
+ if ($this->y - $itemsProp['shift'] < 15) {
+ $page = $this->newPage($pageSettings);
+ }
+
+ foreach ($lines as $line) {
+ $maxHeight = 0;
+ foreach ($line as $column) {
+ $fontSize = empty($column['font_size']) ? 10 : $column['font_size'];
+ if (!empty($column['font_file'])) {
+ $font = Zend_Pdf_Font::fontWithPath($column['font_file']);
+ $page->setFont($font, $fontSize);
+ } else {
+ $fontStyle = empty($column['font']) ? 'regular' : $column['font'];
+ switch ($fontStyle) {
+ case 'bold':
+ $font = $this->_setFontBold($page, $fontSize);
+ break;
+ case 'italic':
+ $font = $this->_setFontItalic($page, $fontSize);
+ break;
+ default:
+ $font = $this->_setFontRegular($page, $fontSize);
+ break;
+ }
+ }
+
+ if (!is_array($column['text'])) {
+ $column['text'] = [$column['text']];
+ }
+
+ $lineSpacing = !empty($column['height']) ? $column['height'] : $height;
+ $top = 0;
+ foreach ($column['text'] as $part) {
+ if ($this->y - $lineSpacing < 15) {
+ $page = $this->newPage($pageSettings);
+ }
+
+ $feed = $column['feed'];
+ $textAlign = empty($column['align']) ? 'left' : $column['align'];
+ $width = empty($column['width']) ? 0 : $column['width'];
+ switch ($textAlign) {
+ case 'right':
+ if ($width) {
+ $feed = $this->getAlignRight($part, $feed, $width, $font, $fontSize);
+ } else {
+ $feed = $feed - $this->widthForStringUsingFontSize($part, $font, $fontSize);
+ }
+ break;
+ case 'center':
+ if ($width) {
+ $feed = $this->getAlignCenter($part, $feed, $width, $font, $fontSize);
+ }
+ break;
+ }
+ $page->drawText($part, $feed, $this->y - $top, 'UTF-8');
+ $top += $lineSpacing;
+ }
+
+ $maxHeight = $top > $maxHeight ? $top : $maxHeight;
+ }
+ $this->y -= $maxHeight;
+ }
+ }
+
+ return $page;
+ }
+
/**
* Insert logo to pdf page
*
@@ -495,19 +673,6 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
}
}
- /**
- * Insert title and number for concrete document type
- *
- * @param string $text
- */
- public function insertDocumentNumber(Zend_Pdf_Page $page, $text)
- {
- $page->setFillColor(new Zend_Pdf_Color_GrayScale(1));
- $this->_setFontRegular($page, 10);
- $docHeader = $this->getDocHeaderCoordinates();
- $page->drawText($text, 35, $docHeader[1] - 15, 'UTF-8');
- }
-
/**
* Sort totals list
*
@@ -708,38 +873,6 @@ protected function _getRenderer($type)
return $this->_renderers[$type]['renderer'];
}
- /**
- * Public method of protected @see _getRenderer()
- *
- * Retrieve renderer model
- *
- * @param string $type
- * @return Mage_Sales_Model_Order_Pdf_Items_Abstract
- */
- public function getRenderer($type)
- {
- return $this->_getRenderer($type);
- }
-
- /**
- * Render item
- *
- * @param Mage_Sales_Model_Order_Pdf_Items_Abstract $renderer
- *
- * @return Mage_Sales_Model_Order_Pdf_Abstract
- */
- public function renderItem(Varien_Object $item, Zend_Pdf_Page $page, Mage_Sales_Model_Order $order, $renderer)
- {
- $renderer->setOrder($order)
- ->setItem($item)
- ->setPdf($this)
- ->setPage($page)
- ->setRenderedModel($this)
- ->draw();
-
- return $this;
- }
-
/**
* Draw Item process
*
@@ -836,138 +969,4 @@ protected function _getPdf()
return $this->_pdf;
}
-
- /**
- * Create new page and assign to PDF object
- *
- * @return Zend_Pdf_Page
- */
- public function newPage(array $settings = [])
- {
- $pageSize = !empty($settings['page_size']) ? $settings['page_size'] : Zend_Pdf_Page::SIZE_A4;
- $page = $this->_getPdf()->newPage($pageSize);
- $this->_getPdf()->pages[] = $page;
- $this->y = 800;
-
- return $page;
- }
-
- /**
- * Draw lines
- *
- * draw items array format:
- * lines array;array of line blocks (required)
- * shift int; full line height (optional)
- * height int;line spacing (default 10)
- *
- * line block has line columns array
- *
- * column array format
- * text string|array; draw text (required)
- * feed int; x position (required)
- * font string; font style, optional: bold, italic, regular
- * font_file string; path to font file (optional for use your custom font)
- * font_size int; font size (default 7)
- * align string; text align (also see feed parameter), optional left, right
- * height int;line spacing (default 10)
- *
- * @throws Mage_Core_Exception
- * @return Zend_Pdf_Page
- */
- public function drawLineBlocks(Zend_Pdf_Page $page, array $draw, array $pageSettings = [])
- {
- foreach ($draw as $itemsProp) {
- if (!isset($itemsProp['lines']) || !is_array($itemsProp['lines'])) {
- Mage::throwException(Mage::helper('sales')->__('Invalid draw line data. Please define "lines" array.'));
- }
- $lines = $itemsProp['lines'];
- $height = $itemsProp['height'] ?? 10;
-
- if (empty($itemsProp['shift'])) {
- $shift = 0;
- foreach ($lines as $line) {
- $maxHeight = 0;
- foreach ($line as $column) {
- $lineSpacing = !empty($column['height']) ? $column['height'] : $height;
- if (!is_array($column['text'])) {
- $column['text'] = [$column['text']];
- }
- $top = 0;
- foreach ($column['text'] as $part) {
- $top += $lineSpacing;
- }
-
- $maxHeight = $top > $maxHeight ? $top : $maxHeight;
- }
- $shift += $maxHeight;
- }
- $itemsProp['shift'] = $shift;
- }
-
- if ($this->y - $itemsProp['shift'] < 15) {
- $page = $this->newPage($pageSettings);
- }
-
- foreach ($lines as $line) {
- $maxHeight = 0;
- foreach ($line as $column) {
- $fontSize = empty($column['font_size']) ? 10 : $column['font_size'];
- if (!empty($column['font_file'])) {
- $font = Zend_Pdf_Font::fontWithPath($column['font_file']);
- $page->setFont($font, $fontSize);
- } else {
- $fontStyle = empty($column['font']) ? 'regular' : $column['font'];
- switch ($fontStyle) {
- case 'bold':
- $font = $this->_setFontBold($page, $fontSize);
- break;
- case 'italic':
- $font = $this->_setFontItalic($page, $fontSize);
- break;
- default:
- $font = $this->_setFontRegular($page, $fontSize);
- break;
- }
- }
-
- if (!is_array($column['text'])) {
- $column['text'] = [$column['text']];
- }
-
- $lineSpacing = !empty($column['height']) ? $column['height'] : $height;
- $top = 0;
- foreach ($column['text'] as $part) {
- if ($this->y - $lineSpacing < 15) {
- $page = $this->newPage($pageSettings);
- }
-
- $feed = $column['feed'];
- $textAlign = empty($column['align']) ? 'left' : $column['align'];
- $width = empty($column['width']) ? 0 : $column['width'];
- switch ($textAlign) {
- case 'right':
- if ($width) {
- $feed = $this->getAlignRight($part, $feed, $width, $font, $fontSize);
- } else {
- $feed = $feed - $this->widthForStringUsingFontSize($part, $font, $fontSize);
- }
- break;
- case 'center':
- if ($width) {
- $feed = $this->getAlignCenter($part, $feed, $width, $font, $fontSize);
- }
- break;
- }
- $page->drawText($part, $feed, $this->y - $top, 'UTF-8');
- $top += $lineSpacing;
- }
-
- $maxHeight = $top > $maxHeight ? $top : $maxHeight;
- }
- $this->y -= $maxHeight;
- }
- }
-
- return $page;
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php
index bceb1dc959c..6cb5cfb12ba 100644
--- a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php
+++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php
@@ -22,75 +22,6 @@
*/
class Mage_Sales_Model_Order_Pdf_Creditmemo extends Mage_Sales_Model_Order_Pdf_Abstract
{
- /**
- * Draw table header for product items
- */
- protected function _drawHeader(Zend_Pdf_Page $page)
- {
- $this->_setFontRegular($page, 10);
- $page->setFillColor(new Zend_Pdf_Color_Rgb(0.93, 0.92, 0.92));
- $page->setLineColor(new Zend_Pdf_Color_GrayScale(0.5));
- $page->setLineWidth(0.5);
- $page->drawRectangle(25, $this->y, 570, $this->y - 30);
- $this->y -= 10;
- $page->setFillColor(new Zend_Pdf_Color_Rgb(0, 0, 0));
-
- //columns headers
- $lines[0][] = [
- 'text' => Mage::helper('sales')->__('Products'),
- 'feed' => 35,
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('SKU'), 12, true, true),
- 'feed' => 255,
- 'align' => 'right',
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('Total (ex)'), 12, true, true),
- 'feed' => 330,
- 'align' => 'right',
- //'width' => 50,
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('Discount'), 12, true, true),
- 'feed' => 380,
- 'align' => 'right',
- //'width' => 50,
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('Qty'), 12, true, true),
- 'feed' => 445,
- 'align' => 'right',
- //'width' => 30,
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('Tax'), 12, true, true),
- 'feed' => 495,
- 'align' => 'right',
- //'width' => 45,
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('Total (inc)'), 12, true, true),
- 'feed' => 565,
- 'align' => 'right',
- ];
-
- $lineBlock = [
- 'lines' => $lines,
- 'height' => 10,
- ];
-
- $this->drawLineBlocks($page, [$lineBlock], ['table_header' => true]);
- $page->setFillColor(new Zend_Pdf_Color_GrayScale(0));
- $this->y -= 20;
- }
-
/**
* Return PDF document
*
@@ -163,4 +94,72 @@ public function newPage(array $settings = [])
}
return $page;
}
+ /**
+ * Draw table header for product items
+ */
+ protected function _drawHeader(Zend_Pdf_Page $page)
+ {
+ $this->_setFontRegular($page, 10);
+ $page->setFillColor(new Zend_Pdf_Color_Rgb(0.93, 0.92, 0.92));
+ $page->setLineColor(new Zend_Pdf_Color_GrayScale(0.5));
+ $page->setLineWidth(0.5);
+ $page->drawRectangle(25, $this->y, 570, $this->y - 30);
+ $this->y -= 10;
+ $page->setFillColor(new Zend_Pdf_Color_Rgb(0, 0, 0));
+
+ //columns headers
+ $lines[0][] = [
+ 'text' => Mage::helper('sales')->__('Products'),
+ 'feed' => 35,
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('SKU'), 12, true, true),
+ 'feed' => 255,
+ 'align' => 'right',
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('Total (ex)'), 12, true, true),
+ 'feed' => 330,
+ 'align' => 'right',
+ //'width' => 50,
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('Discount'), 12, true, true),
+ 'feed' => 380,
+ 'align' => 'right',
+ //'width' => 50,
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('Qty'), 12, true, true),
+ 'feed' => 445,
+ 'align' => 'right',
+ //'width' => 30,
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('Tax'), 12, true, true),
+ 'feed' => 495,
+ 'align' => 'right',
+ //'width' => 45,
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('core/string')->str_split(Mage::helper('sales')->__('Total (inc)'), 12, true, true),
+ 'feed' => 565,
+ 'align' => 'right',
+ ];
+
+ $lineBlock = [
+ 'lines' => $lines,
+ 'height' => 10,
+ ];
+
+ $this->drawLineBlocks($page, [$lineBlock], ['table_header' => true]);
+ $page->setFillColor(new Zend_Pdf_Color_GrayScale(0));
+ $this->y -= 20;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php
index f61ff4de214..5d7e7550422 100644
--- a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php
+++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php
@@ -22,66 +22,6 @@
*/
class Mage_Sales_Model_Order_Pdf_Invoice extends Mage_Sales_Model_Order_Pdf_Abstract
{
- /**
- * Draw header for item table
- */
- protected function _drawHeader(Zend_Pdf_Page $page)
- {
- /* Add table head */
- $this->_setFontRegular($page, 10);
- $page->setFillColor(new Zend_Pdf_Color_Rgb(0.93, 0.92, 0.92));
- $page->setLineColor(new Zend_Pdf_Color_GrayScale(0.5));
- $page->setLineWidth(0.5);
- $page->drawRectangle(25, $this->y, 570, $this->y - 15);
- $this->y -= 10;
- $page->setFillColor(new Zend_Pdf_Color_Rgb(0, 0, 0));
-
- //columns headers
- $lines[0][] = [
- 'text' => Mage::helper('sales')->__('Products'),
- 'feed' => 35,
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('sales')->__('SKU'),
- 'feed' => 290,
- 'align' => 'right',
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('sales')->__('Qty'),
- 'feed' => 435,
- 'align' => 'right',
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('sales')->__('Price'),
- 'feed' => 360,
- 'align' => 'right',
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('sales')->__('Tax'),
- 'feed' => 495,
- 'align' => 'right',
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('sales')->__('Subtotal'),
- 'feed' => 565,
- 'align' => 'right',
- ];
-
- $lineBlock = [
- 'lines' => $lines,
- 'height' => 5,
- ];
-
- $this->drawLineBlocks($page, [$lineBlock], ['table_header' => true]);
- $page->setFillColor(new Zend_Pdf_Color_GrayScale(0));
- $this->y -= 20;
- }
-
/**
* Return PDF document
*
@@ -157,4 +97,63 @@ public function newPage(array $settings = [])
}
return $page;
}
+ /**
+ * Draw header for item table
+ */
+ protected function _drawHeader(Zend_Pdf_Page $page)
+ {
+ /* Add table head */
+ $this->_setFontRegular($page, 10);
+ $page->setFillColor(new Zend_Pdf_Color_Rgb(0.93, 0.92, 0.92));
+ $page->setLineColor(new Zend_Pdf_Color_GrayScale(0.5));
+ $page->setLineWidth(0.5);
+ $page->drawRectangle(25, $this->y, 570, $this->y - 15);
+ $this->y -= 10;
+ $page->setFillColor(new Zend_Pdf_Color_Rgb(0, 0, 0));
+
+ //columns headers
+ $lines[0][] = [
+ 'text' => Mage::helper('sales')->__('Products'),
+ 'feed' => 35,
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('sales')->__('SKU'),
+ 'feed' => 290,
+ 'align' => 'right',
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('sales')->__('Qty'),
+ 'feed' => 435,
+ 'align' => 'right',
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('sales')->__('Price'),
+ 'feed' => 360,
+ 'align' => 'right',
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('sales')->__('Tax'),
+ 'feed' => 495,
+ 'align' => 'right',
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('sales')->__('Subtotal'),
+ 'feed' => 565,
+ 'align' => 'right',
+ ];
+
+ $lineBlock = [
+ 'lines' => $lines,
+ 'height' => 5,
+ ];
+
+ $this->drawLineBlocks($page, [$lineBlock], ['table_header' => true]);
+ $page->setFillColor(new Zend_Pdf_Color_GrayScale(0));
+ $this->y -= 20;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php
index 9ea021eca78..7bf4e6d3ea4 100644
--- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php
@@ -188,48 +188,6 @@ public function getPage()
*/
abstract public function draw();
- /**
- * Format option value process
- *
- * @param array|string $value
- * @return string
- */
- protected function _formatOptionValue($value)
- {
- $order = $this->getOrder();
-
- $resultValue = '';
- if (is_array($value)) {
- if (isset($value['qty'])) {
- $resultValue .= sprintf('%d', $value['qty']) . ' x ';
- }
-
- $resultValue .= $value['title'];
-
- if (isset($value['price'])) {
- $resultValue .= ' ' . $order->formatPrice($value['price']);
- }
- return $resultValue;
- } else {
- return $value;
- }
- }
-
- /**
- * @deprecated To be Removed on next release
- *
- * @return array
- */
- protected function _parseDescription()
- {
- $description = $this->getItem()->getDescription();
- if (preg_match_all('/(.*?)<\/li>/i', $description, $matches)) {
- return $matches[1];
- }
-
- return [$description];
- }
-
/**
* Get array of arrays with item prices information for display in PDF
* array(
@@ -294,6 +252,63 @@ public function getItemOptions()
return $result;
}
+ /**
+ * Return item Sku
+ *
+ * @param Mage_Sales_Model_Order_Invoice_Item|Mage_Sales_Model_Order_Creditmemo_Item $item
+ * @return string
+ */
+ public function getSku($item)
+ {
+ if ($item->getOrderItem()->getProductOptionByCode('simple_sku')) {
+ return $item->getOrderItem()->getProductOptionByCode('simple_sku');
+ } else {
+ return $item->getSku();
+ }
+ }
+
+ /**
+ * Format option value process
+ *
+ * @param array|string $value
+ * @return string
+ */
+ protected function _formatOptionValue($value)
+ {
+ $order = $this->getOrder();
+
+ $resultValue = '';
+ if (is_array($value)) {
+ if (isset($value['qty'])) {
+ $resultValue .= sprintf('%d', $value['qty']) . ' x ';
+ }
+
+ $resultValue .= $value['title'];
+
+ if (isset($value['price'])) {
+ $resultValue .= ' ' . $order->formatPrice($value['price']);
+ }
+ return $resultValue;
+ } else {
+ return $value;
+ }
+ }
+
+ /**
+ * @deprecated To be Removed on next release
+ *
+ * @return array
+ */
+ protected function _parseDescription()
+ {
+ $description = $this->getItem()->getDescription();
+ if (preg_match_all('/(.*?)<\/li>/i', $description, $matches)) {
+ return $matches[1];
+ }
+
+ return [$description];
+ }
+
/**
* Set font as regular
*
@@ -332,19 +347,4 @@ protected function _setFontItalic($size = 7)
$this->getPage()->setFont($font, $size);
return $font;
}
-
- /**
- * Return item Sku
- *
- * @param Mage_Sales_Model_Order_Invoice_Item|Mage_Sales_Model_Order_Creditmemo_Item $item
- * @return string
- */
- public function getSku($item)
- {
- if ($item->getOrderItem()->getProductOptionByCode('simple_sku')) {
- return $item->getOrderItem()->getProductOptionByCode('simple_sku');
- } else {
- return $item->getSku();
- }
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php
index 7f18eb8b4ca..a1180173d11 100644
--- a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php
@@ -22,47 +22,6 @@
*/
class Mage_Sales_Model_Order_Pdf_Shipment extends Mage_Sales_Model_Order_Pdf_Abstract
{
- /**
- * Draw table header for product items
- */
- protected function _drawHeader(Zend_Pdf_Page $page)
- {
- /* Add table head */
- $this->_setFontRegular($page, 10);
- $page->setFillColor(new Zend_Pdf_Color_Rgb(0.93, 0.92, 0.92));
- $page->setLineColor(new Zend_Pdf_Color_GrayScale(0.5));
- $page->setLineWidth(0.5);
- $page->drawRectangle(25, $this->y, 570, $this->y - 15);
- $this->y -= 10;
- $page->setFillColor(new Zend_Pdf_Color_Rgb(0, 0, 0));
-
- //columns headers
- $lines[0][] = [
- 'text' => Mage::helper('sales')->__('Products'),
- 'feed' => 100,
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('sales')->__('Qty'),
- 'feed' => 35,
- ];
-
- $lines[0][] = [
- 'text' => Mage::helper('sales')->__('SKU'),
- 'feed' => 565,
- 'align' => 'right',
- ];
-
- $lineBlock = [
- 'lines' => $lines,
- 'height' => 10,
- ];
-
- $this->drawLineBlocks($page, [$lineBlock], ['table_header' => true]);
- $page->setFillColor(new Zend_Pdf_Color_GrayScale(0));
- $this->y -= 20;
- }
-
/**
* Return PDF document
*
@@ -135,4 +94,44 @@ public function newPage(array $settings = [])
}
return $page;
}
+ /**
+ * Draw table header for product items
+ */
+ protected function _drawHeader(Zend_Pdf_Page $page)
+ {
+ /* Add table head */
+ $this->_setFontRegular($page, 10);
+ $page->setFillColor(new Zend_Pdf_Color_Rgb(0.93, 0.92, 0.92));
+ $page->setLineColor(new Zend_Pdf_Color_GrayScale(0.5));
+ $page->setLineWidth(0.5);
+ $page->drawRectangle(25, $this->y, 570, $this->y - 15);
+ $this->y -= 10;
+ $page->setFillColor(new Zend_Pdf_Color_Rgb(0, 0, 0));
+
+ //columns headers
+ $lines[0][] = [
+ 'text' => Mage::helper('sales')->__('Products'),
+ 'feed' => 100,
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('sales')->__('Qty'),
+ 'feed' => 35,
+ ];
+
+ $lines[0][] = [
+ 'text' => Mage::helper('sales')->__('SKU'),
+ 'feed' => 565,
+ 'align' => 'right',
+ ];
+
+ $lineBlock = [
+ 'lines' => $lines,
+ 'height' => 10,
+ ];
+
+ $this->drawLineBlocks($page, [$lineBlock], ['table_header' => true]);
+ $page->setFillColor(new Zend_Pdf_Color_GrayScale(0));
+ $this->y -= 20;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php
index a5a92543d1b..247319066d7 100644
--- a/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php
+++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php
@@ -64,14 +64,6 @@ public function getTotalsForDisplay()
return [$total];
}
- /**
- * @return Mage_Sales_Helper_Data
- */
- protected function _getSalesHelper()
- {
- return Mage::helper('sales');
- }
-
/**
* Get array of arrays with tax information for display in PDF
* array(
@@ -127,72 +119,80 @@ public function getFullTaxInfo()
}
/**
- * Get full rate info
+ * Check if we can display total information in PDF
*
- * @return array
+ * @return bool
*/
- protected function _getFullRateInfo()
+ public function canDisplay()
{
- $rates = Mage::getModel('tax/sales_order_tax')->getCollection()->loadByOrder($this->getOrder())->toArray();
- return Mage::getSingleton('tax/calculation')->reproduceProcess($rates['items']);
+ $amount = $this->getAmount();
+ return $this->getDisplayZero() || ($amount != 0);
}
/**
- * @return Mage_Tax_Helper_Data
+ * Get Total amount from source
+ *
+ * @return float
*/
- protected function _getTaxHelper()
+ public function getAmount()
{
- return Mage::helper('tax');
+ return $this->getSource()->getDataUsingMethod($this->getSourceField());
}
/**
- * Get shipping tax
+ * Get title description from source
*
- * @return array
+ * @return mixed
*/
- protected function _getShippingTax()
+ public function getTitleDescription()
{
- return $this->_getTaxHelper()->getShippingTax($this->getOrder());
+ return $this->getSource()->getDataUsingMethod($this->getTitleSourceField());
}
/**
- * Get calculated taxes
+ * @return Mage_Sales_Helper_Data
+ */
+ protected function _getSalesHelper()
+ {
+ return Mage::helper('sales');
+ }
+
+ /**
+ * Get full rate info
*
* @return array
*/
- protected function _getCalculatedTaxes()
+ protected function _getFullRateInfo()
{
- return $this->_getTaxHelper()->getCalculatedTaxes($this->getOrder());
+ $rates = Mage::getModel('tax/sales_order_tax')->getCollection()->loadByOrder($this->getOrder())->toArray();
+ return Mage::getSingleton('tax/calculation')->reproduceProcess($rates['items']);
}
/**
- * Check if we can display total information in PDF
- *
- * @return bool
+ * @return Mage_Tax_Helper_Data
*/
- public function canDisplay()
+ protected function _getTaxHelper()
{
- $amount = $this->getAmount();
- return $this->getDisplayZero() || ($amount != 0);
+ return Mage::helper('tax');
}
/**
- * Get Total amount from source
+ * Get shipping tax
*
- * @return float
+ * @return array
*/
- public function getAmount()
+ protected function _getShippingTax()
{
- return $this->getSource()->getDataUsingMethod($this->getSourceField());
+ return $this->_getTaxHelper()->getShippingTax($this->getOrder());
}
/**
- * Get title description from source
+ * Get calculated taxes
*
- * @return mixed
+ * @return array
*/
- public function getTitleDescription()
+ protected function _getCalculatedTaxes()
{
- return $this->getSource()->getDataUsingMethod($this->getTitleSourceField());
+ return $this->_getTaxHelper()->getCalculatedTaxes($this->getOrder());
}
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php
index 63e98572ccb..385afdbc745 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment.php
@@ -101,24 +101,6 @@ class Mage_Sales_Model_Order_Shipment extends Mage_Sales_Model_Abstract
protected $_eventPrefix = 'sales_order_shipment';
protected $_eventObject = 'shipment';
- /**
- * Initialize shipment resource model
- */
- protected function _construct()
- {
- $this->_init('sales/order_shipment');
- }
-
- /**
- * Init mapping array of short fields to its full names
- *
- * @return $this
- */
- protected function _initOldFieldsMap()
- {
- return $this;
- }
-
/**
* Load shipment by increment id
*
@@ -575,6 +557,60 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '')
return $this;
}
+ /**
+ * Retrieve store model instance
+ *
+ * @return Mage_Core_Model_Store
+ */
+ public function getStore()
+ {
+ return $this->getOrder()->getStore();
+ }
+
+ /**
+ * Set shipping label
+ *
+ * @param string $label label representation (image or pdf file)
+ * @return $this
+ */
+ public function setShippingLabel($label)
+ {
+ $this->setData('shipping_label', $label);
+ return $this;
+ }
+
+ /**
+ * Get shipping label and decode by db adapter
+ *
+ * @return string
+ */
+ public function getShippingLabel()
+ {
+ $label = $this->getData('shipping_label');
+ if ($label) {
+ return $this->getResource()->getReadConnection()->decodeVarbinary($label);
+ }
+ return $label;
+ }
+
+ /**
+ * Initialize shipment resource model
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/order_shipment');
+ }
+
+ /**
+ * Init mapping array of short fields to its full names
+ *
+ * @return $this
+ */
+ protected function _initOldFieldsMap()
+ {
+ return $this;
+ }
+
/**
* @param string $configPath
* @return array|false
@@ -650,40 +686,4 @@ protected function _afterSave()
return parent::_afterSave();
}
-
- /**
- * Retrieve store model instance
- *
- * @return Mage_Core_Model_Store
- */
- public function getStore()
- {
- return $this->getOrder()->getStore();
- }
-
- /**
- * Set shipping label
- *
- * @param string $label label representation (image or pdf file)
- * @return $this
- */
- public function setShippingLabel($label)
- {
- $this->setData('shipping_label', $label);
- return $this;
- }
-
- /**
- * Get shipping label and decode by db adapter
- *
- * @return string
- */
- public function getShippingLabel()
- {
- $label = $this->getData('shipping_label');
- if ($label) {
- return $this->getResource()->getReadConnection()->decodeVarbinary($label);
- }
- return $label;
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php
index 5ba48008546..6e238f22a33 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php
@@ -22,21 +22,6 @@
*/
class Mage_Sales_Model_Order_Shipment_Api_V2 extends Mage_Sales_Model_Order_Shipment_Api
{
- /**
- * @param array $data
- * @return array
- */
- protected function _prepareItemQtyData($data)
- {
- $_data = [];
- foreach ($data as $item) {
- if (isset($item->order_item_id) && isset($item->qty)) {
- $_data[$item->order_item_id] = $item->qty;
- }
- }
- return $_data;
- }
-
/**
* Create new shipment for order
*
@@ -116,4 +101,18 @@ public function getCarriers($orderIncrementId)
return $carriers;
}
+ /**
+ * @param array $data
+ * @return array
+ */
+ protected function _prepareItemQtyData($data)
+ {
+ $_data = [];
+ foreach ($data as $item) {
+ if (isset($item->order_item_id) && isset($item->qty)) {
+ $_data[$item->order_item_id] = $item->qty;
+ }
+ }
+ return $_data;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php
index 4436b179c20..e61bb3372fd 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php
@@ -44,11 +44,6 @@ class Mage_Sales_Model_Order_Shipment_Comment extends Mage_Sales_Model_Abstract
*/
protected $_shipment;
- protected function _construct()
- {
- $this->_init('sales/order_shipment_comment');
- }
-
/**
* Declare Shipment instance
*
@@ -83,6 +78,11 @@ public function getStore()
return Mage::app()->getStore();
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_shipment_comment');
+ }
+
/**
* Before object save
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php
index 846ab6906d2..d35232182e7 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php
@@ -61,19 +61,6 @@ public function _construct()
$this->_init('sales/order_shipment_track');
}
- /**
- * Init mapping array of short fields to
- * its full names
- *
- * @return void
- */
- protected function _initOldFieldsMap()
- {
- $this->_oldFieldsMap = [
- 'number' => 'track_number',
- ];
- }
-
/**
* Back compatibility with old versions.
*
@@ -174,6 +161,19 @@ public function getStoreId()
return $this->getStore()->getId();
}
+ /**
+ * Init mapping array of short fields to
+ * its full names
+ *
+ * @return void
+ */
+ protected function _initOldFieldsMap()
+ {
+ $this->_oldFieldsMap = [
+ 'number' => 'track_number',
+ ];
+ }
+
/**
* Before object save
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Status.php b/app/code/core/Mage/Sales/Model/Order/Status.php
index 9e0a9145d3f..667e6178574 100644
--- a/app/code/core/Mage/Sales/Model/Order/Status.php
+++ b/app/code/core/Mage/Sales/Model/Order/Status.php
@@ -30,11 +30,6 @@
*/
class Mage_Sales_Model_Order_Status extends Mage_Core_Model_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_status');
- }
-
/**
* Assign order status to particular state
*
@@ -119,4 +114,8 @@ public function loadDefaultByState($state)
$this->load($state, 'default_state');
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_status');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Order/Status/History.php
index f1cffa95046..f22f47f3efb 100644
--- a/app/code/core/Mage/Sales/Model/Order/Status/History.php
+++ b/app/code/core/Mage/Sales/Model/Order/Status/History.php
@@ -49,11 +49,6 @@ class Mage_Sales_Model_Order_Status_History extends Mage_Sales_Model_Abstract
protected $_eventPrefix = 'sales_order_status_history';
protected $_eventObject = 'status_history';
- protected function _construct()
- {
- $this->_init('sales/order_status_history');
- }
-
/**
* Set order object
*
@@ -137,6 +132,11 @@ public function getStore()
return Mage::app()->getStore();
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_status_history');
+ }
+
/**
* Set order again if required
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php b/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php
index e5c8551e4ab..50d11e491fe 100644
--- a/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php
+++ b/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php
@@ -43,6 +43,21 @@ class Mage_Sales_Model_Order_Total_Config_Base extends Mage_Sales_Model_Config_O
*/
protected $_totalsConfigNode = 'totals';
+ /**
+ * Retrieve total calculation models
+ *
+ * @return array
+ */
+ public function getTotalModels()
+ {
+ if (empty($this->_totalModels)) {
+ $this->_initModels();
+ $this->_initCollectors();
+ $this->_totalModels = $this->_collectors;
+ }
+ return $this->_totalModels;
+ }
+
/**
* Init model class by configuration
*
@@ -65,19 +80,4 @@ protected function _initModelInstance($class, $totalCode, $totalConfig)
$this->_modelsConfig[$totalCode] = $model->processConfigArray($this->_modelsConfig[$totalCode]);
return $model;
}
-
- /**
- * Retrieve total calculation models
- *
- * @return array
- */
- public function getTotalModels()
- {
- if (empty($this->_totalModels)) {
- $this->_initModels();
- $this->_initCollectors();
- $this->_totalModels = $this->_collectors;
- }
- return $this->_totalModels;
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php
index 6e31796a00c..f668dfea71b 100644
--- a/app/code/core/Mage/Sales/Model/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Quote.php
@@ -179,6 +179,12 @@
*/
class Mage_Sales_Model_Quote extends Mage_Core_Model_Abstract
{
+ /**
+ * @deprecated after 1.4 beta1 - one page checkout responsibility
+ */
+ public const CHECKOUT_METHOD_REGISTER = 'register';
+ public const CHECKOUT_METHOD_GUEST = 'guest';
+ public const CHECKOUT_METHOD_LOGIN_IN = 'login_in';
protected $_eventPrefix = 'sales_quote';
protected $_eventObject = 'quote';
@@ -233,25 +239,6 @@ class Mage_Sales_Model_Quote extends Mage_Core_Model_Abstract
*/
protected $_preventSaving = false;
- /**
- * Init resource model
- */
- protected function _construct()
- {
- $this->_init('sales/quote');
- }
-
- /**
- * Init mapping array of short fields to
- * its full names
- *
- * @return Varien_Object
- */
- protected function _initOldFieldsMap()
- {
- return $this;
- }
-
/**
* Get quote store identifier
*
@@ -305,87 +292,6 @@ public function getSharedStoreIds()
return $ids;
}
- /**
- * @inheritDoc
- * @throws Mage_Core_Exception
- */
- protected function _beforeSave()
- {
- /**
- * Currency logic
- *
- * global - currency which is set for default in backend
- * base - currency which is set for current website. all attributes that
- * have 'base_' prefix saved in this currency
- * store - all the time it was currency of website and all attributes
- * with 'base_' were saved in this currency. From now on it is
- * deprecated and will be duplication of base currency code.
- * quote/order - currency which was selected by customer or configured by
- * admin for current store. currency in which customer sees
- * price thought all checkout.
- *
- * Rates:
- * store_to_base & store_to_quote/store_to_order - are deprecated
- * base_to_global & base_to_quote/base_to_order - must be used instead
- */
-
- $globalCurrencyCode = Mage::app()->getBaseCurrencyCode();
- $baseCurrency = $this->getStore()->getBaseCurrency();
-
- if ($this->hasForcedCurrency()) {
- $quoteCurrency = $this->getForcedCurrency();
- } else {
- $quoteCurrency = $this->getStore()->getCurrentCurrency();
- }
-
- $this->setGlobalCurrencyCode($globalCurrencyCode);
- $this->setBaseCurrencyCode($baseCurrency->getCode());
- $this->setStoreCurrencyCode($baseCurrency->getCode());
- $this->setQuoteCurrencyCode($quoteCurrency->getCode());
-
- //deprecated, read above
- $this->setStoreToBaseRate($baseCurrency->getRate($globalCurrencyCode));
- $this->setStoreToQuoteRate($baseCurrency->getRate($quoteCurrency));
-
- $this->setBaseToGlobalRate($baseCurrency->getRate($globalCurrencyCode));
- $this->setBaseToQuoteRate($baseCurrency->getRate($quoteCurrency));
-
- if (!$this->hasChangedFlag() || $this->getChangedFlag() == true) {
- $this->setIsChanged(1);
- } else {
- $this->setIsChanged(0);
- }
-
- if ($this->_customer) {
- $this->setCustomerId($this->_customer->getId());
- }
-
- return parent::_beforeSave();
- }
-
- /**
- * Save related items
- *
- * @return $this
- */
- protected function _afterSave()
- {
- parent::_afterSave();
-
- if ($this->_addresses !== null) {
- $this->getAddressesCollection()->save();
- }
-
- if ($this->_items !== null) {
- $this->getItemsCollection()->save();
- }
-
- if ($this->_payments !== null) {
- $this->getPaymentsCollection()->save();
- }
- return $this;
- }
-
/**
* Loading quote data by customer
*
@@ -571,25 +477,6 @@ public function getAddressesCollection()
return $this->_addresses;
}
- /**
- * Retrieve quote address by type
- *
- * @param string $type
- * @return Mage_Sales_Model_Quote_Address
- */
- protected function _getAddressByType($type)
- {
- foreach ($this->getAddressesCollection() as $address) {
- if ($address->getAddressType() == $type && !$address->isDeleted()) {
- return $address;
- }
- }
-
- $address = Mage::getModel('sales/quote_address')->setAddressType($type);
- $this->addAddress($address);
- return $address;
- }
-
/**
* Retrieve quote billing address
*
@@ -1116,46 +1003,6 @@ public function addProduct(Mage_Catalog_Model_Product $product, $request = null)
);
}
- /**
- * Adding catalog product object data to quote
- *
- * @param int $qty
- * @return Mage_Sales_Model_Quote_Item
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _addCatalogProduct(Mage_Catalog_Model_Product $product, $qty = 1)
- {
- $newItem = false;
- $item = $this->getItemByProduct($product);
- if (!$item) {
- $item = Mage::getModel('sales/quote_item');
- $item->setQuote($this);
- if (Mage::app()->getStore()->isAdmin()) {
- $item->setStoreId($this->getStore()->getId());
- } else {
- $item->setStoreId(Mage::app()->getStore()->getId());
- }
- $newItem = true;
- }
-
- /**
- * We can't modify existing child items
- */
- if ($item->getId() && $product->getParentProductId()) {
- return $item;
- }
-
- $item->setOptions($product->getCustomOptions())
- ->setProduct($product);
-
- // Add only item that is not in quote already (there can be other new or already saved item
- if ($newItem) {
- $this->addItem($item);
- }
-
- return $item;
- }
-
/**
* Updates quote item with new configuration
*
@@ -1573,17 +1420,6 @@ public function getErrors()
return $errors;
}
- /**
- * Sets flag, whether this quote has some error associated with it.
- *
- * @param bool $flag
- * @return $this
- */
- protected function _setHasError($flag)
- {
- return $this->setData('has_error', $flag);
- }
-
/**
* Sets flag, whether this quote has some error associated with it.
* When TRUE - also adds 'unknown' error information to list of quote errors.
@@ -1604,19 +1440,6 @@ public function setHasError($flag)
return $this;
}
- /**
- * Clears list of errors, associated with this quote.
- * Also automatically removes error-flag from oneself.
- *
- * @return $this
- */
- protected function _clearErrorInfo()
- {
- $this->_errorInfoGroups = [];
- $this->_setHasError(false);
- return $this;
- }
-
/**
* Adds error information to the quote.
* Automatically sets error flag.
@@ -1974,51 +1797,6 @@ public function prepareRecurringPaymentProfiles()
return $result;
}
- /**
- * @return $this
- */
- protected function _validateCouponCode()
- {
- $code = $this->getCouponCode();
- if (strlen($code)) {
- $addressHasCoupon = false;
- $addresses = $this->getAllAddresses();
- if (count($addresses) > 0) {
- foreach ($addresses as $address) {
- if ($address->hasCouponCode()) {
- $addressHasCoupon = true;
- }
- }
- if (!$addressHasCoupon) {
- $this->setCouponCode('');
- }
- }
- }
- return $this;
- }
-
- /**
- * Trigger collect totals after loading, if required
- *
- * @inheritDoc
- */
- protected function _afterLoad()
- {
- // collect totals and save me, if required
- if ($this->getData('trigger_recollect') == 1) {
- $this->setTriggerRecollect(0)->getResource()->save($this);
- $this->collectTotals()->save();
- }
- return parent::_afterLoad();
- }
-
- /**
- * @deprecated after 1.4 beta1 - one page checkout responsibility
- */
- public const CHECKOUT_METHOD_REGISTER = 'register';
- public const CHECKOUT_METHOD_GUEST = 'guest';
- public const CHECKOUT_METHOD_LOGIN_IN = 'login_in';
-
/**
* Return quote checkout method code
*
@@ -2081,4 +1859,225 @@ public function setCouponCode(?string $couponCode)
{
return $this->setData('coupon_code', $couponCode);
}
+
+ /**
+ * Init resource model
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/quote');
+ }
+
+ /**
+ * Init mapping array of short fields to
+ * its full names
+ *
+ * @return Varien_Object
+ */
+ protected function _initOldFieldsMap()
+ {
+ return $this;
+ }
+
+ /**
+ * @inheritDoc
+ * @throws Mage_Core_Exception
+ */
+ protected function _beforeSave()
+ {
+ /**
+ * Currency logic
+ *
+ * global - currency which is set for default in backend
+ * base - currency which is set for current website. all attributes that
+ * have 'base_' prefix saved in this currency
+ * store - all the time it was currency of website and all attributes
+ * with 'base_' were saved in this currency. From now on it is
+ * deprecated and will be duplication of base currency code.
+ * quote/order - currency which was selected by customer or configured by
+ * admin for current store. currency in which customer sees
+ * price thought all checkout.
+ *
+ * Rates:
+ * store_to_base & store_to_quote/store_to_order - are deprecated
+ * base_to_global & base_to_quote/base_to_order - must be used instead
+ */
+
+ $globalCurrencyCode = Mage::app()->getBaseCurrencyCode();
+ $baseCurrency = $this->getStore()->getBaseCurrency();
+
+ if ($this->hasForcedCurrency()) {
+ $quoteCurrency = $this->getForcedCurrency();
+ } else {
+ $quoteCurrency = $this->getStore()->getCurrentCurrency();
+ }
+
+ $this->setGlobalCurrencyCode($globalCurrencyCode);
+ $this->setBaseCurrencyCode($baseCurrency->getCode());
+ $this->setStoreCurrencyCode($baseCurrency->getCode());
+ $this->setQuoteCurrencyCode($quoteCurrency->getCode());
+
+ //deprecated, read above
+ $this->setStoreToBaseRate($baseCurrency->getRate($globalCurrencyCode));
+ $this->setStoreToQuoteRate($baseCurrency->getRate($quoteCurrency));
+
+ $this->setBaseToGlobalRate($baseCurrency->getRate($globalCurrencyCode));
+ $this->setBaseToQuoteRate($baseCurrency->getRate($quoteCurrency));
+
+ if (!$this->hasChangedFlag() || $this->getChangedFlag() == true) {
+ $this->setIsChanged(1);
+ } else {
+ $this->setIsChanged(0);
+ }
+
+ if ($this->_customer) {
+ $this->setCustomerId($this->_customer->getId());
+ }
+
+ return parent::_beforeSave();
+ }
+
+ /**
+ * Save related items
+ *
+ * @return $this
+ */
+ protected function _afterSave()
+ {
+ parent::_afterSave();
+
+ if ($this->_addresses !== null) {
+ $this->getAddressesCollection()->save();
+ }
+
+ if ($this->_items !== null) {
+ $this->getItemsCollection()->save();
+ }
+
+ if ($this->_payments !== null) {
+ $this->getPaymentsCollection()->save();
+ }
+ return $this;
+ }
+
+ /**
+ * Retrieve quote address by type
+ *
+ * @param string $type
+ * @return Mage_Sales_Model_Quote_Address
+ */
+ protected function _getAddressByType($type)
+ {
+ foreach ($this->getAddressesCollection() as $address) {
+ if ($address->getAddressType() == $type && !$address->isDeleted()) {
+ return $address;
+ }
+ }
+
+ $address = Mage::getModel('sales/quote_address')->setAddressType($type);
+ $this->addAddress($address);
+ return $address;
+ }
+
+ /**
+ * Adding catalog product object data to quote
+ *
+ * @param int $qty
+ * @return Mage_Sales_Model_Quote_Item
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ protected function _addCatalogProduct(Mage_Catalog_Model_Product $product, $qty = 1)
+ {
+ $newItem = false;
+ $item = $this->getItemByProduct($product);
+ if (!$item) {
+ $item = Mage::getModel('sales/quote_item');
+ $item->setQuote($this);
+ if (Mage::app()->getStore()->isAdmin()) {
+ $item->setStoreId($this->getStore()->getId());
+ } else {
+ $item->setStoreId(Mage::app()->getStore()->getId());
+ }
+ $newItem = true;
+ }
+
+ /**
+ * We can't modify existing child items
+ */
+ if ($item->getId() && $product->getParentProductId()) {
+ return $item;
+ }
+
+ $item->setOptions($product->getCustomOptions())
+ ->setProduct($product);
+
+ // Add only item that is not in quote already (there can be other new or already saved item
+ if ($newItem) {
+ $this->addItem($item);
+ }
+
+ return $item;
+ }
+
+ /**
+ * Sets flag, whether this quote has some error associated with it.
+ *
+ * @param bool $flag
+ * @return $this
+ */
+ protected function _setHasError($flag)
+ {
+ return $this->setData('has_error', $flag);
+ }
+
+ /**
+ * Clears list of errors, associated with this quote.
+ * Also automatically removes error-flag from oneself.
+ *
+ * @return $this
+ */
+ protected function _clearErrorInfo()
+ {
+ $this->_errorInfoGroups = [];
+ $this->_setHasError(false);
+ return $this;
+ }
+
+ /**
+ * @return $this
+ */
+ protected function _validateCouponCode()
+ {
+ $code = $this->getCouponCode();
+ if (strlen($code)) {
+ $addressHasCoupon = false;
+ $addresses = $this->getAllAddresses();
+ if (count($addresses) > 0) {
+ foreach ($addresses as $address) {
+ if ($address->hasCouponCode()) {
+ $addressHasCoupon = true;
+ }
+ }
+ if (!$addressHasCoupon) {
+ $this->setCouponCode('');
+ }
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * Trigger collect totals after loading, if required
+ *
+ * @inheritDoc
+ */
+ protected function _afterLoad()
+ {
+ // collect totals and save me, if required
+ if ($this->getData('trigger_recollect') == 1) {
+ $this->setTriggerRecollect(0)->getResource()->save($this);
+ $this->collectTotals()->save();
+ }
+ return parent::_afterLoad();
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php
index 08363d23c9d..c1084f5682a 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address.php
@@ -296,114 +296,11 @@ class Mage_Sales_Model_Quote_Address extends Mage_Customer_Model_Address_Abstrac
protected $_nominalOnly = null;
/**
- * Initialize resource
- */
- protected function _construct()
- {
- $this->_init('sales/quote_address');
- }
-
- /**
- * Init mapping array of short fields to its full names
- *
- * @return $this
- */
- protected function _initOldFieldsMap()
- {
- return $this;
- }
-
- /**
- * Initialize Quote identifier before save
- *
- * @return $this
- */
- protected function _beforeSave()
- {
- parent::_beforeSave();
- $this->_populateBeforeSaveData();
- return $this;
- }
-
- /**
- * Set the required fields
- */
- protected function _populateBeforeSaveData()
- {
- if ($this->getQuote()) {
- $this->_dataSaveAllowed = (bool) $this->getQuote()->getId();
-
- if ($this->getQuote()->getId()) {
- $this->setQuoteId($this->getQuote()->getId());
- }
- $this->setCustomerId($this->getQuote()->getCustomerId());
-
- /**
- * Init customer address id if customer address is assigned
- */
- if ($this->getCustomerAddress()) {
- $this->setCustomerAddressId($this->getCustomerAddress()->getId());
- }
-
- /**
- * Set same_as_billing to "1" when default shipping address is set as default
- * and it is not equal billing address
- */
- if (!$this->getId()) {
- $this->setSameAsBilling((int) $this->_isSameAsBilling());
- }
- }
- }
-
- /**
- * Returns true if the billing address is same as the shipping
- *
- * @return bool
- */
- protected function _isSameAsBilling()
- {
- return ($this->getAddressType() === self::TYPE_SHIPPING
- && ($this->_isNotRegisteredCustomer() || $this->_isDefaultShippingNullOrSameAsBillingAddress()));
- }
-
- /**
- * Checks if the user is a registered customer
- *
- * @return bool
- */
- protected function _isNotRegisteredCustomer()
- {
- return !$this->getQuote()->getCustomerId() || $this->getCustomerAddressId() === null;
- }
-
- /**
- * Returns true if the def billing address is same as customer address
- *
- * @return bool
- */
- protected function _isDefaultShippingNullOrSameAsBillingAddress()
- {
- $customer = $this->getQuote()->getCustomer();
- return !$customer->getDefaultShippingAddress()
- || $customer->getDefaultBillingAddress() && $customer->getDefaultShippingAddress()
- && $customer->getDefaultBillingAddress()->getId() == $customer->getDefaultShippingAddress()->getId();
- }
-
- /**
- * Save child collections
- *
- * @return $this
+ * Rewrite clone method
*/
- protected function _afterSave()
+ public function __clone()
{
- parent::_afterSave();
- if ($this->_items !== null) {
- $this->getItemsCollection()->save();
- }
- if ($this->_rates !== null) {
- $this->getShippingRatesCollection()->save();
- }
- return $this;
+ $this->setId(null);
}
/**
@@ -620,24 +517,6 @@ public function getAllNominalItems()
return $result;
}
- /**
- * Segregate by nominal criteria
- *
- * true: get nominals only
- * false: get non-nominals only
- * null: get all
- *
- * @param Mage_Sales_Model_Quote_Item_Abstract $item
- * @return Mage_Sales_Model_Quote_Item_Abstract|false
- */
- protected function _filterNominal($item)
- {
- return ($this->_nominalOnly === null)
- || (($this->_nominalOnly === false) && !$item->isNominal())
- || (($this->_nominalOnly === true) && $item->isNominal())
- ? $item : false;
- }
-
/**
* Retrieve all visible items
*
@@ -853,24 +732,6 @@ public function getGroupedAllShippingRates()
return $rates;
}
- /**
- * Sort rates recursive callback
- *
- * @param array $a
- * @param array $b
- * @return int
- */
- protected function _sortRates($a, $b)
- {
- if ((int) $a[0]->carrier_sort_order < (int) $b[0]->carrier_sort_order) {
- return -1;
- } elseif ((int) $a[0]->carrier_sort_order > (int) $b[0]->carrier_sort_order) {
- return 1;
- } else {
- return 0;
- }
- }
-
/**
* Retrieve shipping rate by identifier
*
@@ -1122,14 +983,6 @@ public function addTotal($total)
return $this;
}
- /**
- * Rewrite clone method
- */
- public function __clone()
- {
- $this->setId(null);
- }
-
/**
* Validate minimum amount
*
@@ -1337,4 +1190,151 @@ public function getCouponCode(): string
{
return (string) $this->_getData('coupon_code');
}
+
+ /**
+ * Initialize resource
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/quote_address');
+ }
+
+ /**
+ * Init mapping array of short fields to its full names
+ *
+ * @return $this
+ */
+ protected function _initOldFieldsMap()
+ {
+ return $this;
+ }
+
+ /**
+ * Initialize Quote identifier before save
+ *
+ * @return $this
+ */
+ protected function _beforeSave()
+ {
+ parent::_beforeSave();
+ $this->_populateBeforeSaveData();
+ return $this;
+ }
+
+ /**
+ * Set the required fields
+ */
+ protected function _populateBeforeSaveData()
+ {
+ if ($this->getQuote()) {
+ $this->_dataSaveAllowed = (bool) $this->getQuote()->getId();
+
+ if ($this->getQuote()->getId()) {
+ $this->setQuoteId($this->getQuote()->getId());
+ }
+ $this->setCustomerId($this->getQuote()->getCustomerId());
+
+ /**
+ * Init customer address id if customer address is assigned
+ */
+ if ($this->getCustomerAddress()) {
+ $this->setCustomerAddressId($this->getCustomerAddress()->getId());
+ }
+
+ /**
+ * Set same_as_billing to "1" when default shipping address is set as default
+ * and it is not equal billing address
+ */
+ if (!$this->getId()) {
+ $this->setSameAsBilling((int) $this->_isSameAsBilling());
+ }
+ }
+ }
+
+ /**
+ * Returns true if the billing address is same as the shipping
+ *
+ * @return bool
+ */
+ protected function _isSameAsBilling()
+ {
+ return ($this->getAddressType() === self::TYPE_SHIPPING
+ && ($this->_isNotRegisteredCustomer() || $this->_isDefaultShippingNullOrSameAsBillingAddress()));
+ }
+
+ /**
+ * Checks if the user is a registered customer
+ *
+ * @return bool
+ */
+ protected function _isNotRegisteredCustomer()
+ {
+ return !$this->getQuote()->getCustomerId() || $this->getCustomerAddressId() === null;
+ }
+
+ /**
+ * Returns true if the def billing address is same as customer address
+ *
+ * @return bool
+ */
+ protected function _isDefaultShippingNullOrSameAsBillingAddress()
+ {
+ $customer = $this->getQuote()->getCustomer();
+ return !$customer->getDefaultShippingAddress()
+ || $customer->getDefaultBillingAddress() && $customer->getDefaultShippingAddress()
+ && $customer->getDefaultBillingAddress()->getId() == $customer->getDefaultShippingAddress()->getId();
+ }
+
+ /**
+ * Save child collections
+ *
+ * @return $this
+ */
+ protected function _afterSave()
+ {
+ parent::_afterSave();
+ if ($this->_items !== null) {
+ $this->getItemsCollection()->save();
+ }
+ if ($this->_rates !== null) {
+ $this->getShippingRatesCollection()->save();
+ }
+ return $this;
+ }
+
+ /**
+ * Segregate by nominal criteria
+ *
+ * true: get nominals only
+ * false: get non-nominals only
+ * null: get all
+ *
+ * @param Mage_Sales_Model_Quote_Item_Abstract $item
+ * @return Mage_Sales_Model_Quote_Item_Abstract|false
+ */
+ protected function _filterNominal($item)
+ {
+ return ($this->_nominalOnly === null)
+ || (($this->_nominalOnly === false) && !$item->isNominal())
+ || (($this->_nominalOnly === true) && $item->isNominal())
+ ? $item : false;
+ }
+
+ /**
+ * Sort rates recursive callback
+ *
+ * @param array $a
+ * @param array $b
+ * @return int
+ */
+ protected function _sortRates($a, $b)
+ {
+ if ((int) $a[0]->carrier_sort_order < (int) $b[0]->carrier_sort_order) {
+ return -1;
+ } elseif ((int) $a[0]->carrier_sort_order > (int) $b[0]->carrier_sort_order) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php
index 5810bf523c7..e1fa525e629 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php
@@ -118,23 +118,6 @@ class Mage_Sales_Model_Quote_Address_Item extends Mage_Sales_Model_Quote_Item_Ab
protected $_address;
protected $_quote;
- protected function _construct()
- {
- $this->_init('sales/quote_address_item');
- }
-
- /**
- * @return $this
- */
- protected function _beforeSave()
- {
- parent::_beforeSave();
- if ($this->getAddress()) {
- $this->setQuoteAddressId($this->getAddress()->getId());
- }
- return $this;
- }
-
/**
* Declare address model
*
@@ -205,4 +188,21 @@ public function getOptionBycode($code)
}
return null;
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/quote_address_item');
+ }
+
+ /**
+ * @return $this
+ */
+ protected function _beforeSave()
+ {
+ parent::_beforeSave();
+ if ($this->getAddress()) {
+ $this->setQuoteAddressId($this->getAddress()->getId());
+ }
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php
index 290b15329b4..dfd26b55ffd 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php
@@ -50,23 +50,6 @@ class Mage_Sales_Model_Quote_Address_Rate extends Mage_Shipping_Model_Rate_Abstr
{
protected $_address;
- protected function _construct()
- {
- $this->_init('sales/quote_address_rate');
- }
-
- /**
- * @return $this
- */
- protected function _beforeSave()
- {
- parent::_beforeSave();
- if ($this->getAddress()) {
- $this->setAddressId($this->getAddress()->getId());
- }
- return $this;
- }
-
/**
* @return $this
*/
@@ -109,4 +92,21 @@ public function importShippingRate(Mage_Shipping_Model_Rate_Result_Abstract $rat
}
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/quote_address_rate');
+ }
+
+ /**
+ * @return $this
+ */
+ protected function _beforeSave()
+ {
+ parent::_beforeSave();
+ if ($this->getAddress()) {
+ $this->setAddressId($this->getAddress()->getId());
+ }
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php
index c5e10a50b54..2d0faab8a0b 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php
@@ -107,6 +107,58 @@ public function fetch(Mage_Sales_Model_Quote_Address $address)
return [];
}
+ /**
+ * Getter for row default total
+ *
+ * @return float
+ */
+ public function getItemRowTotal(Mage_Sales_Model_Quote_Item_Abstract $item)
+ {
+ if (!$this->_itemRowTotalKey) {
+ return 0;
+ }
+ return $item->getDataUsingMethod($this->_itemRowTotalKey);
+ }
+
+ /**
+ * Getter for row default base total
+ *
+ * @return float
+ */
+ public function getItemBaseRowTotal(Mage_Sales_Model_Quote_Item_Abstract $item)
+ {
+ if (!$this->_itemRowTotalKey) {
+ return 0;
+ }
+ return $item->getDataUsingMethod('base_' . $this->_itemRowTotalKey);
+ }
+
+ /**
+ * Whether the item row total may be compounded with others
+ *
+ * @return bool
+ */
+ public function getIsItemRowTotalCompoundable(Mage_Sales_Model_Quote_Item_Abstract $item)
+ {
+ if ($item->getData("skip_compound_{$this->_itemRowTotalKey}")) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Process model configuration array.
+ * This method can be used for changing models apply sort order
+ *
+ * @param array $config
+ * @param Mage_Core_Model_Store $store
+ * @return array
+ */
+ public function processConfigArray($config, $store)
+ {
+ return $config;
+ }
+
/**
* Set address which can be used inside totals calculation
*
@@ -199,56 +251,4 @@ protected function _getAddressItems(Mage_Sales_Model_Quote_Address $address)
{
return $address->getAllNonNominalItems();
}
-
- /**
- * Getter for row default total
- *
- * @return float
- */
- public function getItemRowTotal(Mage_Sales_Model_Quote_Item_Abstract $item)
- {
- if (!$this->_itemRowTotalKey) {
- return 0;
- }
- return $item->getDataUsingMethod($this->_itemRowTotalKey);
- }
-
- /**
- * Getter for row default base total
- *
- * @return float
- */
- public function getItemBaseRowTotal(Mage_Sales_Model_Quote_Item_Abstract $item)
- {
- if (!$this->_itemRowTotalKey) {
- return 0;
- }
- return $item->getDataUsingMethod('base_' . $this->_itemRowTotalKey);
- }
-
- /**
- * Whether the item row total may be compounded with others
- *
- * @return bool
- */
- public function getIsItemRowTotalCompoundable(Mage_Sales_Model_Quote_Item_Abstract $item)
- {
- if ($item->getData("skip_compound_{$this->_itemRowTotalKey}")) {
- return false;
- }
- return true;
- }
-
- /**
- * Process model configuration array.
- * This method can be used for changing models apply sort order
- *
- * @param array $config
- * @param Mage_Core_Model_Store $store
- * @return array
- */
- public function processConfigArray($config, $store)
- {
- return $config;
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php
index 12062bf919d..46f5ae1d55a 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php
@@ -63,6 +63,31 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
return $this;
}
+ /**
+ * Assign subtotal amount and label to address object
+ *
+ * @return Mage_Sales_Model_Quote_Address_Total_Subtotal
+ */
+ public function fetch(Mage_Sales_Model_Quote_Address $address)
+ {
+ $address->addTotal([
+ 'code' => $this->getCode(),
+ 'title' => Mage::helper('sales')->__('Subtotal'),
+ 'value' => $address->getSubtotal(),
+ ]);
+ return $this;
+ }
+
+ /**
+ * Get Subtotal label
+ *
+ * @return string
+ */
+ public function getLabel()
+ {
+ return Mage::helper('sales')->__('Subtotal');
+ }
+
/**
* Address item initialization
*
@@ -139,29 +164,4 @@ protected function _removeItem($address, $item)
return $this;
}
-
- /**
- * Assign subtotal amount and label to address object
- *
- * @return Mage_Sales_Model_Quote_Address_Total_Subtotal
- */
- public function fetch(Mage_Sales_Model_Quote_Address $address)
- {
- $address->addTotal([
- 'code' => $this->getCode(),
- 'title' => Mage::helper('sales')->__('Subtotal'),
- 'value' => $address->getSubtotal(),
- ]);
- return $this;
- }
-
- /**
- * Get Subtotal label
- *
- * @return string
- */
- public function getLabel()
- {
- return Mage::helper('sales')->__('Subtotal');
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php
index 244c610d678..80f8a05a88f 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php
@@ -190,6 +190,26 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
return $this;
}
+ /**
+ * @return $this
+ */
+ public function fetch(Mage_Sales_Model_Quote_Address $address)
+ {
+ $applied = $address->getAppliedTaxes();
+ $store = $address->getQuote()->getStore();
+ $amount = $address->getTaxAmount();
+
+ if (($amount != 0) || (Mage::helper('tax')->displayZeroTax($store))) {
+ $address->addTotal([
+ 'code' => $this->getCode(),
+ 'title' => Mage::helper('sales')->__('Tax'),
+ 'full_info' => $applied ? $applied : [],
+ 'value' => $amount,
+ ]);
+ }
+ return $this;
+ }
+
/**
* @param array $applied
* @param float $amount
@@ -233,24 +253,4 @@ protected function _saveAppliedTaxes(Mage_Sales_Model_Quote_Address $address, $a
}
$address->setAppliedTaxes($previouslyAppliedTaxes);
}
-
- /**
- * @return $this
- */
- public function fetch(Mage_Sales_Model_Quote_Address $address)
- {
- $applied = $address->getAppliedTaxes();
- $store = $address->getQuote()->getStore();
- $amount = $address->getTaxAmount();
-
- if (($amount != 0) || (Mage::helper('tax')->displayZeroTax($store))) {
- $address->addTotal([
- 'code' => $this->getCode(),
- 'title' => Mage::helper('sales')->__('Tax'),
- 'full_info' => $applied ? $applied : [],
- 'value' => $amount,
- ]);
- }
- return $this;
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Item.php b/app/code/core/Mage/Sales/Model/Quote/Item.php
index d914981ce22..b6356d6084a 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Item.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Item.php
@@ -219,36 +219,19 @@ class Mage_Sales_Model_Quote_Item extends Mage_Sales_Model_Quote_Item_Abstract
*/
protected $_errorInfos = null;
- protected function _construct()
- {
- $this->_init('sales/quote_item');
- $this->_errorInfos = Mage::getModel('sales/status_list');
- }
-
- /**
- * Init mapping array of short fields to
- * its full names
- *
- * @return $this
- */
- protected function _initOldFieldsMap()
- {
- return $this;
- }
-
/**
- * Quote Item Before Save prepare data process
- *
- * @return $this
+ * Clone quote item
*/
- protected function _beforeSave()
+ public function __clone()
{
- parent::_beforeSave();
- $this->setIsVirtual($this->getProduct()->getIsVirtual());
- if ($this->getQuote()) {
- $this->setQuoteId($this->getQuote()->getId());
+ parent::__clone();
+ $options = $this->getOptions();
+ $this->_quote = null;
+ $this->_options = [];
+ $this->_optionsByCode = [];
+ foreach ($options as $option) {
+ $this->addOption(clone $option);
}
- return $this;
}
/**
@@ -278,28 +261,6 @@ public function getQuote()
return $this->_quote;
}
- /**
- * Prepare quantity
- *
- * @param float|int $qty
- * @return int|float
- */
- protected function _prepareQty($qty)
- {
- $qty = Mage::app()->getLocale()->getNumber($qty);
- return ($qty > 0) ? $qty : 1;
- }
-
- /**
- * Get Magento App instance
- *
- * @return Mage_Core_Model_App
- */
- protected function _getApp()
- {
- return Mage::app();
- }
-
/**
* Adding quantity to quote item
*
@@ -693,22 +654,6 @@ public function removeOption($code)
return $this;
}
- /**
- * Register option code
- *
- * @param Mage_Sales_Model_Quote_Item_Option $option
- * @return $this
- */
- protected function _addOptionCode($option)
- {
- if (!isset($this->_optionsByCode[$option->getCode()])) {
- $this->_optionsByCode[$option->getCode()] = $option;
- } else {
- Mage::throwException(Mage::helper('sales')->__('An item option with code %s already exists.', $option->getCode()));
- }
- return $this;
- }
-
/**
* Get item option by code
*
@@ -723,45 +668,6 @@ public function getOptionByCode($code)
return null;
}
- /**
- * Checks that item model has data changes.
- * Call save item options if model isn't need to save in DB
- *
- * @return bool
- */
- protected function _hasModelChanged()
- {
- if (!$this->hasDataChanges()) {
- return false;
- }
-
- return $this->_getResource()->hasDataChanged($this);
- }
-
- /**
- * Save item options
- *
- * @return $this
- */
- protected function _saveItemOptions()
- {
- foreach ($this->_options as $index => $option) {
- if ($option->isDeleted()) {
- // phpcs:ignore Ecg.Performance.Loop.ModelLSD
- $option->delete();
- unset($this->_options[$index]);
- unset($this->_optionsByCode[$option->getCode()]);
- } else {
- // phpcs:ignore Ecg.Performance.Loop.ModelLSD
- $option->save();
- }
- }
-
- $this->_flagOptionsSaved = true; // Report to watchers that options were saved
-
- return $this;
- }
-
/**
* Save model plus its options
* Ensures saving options in case when resource model was not changed
@@ -780,32 +686,6 @@ public function save()
return $this;
}
- /**
- * Save item options after item saved
- *
- * @inheritDoc
- */
- protected function _afterSave()
- {
- $this->_saveItemOptions();
- return parent::_afterSave();
- }
-
- /**
- * Clone quote item
- */
- public function __clone()
- {
- parent::__clone();
- $options = $this->getOptions();
- $this->_quote = null;
- $this->_options = [];
- $this->_optionsByCode = [];
- foreach ($options as $option) {
- $this->addOption(clone $option);
- }
- }
-
/**
* Returns formatted buy request - object, holding request received from
* product view page with keys and options for configured product
@@ -824,17 +704,6 @@ public function getBuyRequest()
return $buyRequest;
}
- /**
- * Sets flag, whether this quote item has some error associated with it.
- *
- * @param bool $flag
- * @return $this
- */
- protected function _setHasError($flag)
- {
- return $this->setData('has_error', $flag);
- }
-
/**
* Sets flag, whether this quote item has some error associated with it.
* When TRUE - also adds 'unknown' error information to list of quote item errors.
@@ -855,19 +724,6 @@ public function setHasError($flag)
return $this;
}
- /**
- * Clears list of errors, associated with this quote item.
- * Also automatically removes error-flag from oneself.
- *
- * @return $this
- */
- protected function _clearErrorInfo()
- {
- $this->_errorInfos->clear();
- $this->_setHasError(false);
- return $this;
- }
-
/**
* Adds error information to the quote item.
* Automatically sets error flag.
@@ -922,4 +778,148 @@ public function removeErrorInfosByParams($params)
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/quote_item');
+ $this->_errorInfos = Mage::getModel('sales/status_list');
+ }
+
+ /**
+ * Init mapping array of short fields to
+ * its full names
+ *
+ * @return $this
+ */
+ protected function _initOldFieldsMap()
+ {
+ return $this;
+ }
+
+ /**
+ * Quote Item Before Save prepare data process
+ *
+ * @return $this
+ */
+ protected function _beforeSave()
+ {
+ parent::_beforeSave();
+ $this->setIsVirtual($this->getProduct()->getIsVirtual());
+ if ($this->getQuote()) {
+ $this->setQuoteId($this->getQuote()->getId());
+ }
+ return $this;
+ }
+
+ /**
+ * Prepare quantity
+ *
+ * @param float|int $qty
+ * @return int|float
+ */
+ protected function _prepareQty($qty)
+ {
+ $qty = Mage::app()->getLocale()->getNumber($qty);
+ return ($qty > 0) ? $qty : 1;
+ }
+
+ /**
+ * Get Magento App instance
+ *
+ * @return Mage_Core_Model_App
+ */
+ protected function _getApp()
+ {
+ return Mage::app();
+ }
+
+ /**
+ * Register option code
+ *
+ * @param Mage_Sales_Model_Quote_Item_Option $option
+ * @return $this
+ */
+ protected function _addOptionCode($option)
+ {
+ if (!isset($this->_optionsByCode[$option->getCode()])) {
+ $this->_optionsByCode[$option->getCode()] = $option;
+ } else {
+ Mage::throwException(Mage::helper('sales')->__('An item option with code %s already exists.', $option->getCode()));
+ }
+ return $this;
+ }
+
+ /**
+ * Checks that item model has data changes.
+ * Call save item options if model isn't need to save in DB
+ *
+ * @return bool
+ */
+ protected function _hasModelChanged()
+ {
+ if (!$this->hasDataChanges()) {
+ return false;
+ }
+
+ return $this->_getResource()->hasDataChanged($this);
+ }
+
+ /**
+ * Save item options
+ *
+ * @return $this
+ */
+ protected function _saveItemOptions()
+ {
+ foreach ($this->_options as $index => $option) {
+ if ($option->isDeleted()) {
+ // phpcs:ignore Ecg.Performance.Loop.ModelLSD
+ $option->delete();
+ unset($this->_options[$index]);
+ unset($this->_optionsByCode[$option->getCode()]);
+ } else {
+ // phpcs:ignore Ecg.Performance.Loop.ModelLSD
+ $option->save();
+ }
+ }
+
+ $this->_flagOptionsSaved = true; // Report to watchers that options were saved
+
+ return $this;
+ }
+
+ /**
+ * Save item options after item saved
+ *
+ * @inheritDoc
+ */
+ protected function _afterSave()
+ {
+ $this->_saveItemOptions();
+ return parent::_afterSave();
+ }
+
+ /**
+ * Sets flag, whether this quote item has some error associated with it.
+ *
+ * @param bool $flag
+ * @return $this
+ */
+ protected function _setHasError($flag)
+ {
+ return $this->setData('has_error', $flag);
+ }
+
+ /**
+ * Clears list of errors, associated with this quote item.
+ * Also automatically removes error-flag from oneself.
+ *
+ * @return $this
+ */
+ protected function _clearErrorInfo()
+ {
+ $this->_errorInfos->clear();
+ $this->_setHasError(false);
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
index 6b54dfc1bf1..bc34727aa16 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
@@ -192,6 +192,17 @@ abstract class Mage_Sales_Model_Quote_Item_Abstract extends Mage_Core_Model_Abst
*/
protected $_optionsByCode;
+ /**
+ * Clone quote item
+ */
+ public function __clone()
+ {
+ $this->setId(null);
+ $this->_parentItem = null;
+ $this->_children = [];
+ $this->_messages = [];
+ }
+
/**
* Retrieve Quote instance
*
@@ -236,20 +247,6 @@ public function getFileDownloadParams()
return null;
}
- /**
- * Specify parent item id before saving data
- *
- * @return $this
- */
- protected function _beforeSave()
- {
- parent::_beforeSave();
- if ($this->getParentItem()) {
- $this->setParentItemId($this->getParentItem()->getId());
- }
- return $this;
- }
-
/**
* Set parent item
*
@@ -687,17 +684,6 @@ public function setConvertedPrice($value)
return $this;
}
- /**
- * Clone quote item
- */
- public function __clone()
- {
- $this->setId(null);
- $this->_parentItem = null;
- $this->_children = [];
- $this->_messages = [];
- }
-
/**
* Checking if there children calculated or parent item
* when we have parent quote item and its children
@@ -821,6 +807,20 @@ public function getBaseTaxAmount()
return $this->_getData('base_tax_amount');
}
+ /**
+ * Specify parent item id before saving data
+ *
+ * @return $this
+ */
+ protected function _beforeSave()
+ {
+ parent::_beforeSave();
+ if ($this->getParentItem()) {
+ $this->setParentItemId($this->getParentItem()->getId());
+ }
+ return $this;
+ }
+
/**
* Get item price (item price always exclude price)
*
diff --git a/app/code/core/Mage/Sales/Model/Quote/Item/Option.php b/app/code/core/Mage/Sales/Model/Quote/Item/Option.php
index 7d1785e1cfc..888478a90db 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Item/Option.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Item/Option.php
@@ -42,23 +42,13 @@ class Mage_Sales_Model_Quote_Item_Option extends Mage_Core_Model_Abstract implem
protected $_item;
protected $_product;
- protected function _construct()
- {
- $this->_init('sales/quote_item_option');
- }
-
/**
- * Checks that item option model has data changes
- *
- * @return bool
+ * Clone option object
*/
- protected function _hasModelChanged()
+ public function __clone()
{
- if (!$this->hasDataChanges()) {
- return false;
- }
-
- return $this->_getResource()->hasDataChanged($this);
+ $this->setId(null);
+ $this->_item = null;
}
/**
@@ -121,6 +111,25 @@ public function getValue()
return $this->_getData('value');
}
+ protected function _construct()
+ {
+ $this->_init('sales/quote_item_option');
+ }
+
+ /**
+ * Checks that item option model has data changes
+ *
+ * @return bool
+ */
+ protected function _hasModelChanged()
+ {
+ if (!$this->hasDataChanges()) {
+ return false;
+ }
+
+ return $this->_getResource()->hasDataChanged($this);
+ }
+
/**
* Initialize item identifier before save data
*
@@ -133,13 +142,4 @@ protected function _beforeSave()
}
return parent::_beforeSave();
}
-
- /**
- * Clone option object
- */
- public function __clone()
- {
- $this->setId(null);
- $this->_item = null;
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Quote/Payment.php
index 3907bf1a027..667e57323ae 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Payment.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Payment.php
@@ -91,11 +91,6 @@ class Mage_Sales_Model_Quote_Payment extends Mage_Payment_Model_Info
protected $_quote;
- protected function _construct()
- {
- $this->_init('sales/quote_payment');
- }
-
/**
* Declare quote model instance
*
@@ -162,25 +157,6 @@ public function importData(array $data)
return $this;
}
- /**
- * Prepare object for save
- *
- * @inheritDoc
- */
- protected function _beforeSave()
- {
- if ($this->getQuote()) {
- $this->setQuoteId($this->getQuote()->getId());
- }
- try {
- $method = $this->getMethodInstance();
- } catch (Mage_Core_Exception $e) {
- return parent::_beforeSave();
- }
- $method->prepareSave();
- return parent::_beforeSave();
- }
-
/**
* Checkout redirect URL getter
*
@@ -219,4 +195,28 @@ public function getMethodInstance()
$method = parent::getMethodInstance();
return $method->setStore($this->getQuote()->getStore());
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/quote_payment');
+ }
+
+ /**
+ * Prepare object for save
+ *
+ * @inheritDoc
+ */
+ protected function _beforeSave()
+ {
+ if ($this->getQuote()) {
+ $this->setQuoteId($this->getQuote()->getId());
+ }
+ try {
+ $method = $this->getMethodInstance();
+ } catch (Mage_Core_Exception $e) {
+ return parent::_beforeSave();
+ }
+ $method->prepareSave();
+ return parent::_beforeSave();
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Recurring/Profile.php
index 77e14940f43..6c13d966a95 100644
--- a/app/code/core/Mage/Sales/Model/Recurring/Profile.php
+++ b/app/code/core/Mage/Sales/Model/Recurring/Profile.php
@@ -543,6 +543,32 @@ public function getInfoValue($infoKey, $infoValueKey)
}
}
+ /**
+ * Return recurring profile child orders Ids
+ *
+ * @return array
+ */
+ public function getChildOrderIds()
+ {
+ $ids = $this->_getResource()->getChildOrderIds($this);
+ if (empty($ids)) {
+ $ids[] = '-1';
+ }
+ return $ids;
+ }
+
+ /**
+ * Add order relation to recurring profile
+ *
+ * @param int $orderId
+ * @return $this
+ */
+ public function addOrderRelation($orderId)
+ {
+ $this->getResource()->addOrderRelation($this->getId(), $orderId);
+ return $this;
+ }
+
protected function _construct()
{
$this->_init('sales/recurring_profile');
@@ -602,32 +628,6 @@ protected function _checkWorkflow($againstState, $soft = true)
return $result;
}
- /**
- * Return recurring profile child orders Ids
- *
- * @return array
- */
- public function getChildOrderIds()
- {
- $ids = $this->_getResource()->getChildOrderIds($this);
- if (empty($ids)) {
- $ids[] = '-1';
- }
- return $ids;
- }
-
- /**
- * Add order relation to recurring profile
- *
- * @param int $orderId
- * @return $this
- */
- public function addOrderRelation($orderId)
- {
- $this->getResource()->addOrderRelation($this->getId(), $orderId);
- return $this;
- }
-
/**
* Create and return new order item based on profile item data and $itemInfo
*
diff --git a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php
index f97ba127870..7437def5766 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Resource_Billing_Agreement extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/billing_agreement', 'agreement_id');
- }
-
/**
* Add order relation to billing agreement
*
@@ -45,4 +40,8 @@ public function addOrderRelation($agreementId, $orderId)
);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/billing_agreement', 'agreement_id');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php
index d76c2d03d23..3dd8e09d83a 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php
@@ -36,15 +36,6 @@ class Mage_Sales_Model_Resource_Billing_Agreement_Collection extends Mage_Core_M
'agreement_updated_at' => 'main_table.updated_at',
]];
- /**
- * Collection initialization
- *
- */
- protected function _construct()
- {
- $this->_init('sales/billing_agreement');
- }
-
/**
* Add cutomer details(email, firstname, lastname) to select
*
@@ -94,4 +85,13 @@ public function addCustomerDetails()
);
return $this;
}
+
+ /**
+ * Collection initialization
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/billing_agreement');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php
index 8b0b171184b..fbdccd67c69 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php
@@ -22,26 +22,6 @@
*/
abstract class Mage_Sales_Model_Resource_Collection_Abstract extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Check if $attribute is Mage_Eav_Model_Entity_Attribute and convert to string field name
- *
- * @param string|Mage_Eav_Model_Entity_Attribute $attribute
- * @return string
- */
- protected function _attributeToField($attribute)
- {
- $field = false;
- if (is_string($attribute)) {
- $field = $attribute;
- } elseif ($attribute instanceof Mage_Eav_Model_Entity_Attribute) {
- $field = $attribute->getAttributeCode();
- }
- if (!$field) {
- Mage::throwException(Mage::helper('sales')->__('Cannot determine the field name.'));
- }
- return $field;
- }
-
/**
* Add attribute to select result set.
* Backward compatibility with EAV collection
@@ -98,26 +78,6 @@ public function setPage($pageNum, $pageSize)
return $this;
}
- /**
- * Create all ids retrieving select with limitation
- * Backward compatibility with EAV collection
- *
- * @param int $limit
- * @param int $offset
- * @return Varien_Db_Select
- */
- protected function _getAllIdsSelect($limit = null, $offset = null)
- {
- $idsSelect = clone $this->getSelect();
- $idsSelect->reset(Zend_Db_Select::ORDER);
- $idsSelect->reset(Zend_Db_Select::LIMIT_COUNT);
- $idsSelect->reset(Zend_Db_Select::LIMIT_OFFSET);
- $idsSelect->reset(Zend_Db_Select::COLUMNS);
- $idsSelect->columns($this->getResource()->getIdFieldName(), 'main_table');
- $idsSelect->limit($limit, $offset);
- return $idsSelect;
- }
-
/**
* Retrieve all ids for collection
* Backward compatibility with EAV collection
@@ -151,4 +111,43 @@ public function joinAttribute($alias, $attribute, $bind, $filter = null, $joinTy
{
return $this;
}
+ /**
+ * Check if $attribute is Mage_Eav_Model_Entity_Attribute and convert to string field name
+ *
+ * @param string|Mage_Eav_Model_Entity_Attribute $attribute
+ * @return string
+ */
+ protected function _attributeToField($attribute)
+ {
+ $field = false;
+ if (is_string($attribute)) {
+ $field = $attribute;
+ } elseif ($attribute instanceof Mage_Eav_Model_Entity_Attribute) {
+ $field = $attribute->getAttributeCode();
+ }
+ if (!$field) {
+ Mage::throwException(Mage::helper('sales')->__('Cannot determine the field name.'));
+ }
+ return $field;
+ }
+
+ /**
+ * Create all ids retrieving select with limitation
+ * Backward compatibility with EAV collection
+ *
+ * @param int $limit
+ * @param int $offset
+ * @return Varien_Db_Select
+ */
+ protected function _getAllIdsSelect($limit = null, $offset = null)
+ {
+ $idsSelect = clone $this->getSelect();
+ $idsSelect->reset(Zend_Db_Select::ORDER);
+ $idsSelect->reset(Zend_Db_Select::LIMIT_COUNT);
+ $idsSelect->reset(Zend_Db_Select::LIMIT_OFFSET);
+ $idsSelect->reset(Zend_Db_Select::COLUMNS);
+ $idsSelect->columns($this->getResource()->getIdFieldName(), 'main_table');
+ $idsSelect->limit($limit, $offset);
+ return $idsSelect;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order.php b/app/code/core/Mage/Sales/Model/Resource/Order.php
index ee116af5738..33934ce0337 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order.php
@@ -51,48 +51,6 @@ class Mage_Sales_Model_Resource_Order extends Mage_Sales_Model_Resource_Order_Ab
*/
protected $_entityCodeForIncrementId = 'order';
- protected function _construct()
- {
- $this->_init('sales/order', 'entity_id');
- }
-
- /**
- * Init virtual grid records for entity
- *
- * @return $this
- */
- protected function _initVirtualGridColumns()
- {
- parent::_initVirtualGridColumns();
- $adapter = $this->getReadConnection();
- $ifnullFirst = $adapter->getIfNullSql('{{table}}.firstname', $adapter->quote(''));
- $ifnullMiddle = $adapter->getIfNullSql('{{table}}.middlename', $adapter->quote(''));
- $ifnullLast = $adapter->getIfNullSql('{{table}}.lastname', $adapter->quote(''));
- $concatAddress = $adapter->getConcatSql([
- $ifnullFirst,
- $adapter->quote(' '),
- $ifnullMiddle,
- $adapter->quote(' '),
- $ifnullLast,
- ]);
- $concatAddress = new Zend_Db_Expr("TRIM(REPLACE($concatAddress,' ', ' '))");
-
- $this->addVirtualGridColumn(
- 'billing_name',
- 'sales/order_address',
- ['billing_address_id' => 'entity_id'],
- $concatAddress,
- )
- ->addVirtualGridColumn(
- 'shipping_name',
- 'sales/order_address',
- ['shipping_address_id' => 'entity_id'],
- $concatAddress,
- );
-
- return $this;
- }
-
/**
* Count existent products of order items by specified product types
*
@@ -141,4 +99,46 @@ public function getIncrementId($orderId)
->where('entity_id = :entity_id');
return $adapter->fetchOne($select, $bind);
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/order', 'entity_id');
+ }
+
+ /**
+ * Init virtual grid records for entity
+ *
+ * @return $this
+ */
+ protected function _initVirtualGridColumns()
+ {
+ parent::_initVirtualGridColumns();
+ $adapter = $this->getReadConnection();
+ $ifnullFirst = $adapter->getIfNullSql('{{table}}.firstname', $adapter->quote(''));
+ $ifnullMiddle = $adapter->getIfNullSql('{{table}}.middlename', $adapter->quote(''));
+ $ifnullLast = $adapter->getIfNullSql('{{table}}.lastname', $adapter->quote(''));
+ $concatAddress = $adapter->getConcatSql([
+ $ifnullFirst,
+ $adapter->quote(' '),
+ $ifnullMiddle,
+ $adapter->quote(' '),
+ $ifnullLast,
+ ]);
+ $concatAddress = new Zend_Db_Expr("TRIM(REPLACE($concatAddress,' ', ' '))");
+
+ $this->addVirtualGridColumn(
+ 'billing_name',
+ 'sales/order_address',
+ ['billing_address_id' => 'entity_id'],
+ $concatAddress,
+ )
+ ->addVirtualGridColumn(
+ 'shipping_name',
+ 'sales/order_address',
+ ['shipping_address_id' => 'entity_id'],
+ $concatAddress,
+ );
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
index f493933134a..5b0ee599fb1 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
@@ -114,22 +114,6 @@ public function getVirtualGridColumns()
return $this->_virtualGridColumns;
}
- /**
- * Init virtual grid records for entity
- *
- * @return $this
- */
- protected function _initVirtualGridColumns()
- {
- $this->_virtualGridColumns = [];
- if ($this->_eventPrefix && $this->_eventObject) {
- Mage::dispatchEvent($this->_eventPrefix . '_init_virtual_grid_columns', [
- $this->_eventObject => $this,
- ]);
- }
- return $this;
- }
-
/**
* Update records in grid table
*
@@ -264,42 +248,6 @@ public function getGridTable()
return false;
}
- /**
- * Before save object attribute
- *
- * @param string $attribute
- * @return $this
- */
- protected function _beforeSaveAttribute(Mage_Core_Model_Abstract $object, $attribute)
- {
- if ($this->_eventObject && $this->_eventPrefix) {
- Mage::dispatchEvent($this->_eventPrefix . '_save_attribute_before', [
- $this->_eventObject => $this,
- 'object' => $object,
- 'attribute' => $attribute,
- ]);
- }
- return $this;
- }
-
- /**
- * After save object attribute
- *
- * @param string $attribute
- * @return $this
- */
- protected function _afterSaveAttribute(Mage_Core_Model_Abstract $object, $attribute)
- {
- if ($this->_eventObject && $this->_eventPrefix) {
- Mage::dispatchEvent($this->_eventPrefix . '_save_attribute_after', [
- $this->_eventObject => $this,
- 'object' => $object,
- 'attribute' => $attribute,
- ]);
- }
- return $this;
- }
-
/**
* Perform actions after object save
*
@@ -343,44 +291,6 @@ public function saveAttribute(Mage_Core_Model_Abstract $object, $attribute)
return $this;
}
- /**
- * Perform actions before object save
- *
- * @return $this
- */
- protected function _beforeSave(Mage_Core_Model_Abstract $object)
- {
- if ($this->_useIncrementId && !$object->getIncrementId()) {
- /** @var Mage_Eav_Model_Entity_Type $entityType */
- $entityType = Mage::getSingleton('eav/config')->getEntityType($this->_entityTypeForIncrementId);
- $object->setIncrementId($entityType->fetchNewIncrementId($object->getStoreId()));
- }
- parent::_beforeSave($object);
- return $this;
- }
-
- /**
- * Update field in table if model have been already saved
- *
- * @param Mage_Core_Model_Abstract $object
- * @param array $data
- * @return $this
- */
- protected function _postSaveFieldsUpdate($object, $data)
- {
- if ($object->getId() && !empty($data)) {
- $table = $this->getMainTable();
- $this->_getWriteAdapter()->update(
- $table,
- $data,
- [$this->getIdFieldName() . '=?' => (int) $object->getId()],
- );
- $object->addData($data);
- }
-
- return $this;
- }
-
/**
* Set main resource table
*
@@ -432,4 +342,94 @@ public function updateOnRelatedRecordChanged($field, $entityId)
}
return $this;
}
+
+ /**
+ * Init virtual grid records for entity
+ *
+ * @return $this
+ */
+ protected function _initVirtualGridColumns()
+ {
+ $this->_virtualGridColumns = [];
+ if ($this->_eventPrefix && $this->_eventObject) {
+ Mage::dispatchEvent($this->_eventPrefix . '_init_virtual_grid_columns', [
+ $this->_eventObject => $this,
+ ]);
+ }
+ return $this;
+ }
+
+ /**
+ * Before save object attribute
+ *
+ * @param string $attribute
+ * @return $this
+ */
+ protected function _beforeSaveAttribute(Mage_Core_Model_Abstract $object, $attribute)
+ {
+ if ($this->_eventObject && $this->_eventPrefix) {
+ Mage::dispatchEvent($this->_eventPrefix . '_save_attribute_before', [
+ $this->_eventObject => $this,
+ 'object' => $object,
+ 'attribute' => $attribute,
+ ]);
+ }
+ return $this;
+ }
+
+ /**
+ * After save object attribute
+ *
+ * @param string $attribute
+ * @return $this
+ */
+ protected function _afterSaveAttribute(Mage_Core_Model_Abstract $object, $attribute)
+ {
+ if ($this->_eventObject && $this->_eventPrefix) {
+ Mage::dispatchEvent($this->_eventPrefix . '_save_attribute_after', [
+ $this->_eventObject => $this,
+ 'object' => $object,
+ 'attribute' => $attribute,
+ ]);
+ }
+ return $this;
+ }
+
+ /**
+ * Perform actions before object save
+ *
+ * @return $this
+ */
+ protected function _beforeSave(Mage_Core_Model_Abstract $object)
+ {
+ if ($this->_useIncrementId && !$object->getIncrementId()) {
+ /** @var Mage_Eav_Model_Entity_Type $entityType */
+ $entityType = Mage::getSingleton('eav/config')->getEntityType($this->_entityTypeForIncrementId);
+ $object->setIncrementId($entityType->fetchNewIncrementId($object->getStoreId()));
+ }
+ parent::_beforeSave($object);
+ return $this;
+ }
+
+ /**
+ * Update field in table if model have been already saved
+ *
+ * @param Mage_Core_Model_Abstract $object
+ * @param array $data
+ * @return $this
+ */
+ protected function _postSaveFieldsUpdate($object, $data)
+ {
+ if ($object->getId() && !empty($data)) {
+ $table = $this->getMainTable();
+ $this->_getWriteAdapter()->update(
+ $table,
+ $data,
+ [$this->getIdFieldName() . '=?' => (int) $object->getId()],
+ );
+ $object->addData($data);
+ }
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Address.php b/app/code/core/Mage/Sales/Model/Resource/Order/Address.php
index 54bca339f15..23c69af7b66 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Address.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Address.php
@@ -27,11 +27,6 @@ class Mage_Sales_Model_Resource_Order_Address extends Mage_Sales_Model_Resource_
*/
protected $_eventPrefix = 'sales_order_address_resource';
- protected function _construct()
- {
- $this->_init('sales/order_address', 'entity_id');
- }
-
/**
* Return configuration for all attributes
*
@@ -56,6 +51,11 @@ public function getAllAttributes()
return $attributes;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_address', 'entity_id');
+ }
+
/**
* Update related grid table after object save
*
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php
index a85801fd113..12527b03c3f 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php
@@ -32,15 +32,6 @@ class Mage_Sales_Model_Resource_Order_Collection extends Mage_Sales_Model_Resour
*/
protected $_eventObject = 'order_collection';
- protected function _construct()
- {
- $this->_init('sales/order');
- $this
- ->addFilterToMap('entity_id', 'main_table.entity_id')
- ->addFilterToMap('customer_id', 'main_table.customer_id')
- ->addFilterToMap('quote_address_id', 'main_table.quote_address_id');
- }
-
/**
* Add items count expr to collection select, backward capability with eav structure
*
@@ -70,78 +61,6 @@ public function getSelectCountSql()
return $countSelect;
}
- /**
- * Reset left join
- *
- * @param int $limit
- * @param int $offset
- * @return Varien_Db_Select
- */
- protected function _getAllIdsSelect($limit = null, $offset = null)
- {
- $idsSelect = parent::_getAllIdsSelect($limit, $offset);
- $idsSelect->resetJoinLeft();
- return $idsSelect;
- }
-
- /**
- * Join table sales_flat_order_address to select for billing and shipping order addresses.
- * Create corillation map
- *
- * @return $this
- */
- protected function _addAddressFields()
- {
- $billingAliasName = 'billing_o_a';
- $shippingAliasName = 'shipping_o_a';
- $joinTable = $this->getTable('sales/order_address');
-
- $this
- ->addFilterToMap('billing_firstname', $billingAliasName . '.firstname')
- ->addFilterToMap('billing_middlename', $billingAliasName . '.middlename')
- ->addFilterToMap('billing_lastname', $billingAliasName . '.lastname')
- ->addFilterToMap('billing_telephone', $billingAliasName . '.telephone')
- ->addFilterToMap('billing_postcode', $billingAliasName . '.postcode')
-
- ->addFilterToMap('shipping_firstname', $shippingAliasName . '.firstname')
- ->addFilterToMap('shipping_middlename', $shippingAliasName . '.middlename')
- ->addFilterToMap('shipping_lastname', $shippingAliasName . '.lastname')
- ->addFilterToMap('shipping_telephone', $shippingAliasName . '.telephone')
- ->addFilterToMap('shipping_postcode', $shippingAliasName . '.postcode');
-
- $this
- ->getSelect()
- ->joinLeft(
- [$billingAliasName => $joinTable],
- "(main_table.entity_id = {$billingAliasName}.parent_id"
- . " AND {$billingAliasName}.address_type = 'billing')",
- [
- $billingAliasName . '.firstname',
- $billingAliasName . '.middlename',
- $billingAliasName . '.lastname',
- $billingAliasName . '.telephone',
- $billingAliasName . '.postcode',
- ],
- )
- ->joinLeft(
- [$shippingAliasName => $joinTable],
- "(main_table.entity_id = {$shippingAliasName}.parent_id"
- . " AND {$shippingAliasName}.address_type = 'shipping')",
- [
- $shippingAliasName . '.firstname',
- $shippingAliasName . '.middlename',
- $shippingAliasName . '.lastname',
- $shippingAliasName . '.telephone',
- $shippingAliasName . '.postcode',
- ],
- );
-
- /** @var Mage_Core_Model_Resource_Helper_Mysql4 $helper */
- $helper = Mage::getResourceHelper('core');
- $helper->prepareColumnsList($this->getSelect());
- return $this;
- }
-
/**
* Add addresses information to select
*
@@ -228,4 +147,85 @@ public function addRecurringProfilesFilter($ids)
->where('srpo.profile_id IN(?)', $ids);
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/order');
+ $this
+ ->addFilterToMap('entity_id', 'main_table.entity_id')
+ ->addFilterToMap('customer_id', 'main_table.customer_id')
+ ->addFilterToMap('quote_address_id', 'main_table.quote_address_id');
+ }
+
+ /**
+ * Reset left join
+ *
+ * @param int $limit
+ * @param int $offset
+ * @return Varien_Db_Select
+ */
+ protected function _getAllIdsSelect($limit = null, $offset = null)
+ {
+ $idsSelect = parent::_getAllIdsSelect($limit, $offset);
+ $idsSelect->resetJoinLeft();
+ return $idsSelect;
+ }
+
+ /**
+ * Join table sales_flat_order_address to select for billing and shipping order addresses.
+ * Create corillation map
+ *
+ * @return $this
+ */
+ protected function _addAddressFields()
+ {
+ $billingAliasName = 'billing_o_a';
+ $shippingAliasName = 'shipping_o_a';
+ $joinTable = $this->getTable('sales/order_address');
+
+ $this
+ ->addFilterToMap('billing_firstname', $billingAliasName . '.firstname')
+ ->addFilterToMap('billing_middlename', $billingAliasName . '.middlename')
+ ->addFilterToMap('billing_lastname', $billingAliasName . '.lastname')
+ ->addFilterToMap('billing_telephone', $billingAliasName . '.telephone')
+ ->addFilterToMap('billing_postcode', $billingAliasName . '.postcode')
+
+ ->addFilterToMap('shipping_firstname', $shippingAliasName . '.firstname')
+ ->addFilterToMap('shipping_middlename', $shippingAliasName . '.middlename')
+ ->addFilterToMap('shipping_lastname', $shippingAliasName . '.lastname')
+ ->addFilterToMap('shipping_telephone', $shippingAliasName . '.telephone')
+ ->addFilterToMap('shipping_postcode', $shippingAliasName . '.postcode');
+
+ $this
+ ->getSelect()
+ ->joinLeft(
+ [$billingAliasName => $joinTable],
+ "(main_table.entity_id = {$billingAliasName}.parent_id"
+ . " AND {$billingAliasName}.address_type = 'billing')",
+ [
+ $billingAliasName . '.firstname',
+ $billingAliasName . '.middlename',
+ $billingAliasName . '.lastname',
+ $billingAliasName . '.telephone',
+ $billingAliasName . '.postcode',
+ ],
+ )
+ ->joinLeft(
+ [$shippingAliasName => $joinTable],
+ "(main_table.entity_id = {$shippingAliasName}.parent_id"
+ . " AND {$shippingAliasName}.address_type = 'shipping')",
+ [
+ $shippingAliasName . '.firstname',
+ $shippingAliasName . '.middlename',
+ $shippingAliasName . '.lastname',
+ $shippingAliasName . '.telephone',
+ $shippingAliasName . '.postcode',
+ ],
+ );
+
+ /** @var Mage_Core_Model_Resource_Helper_Mysql4 $helper */
+ $helper = Mage::getResourceHelper('core');
+ $helper->prepareColumnsList($this->getSelect());
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php
index e7814709c4f..9026217a42f 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php
@@ -39,22 +39,6 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Collection extends Mage_Sales_M
*/
protected $_orderField = 'order_id';
- protected function _construct()
- {
- $this->_init('sales/order_creditmemo');
- }
-
- /**
- * Used to emulate after load functionality for each item without loading them
- *
- * @return $this
- */
- protected function _afterLoad()
- {
- $this->walk('afterLoad');
- return $this;
- }
-
/**
* Add filtration conditions
*
@@ -70,4 +54,20 @@ public function getFiltered($filter = null)
}
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/order_creditmemo');
+ }
+
+ /**
+ * Used to emulate after load functionality for each item without loading them
+ *
+ * @return $this
+ */
+ protected function _afterLoad()
+ {
+ $this->walk('afterLoad');
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php
index 79bf4578df5..e74b3bd190c 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php
@@ -32,12 +32,6 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection extends Mage
*/
protected $_eventObject = 'order_creditmemo_comment_collection';
- protected function _construct()
- {
- parent::_construct();
- $this->_init('sales/order_creditmemo_comment');
- }
-
/**
* Set creditmemo filter
*
@@ -48,4 +42,10 @@ public function setCreditmemoFilter($creditmemoId)
{
return $this->setParentFilter($creditmemoId);
}
+
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_init('sales/order_creditmemo_comment');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php
index 9484ba011c8..4f3d36b8879 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php
@@ -32,11 +32,6 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection extends Mage_Sa
*/
protected $_eventObject = 'order_creditmemo_item_collection';
- protected function _construct()
- {
- $this->_init('sales/order_creditmemo_item');
- }
-
/**
* Set creditmemo filter
*
@@ -48,4 +43,9 @@ public function setCreditmemoFilter($creditmemoId)
$this->addFieldToFilter('parent_id', $creditmemoId);
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/order_creditmemo_item');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php
index 5e8273467b0..18bf107098d 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php
@@ -37,12 +37,6 @@ class Mage_Sales_Model_Resource_Order_Grid_Collection extends Mage_Sales_Model_R
*/
protected $_customerModeFlag = false;
- protected function _construct()
- {
- parent::_construct();
- $this->setMainTable('sales/order_grid');
- }
-
/**
* Get SQL for get record count
*
@@ -90,4 +84,10 @@ public function getIsCustomerMode()
{
return $this->_customerModeFlag;
}
+
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setMainTable('sales/order_grid');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php
index 17475a65158..638f30c486f 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php
@@ -32,12 +32,6 @@ class Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection extends Mage_Sa
*/
protected $_eventObject = 'order_invoice_comment_collection';
- protected function _construct()
- {
- parent::_construct();
- $this->_init('sales/order_invoice_comment');
- }
-
/**
* Set invoice filter
*
@@ -48,4 +42,10 @@ public function setInvoiceFilter($invoiceId)
{
return $this->setParentFilter($invoiceId);
}
+
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_init('sales/order_invoice_comment');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php
index 309e4eb8327..f9a056e6a62 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php
@@ -32,11 +32,6 @@ class Mage_Sales_Model_Resource_Order_Invoice_Item_Collection extends Mage_Sales
*/
protected $_eventObject = 'order_invoice_item_collection';
- protected function _construct()
- {
- $this->_init('sales/order_invoice_item');
- }
-
/**
* Set invoice filter
*
@@ -48,4 +43,9 @@ public function setInvoiceFilter($invoiceId)
$this->addFieldToFilter('parent_id', $invoiceId);
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/order_invoice_item');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php
index 9debea02be8..e752a5d8930 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php
@@ -41,30 +41,6 @@ class Mage_Sales_Model_Resource_Order_Item_Collection extends Mage_Sales_Model_R
*/
protected $_orderField = 'order_id';
- protected function _construct()
- {
- $this->_init('sales/order_item');
- }
-
- /**
- * Assign parent items on after collection load
- *
- * @return $this
- */
- protected function _afterLoad()
- {
- parent::_afterLoad();
- /**
- * Assign parent items
- */
- foreach ($this as $item) {
- if ($item->getParentItemId()) {
- $item->setParentItem($this->getItemById($item->getParentItemId()));
- }
- }
- return $this;
- }
-
/**
* Set random items order
*
@@ -152,4 +128,28 @@ public function addFilterByCustomerId($customerId)
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/order_item');
+ }
+
+ /**
+ * Assign parent items on after collection load
+ *
+ * @return $this
+ */
+ protected function _afterLoad()
+ {
+ parent::_afterLoad();
+ /**
+ * Assign parent items
+ */
+ foreach ($this as $item) {
+ if ($item->getParentItemId()) {
+ $item->setParentItem($this->getItemById($item->getParentItemId()));
+ }
+ }
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php
index a7169044736..1596aedb31e 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php
@@ -31,38 +31,6 @@ class Mage_Sales_Model_Resource_Order_Payment_Transaction extends Mage_Sales_Mod
'additional_information' => [null, []],
];
- /**
- * Initialize main table and the primary key field name
- *
- */
- protected function _construct()
- {
- $this->_init('sales/payment_transaction', 'transaction_id');
- }
-
- /**
- * Unserialize Varien_Object field in an object
- *
- * @param string $field
- * @param mixed $defaultValue
- */
- protected function _unserializeField(Varien_Object $object, $field, $defaultValue = null)
- {
- $value = $object->getData($field);
- if (empty($value)) {
- $object->setData($field, $defaultValue);
- } elseif (!is_array($value) && !is_object($value)) {
- $unserializedValue = false;
- try {
- $unserializedValue = Mage::helper('core/unserializeArray')
- ->unserialize($value);
- } catch (Exception $e) {
- Mage::logException($e);
- }
- $object->setData($field, $unserializedValue);
- }
- }
-
/**
* Update transactions in database using provided transaction as parent for them
* have to repeat the business logic to avoid accidental injection of wrong transactions
@@ -138,6 +106,38 @@ public function getOrderWebsiteId($orderId)
return $adapter->fetchOne($select, $bind);
}
+ /**
+ * Initialize main table and the primary key field name
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/payment_transaction', 'transaction_id');
+ }
+
+ /**
+ * Unserialize Varien_Object field in an object
+ *
+ * @param string $field
+ * @param mixed $defaultValue
+ */
+ protected function _unserializeField(Varien_Object $object, $field, $defaultValue = null)
+ {
+ $value = $object->getData($field);
+ if (empty($value)) {
+ $object->setData($field, $defaultValue);
+ } elseif (!is_array($value) && !is_object($value)) {
+ $unserializedValue = false;
+ try {
+ $unserializedValue = Mage::helper('core/unserializeArray')
+ ->unserialize($value);
+ } catch (Exception $e) {
+ Mage::logException($e);
+ }
+ $object->setData($field, $unserializedValue);
+ }
+ }
+
/**
* Lookup for parent_id in already saved transactions of this payment by the order_id
* Also serialize additional information, if any
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php
index f611c1d9ec6..4f5a6b77238 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php
@@ -78,15 +78,6 @@ class Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection extends Mag
*/
protected $_orderField = 'order_id';
- /**
- * Initialize collection items factory class
- */
- protected function _construct()
- {
- $this->_init('sales/order_payment_transaction');
- parent::_construct();
- }
-
/**
* Join order information
*
@@ -179,6 +170,15 @@ public function addStoreFilter($storeIds)
return $this;
}
+ /**
+ * Initialize collection items factory class
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/order_payment_transaction');
+ parent::_construct();
+ }
+
/**
* Prepare filters
*
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php
index 05d1c9524f4..d80149a05ed 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php
@@ -35,11 +35,6 @@ class Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection extends Mage_S
*/
protected $_eventObject = 'order_shipment_comment_collection';
- protected function _construct()
- {
- $this->_init('sales/order_shipment_comment');
- }
-
/**
* Set shipment filter
*
@@ -50,4 +45,9 @@ public function setShipmentFilter($shipmentId)
{
return $this->setParentFilter($shipmentId);
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/order_shipment_comment');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php
index 07a37ddd252..b0c224a8edd 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php
@@ -35,11 +35,6 @@ class Mage_Sales_Model_Resource_Order_Shipment_Item_Collection extends Mage_Sale
*/
protected $_eventObject = 'order_shipment_item_collection';
- protected function _construct()
- {
- $this->_init('sales/order_shipment_item');
- }
-
/**
* Set shipment filter
*
@@ -51,4 +46,9 @@ public function setShipmentFilter($shipmentId)
$this->addFieldToFilter('parent_id', $shipmentId);
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/order_shipment_item');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php
index 81d3a878c54..b1e799d5603 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php
@@ -42,11 +42,6 @@ class Mage_Sales_Model_Resource_Order_Shipment_Track_Collection extends Mage_Sal
*/
protected $_orderField = 'order_id';
- protected function _construct()
- {
- $this->_init('sales/order_shipment_track');
- }
-
/**
* Set shipment filter
*
@@ -58,4 +53,9 @@ public function setShipmentFilter($shipmentId)
$this->addFieldToFilter('parent_id', $shipmentId);
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/order_shipment_track');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status.php
index 9d4745a6e2c..2268e1c04da 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Status.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status.php
@@ -36,44 +36,6 @@ class Mage_Sales_Model_Resource_Order_Status extends Mage_Core_Model_Resource_Db
*/
protected $_stateTable;
- /**
- * Internal constructor
- */
- protected function _construct()
- {
- $this->_init('sales/order_status', 'status');
- $this->_isPkAutoIncrement = false;
- $this->_labelsTable = $this->getTable('sales/order_status_label');
- $this->_stateTable = $this->getTable('sales/order_status_state');
- }
-
- /**
- * Retrieve select object for load object data
- *
- * @param string $field
- * @param mixed $value
- * @param Varien_Object $object
- * @return Zend_Db_Select
- */
- protected function _getLoadSelect($field, $value, $object)
- {
- if ($field == 'default_state') {
- $select = $this->_getReadAdapter()->select()
- ->from($this->getMainTable(), ['label'])
- ->join(
- ['state_table' => $this->_stateTable],
- $this->getMainTable() . '.status = state_table.status',
- 'status',
- )
- ->where('state_table.state = ?', $value)
- ->order('state_table.is_default DESC')
- ->limit(1);
- } else {
- $select = parent::_getLoadSelect($field, $value, $object);
- }
- return $select;
- }
-
/**
* Store labels getter
*
@@ -87,38 +49,6 @@ public function getStoreLabels(Mage_Core_Model_Abstract $status)
return $this->_getReadAdapter()->fetchPairs($select);
}
- /**
- * Save status labels per store
- *
- * @param Mage_Sales_Model_Order|Mage_Sales_Model_Order_Status $object
- * @inheritDoc
- */
- protected function _afterSave(Mage_Core_Model_Abstract $object)
- {
- if ($object->hasStoreLabels()) {
- $labels = $object->getStoreLabels();
- $this->_getWriteAdapter()->delete(
- $this->_labelsTable,
- ['status = ?' => $object->getStatus()],
- );
- $data = [];
- foreach ($labels as $storeId => $label) {
- if (empty($label)) {
- continue;
- }
- $data[] = [
- 'status' => $object->getStatus(),
- 'store_id' => $storeId,
- 'label' => $label,
- ];
- }
- if (!empty($data)) {
- $this->_getWriteAdapter()->insertMultiple($this->_labelsTable, $data);
- }
- }
- return parent::_afterSave($object);
- }
-
/**
* Assign order status to order state
*
@@ -198,4 +128,74 @@ public function unassignState($status, $state)
}
return $this;
}
+
+ /**
+ * Internal constructor
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/order_status', 'status');
+ $this->_isPkAutoIncrement = false;
+ $this->_labelsTable = $this->getTable('sales/order_status_label');
+ $this->_stateTable = $this->getTable('sales/order_status_state');
+ }
+
+ /**
+ * Retrieve select object for load object data
+ *
+ * @param string $field
+ * @param mixed $value
+ * @param Varien_Object $object
+ * @return Zend_Db_Select
+ */
+ protected function _getLoadSelect($field, $value, $object)
+ {
+ if ($field == 'default_state') {
+ $select = $this->_getReadAdapter()->select()
+ ->from($this->getMainTable(), ['label'])
+ ->join(
+ ['state_table' => $this->_stateTable],
+ $this->getMainTable() . '.status = state_table.status',
+ 'status',
+ )
+ ->where('state_table.state = ?', $value)
+ ->order('state_table.is_default DESC')
+ ->limit(1);
+ } else {
+ $select = parent::_getLoadSelect($field, $value, $object);
+ }
+ return $select;
+ }
+
+ /**
+ * Save status labels per store
+ *
+ * @param Mage_Sales_Model_Order|Mage_Sales_Model_Order_Status $object
+ * @inheritDoc
+ */
+ protected function _afterSave(Mage_Core_Model_Abstract $object)
+ {
+ if ($object->hasStoreLabels()) {
+ $labels = $object->getStoreLabels();
+ $this->_getWriteAdapter()->delete(
+ $this->_labelsTable,
+ ['status = ?' => $object->getStatus()],
+ );
+ $data = [];
+ foreach ($labels as $storeId => $label) {
+ if (empty($label)) {
+ continue;
+ }
+ $data[] = [
+ 'status' => $object->getStatus(),
+ 'store_id' => $storeId,
+ 'label' => $label,
+ ];
+ }
+ if (!empty($data)) {
+ $this->_getWriteAdapter()->insertMultiple($this->_labelsTable, $data);
+ }
+ }
+ return parent::_afterSave($object);
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php
index a0cdf64dcf2..0ee507bdf94 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php
@@ -25,14 +25,6 @@
*/
class Mage_Sales_Model_Resource_Order_Status_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Internal constructor
- */
- protected function _construct()
- {
- $this->_init('sales/order_status');
- }
-
/**
* Get collection data as options array
*
@@ -107,4 +99,11 @@ public function orderByLabel($dir = 'ASC')
$this->getSelect()->order('main_table.label ' . $dir);
return $this;
}
+ /**
+ * Internal constructor
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/order_status');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php
index e89cad0ce78..4c4a44fda2e 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php
@@ -32,11 +32,6 @@ class Mage_Sales_Model_Resource_Order_Status_History_Collection extends Mage_Sal
*/
protected $_eventObject = 'order_status_history_collection';
- protected function _construct()
- {
- $this->_init('sales/order_status_history');
- }
-
/**
* Get history object collection for specified instance (order, shipment, invoice or credit memo)
* Parameter instance may be one of the following types: Mage_Sales_Model_Order,
@@ -60,4 +55,9 @@ public function getUnnotifiedForInstance($instance, $historyEntityName = Mage_Sa
}
return null;
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/order_status_history');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php
index bd3c84568b0..3ea3a4fa558 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Resource_Order_Tax_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_tax', 'sales/order_tax');
- }
-
/**
* Load by order
*
@@ -41,4 +36,8 @@ public function loadByOrder($order)
->order('process');
return $this->load();
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_tax', 'sales/order_tax');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote.php b/app/code/core/Mage/Sales/Model/Resource/Quote.php
index e62b49e9400..99e0d7158ff 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Quote.php
@@ -22,39 +22,6 @@
*/
class Mage_Sales_Model_Resource_Quote extends Mage_Sales_Model_Resource_Abstract
{
- /**
- * Initialize table nad PK name
- *
- */
- protected function _construct()
- {
- $this->_init('sales/quote', 'entity_id');
- }
-
- /**
- * Retrieve select object for load object data
- *
- * @param string $field
- * @param mixed $value
- * @param Mage_Core_Model_Abstract|Mage_Sales_Model_Quote $object
- * @return Varien_Db_Select
- */
- protected function _getLoadSelect($field, $value, $object)
- {
- $select = parent::_getLoadSelect($field, $value, $object);
- $storeIds = $object->getSharedStoreIds();
- if ($storeIds) {
- $select->where('store_id IN (?)', $storeIds);
- } else {
- /**
- * For empty result
- */
- $select->where('store_id < ?', 0);
- }
-
- return $select;
- }
-
/**
* Load quote data by customer identifier
*
@@ -279,4 +246,36 @@ public function markQuotesRecollect($productIds)
return $this;
}
+ /**
+ * Initialize table nad PK name
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/quote', 'entity_id');
+ }
+
+ /**
+ * Retrieve select object for load object data
+ *
+ * @param string $field
+ * @param mixed $value
+ * @param Mage_Core_Model_Abstract|Mage_Sales_Model_Quote $object
+ * @return Varien_Db_Select
+ */
+ protected function _getLoadSelect($field, $value, $object)
+ {
+ $select = parent::_getLoadSelect($field, $value, $object);
+ $storeIds = $object->getSharedStoreIds();
+ if ($storeIds) {
+ $select->where('store_id IN (?)', $storeIds);
+ } else {
+ /**
+ * For empty result
+ */
+ $select->where('store_id < ?', 0);
+ }
+
+ return $select;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php
index 28b80468356..050bc33f4fa 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php
@@ -32,11 +32,6 @@ class Mage_Sales_Model_Resource_Quote_Address_Collection extends Mage_Core_Model
*/
protected $_eventObject = 'quote_address_collection';
- protected function _construct()
- {
- $this->_init('sales/quote_address');
- }
-
/**
* Setting filter on quote_id field but if quote_id is 0
* we should exclude loading junk data from DB
@@ -50,6 +45,11 @@ public function setQuoteFilter($quoteId)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/quote_address');
+ }
+
/**
* Redeclare after load method for dispatch event
*
diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php
index a982f854604..31a5801a0ed 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php
@@ -22,6 +22,23 @@
*/
class Mage_Sales_Model_Resource_Quote_Address_Item_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
+ /**
+ * Set address filter
+ *
+ * @param int $addressId
+ * @return $this
+ */
+ public function setAddressFilter($addressId)
+ {
+ if ($addressId) {
+ $this->addFieldToFilter('quote_address_id', $addressId);
+ } else {
+ $this->_totalRecords = 0;
+ $this->_setIsLoaded(true);
+ }
+
+ return $this;
+ }
protected function _construct()
{
$this->_init('sales/quote_address_item');
@@ -46,22 +63,4 @@ protected function _afterLoad()
return $this;
}
-
- /**
- * Set address filter
- *
- * @param int $addressId
- * @return $this
- */
- public function setAddressFilter($addressId)
- {
- if ($addressId) {
- $this->addFieldToFilter('quote_address_id', $addressId);
- } else {
- $this->_totalRecords = 0;
- $this->_setIsLoaded(true);
- }
-
- return $this;
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php
index 6acfd0b0b98..06c7b29b64b 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php
@@ -29,11 +29,6 @@ class Mage_Sales_Model_Resource_Quote_Address_Rate_Collection extends Mage_Core_
*/
protected $_allowFixedOnly = false;
- protected function _construct()
- {
- $this->_init('sales/quote_address_rate');
- }
-
/**
* Set filter by address id
*
@@ -76,4 +71,9 @@ public function addItem(Varien_Object $rate)
}
return parent::addItem($rate);
}
+
+ protected function _construct()
+ {
+ $this->_init('sales/quote_address_rate');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php
index 10bc6e1243a..50c8e0fa655 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php
@@ -39,11 +39,6 @@ class Mage_Sales_Model_Resource_Quote_Item_Collection extends Mage_Core_Model_Re
*/
protected $_productIds = [];
- protected function _construct()
- {
- $this->_init('sales/quote_item');
- }
-
/**
* Retrieve store Id (From Quote)
*
@@ -99,6 +94,11 @@ public function resetJoinQuotes($quotesTableName, $productId = null)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/quote_item');
+ }
+
/**
* After load processing
*
diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php
index e8657233254..dc79a77226d 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php
@@ -36,43 +36,6 @@ class Mage_Sales_Model_Resource_Quote_Item_Option_Collection extends Mage_Core_M
*/
protected $_optionsByProduct = [];
- /**
- * Define resource model for collection
- *
- */
- protected function _construct()
- {
- $this->_init('sales/quote_item_option');
- }
-
- /**
- * Fill array of options by item and product
- *
- * @return $this
- */
- protected function _afterLoad()
- {
- parent::_afterLoad();
-
- foreach ($this as $option) {
- $optionId = $option->getId();
- $itemId = $option->getItemId();
- $productId = $option->getProductId();
- if (isset($this->_optionsByItem[$itemId])) {
- $this->_optionsByItem[$itemId][] = $optionId;
- } else {
- $this->_optionsByItem[$itemId] = [$optionId];
- }
- if (isset($this->_optionsByProduct[$productId])) {
- $this->_optionsByProduct[$productId][] = $optionId;
- } else {
- $this->_optionsByProduct[$productId] = [$optionId];
- }
- }
-
- return $this;
- }
-
/**
* Apply quote item(s) filter to collection
*
@@ -158,4 +121,41 @@ public function getOptionsByProduct($product)
return $options;
}
+
+ /**
+ * Define resource model for collection
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/quote_item_option');
+ }
+
+ /**
+ * Fill array of options by item and product
+ *
+ * @return $this
+ */
+ protected function _afterLoad()
+ {
+ parent::_afterLoad();
+
+ foreach ($this as $option) {
+ $optionId = $option->getId();
+ $itemId = $option->getItemId();
+ $productId = $option->getProductId();
+ if (isset($this->_optionsByItem[$itemId])) {
+ $this->_optionsByItem[$itemId][] = $optionId;
+ } else {
+ $this->_optionsByItem[$itemId] = [$optionId];
+ }
+ if (isset($this->_optionsByProduct[$productId])) {
+ $this->_optionsByProduct[$productId][] = $optionId;
+ } else {
+ $this->_optionsByProduct[$productId] = [$optionId];
+ }
+ }
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php
index e1304599302..0003d677bcf 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Resource_Quote_Payment_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/quote_payment');
- }
-
/**
* Setquote filter to result
*
@@ -37,6 +32,10 @@ public function setQuoteFilter($quoteId)
{
return $this->addFieldToFilter('quote_id', $quoteId);
}
+ protected function _construct()
+ {
+ $this->_init('sales/quote_payment');
+ }
/**
* Unserialize additional_information in each item
diff --git a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php
index f300f0c2eec..c0a3dc0a002 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php
@@ -22,6 +22,45 @@
*/
class Mage_Sales_Model_Resource_Recurring_Profile extends Mage_Sales_Model_Resource_Abstract
{
+ /**
+ * Return recurring profile child Orders Ids
+ *
+ *
+ * @param Varien_Object $object
+ * @return array
+ */
+ public function getChildOrderIds($object)
+ {
+ $adapter = $this->_getReadAdapter();
+ $bind = [':profile_id' => $object->getId()];
+ $select = $adapter->select()
+ ->from(
+ ['main_table' => $this->getTable('sales/recurring_profile_order')],
+ ['order_id'],
+ )
+ ->where('profile_id=:profile_id');
+
+ return $adapter->fetchCol($select, $bind);
+ }
+
+ /**
+ * Add order relation to recurring profile
+ *
+ * @param int $recurringProfileId
+ * @param int $orderId
+ * @return $this
+ */
+ public function addOrderRelation($recurringProfileId, $orderId)
+ {
+ $this->_getWriteAdapter()->insert(
+ $this->getTable('sales/recurring_profile_order'),
+ [
+ 'profile_id' => $recurringProfileId,
+ 'order_id' => $orderId,
+ ],
+ );
+ return $this;
+ }
/**
* Initialize main table and column
*
@@ -66,44 +105,4 @@ protected function _unserializeField(Varien_Object $object, $field, $defaultValu
$object->setData($field, $unserializedValue);
}
}
-
- /**
- * Return recurring profile child Orders Ids
- *
- *
- * @param Varien_Object $object
- * @return array
- */
- public function getChildOrderIds($object)
- {
- $adapter = $this->_getReadAdapter();
- $bind = [':profile_id' => $object->getId()];
- $select = $adapter->select()
- ->from(
- ['main_table' => $this->getTable('sales/recurring_profile_order')],
- ['order_id'],
- )
- ->where('profile_id=:profile_id');
-
- return $adapter->fetchCol($select, $bind);
- }
-
- /**
- * Add order relation to recurring profile
- *
- * @param int $recurringProfileId
- * @param int $orderId
- * @return $this
- */
- public function addOrderRelation($recurringProfileId, $orderId)
- {
- $this->_getWriteAdapter()->insert(
- $this->getTable('sales/recurring_profile_order'),
- [
- 'profile_id' => $recurringProfileId,
- 'order_id' => $orderId,
- ],
- );
- return $this;
- }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report.php b/app/code/core/Mage/Sales/Model/Resource/Report.php
index 825fff7f721..69d1e3fbfc2 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report.php
@@ -22,8 +22,6 @@
*/
class Mage_Sales_Model_Resource_Report extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct() {}
-
/**
* Set main table and idField
*
@@ -36,4 +34,5 @@ public function init($table, $field = 'id')
$this->_init($table, $field);
return $this;
}
+ protected function _construct() {}
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php
index 30fe2cfd8cd..a9a0b402eb7 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php
@@ -26,14 +26,6 @@ class Mage_Sales_Model_Resource_Report_Bestsellers extends Mage_Sales_Model_Reso
public const AGGREGATION_MONTHLY = 'monthly';
public const AGGREGATION_YEARLY = 'yearly';
- /**
- * Model initialization
- */
- protected function _construct()
- {
- $this->_init('sales/bestsellers_aggregated_' . self::AGGREGATION_DAILY, 'id');
- }
-
/**
* Aggregate Orders data by order created at
*
@@ -228,6 +220,14 @@ public function aggregate($from = null, $to = null)
return $this;
}
+ /**
+ * Model initialization
+ */
+ protected function _construct()
+ {
+ $this->_init('sales/bestsellers_aggregated_' . self::AGGREGATION_DAILY, 'id');
+ }
+
/**
* Aggregate Orders data for default store
*
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php
index f2bd3a13db3..f199719ac31 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php
@@ -50,6 +50,45 @@ public function __construct()
$this->_applyFilters = false;
}
+ /**
+ * Get SQL for get record count
+ *
+ * @return Varien_Db_Select
+ */
+ public function getSelectCountSql()
+ {
+ $this->_renderFilters();
+ $select = clone $this->getSelect();
+ $select->reset(Zend_Db_Select::ORDER);
+ return $this->getConnection()->select()->from($select, 'COUNT(*)');
+ }
+
+ /**
+ * Set ids for store restrictions
+ *
+ * @param array $storeIds
+ * @return $this
+ */
+ public function addStoreRestrictions($storeIds)
+ {
+ if (!is_array($storeIds)) {
+ $storeIds = [$storeIds];
+ }
+ $currentStoreIds = $this->_storesIds;
+ if (isset($currentStoreIds) && $currentStoreIds != Mage_Core_Model_App::ADMIN_STORE_ID
+ && $currentStoreIds != [Mage_Core_Model_App::ADMIN_STORE_ID]
+ ) {
+ if (!is_array($currentStoreIds)) {
+ $currentStoreIds = [$currentStoreIds];
+ }
+ $this->_storesIds = array_intersect($currentStoreIds, $storeIds);
+ } else {
+ $this->_storesIds = $storeIds;
+ }
+
+ return $this;
+ }
+
/**
* Retrieve columns for select
*
@@ -158,45 +197,6 @@ protected function _initSelect()
return $this;
}
- /**
- * Get SQL for get record count
- *
- * @return Varien_Db_Select
- */
- public function getSelectCountSql()
- {
- $this->_renderFilters();
- $select = clone $this->getSelect();
- $select->reset(Zend_Db_Select::ORDER);
- return $this->getConnection()->select()->from($select, 'COUNT(*)');
- }
-
- /**
- * Set ids for store restrictions
- *
- * @param array $storeIds
- * @return $this
- */
- public function addStoreRestrictions($storeIds)
- {
- if (!is_array($storeIds)) {
- $storeIds = [$storeIds];
- }
- $currentStoreIds = $this->_storesIds;
- if (isset($currentStoreIds) && $currentStoreIds != Mage_Core_Model_App::ADMIN_STORE_ID
- && $currentStoreIds != [Mage_Core_Model_App::ADMIN_STORE_ID]
- ) {
- if (!is_array($currentStoreIds)) {
- $currentStoreIds = [$currentStoreIds];
- }
- $this->_storesIds = array_intersect($currentStoreIds, $storeIds);
- } else {
- $this->_storesIds = $storeIds;
- }
-
- return $this;
- }
-
/**
* Redeclare parent method for applying filters after parent method
* but before adding unions and calculating totals
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php
index 3e2e548c75b..ede7cf0f456 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Resource_Report_Invoiced extends Mage_Sales_Model_Resource_Report_Abstract
{
- protected function _construct()
- {
- $this->_setResource('sales');
- }
-
/**
* Aggregate Invoiced data
*
@@ -47,6 +42,10 @@ public function aggregate($from = null, $to = null)
$this->_setFlagData(Mage_Reports_Model_Flag::REPORT_INVOICE_FLAG_CODE);
return $this;
}
+ protected function _construct()
+ {
+ $this->_setResource('sales');
+ }
/**
* Aggregate Invoiced data by invoice created_at as period
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order.php
index 91d17aa3b3f..2e0f26c0480 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Order.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Resource_Report_Order extends Mage_Sales_Model_Resource_Report_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_aggregated_created', 'id');
- }
-
/**
* Aggregate Orders data
*
@@ -42,4 +37,8 @@ public function aggregate($from = null, $to = null)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_aggregated_created', 'id');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
index 420c6f75699..040cf2f82ac 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Resource_Report_Order_Createdat extends Mage_Sales_Model_Resource_Report_Abstract
{
- protected function _construct()
- {
- $this->_init('sales/order_aggregated_created', 'id');
- }
-
/**
* Aggregate Orders data by order created at
*
@@ -38,6 +33,10 @@ public function aggregate($from = null, $to = null)
{
return $this->_aggregateByField('created_at', $from, $to);
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_aggregated_created', 'id');
+ }
/**
* Aggregate Orders data by custom field
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php
index 3549a799454..12eb64834bd 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Resource_Report_Order_Updatedat extends Mage_Sales_Model_Resource_Report_Order_Createdat
{
- protected function _construct()
- {
- $this->_init('sales/order_aggregated_updated', 'id');
- }
-
/**
* Aggregate Orders data by order updated at
*
@@ -38,4 +33,8 @@ public function aggregate($from = null, $to = null)
{
return $this->_aggregateByField('updated_at', $from, $to);
}
+ protected function _construct()
+ {
+ $this->_init('sales/order_aggregated_updated', 'id');
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php
index 17dcac7a204..d901c72f5a0 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php
@@ -22,14 +22,6 @@
*/
class Mage_Sales_Model_Resource_Report_Refunded extends Mage_Sales_Model_Resource_Report_Abstract
{
- /**
- * Model initialization
- */
- protected function _construct()
- {
- $this->_setResource('sales');
- }
-
/**
* Aggregate Refunded data
*
@@ -50,6 +42,13 @@ public function aggregate($from = null, $to = null)
$this->_setFlagData(Mage_Reports_Model_Flag::REPORT_REFUNDED_FLAG_CODE);
return $this;
}
+ /**
+ * Model initialization
+ */
+ protected function _construct()
+ {
+ $this->_setResource('sales');
+ }
/**
* Aggregate refunded data by order created at as period
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php
index 2c420e1c166..74cde50d110 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php
@@ -22,11 +22,6 @@
*/
class Mage_Sales_Model_Resource_Report_Shipping extends Mage_Sales_Model_Resource_Report_Abstract
{
- protected function _construct()
- {
- $this->_setResource('sales');
- }
-
/**
* Aggregate Shipping data
*
@@ -46,6 +41,10 @@ public function aggregate($from = null, $to = null)
$this->_setFlagData(Mage_Reports_Model_Flag::REPORT_SHIPPING_FLAG_CODE);
return $this;
}
+ protected function _construct()
+ {
+ $this->_setResource('sales');
+ }
/**
* Aggregate shipping report by order create_at as period
diff --git a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
index 1af7f5b521d..4969f30f45f 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
@@ -102,48 +102,6 @@ public function setOrderStateFilter($state, $exclude = false)
return $this;
}
- /**
- * Before load action
- *
- * @return Varien_Data_Collection_Db
- */
- protected function _beforeLoad()
- {
- $this->getSelect()
- ->from(
- ['sales' => Mage::getResourceSingleton('sales/order')->getMainTable()],
- [
- 'store_id',
- 'lifetime' => new Zend_Db_Expr('SUM(sales.base_grand_total)'),
- 'base_lifetime' => new Zend_Db_Expr('SUM(sales.base_grand_total * sales.base_to_global_rate)'),
- 'avgsale' => new Zend_Db_Expr('AVG(sales.base_grand_total)'),
- 'base_avgsale' => new Zend_Db_Expr('AVG(sales.base_grand_total * sales.base_to_global_rate)'),
- 'num_orders' => new Zend_Db_Expr('COUNT(sales.base_grand_total)'),
- ],
- )
- ->group('sales.store_id');
-
- if ($this->_customer instanceof Mage_Customer_Model_Customer) {
- $this->addFieldToFilter('sales.customer_id', $this->_customer->getId());
- }
-
- if (!is_null($this->_orderStateValue)) {
- $condition = '';
- switch ($this->_orderStateCondition) {
- case 'IN':
- $condition = 'in';
- break;
- case 'NOT IN':
- $condition = 'nin';
- break;
- }
- $this->addFieldToFilter('state', [$condition => $this->_orderStateValue]);
- }
-
- Mage::dispatchEvent('sales_sale_collection_query_before', ['collection' => $this]);
- return $this;
- }
-
/**
* Load data
*
@@ -205,4 +163,46 @@ public function getTotals()
{
return new Varien_Object($this->_totals);
}
+
+ /**
+ * Before load action
+ *
+ * @return Varien_Data_Collection_Db
+ */
+ protected function _beforeLoad()
+ {
+ $this->getSelect()
+ ->from(
+ ['sales' => Mage::getResourceSingleton('sales/order')->getMainTable()],
+ [
+ 'store_id',
+ 'lifetime' => new Zend_Db_Expr('SUM(sales.base_grand_total)'),
+ 'base_lifetime' => new Zend_Db_Expr('SUM(sales.base_grand_total * sales.base_to_global_rate)'),
+ 'avgsale' => new Zend_Db_Expr('AVG(sales.base_grand_total)'),
+ 'base_avgsale' => new Zend_Db_Expr('AVG(sales.base_grand_total * sales.base_to_global_rate)'),
+ 'num_orders' => new Zend_Db_Expr('COUNT(sales.base_grand_total)'),
+ ],
+ )
+ ->group('sales.store_id');
+
+ if ($this->_customer instanceof Mage_Customer_Model_Customer) {
+ $this->addFieldToFilter('sales.customer_id', $this->_customer->getId());
+ }
+
+ if (!is_null($this->_orderStateValue)) {
+ $condition = '';
+ switch ($this->_orderStateCondition) {
+ case 'IN':
+ $condition = 'in';
+ break;
+ case 'NOT IN':
+ $condition = 'nin';
+ break;
+ }
+ $this->addFieldToFilter('state', [$condition => $this->_orderStateValue]);
+ }
+
+ Mage::dispatchEvent('sales_sale_collection_query_before', ['collection' => $this]);
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Setup.php b/app/code/core/Mage/Sales/Model/Resource/Setup.php
index 76e59975f43..5a765f6a5aa 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Setup.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Setup.php
@@ -63,18 +63,6 @@ class Mage_Sales_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup
'creditmemo',
];
- /**
- * Check if table exist for flat entity
- *
- * @param string $table
- * @return bool
- */
- protected function _flatTableExist($table)
- {
- $tablesList = $this->getConnection()->listTables();
- return in_array(strtoupper($this->getTable($table)), array_map('strtoupper', $tablesList));
- }
-
/**
* Add entity attribute. Overwrited for flat entities support
*
@@ -95,90 +83,6 @@ public function addAttribute($entityTypeId, $code, array $attr)
return $this;
}
- /**
- * Add attribute as separate column in the table
- *
- * @param string $table
- * @param string $attribute
- * @param array $attr
- * @return $this
- */
- protected function _addFlatAttribute($table, $attribute, $attr)
- {
- $tableInfo = $this->getConnection()->describeTable($this->getTable($table));
- if (isset($tableInfo[$attribute])) {
- return $this;
- }
- $columnDefinition = $this->_getAttributeColumnDefinition($attribute, $attr);
- $this->getConnection()->addColumn($this->getTable($table), $attribute, $columnDefinition);
- return $this;
- }
-
- /**
- * Add attribute to grid table if necessary
- *
- * @param string $table
- * @param string $attribute
- * @param array $attr
- * @param string $entityTypeId
- * @return $this
- */
- protected function _addGridAttribute($table, $attribute, $attr, $entityTypeId)
- {
- if (in_array($entityTypeId, $this->_flatEntitiesGrid) && !empty($attr['grid'])) {
- $columnDefinition = $this->_getAttributeColumnDefinition($attribute, $attr);
- $this->getConnection()->addColumn($this->getTable($table . '_grid'), $attribute, $columnDefinition);
- }
- return $this;
- }
-
- /**
- * Retrieve definition of column for create in flat table
- *
- * @param string $code
- * @param array $data
- * @return array
- */
- protected function _getAttributeColumnDefinition($code, $data)
- {
- // Convert attribute type to column info
- $data['type'] = $data['type'] ?? 'varchar';
- $type = null;
- $length = null;
- switch ($data['type']) {
- case 'timestamp':
- $type = Varien_Db_Ddl_Table::TYPE_TIMESTAMP;
- break;
- case 'datetime':
- $type = Varien_Db_Ddl_Table::TYPE_DATETIME;
- break;
- case 'decimal':
- $type = Varien_Db_Ddl_Table::TYPE_DECIMAL;
- $length = '12,4';
- break;
- case 'int':
- $type = Varien_Db_Ddl_Table::TYPE_INTEGER;
- break;
- case 'text':
- $type = Varien_Db_Ddl_Table::TYPE_TEXT;
- $length = 65536;
- break;
- case 'char':
- case 'varchar':
- $type = Varien_Db_Ddl_Table::TYPE_TEXT;
- $length = 255;
- break;
- }
- if ($type !== null) {
- $data['type'] = $type;
- $data['length'] = $length;
- }
-
- $data['nullable'] = isset($data['required']) ? !$data['required'] : true;
- $data['comment'] = $data['comment'] ?? ucwords(str_replace('_', ' ', $code));
- return $data;
- }
-
/**
* Retrieve default entities
*
@@ -972,4 +876,100 @@ public function getDefaultEntities()
];
}
+
+ /**
+ * Check if table exist for flat entity
+ *
+ * @param string $table
+ * @return bool
+ */
+ protected function _flatTableExist($table)
+ {
+ $tablesList = $this->getConnection()->listTables();
+ return in_array(strtoupper($this->getTable($table)), array_map('strtoupper', $tablesList));
+ }
+
+ /**
+ * Add attribute as separate column in the table
+ *
+ * @param string $table
+ * @param string $attribute
+ * @param array $attr
+ * @return $this
+ */
+ protected function _addFlatAttribute($table, $attribute, $attr)
+ {
+ $tableInfo = $this->getConnection()->describeTable($this->getTable($table));
+ if (isset($tableInfo[$attribute])) {
+ return $this;
+ }
+ $columnDefinition = $this->_getAttributeColumnDefinition($attribute, $attr);
+ $this->getConnection()->addColumn($this->getTable($table), $attribute, $columnDefinition);
+ return $this;
+ }
+
+ /**
+ * Add attribute to grid table if necessary
+ *
+ * @param string $table
+ * @param string $attribute
+ * @param array $attr
+ * @param string $entityTypeId
+ * @return $this
+ */
+ protected function _addGridAttribute($table, $attribute, $attr, $entityTypeId)
+ {
+ if (in_array($entityTypeId, $this->_flatEntitiesGrid) && !empty($attr['grid'])) {
+ $columnDefinition = $this->_getAttributeColumnDefinition($attribute, $attr);
+ $this->getConnection()->addColumn($this->getTable($table . '_grid'), $attribute, $columnDefinition);
+ }
+ return $this;
+ }
+
+ /**
+ * Retrieve definition of column for create in flat table
+ *
+ * @param string $code
+ * @param array $data
+ * @return array
+ */
+ protected function _getAttributeColumnDefinition($code, $data)
+ {
+ // Convert attribute type to column info
+ $data['type'] = $data['type'] ?? 'varchar';
+ $type = null;
+ $length = null;
+ switch ($data['type']) {
+ case 'timestamp':
+ $type = Varien_Db_Ddl_Table::TYPE_TIMESTAMP;
+ break;
+ case 'datetime':
+ $type = Varien_Db_Ddl_Table::TYPE_DATETIME;
+ break;
+ case 'decimal':
+ $type = Varien_Db_Ddl_Table::TYPE_DECIMAL;
+ $length = '12,4';
+ break;
+ case 'int':
+ $type = Varien_Db_Ddl_Table::TYPE_INTEGER;
+ break;
+ case 'text':
+ $type = Varien_Db_Ddl_Table::TYPE_TEXT;
+ $length = 65536;
+ break;
+ case 'char':
+ case 'varchar':
+ $type = Varien_Db_Ddl_Table::TYPE_TEXT;
+ $length = 255;
+ break;
+ }
+ if ($type !== null) {
+ $data['type'] = $type;
+ $data['length'] = $length;
+ }
+
+ $data['nullable'] = isset($data['required']) ? !$data['required'] : true;
+ $data['comment'] = $data['comment'] ?? ucwords(str_replace('_', ' ', $code));
+ return $data;
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Service/Order.php b/app/code/core/Mage/Sales/Model/Service/Order.php
index 46f2eea74bf..da0cd70cc82 100644
--- a/app/code/core/Mage/Sales/Model/Service/Order.php
+++ b/app/code/core/Mage/Sales/Model/Service/Order.php
@@ -86,17 +86,6 @@ public function updateLocaleNumbers(&$data)
return $this;
}
- /**
- * Perform numbers conversion according to locale
- *
- * @param mixed $value
- * @return float
- */
- protected function _getLocaleNumber($value)
- {
- return Mage::app()->getLocale()->getNumber($value);
- }
-
/**
* Prepare order invoice based on order data and requested items qtys. If $qtys is not empty - the function will
* prepare only specified items, otherwise all containing in the order.
@@ -328,6 +317,17 @@ public function prepareInvoiceCreditmemo($invoice, $data = [])
return $creditmemo;
}
+ /**
+ * Perform numbers conversion according to locale
+ *
+ * @param mixed $value
+ * @return float
+ */
+ protected function _getLocaleNumber($value)
+ {
+ return Mage::app()->getLocale()->getNumber($value);
+ }
+
/**
* Initialize creditmemo state based on requested parameters
*
diff --git a/app/code/core/Mage/Sales/controllers/DownloadController.php b/app/code/core/Mage/Sales/controllers/DownloadController.php
index 01b457865fa..950ae6150be 100644
--- a/app/code/core/Mage/Sales/controllers/DownloadController.php
+++ b/app/code/core/Mage/Sales/controllers/DownloadController.php
@@ -22,87 +22,6 @@
*/
class Mage_Sales_DownloadController extends Mage_Core_Controller_Front_Action
{
- /**
- * Custom options downloader
- *
- * @param mixed $info
- */
- protected function _downloadFileAction($info)
- {
- $secretKey = $this->getRequest()->getParam('key');
- try {
- if ($secretKey != $info['secret_key']) {
- throw new Exception();
- }
-
- $this->_validateFilePath($info);
-
- $filePath = Mage::getBaseDir() . $info['order_path'];
- if ((!is_file($filePath) || !is_readable($filePath)) && !$this->_processDatabaseFile($filePath)) {
- //try get file from quote
- $filePath = Mage::getBaseDir() . $info['quote_path'];
- if ((!is_file($filePath) || !is_readable($filePath)) && !$this->_processDatabaseFile($filePath)) {
- throw new Exception();
- }
- }
- $this->_prepareDownloadResponse($info['title'], [
- 'value' => $filePath,
- 'type' => 'filename',
- ]);
- } catch (Exception $e) {
- $this->_forward('noRoute');
- }
- }
-
- /**
- * @param array $info
- * @throws Exception
- */
- protected function _validateFilePath($info)
- {
- $optionFile = Mage::getModel('catalog/product_option_type_file');
- $optionStoragePath = $optionFile->getOrderTargetDir(true);
- if (strpos($info['order_path'], $optionStoragePath) !== 0) {
- throw new Exception('Unexpected file path');
- }
- }
-
- /**
- * Check file in database storage if needed and place it on file system
- *
- * @param string $filePath
- * @return bool
- *
- * @SuppressWarnings("PHPMD.ErrorControlOperator")
- */
- protected function _processDatabaseFile($filePath)
- {
- if (!Mage::helper('core/file_storage_database')->checkDbUsage()) {
- return false;
- }
-
- $relativePath = Mage::helper('core/file_storage_database')->getMediaRelativePath($filePath);
- $file = Mage::getModel('core/file_storage_database')->loadByFilename($relativePath);
-
- if (!$file->getId()) {
- return false;
- }
-
- $directory = dirname($filePath);
- @mkdir($directory, 0777, true);
-
- $io = new Varien_Io_File();
- $io->cd($directory);
-
- $io->streamOpen($filePath);
- $io->streamLock(true);
- $io->streamWrite($file->getContent());
- $io->streamUnlock();
- $io->streamClose();
-
- return true;
- }
-
/**
* Profile custom options download action
*/
@@ -189,4 +108,84 @@ public function downloadCustomOptionAction()
}
exit(0);
}
+ /**
+ * Custom options downloader
+ *
+ * @param mixed $info
+ */
+ protected function _downloadFileAction($info)
+ {
+ $secretKey = $this->getRequest()->getParam('key');
+ try {
+ if ($secretKey != $info['secret_key']) {
+ throw new Exception();
+ }
+
+ $this->_validateFilePath($info);
+
+ $filePath = Mage::getBaseDir() . $info['order_path'];
+ if ((!is_file($filePath) || !is_readable($filePath)) && !$this->_processDatabaseFile($filePath)) {
+ //try get file from quote
+ $filePath = Mage::getBaseDir() . $info['quote_path'];
+ if ((!is_file($filePath) || !is_readable($filePath)) && !$this->_processDatabaseFile($filePath)) {
+ throw new Exception();
+ }
+ }
+ $this->_prepareDownloadResponse($info['title'], [
+ 'value' => $filePath,
+ 'type' => 'filename',
+ ]);
+ } catch (Exception $e) {
+ $this->_forward('noRoute');
+ }
+ }
+
+ /**
+ * @param array $info
+ * @throws Exception
+ */
+ protected function _validateFilePath($info)
+ {
+ $optionFile = Mage::getModel('catalog/product_option_type_file');
+ $optionStoragePath = $optionFile->getOrderTargetDir(true);
+ if (strpos($info['order_path'], $optionStoragePath) !== 0) {
+ throw new Exception('Unexpected file path');
+ }
+ }
+
+ /**
+ * Check file in database storage if needed and place it on file system
+ *
+ * @param string $filePath
+ * @return bool
+ *
+ * @SuppressWarnings("PHPMD.ErrorControlOperator")
+ */
+ protected function _processDatabaseFile($filePath)
+ {
+ if (!Mage::helper('core/file_storage_database')->checkDbUsage()) {
+ return false;
+ }
+
+ $relativePath = Mage::helper('core/file_storage_database')->getMediaRelativePath($filePath);
+ $file = Mage::getModel('core/file_storage_database')->loadByFilename($relativePath);
+
+ if (!$file->getId()) {
+ return false;
+ }
+
+ $directory = dirname($filePath);
+ @mkdir($directory, 0777, true);
+
+ $io = new Varien_Io_File();
+ $io->cd($directory);
+
+ $io->streamOpen($filePath);
+ $io->streamLock(true);
+ $io->streamWrite($file->getContent());
+ $io->streamUnlock();
+ $io->streamClose();
+
+ return true;
+ }
}
diff --git a/app/code/core/Mage/Sales/controllers/GuestController.php b/app/code/core/Mage/Sales/controllers/GuestController.php
index cde3cbe5ef0..43695c43c02 100644
--- a/app/code/core/Mage/Sales/controllers/GuestController.php
+++ b/app/code/core/Mage/Sales/controllers/GuestController.php
@@ -22,43 +22,6 @@
*/
class Mage_Sales_GuestController extends Mage_Sales_Controller_Abstract
{
- /**
- * Try to load valid order and register it
- *
- * @param int $orderId
- * @return bool
- */
- protected function _loadValidOrder($orderId = null)
- {
- return Mage::helper('sales/guest')->loadValidOrder();
- }
-
- /**
- * Check order view availability
- *
- * @param Mage_Sales_Model_Order $order
- * @return bool
- */
- protected function _canViewOrder($order)
- {
- $currentOrder = Mage::registry('current_order');
- if ($order->getId() && ($order->getId() === $currentOrder->getId())) {
- return true;
- }
- return false;
- }
-
- protected function _viewAction()
- {
- if (!$this->_loadValidOrder()) {
- return;
- }
-
- $this->loadLayout();
- Mage::helper('sales/guest')->getBreadcrumbs($this);
- $this->renderLayout();
- }
-
/**
* Order view form page
*/
@@ -146,4 +109,40 @@ public function printCreditmemoAction()
$this->_redirect('sales/guest/form');
}
}
+ /**
+ * Try to load valid order and register it
+ *
+ * @param int $orderId
+ * @return bool
+ */
+ protected function _loadValidOrder($orderId = null)
+ {
+ return Mage::helper('sales/guest')->loadValidOrder();
+ }
+
+ /**
+ * Check order view availability
+ *
+ * @param Mage_Sales_Model_Order $order
+ * @return bool
+ */
+ protected function _canViewOrder($order)
+ {
+ $currentOrder = Mage::registry('current_order');
+ if ($order->getId() && ($order->getId() === $currentOrder->getId())) {
+ return true;
+ }
+ return false;
+ }
+
+ protected function _viewAction()
+ {
+ if (!$this->_loadValidOrder()) {
+ return;
+ }
+
+ $this->loadLayout();
+ Mage::helper('sales/guest')->getBreadcrumbs($this);
+ $this->renderLayout();
+ }
}
diff --git a/app/code/core/Mage/Sales/controllers/OrderController.php b/app/code/core/Mage/Sales/controllers/OrderController.php
index c9df472a307..f104e8ee8de 100644
--- a/app/code/core/Mage/Sales/controllers/OrderController.php
+++ b/app/code/core/Mage/Sales/controllers/OrderController.php
@@ -56,25 +56,25 @@ public function historyAction()
}
/**
- * Check osCommerce order view availability
+ * osCommerce Order view page
*
* @deprecated after 1.6.0.0
- * @param array $order
- * @return bool
+ *
*/
- protected function _canViewOscommerceOrder($order)
+ public function viewOldAction()
{
- return false;
+ $this->_forward('noRoute');
}
/**
- * osCommerce Order view page
+ * Check osCommerce order view availability
*
* @deprecated after 1.6.0.0
- *
+ * @param array $order
+ * @return bool
*/
- public function viewOldAction()
+ protected function _canViewOscommerceOrder($order)
{
- $this->_forward('noRoute');
+ return false;
}
}
diff --git a/app/code/core/Mage/SalesRule/Model/Coupon.php b/app/code/core/Mage/SalesRule/Model/Coupon.php
index 92495f415be..64bbb536e21 100644
--- a/app/code/core/Mage/SalesRule/Model/Coupon.php
+++ b/app/code/core/Mage/SalesRule/Model/Coupon.php
@@ -50,25 +50,6 @@ class Mage_SalesRule_Model_Coupon extends Mage_Core_Model_Abstract
*/
protected $_rule;
- protected function _construct()
- {
- parent::_construct();
- $this->_init('salesrule/coupon');
- }
-
- /**
- * Processing object before save data
- *
- * @return Mage_Core_Model_Abstract
- */
- protected function _beforeSave()
- {
- if (!$this->getRuleId() && $this->_rule instanceof Mage_SalesRule_Model_Rule) {
- $this->setRuleId($this->_rule->getId());
- }
- return parent::_beforeSave();
- }
-
/**
* Set rule instance
*
@@ -103,4 +84,23 @@ public function loadByCode($couponCode)
$this->load($couponCode, 'code');
return $this;
}
+
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_init('salesrule/coupon');
+ }
+
+ /**
+ * Processing object before save data
+ *
+ * @return Mage_Core_Model_Abstract
+ */
+ protected function _beforeSave()
+ {
+ if (!$this->getRuleId() && $this->_rule instanceof Mage_SalesRule_Model_Rule) {
+ $this->setRuleId($this->_rule->getId());
+ }
+ return parent::_beforeSave();
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php b/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php
index 432381186cc..71ae1476380 100644
--- a/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php
+++ b/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php
@@ -50,14 +50,6 @@ class Mage_SalesRule_Model_Coupon_Massgenerator extends Mage_Core_Model_Abstract
*/
protected $_generatedCount = 0;
- /**
- * Initialize resource
- */
- protected function _construct()
- {
- $this->_init('salesrule/coupon');
- }
-
/**
* Generate coupon code
*
@@ -190,4 +182,12 @@ public function getGeneratedCount()
{
return $this->_generatedCount;
}
+
+ /**
+ * Initialize resource
+ */
+ protected function _construct()
+ {
+ $this->_init('salesrule/coupon');
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Observer.php b/app/code/core/Mage/SalesRule/Model/Observer.php
index c97c4f2336c..ba265447a25 100644
--- a/app/code/core/Mage/SalesRule/Model/Observer.php
+++ b/app/code/core/Mage/SalesRule/Model/Observer.php
@@ -190,63 +190,6 @@ public function aggregateSalesReportCouponsData($schedule)
return $this;
}
- /**
- * Check rules that contains affected attribute
- * If rules were found they will be set to inactive and notice will be add to admin session
- *
- * @param string $attributeCode
- * @return $this
- */
- protected function _checkSalesRulesAvailability($attributeCode)
- {
- /** @var Mage_SalesRule_Model_Resource_Rule_Collection $collection */
- $collection = Mage::getResourceModel('salesrule/rule_collection')
- ->addAttributeInConditionFilter($attributeCode);
-
- $disabledRulesCount = 0;
- foreach ($collection as $rule) {
- /** @var Mage_SalesRule_Model_Rule $rule */
- $rule->setIsActive(0);
- /** @var $rule->getConditions() Mage_SalesRule_Model_Rule_Condition_Combine */
- $this->_removeAttributeFromConditions($rule->getConditions(), $attributeCode);
- $this->_removeAttributeFromConditions($rule->getActions(), $attributeCode);
- // phpcs:ignore Ecg.Performance.Loop.ModelLSD
- $rule->save();
-
- $disabledRulesCount++;
- }
-
- if ($disabledRulesCount) {
- Mage::getSingleton('adminhtml/session')->addWarning(
- Mage::helper('salesrule')->__('%d Shopping Cart Price Rules based on "%s" attribute have been disabled.', $disabledRulesCount, $attributeCode),
- );
- }
-
- return $this;
- }
-
- /**
- * Remove catalog attribute condition by attribute code from rule conditions
- *
- * @param Mage_Rule_Model_Condition_Combine $combine
- * @param string $attributeCode
- */
- protected function _removeAttributeFromConditions($combine, $attributeCode)
- {
- $conditions = $combine->getConditions();
- foreach ($conditions as $conditionId => $condition) {
- if ($condition instanceof Mage_Rule_Model_Condition_Combine) {
- $this->_removeAttributeFromConditions($condition, $attributeCode);
- }
- if ($condition instanceof Mage_SalesRule_Model_Rule_Condition_Product) {
- if ($condition->getAttribute() == $attributeCode) {
- unset($conditions[$conditionId]);
- }
- }
- }
- $combine->setConditions($conditions);
- }
-
/**
* After save attribute if it is not used for promo rules already check rules for containing this attribute
*
@@ -341,4 +284,61 @@ public function addSalesRuleNameToOrder($observer)
return $this;
}
+
+ /**
+ * Check rules that contains affected attribute
+ * If rules were found they will be set to inactive and notice will be add to admin session
+ *
+ * @param string $attributeCode
+ * @return $this
+ */
+ protected function _checkSalesRulesAvailability($attributeCode)
+ {
+ /** @var Mage_SalesRule_Model_Resource_Rule_Collection $collection */
+ $collection = Mage::getResourceModel('salesrule/rule_collection')
+ ->addAttributeInConditionFilter($attributeCode);
+
+ $disabledRulesCount = 0;
+ foreach ($collection as $rule) {
+ /** @var Mage_SalesRule_Model_Rule $rule */
+ $rule->setIsActive(0);
+ /** @var $rule->getConditions() Mage_SalesRule_Model_Rule_Condition_Combine */
+ $this->_removeAttributeFromConditions($rule->getConditions(), $attributeCode);
+ $this->_removeAttributeFromConditions($rule->getActions(), $attributeCode);
+ // phpcs:ignore Ecg.Performance.Loop.ModelLSD
+ $rule->save();
+
+ $disabledRulesCount++;
+ }
+
+ if ($disabledRulesCount) {
+ Mage::getSingleton('adminhtml/session')->addWarning(
+ Mage::helper('salesrule')->__('%d Shopping Cart Price Rules based on "%s" attribute have been disabled.', $disabledRulesCount, $attributeCode),
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Remove catalog attribute condition by attribute code from rule conditions
+ *
+ * @param Mage_Rule_Model_Condition_Combine $combine
+ * @param string $attributeCode
+ */
+ protected function _removeAttributeFromConditions($combine, $attributeCode)
+ {
+ $conditions = $combine->getConditions();
+ foreach ($conditions as $conditionId => $condition) {
+ if ($condition instanceof Mage_Rule_Model_Condition_Combine) {
+ $this->_removeAttributeFromConditions($condition, $attributeCode);
+ }
+ if ($condition instanceof Mage_SalesRule_Model_Rule_Condition_Product) {
+ if ($condition->getAttribute() == $attributeCode) {
+ unset($conditions[$conditionId]);
+ }
+ }
+ }
+ $combine->setConditions($conditions);
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php
index c2e25dc5f10..db87d655162 100644
--- a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php
+++ b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php
@@ -118,19 +118,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
return $this;
}
- /**
- * Aggregate item discount information to address data and related properties
- *
- * @param Mage_Sales_Model_Quote_Item_Abstract $item
- * @return $this
- */
- protected function _aggregateItemDiscount($item)
- {
- $this->_addAmount(-$item->getDiscountAmount());
- $this->_addBaseAmount(-$item->getBaseDiscountAmount());
- return $this;
- }
-
/**
* Add discount total information to address
*
@@ -155,4 +142,17 @@ public function fetch(Mage_Sales_Model_Quote_Address $address)
}
return $this;
}
+
+ /**
+ * Aggregate item discount information to address data and related properties
+ *
+ * @param Mage_Sales_Model_Quote_Item_Abstract $item
+ * @return $this
+ */
+ protected function _aggregateItemDiscount($item)
+ {
+ $this->_addAmount(-$item->getDiscountAmount());
+ $this->_addBaseAmount(-$item->getBaseDiscountAmount());
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php
index 1c8f8b1636e..52ccd3281ea 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php
@@ -22,15 +22,6 @@
*/
class Mage_SalesRule_Model_Resource_Coupon extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('salesrule/coupon', 'coupon_id');
- $this->addUniqueField([
- 'field' => 'code',
- 'title' => Mage::helper('salesrule')->__('Coupon with the same code'),
- ]);
- }
-
/**
* Perform actions before object save
*
@@ -139,4 +130,12 @@ public function updateSpecificCoupons(Mage_SalesRule_Model_Rule $rule)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('salesrule/coupon', 'coupon_id');
+ $this->addUniqueField([
+ 'field' => 'code',
+ 'title' => Mage::helper('salesrule')->__('Coupon with the same code'),
+ ]);
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php
index b255e5ce8df..3d7769f8db5 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php
@@ -22,12 +22,6 @@
*/
class Mage_SalesRule_Model_Resource_Coupon_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- protected function _construct()
- {
- parent::_construct();
- $this->_init('salesrule/coupon');
- }
-
/**
* Add rule to filter
*
@@ -85,4 +79,9 @@ public function addIsUsedFilterCallback($collection, $column)
$resultCondition = $this->_getConditionSql($fieldExpression, ['eq' => $filterValue]);
$collection->getSelect()->where($resultCondition);
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_init('salesrule/coupon');
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php
index db5f35df0ff..d89b5f05b6b 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php
@@ -22,11 +22,6 @@
*/
class Mage_SalesRule_Model_Resource_Coupon_Usage extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('salesrule/coupon_usage', '');
- }
-
/**
* Increment times_used counter
*
@@ -97,4 +92,8 @@ public function loadByCustomerCoupon(Varien_Object $object, $customerId, $coupon
}
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('salesrule/coupon_usage', '');
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php
index 4b4d1c385c5..df5f32f0389 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php
@@ -62,6 +62,18 @@ public function __construct()
$this->setConnection($this->getResource()->getReadConnection());
}
+ /**
+ * Add filtering by rules ids
+ *
+ * @param array $rulesList
+ * @return $this
+ */
+ public function addRuleFilter($rulesList)
+ {
+ $this->_rulesIdsFilter = $rulesList;
+ return $this;
+ }
+
/**
* collect columns for collection
*
@@ -127,18 +139,6 @@ protected function _initSelect()
return $this;
}
- /**
- * Add filtering by rules ids
- *
- * @param array $rulesList
- * @return $this
- */
- public function addRuleFilter($rulesList)
- {
- $this->_rulesIdsFilter = $rulesList;
- return $this;
- }
-
/**
* Apply filtering by rules ids
*
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php
index 4980e773b1c..9b639cc988d 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php
@@ -22,11 +22,6 @@
*/
class Mage_SalesRule_Model_Resource_Report_Rule extends Mage_Reports_Model_Resource_Report_Abstract
{
- protected function _construct()
- {
- $this->_setResource('salesrule');
- }
-
/**
* Aggregate Coupons data
*
@@ -71,6 +66,10 @@ public function getUniqRulesNamesList()
return $result;
}
+ protected function _construct()
+ {
+ $this->_setResource('salesrule');
+ }
/**
* Aggregate coupons reports by order created at as range
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php
index db1f71dc08c..577d70dd17e 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php
@@ -22,15 +22,6 @@
*/
class Mage_SalesRule_Model_Resource_Report_Rule_Createdat extends Mage_Reports_Model_Resource_Report_Abstract
{
- /**
- * Resource Report Rule constructor
- *
- */
- protected function _construct()
- {
- $this->_init('salesrule/coupon_aggregated', 'id');
- }
-
/**
* Aggregate Coupons data by order created at
*
@@ -42,6 +33,14 @@ public function aggregate($from = null, $to = null)
{
return $this->_aggregateByOrder('created_at', $from, $to);
}
+ /**
+ * Resource Report Rule constructor
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('salesrule/coupon_aggregated', 'id');
+ }
/**
* Aggregate coupons reports by orders
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php
index cabe3496ab4..c63c753d657 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php
@@ -22,11 +22,6 @@
*/
class Mage_SalesRule_Model_Resource_Report_Rule_Updatedat extends Mage_SalesRule_Model_Resource_Report_Rule_Createdat
{
- protected function _construct()
- {
- $this->_init('salesrule/coupon_aggregated_updated', 'id');
- }
-
/**
* Aggregate Coupons data by order updated at
*
@@ -38,4 +33,8 @@ public function aggregate($from = null, $to = null)
{
return $this->_aggregateByOrder('updated_at', $from, $to);
}
+ protected function _construct()
+ {
+ $this->_init('salesrule/coupon_aggregated_updated', 'id');
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule.php
index 908e9d3a380..3008b1d425c 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Rule.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule.php
@@ -40,29 +40,6 @@ class Mage_SalesRule_Model_Resource_Rule extends Mage_Rule_Model_Resource_Abstra
],
];
- /**
- * Initialize main table and table id field
- */
- protected function _construct()
- {
- $this->_init('salesrule/rule', 'rule_id');
- }
-
- /**
- * Add customer group ids and website ids to rule data after load
- *
- *
- * @return $this
- */
- protected function _afterLoad(Mage_Core_Model_Abstract $object)
- {
- $object->setData('customer_group_ids', (array) $this->getCustomerGroupIds($object->getId()));
- $object->setData('website_ids', (array) $this->getWebsiteIds($object->getId()));
-
- parent::_afterLoad($object);
- return $this;
- }
-
/**
* Prepare sales rule's discount quantity
*
@@ -79,52 +56,6 @@ public function _beforeSave(Mage_Core_Model_Abstract $object)
return $this;
}
- /**
- * Bind sales rule to customer group(s) and website(s).
- * Save rule's associated store labels.
- * Save product attributes used in rule.
- *
- * @param Mage_SalesRule_Model_Rule $object
- * @inheritDoc
- */
- protected function _afterSave(Mage_Core_Model_Abstract $object)
- {
- if ($object->hasStoreLabels()) {
- $this->saveStoreLabels($object->getId(), $object->getStoreLabels());
- }
-
- if ($object->hasWebsiteIds()) {
- $websiteIds = $object->getWebsiteIds();
- if (!is_array($websiteIds)) {
- $websiteIds = explode(',', (string) $websiteIds);
- }
- $this->bindRuleToEntity($object->getId(), $websiteIds, 'website');
- }
-
- if ($object->hasCustomerGroupIds()) {
- $customerGroupIds = $object->getCustomerGroupIds();
- if (!is_array($customerGroupIds)) {
- $customerGroupIds = explode(',', (string) $customerGroupIds);
- }
- $this->bindRuleToEntity($object->getId(), $customerGroupIds, 'customer_group');
- }
-
- // Save product attributes used in rule
- $ruleProductAttributes = array_merge(
- $this->getProductAttributes(serialize($object->getConditions()->asArray())),
- $this->getProductAttributes(serialize($object->getActions()->asArray())),
- );
- if (count($ruleProductAttributes)) {
- $this->setActualProductAttributes($object, $ruleProductAttributes);
- }
-
- // Update auto geterated specific coupons if exists
- if ($object->getUseAutoGeneration() && $object->hasDataChanges()) {
- Mage::getResourceModel('salesrule/coupon')->updateSpecificCoupons($object);
- }
- return parent::_afterSave($object);
- }
-
/**
* Retrieve coupon/rule uses for specified customer
*
@@ -300,4 +231,73 @@ public function getProductAttributes($serializedString)
return $result;
}
+
+ /**
+ * Initialize main table and table id field
+ */
+ protected function _construct()
+ {
+ $this->_init('salesrule/rule', 'rule_id');
+ }
+
+ /**
+ * Add customer group ids and website ids to rule data after load
+ *
+ *
+ * @return $this
+ */
+ protected function _afterLoad(Mage_Core_Model_Abstract $object)
+ {
+ $object->setData('customer_group_ids', (array) $this->getCustomerGroupIds($object->getId()));
+ $object->setData('website_ids', (array) $this->getWebsiteIds($object->getId()));
+
+ parent::_afterLoad($object);
+ return $this;
+ }
+
+ /**
+ * Bind sales rule to customer group(s) and website(s).
+ * Save rule's associated store labels.
+ * Save product attributes used in rule.
+ *
+ * @param Mage_SalesRule_Model_Rule $object
+ * @inheritDoc
+ */
+ protected function _afterSave(Mage_Core_Model_Abstract $object)
+ {
+ if ($object->hasStoreLabels()) {
+ $this->saveStoreLabels($object->getId(), $object->getStoreLabels());
+ }
+
+ if ($object->hasWebsiteIds()) {
+ $websiteIds = $object->getWebsiteIds();
+ if (!is_array($websiteIds)) {
+ $websiteIds = explode(',', (string) $websiteIds);
+ }
+ $this->bindRuleToEntity($object->getId(), $websiteIds, 'website');
+ }
+
+ if ($object->hasCustomerGroupIds()) {
+ $customerGroupIds = $object->getCustomerGroupIds();
+ if (!is_array($customerGroupIds)) {
+ $customerGroupIds = explode(',', (string) $customerGroupIds);
+ }
+ $this->bindRuleToEntity($object->getId(), $customerGroupIds, 'customer_group');
+ }
+
+ // Save product attributes used in rule
+ $ruleProductAttributes = array_merge(
+ $this->getProductAttributes(serialize($object->getConditions()->asArray())),
+ $this->getProductAttributes(serialize($object->getActions()->asArray())),
+ );
+ if (count($ruleProductAttributes)) {
+ $this->setActualProductAttributes($object, $ruleProductAttributes);
+ }
+
+ // Update auto geterated specific coupons if exists
+ if ($object->getUseAutoGeneration() && $object->hasDataChanges()) {
+ Mage::getResourceModel('salesrule/coupon')->updateSpecificCoupons($object);
+ }
+ return parent::_afterSave($object);
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php
index bb9b8187f2e..4992e64f872 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php
@@ -40,15 +40,6 @@ class Mage_SalesRule_Model_Resource_Rule_Collection extends Mage_Rule_Model_Reso
],
];
- /**
- * Set resource model and determine field mapping
- */
- protected function _construct()
- {
- $this->_init('salesrule/rule');
- $this->_map['fields']['rule_id'] = 'main_table.rule_id';
- }
-
/**
* Filter collection by specified website, customer group, coupon code, date.
* Filter collection to use only active rules.
@@ -213,4 +204,13 @@ public function addAllowedSalesRulesFilter()
return $this;
}
+
+ /**
+ * Set resource model and determine field mapping
+ */
+ protected function _construct()
+ {
+ $this->_init('salesrule/rule');
+ $this->_map['fields']['rule_id'] = 'main_table.rule_id';
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php
index 495226915c9..5c8b997beaa 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php
@@ -22,11 +22,6 @@
*/
class Mage_SalesRule_Model_Resource_Rule_Customer extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('salesrule/rule_customer', 'rule_customer_id');
- }
-
/**
* Get rule usage record for a customer
*
@@ -49,4 +44,8 @@ public function loadByCustomerRule($rule, $customerId, $ruleId)
$rule->setData($data);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('salesrule/rule_customer', 'rule_customer_id');
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Rule.php b/app/code/core/Mage/SalesRule/Model/Rule.php
index 2acb66e1d08..4b070621ca5 100644
--- a/app/code/core/Mage/SalesRule/Model/Rule.php
+++ b/app/code/core/Mage/SalesRule/Model/Rule.php
@@ -160,16 +160,6 @@ class Mage_SalesRule_Model_Rule extends Mage_Rule_Model_Abstract
*/
protected $_validatedAddresses = [];
- /**
- * Set resource model and Id field name
- */
- protected function _construct()
- {
- parent::_construct();
- $this->_init('salesrule/rule');
- $this->setIdFieldName('rule_id');
- }
-
/**
* Returns code mass generator instance for auto generated specific coupons
*
@@ -180,46 +170,6 @@ public static function getCouponMassGenerator()
return Mage::getSingleton('salesrule/coupon_massgenerator');
}
- /**
- * Set coupon code and uses per coupon
- *
- * @inheritDoc
- */
- protected function _afterLoad()
- {
- $this->setCouponCode($this->getPrimaryCoupon()->getCode());
- if ($this->getUsesPerCoupon() !== null && !$this->getUseAutoGeneration()) {
- $this->setUsesPerCoupon($this->getPrimaryCoupon()->getUsageLimit());
- }
- return parent::_afterLoad();
- }
-
- /**
- * Save/delete coupon
- *
- * @return $this
- */
- protected function _afterSave()
- {
- $couponCode = trim((string) $this->getCouponCode());
- if (strlen($couponCode)
- && $this->getCouponType() == self::COUPON_TYPE_SPECIFIC
- && !$this->getUseAutoGeneration()
- ) {
- $this->getPrimaryCoupon()
- ->setCode($couponCode)
- ->setUsageLimit($this->getUsesPerCoupon() ? $this->getUsesPerCoupon() : null)
- ->setUsagePerCustomer($this->getUsesPerCustomer() ? $this->getUsesPerCustomer() : null)
- ->setExpirationDate($this->getToDate())
- ->save();
- } else {
- $this->getPrimaryCoupon()->delete();
- }
-
- parent::_afterSave();
- return $this;
- }
-
/**
* Initialize rule model data from array.
* Set store labels if applicable.
@@ -477,34 +427,6 @@ public function getIsValidForAddress($address)
return $this->_validatedAddresses[$addressId] ?? false;
}
- /**
- * Return id for address
- *
- * @param Mage_Sales_Model_Quote_Address $address
- * @return string
- */
- private function _getAddressId($address)
- {
- if ($address instanceof Mage_Sales_Model_Quote_Address) {
- return $address->getId();
- }
- return $address;
- }
-
- /**
- * Collect all product attributes used in serialized rule's action or condition
- *
- * @deprecated after 1.6.2.0 use Mage_SalesRule_Model_Resource_Rule::getProductAttributes() instead
- *
- * @param string $serializedString
- *
- * @return array
- */
- protected function _getUsedAttributes($serializedString)
- {
- return $this->_getResource()->getProductAttributes($serializedString);
- }
-
/**
* @deprecated after 1.6.2.0
*
@@ -537,4 +459,82 @@ public function toArray(array $arrAttributes = [])
{
return parent::toArray($arrAttributes);
}
+
+ /**
+ * Set resource model and Id field name
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_init('salesrule/rule');
+ $this->setIdFieldName('rule_id');
+ }
+
+ /**
+ * Set coupon code and uses per coupon
+ *
+ * @inheritDoc
+ */
+ protected function _afterLoad()
+ {
+ $this->setCouponCode($this->getPrimaryCoupon()->getCode());
+ if ($this->getUsesPerCoupon() !== null && !$this->getUseAutoGeneration()) {
+ $this->setUsesPerCoupon($this->getPrimaryCoupon()->getUsageLimit());
+ }
+ return parent::_afterLoad();
+ }
+
+ /**
+ * Save/delete coupon
+ *
+ * @return $this
+ */
+ protected function _afterSave()
+ {
+ $couponCode = trim((string) $this->getCouponCode());
+ if (strlen($couponCode)
+ && $this->getCouponType() == self::COUPON_TYPE_SPECIFIC
+ && !$this->getUseAutoGeneration()
+ ) {
+ $this->getPrimaryCoupon()
+ ->setCode($couponCode)
+ ->setUsageLimit($this->getUsesPerCoupon() ? $this->getUsesPerCoupon() : null)
+ ->setUsagePerCustomer($this->getUsesPerCustomer() ? $this->getUsesPerCustomer() : null)
+ ->setExpirationDate($this->getToDate())
+ ->save();
+ } else {
+ $this->getPrimaryCoupon()->delete();
+ }
+
+ parent::_afterSave();
+ return $this;
+ }
+
+ /**
+ * Collect all product attributes used in serialized rule's action or condition
+ *
+ * @deprecated after 1.6.2.0 use Mage_SalesRule_Model_Resource_Rule::getProductAttributes() instead
+ *
+ * @param string $serializedString
+ *
+ * @return array
+ */
+ protected function _getUsedAttributes($serializedString)
+ {
+ return $this->_getResource()->getProductAttributes($serializedString);
+ }
+
+ /**
+ * Return id for address
+ *
+ * @param Mage_Sales_Model_Quote_Address $address
+ * @return string
+ */
+ private function _getAddressId($address)
+ {
+ if ($address instanceof Mage_Sales_Model_Quote_Address) {
+ return $address->getId();
+ }
+ return $address;
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php
index 1bdee85fe4a..5e6380b1733 100644
--- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php
+++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php
@@ -22,17 +22,6 @@
*/
class Mage_SalesRule_Model_Rule_Condition_Product extends Mage_Rule_Model_Condition_Product_Abstract
{
- /**
- * Add special attributes
- */
- protected function _addSpecialAttributes(array &$attributes)
- {
- parent::_addSpecialAttributes($attributes);
- $attributes['quote_item_qty'] = Mage::helper('salesrule')->__('Quantity in cart');
- $attributes['quote_item_price'] = Mage::helper('salesrule')->__('Price in cart');
- $attributes['quote_item_row_total'] = Mage::helper('salesrule')->__('Row total in cart');
- }
-
/**
* Validate Product Rule Condition
*
@@ -54,4 +43,14 @@ public function validate(Varien_Object $object)
return parent::validate($product);
}
+ /**
+ * Add special attributes
+ */
+ protected function _addSpecialAttributes(array &$attributes)
+ {
+ parent::_addSpecialAttributes($attributes);
+ $attributes['quote_item_qty'] = Mage::helper('salesrule')->__('Quantity in cart');
+ $attributes['quote_item_price'] = Mage::helper('salesrule')->__('Price in cart');
+ $attributes['quote_item_row_total'] = Mage::helper('salesrule')->__('Row total in cart');
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php
index aa0d7113bb7..abbf9830a26 100644
--- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php
+++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php
@@ -49,27 +49,6 @@ class Mage_SalesRule_Model_Rule_Condition_Product_Attribute_Assigned extends Mag
*/
protected $_cachedOperatorSelectOptionsCache = null;
- /**
- * Initialize and retrieve a helper instance
- * @return Mage_SalesRule_Helper_Data
- */
- protected function _getHelper()
- {
- return Mage::helper('salesrule');
- }
-
- /**
- * Retrieve a product instance and initialize if needed
- *
- * @return Mage_Catalog_Model_Product
- */
- protected function _getProduct(Varien_Object $object)
- {
- return $object->getProduct() instanceof Mage_Catalog_Model_Product
- ? $object->getProduct()
- : Mage::getModel('catalog/product')->load($object->getProductId());
- }
-
/**
* Initialize options hash
*/
@@ -143,4 +122,25 @@ public function asHtml()
$this->getTypeElementHtml(),
);
}
+
+ /**
+ * Initialize and retrieve a helper instance
+ * @return Mage_SalesRule_Helper_Data
+ */
+ protected function _getHelper()
+ {
+ return Mage::helper('salesrule');
+ }
+
+ /**
+ * Retrieve a product instance and initialize if needed
+ *
+ * @return Mage_Catalog_Model_Product
+ */
+ protected function _getProduct(Varien_Object $object)
+ {
+ return $object->getProduct() instanceof Mage_Catalog_Model_Product
+ ? $object->getProduct()
+ : Mage::getModel('catalog/product')->load($object->getProductId());
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php
index 0869ca05181..08d9bc855d6 100644
--- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php
+++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php
@@ -41,6 +41,95 @@ class Mage_SalesRule_Model_Rule_Condition_Product_Combine extends Mage_Rule_Mode
*/
protected $_productAttributesInfo = null;
+ /**
+ * Initialize a rule condition
+ */
+ public function __construct()
+ {
+ parent::__construct();
+ $this->setType('salesrule/rule_condition_product_combine');
+ }
+
+ /**
+ * Generate a conditions data
+ * @return array
+ */
+ public function getNewChildSelectOptions()
+ {
+ $conditions = parent::getNewChildSelectOptions();
+ return array_merge_recursive(
+ $conditions,
+ [
+ [
+ 'label' => Mage::helper('catalog')->__('Conditions Combination'),
+ 'value' => 'salesrule/rule_condition_product_combine',
+ ],
+ [
+ 'label' => Mage::helper('catalog')->__('Cart Item Attribute'),
+ 'value' => $this->_getAttributeConditions(self::PRODUCT_ATTRIBUTES_TYPE_QUOTE_ITEM),
+ ],
+ [
+ 'label' => Mage::helper('catalog')->__('Product Attribute'),
+ 'value' => $this->_getAttributeConditions(self::PRODUCT_ATTRIBUTES_TYPE_PRODUCT),
+ ],
+ [
+ 'label' => $this->_getHelper()->__('Product Attribute Assigned'),
+ 'value' => $this->_getAttributeConditions(self::PRODUCT_ATTRIBUTES_TYPE_ISSET),
+ ],
+ ],
+ );
+ }
+
+ /**
+ * Collect all validated attributes
+ * @param Mage_Catalog_Model_Resource_Product_Collection $productCollection
+ * @return $this
+ */
+ public function collectValidatedAttributes($productCollection)
+ {
+ foreach ($this->getConditions() as $condition) {
+ $condition->collectValidatedAttributes($productCollection);
+ }
+ return $this;
+ }
+
+ /**
+ * Validate a condition with the checking of the child value
+ *
+ * @return bool
+ */
+ public function validate(Varien_Object $object)
+ {
+ /** @var Mage_Catalog_Model_Product $product */
+ $product = $object->getProduct();
+ if (!($product instanceof Mage_Catalog_Model_Product)) {
+ $product = Mage::getModel('catalog/product')->load($object->getProductId());
+ }
+
+ $valid = parent::validate($object);
+ if (!$valid && $product->getTypeId() == Mage_Catalog_Model_Product_Type_Configurable::TYPE_CODE) {
+ $children = $object->getChildren();
+ if (is_array($children) && isset($children[0])) {
+ $child = $children[0];
+
+ /** @var Mage_Catalog_Model_Product $childProduct */
+ $childProduct = Mage::getModel('catalog/product')->load($child->getProductId());
+ $childProduct
+ ->setQuoteItemQty($object->getQty())
+ ->setQuoteItemPrice($object->getPrice())
+ ->setQuoteItemRowTotal($object->getBaseRowTotal());
+
+ if (!$childProduct->isVisibleInSiteVisibility()) {
+ $childProduct->setCategoryIds($product->getCategoryIds());
+ }
+
+ $valid = parent::validate($childProduct);
+ }
+ }
+
+ return $valid;
+ }
+
/**
* Initialize and retrieve a helper instance
* @return Mage_Catalog_Helper_Data
@@ -136,93 +225,4 @@ protected function _initializeProductAttributesInfo()
return $this;
}
-
- /**
- * Initialize a rule condition
- */
- public function __construct()
- {
- parent::__construct();
- $this->setType('salesrule/rule_condition_product_combine');
- }
-
- /**
- * Generate a conditions data
- * @return array
- */
- public function getNewChildSelectOptions()
- {
- $conditions = parent::getNewChildSelectOptions();
- return array_merge_recursive(
- $conditions,
- [
- [
- 'label' => Mage::helper('catalog')->__('Conditions Combination'),
- 'value' => 'salesrule/rule_condition_product_combine',
- ],
- [
- 'label' => Mage::helper('catalog')->__('Cart Item Attribute'),
- 'value' => $this->_getAttributeConditions(self::PRODUCT_ATTRIBUTES_TYPE_QUOTE_ITEM),
- ],
- [
- 'label' => Mage::helper('catalog')->__('Product Attribute'),
- 'value' => $this->_getAttributeConditions(self::PRODUCT_ATTRIBUTES_TYPE_PRODUCT),
- ],
- [
- 'label' => $this->_getHelper()->__('Product Attribute Assigned'),
- 'value' => $this->_getAttributeConditions(self::PRODUCT_ATTRIBUTES_TYPE_ISSET),
- ],
- ],
- );
- }
-
- /**
- * Collect all validated attributes
- * @param Mage_Catalog_Model_Resource_Product_Collection $productCollection
- * @return $this
- */
- public function collectValidatedAttributes($productCollection)
- {
- foreach ($this->getConditions() as $condition) {
- $condition->collectValidatedAttributes($productCollection);
- }
- return $this;
- }
-
- /**
- * Validate a condition with the checking of the child value
- *
- * @return bool
- */
- public function validate(Varien_Object $object)
- {
- /** @var Mage_Catalog_Model_Product $product */
- $product = $object->getProduct();
- if (!($product instanceof Mage_Catalog_Model_Product)) {
- $product = Mage::getModel('catalog/product')->load($object->getProductId());
- }
-
- $valid = parent::validate($object);
- if (!$valid && $product->getTypeId() == Mage_Catalog_Model_Product_Type_Configurable::TYPE_CODE) {
- $children = $object->getChildren();
- if (is_array($children) && isset($children[0])) {
- $child = $children[0];
-
- /** @var Mage_Catalog_Model_Product $childProduct */
- $childProduct = Mage::getModel('catalog/product')->load($child->getProductId());
- $childProduct
- ->setQuoteItemQty($object->getQty())
- ->setQuoteItemPrice($object->getPrice())
- ->setQuoteItemRowTotal($object->getBaseRowTotal());
-
- if (!$childProduct->isVisibleInSiteVisibility()) {
- $childProduct->setCategoryIds($product->getCategoryIds());
- }
-
- $valid = parent::validate($childProduct);
- }
- }
-
- return $valid;
- }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php
index de42642a99c..de6f5eabcf0 100644
--- a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php
+++ b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php
@@ -31,12 +31,6 @@
*/
class Mage_SalesRule_Model_Rule_Customer extends Mage_Core_Model_Abstract
{
- protected function _construct()
- {
- parent::_construct();
- $this->_init('salesrule/rule_customer');
- }
-
/**
* @param int $customerId
* @param int $ruleId
@@ -47,4 +41,9 @@ public function loadByCustomerRule($customerId, $ruleId)
$this->_getResource()->loadByCustomerRule($this, $customerId, $ruleId);
return $this;
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_init('salesrule/rule_customer');
+ }
}
diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php
index 033beb4dc48..4b22fcfaed4 100644
--- a/app/code/core/Mage/SalesRule/Model/Validator.php
+++ b/app/code/core/Mage/SalesRule/Model/Validator.php
@@ -121,118 +121,6 @@ public function init($websiteId, $customerGroupId, $couponCode)
return $this;
}
- /**
- * Get rules collection for current object state
- *
- * @return Mage_SalesRule_Model_Resource_Rule_Collection
- */
- protected function _getRules()
- {
- $key = $this->getWebsiteId() . '_' . $this->getCustomerGroupId() . '_' . $this->getCouponCode();
- return $this->_rules[$key] ?? null;
- }
-
- /**
- * Get address object which can be used for discount calculation
- *
- * @return Mage_Sales_Model_Quote_Address
- */
- protected function _getAddress(Mage_Sales_Model_Quote_Item_Abstract $item)
- {
- if ($item instanceof Mage_Sales_Model_Quote_Address_Item) {
- $address = $item->getAddress();
- } elseif ($this->_address) {
- $address = $this->_address;
- } elseif ($item->getQuote()->getItemVirtualQty() > 0) {
- $address = $item->getQuote()->getBillingAddress();
- } else {
- $address = $item->getQuote()->getShippingAddress();
- }
- return $address;
- }
-
- /**
- * Check if rule can be applied for specific address/quote/customer
- *
- * @param Mage_SalesRule_Model_Rule $rule
- * @param Mage_Sales_Model_Quote_Address $address
- * @return bool
- */
- protected function _canProcessRule($rule, $address)
- {
- if ($rule->hasIsValidForAddress($address) && !$address->isObjectNew()) {
- return $rule->getIsValidForAddress($address);
- }
-
- /**
- * check per coupon usage limit
- */
- if ($rule->getCouponType() != Mage_SalesRule_Model_Rule::COUPON_TYPE_NO_COUPON) {
- $couponCode = $address->getQuote()->getCouponCode();
- if (strlen($couponCode)) {
- $coupon = Mage::getModel('salesrule/coupon');
- $coupon->load($couponCode, 'code');
- if ($coupon->getId()) {
- // check entire usage limit
- if ($coupon->getUsageLimit() && $coupon->getTimesUsed() >= $coupon->getUsageLimit()) {
- $rule->setIsValidForAddress($address, false);
- return false;
- }
- // check coupon expiration
- if ($coupon->hasExpirationDate() && ($coupon->getExpirationDate() < Mage::getModel('core/date')->date())) {
- $rule->setIsValidForAddress($address, false);
- return false;
- }
- // check per customer usage limit
- $customerId = $address->getQuote()->getCustomerId();
- if ($customerId && $coupon->getUsagePerCustomer()) {
- $couponUsage = new Varien_Object();
- Mage::getResourceModel('salesrule/coupon_usage')->loadByCustomerCoupon(
- $couponUsage,
- $customerId,
- $coupon->getId(),
- );
- if ($couponUsage->getCouponId() &&
- $couponUsage->getTimesUsed() >= $coupon->getUsagePerCustomer()
- ) {
- $rule->setIsValidForAddress($address, false);
- return false;
- }
- }
- }
- }
- }
-
- /**
- * check per rule usage limit
- */
- $ruleId = $rule->getId();
- if ($ruleId && $rule->getUsesPerCustomer()) {
- $customerId = $address->getQuote()->getCustomerId();
- $ruleCustomer = Mage::getModel('salesrule/rule_customer');
- $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
- if ($ruleCustomer->getId()) {
- if ($ruleCustomer->getTimesUsed() >= $rule->getUsesPerCustomer()) {
- $rule->setIsValidForAddress($address, false);
- return false;
- }
- }
- }
- $rule->afterLoad();
- /**
- * quote does not meet rule's conditions
- */
- if (!$rule->validate($address)) {
- $rule->setIsValidForAddress($address, false);
- return false;
- }
- /**
- * passed all validations, remember to be valid
- */
- $rule->setIsValidForAddress($address, true);
- return true;
- }
-
/**
* Quote item free shipping ability check
* This process not affect information about applied rules, coupon code etc.
@@ -703,39 +591,6 @@ public function processWeeeAmount(Mage_Sales_Model_Quote_Address $address, $item
return $this;
}
- /**
- * Round the amount with deltas collected
- *
- * @param string $key
- * @param float $amount
- * @param Mage_Core_Model_Store $store
- * @return float
- */
- protected function _roundWithDeltas($key, $amount, $store)
- {
- $delta = $this->_roundingDeltas[$key] ?? 0;
- $this->_roundingDeltas[$key] = $store->roundPrice($amount + $delta)
- - $amount;
- return $store->roundPrice($amount + $delta);
- }
-
- /**
- * Round the amount with deltas collected
- *
- * @param string $key
- * @param float $amount
- * @param Mage_Core_Model_Store $store
- * @return float
- */
- protected function _roundWithDeltasForBase($key, $amount, $store)
- {
- $delta = isset($this->_baseRoundingDeltas[$key]) ?
- $this->_roundingDeltas[$key] : 0;
- $this->_baseRoundingDeltas[$key] = $store->roundPrice($amount + $delta)
- - $amount;
- return $store->roundPrice($amount + $delta);
- }
-
/**
* Apply discounts to shipping amount
*
@@ -919,6 +774,197 @@ public function initTotals($items, Mage_Sales_Model_Quote_Address $address)
return $this;
}
+ /**
+ * Convert address discount description array to string
+ *
+ * @param Mage_Sales_Model_Quote_Address $address
+ * @param string $separator
+ * @return $this
+ */
+ public function prepareDescription($address, $separator = ', ')
+ {
+ $descriptionArray = $address->getDiscountDescriptionArray();
+ /** @see Mage_SalesRule_Model_Validator::_getAddress */
+ if (!$descriptionArray && $address->getQuote()->getItemVirtualQty() > 0) {
+ $descriptionArray = $address->getQuote()->getBillingAddress()->getDiscountDescriptionArray();
+ }
+
+ $description = $descriptionArray && is_array($descriptionArray)
+ ? implode($separator, array_unique($descriptionArray))
+ : '';
+
+ $address->setDiscountDescription($description);
+ return $this;
+ }
+
+ /**
+ * Return items list sorted by possibility to apply prioritized rules
+ *
+ * @param array $items
+ * @return array $items
+ */
+ public function sortItemsByPriority($items)
+ {
+ $itemsSorted = [];
+ foreach ($this->_getRules() as $rule) {
+ foreach ($items as $itemKey => $itemValue) {
+ if ($rule->getActions()->validate($itemValue)) {
+ unset($items[$itemKey]);
+ $itemsSorted[] = $itemValue;
+ }
+ }
+ }
+ if (!empty($itemsSorted)) {
+ $items = array_merge($itemsSorted, $items);
+ }
+ return $items;
+ }
+
+ /**
+ * Get rules collection for current object state
+ *
+ * @return Mage_SalesRule_Model_Resource_Rule_Collection
+ */
+ protected function _getRules()
+ {
+ $key = $this->getWebsiteId() . '_' . $this->getCustomerGroupId() . '_' . $this->getCouponCode();
+ return $this->_rules[$key] ?? null;
+ }
+
+ /**
+ * Get address object which can be used for discount calculation
+ *
+ * @return Mage_Sales_Model_Quote_Address
+ */
+ protected function _getAddress(Mage_Sales_Model_Quote_Item_Abstract $item)
+ {
+ if ($item instanceof Mage_Sales_Model_Quote_Address_Item) {
+ $address = $item->getAddress();
+ } elseif ($this->_address) {
+ $address = $this->_address;
+ } elseif ($item->getQuote()->getItemVirtualQty() > 0) {
+ $address = $item->getQuote()->getBillingAddress();
+ } else {
+ $address = $item->getQuote()->getShippingAddress();
+ }
+ return $address;
+ }
+
+ /**
+ * Check if rule can be applied for specific address/quote/customer
+ *
+ * @param Mage_SalesRule_Model_Rule $rule
+ * @param Mage_Sales_Model_Quote_Address $address
+ * @return bool
+ */
+ protected function _canProcessRule($rule, $address)
+ {
+ if ($rule->hasIsValidForAddress($address) && !$address->isObjectNew()) {
+ return $rule->getIsValidForAddress($address);
+ }
+
+ /**
+ * check per coupon usage limit
+ */
+ if ($rule->getCouponType() != Mage_SalesRule_Model_Rule::COUPON_TYPE_NO_COUPON) {
+ $couponCode = $address->getQuote()->getCouponCode();
+ if (strlen($couponCode)) {
+ $coupon = Mage::getModel('salesrule/coupon');
+ $coupon->load($couponCode, 'code');
+ if ($coupon->getId()) {
+ // check entire usage limit
+ if ($coupon->getUsageLimit() && $coupon->getTimesUsed() >= $coupon->getUsageLimit()) {
+ $rule->setIsValidForAddress($address, false);
+ return false;
+ }
+ // check coupon expiration
+ if ($coupon->hasExpirationDate() && ($coupon->getExpirationDate() < Mage::getModel('core/date')->date())) {
+ $rule->setIsValidForAddress($address, false);
+ return false;
+ }
+ // check per customer usage limit
+ $customerId = $address->getQuote()->getCustomerId();
+ if ($customerId && $coupon->getUsagePerCustomer()) {
+ $couponUsage = new Varien_Object();
+ Mage::getResourceModel('salesrule/coupon_usage')->loadByCustomerCoupon(
+ $couponUsage,
+ $customerId,
+ $coupon->getId(),
+ );
+ if ($couponUsage->getCouponId() &&
+ $couponUsage->getTimesUsed() >= $coupon->getUsagePerCustomer()
+ ) {
+ $rule->setIsValidForAddress($address, false);
+ return false;
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * check per rule usage limit
+ */
+ $ruleId = $rule->getId();
+ if ($ruleId && $rule->getUsesPerCustomer()) {
+ $customerId = $address->getQuote()->getCustomerId();
+ $ruleCustomer = Mage::getModel('salesrule/rule_customer');
+ $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
+ if ($ruleCustomer->getId()) {
+ if ($ruleCustomer->getTimesUsed() >= $rule->getUsesPerCustomer()) {
+ $rule->setIsValidForAddress($address, false);
+ return false;
+ }
+ }
+ }
+ $rule->afterLoad();
+ /**
+ * quote does not meet rule's conditions
+ */
+ if (!$rule->validate($address)) {
+ $rule->setIsValidForAddress($address, false);
+ return false;
+ }
+ /**
+ * passed all validations, remember to be valid
+ */
+ $rule->setIsValidForAddress($address, true);
+ return true;
+ }
+
+ /**
+ * Round the amount with deltas collected
+ *
+ * @param string $key
+ * @param float $amount
+ * @param Mage_Core_Model_Store $store
+ * @return float
+ */
+ protected function _roundWithDeltas($key, $amount, $store)
+ {
+ $delta = $this->_roundingDeltas[$key] ?? 0;
+ $this->_roundingDeltas[$key] = $store->roundPrice($amount + $delta)
+ - $amount;
+ return $store->roundPrice($amount + $delta);
+ }
+
+ /**
+ * Round the amount with deltas collected
+ *
+ * @param string $key
+ * @param float $amount
+ * @param Mage_Core_Model_Store $store
+ * @return float
+ */
+ protected function _roundWithDeltasForBase($key, $amount, $store)
+ {
+ $delta = isset($this->_baseRoundingDeltas[$key]) ?
+ $this->_roundingDeltas[$key] : 0;
+ $this->_baseRoundingDeltas[$key] = $store->roundPrice($amount + $delta)
+ - $amount;
+ return $store->roundPrice($amount + $delta);
+ }
+
/**
* Set coupon code to address if $rule contains validated coupon
*
@@ -1030,29 +1076,6 @@ protected function _getItemQty($item, $rule)
return $rule->getDiscountQty() ? min($qty, $rule->getDiscountQty()) : $qty;
}
- /**
- * Convert address discount description array to string
- *
- * @param Mage_Sales_Model_Quote_Address $address
- * @param string $separator
- * @return $this
- */
- public function prepareDescription($address, $separator = ', ')
- {
- $descriptionArray = $address->getDiscountDescriptionArray();
- /** @see Mage_SalesRule_Model_Validator::_getAddress */
- if (!$descriptionArray && $address->getQuote()->getItemVirtualQty() > 0) {
- $descriptionArray = $address->getQuote()->getBillingAddress()->getDiscountDescriptionArray();
- }
-
- $description = $descriptionArray && is_array($descriptionArray)
- ? implode($separator, array_unique($descriptionArray))
- : '';
-
- $address->setDiscountDescription($description);
- return $this;
- }
-
/**
* wrap Mage::getSingleton
*
@@ -1074,27 +1097,4 @@ protected function _getHelper($name)
{
return Mage::helper($name);
}
-
- /**
- * Return items list sorted by possibility to apply prioritized rules
- *
- * @param array $items
- * @return array $items
- */
- public function sortItemsByPriority($items)
- {
- $itemsSorted = [];
- foreach ($this->_getRules() as $rule) {
- foreach ($items as $itemKey => $itemValue) {
- if ($rule->getActions()->validate($itemValue)) {
- unset($items[$itemKey]);
- $itemsSorted[] = $itemValue;
- }
- }
- }
- if (!empty($itemsSorted)) {
- $items = array_merge($itemsSorted, $items);
- }
- return $items;
- }
}
diff --git a/app/code/core/Mage/Shipping/Block/Tracking/Popup.php b/app/code/core/Mage/Shipping/Block/Tracking/Popup.php
index 4106c4e7f72..0a526f6886d 100644
--- a/app/code/core/Mage/Shipping/Block/Tracking/Popup.php
+++ b/app/code/core/Mage/Shipping/Block/Tracking/Popup.php
@@ -93,40 +93,6 @@ public function getTrackId()
return $this->_getData('track_id');
}
- /**
- * @deprecated after 1.4.0.0-alpha3
- * Initialize order model instance
- *
- * @return Mage_Sales_Model_Order|false
- */
- protected function _initOrder()
- {
- $order = Mage::getModel('sales/order')->load($this->getOrderId());
-
- if (!$order->getId() || $this->getProtectCode() != $order->getProtectCode()) {
- return false;
- }
-
- return $order;
- }
-
- /**
- * @deprecated after 1.4.0.0-alpha3
- * Initialize ship model instance
- *
- * @return Mage_Sales_Model_Order_Shipment|false
- */
- protected function _initShipment()
- {
- $ship = Mage::getModel('sales/order_shipment')->load($this->getShipId());
-
- if (!$ship->getEntityId() || $this->getProtectCode() != $ship->getProtectCode()) {
- return false;
- }
-
- return $ship;
- }
-
/**
* Retrieve array of tracking info
*
@@ -274,4 +240,38 @@ public function getContactUs()
{
return $this->getUrl('contacts');
}
+
+ /**
+ * @deprecated after 1.4.0.0-alpha3
+ * Initialize order model instance
+ *
+ * @return Mage_Sales_Model_Order|false
+ */
+ protected function _initOrder()
+ {
+ $order = Mage::getModel('sales/order')->load($this->getOrderId());
+
+ if (!$order->getId() || $this->getProtectCode() != $order->getProtectCode()) {
+ return false;
+ }
+
+ return $order;
+ }
+
+ /**
+ * @deprecated after 1.4.0.0-alpha3
+ * Initialize ship model instance
+ *
+ * @return Mage_Sales_Model_Order_Shipment|false
+ */
+ protected function _initShipment()
+ {
+ $ship = Mage::getModel('sales/order_shipment')->load($this->getShipId());
+
+ if (!$ship->getEntityId() || $this->getProtectCode() != $ship->getProtectCode()) {
+ return false;
+ }
+
+ return $ship;
+ }
}
diff --git a/app/code/core/Mage/Shipping/Helper/Data.php b/app/code/core/Mage/Shipping/Helper/Data.php
index 0b8f1ffa58f..d231b184319 100644
--- a/app/code/core/Mage/Shipping/Helper/Data.php
+++ b/app/code/core/Mage/Shipping/Helper/Data.php
@@ -44,32 +44,6 @@ public function decodeTrackingHash($hash)
return [];
}
- /**
- * Retrieve tracking url with params
- *
- * @deprecated the non-model usage
- *
- * @param string $key
- * @param int|Mage_Sales_Model_Order|Mage_Sales_Model_Order_Shipment|Mage_Sales_Model_Order_Shipment_Track $model
- * @param string $method - option
- * @return string
- */
- protected function _getTrackingUrl($key, $model, $method = 'getId')
- {
- if (empty($model)) {
- $param = [$key => '']; // @deprecated after 1.4.0.0-alpha3
- } elseif (!is_object($model)) {
- $param = [$key => $model]; // @deprecated after 1.4.0.0-alpha3
- } else {
- $param = [
- 'hash' => Mage::helper('core')->urlEncode("{$key}:{$model->$method()}:{$model->getProtectCode()}"),
- ];
- }
- $storeId = is_object($model) ? $model->getStoreId() : null;
- $storeModel = Mage::app()->getStore($storeId);
- return $storeModel->getUrl('shipping/tracking/popup', $param);
- }
-
/**
* @param string $order
* @return string
@@ -157,4 +131,30 @@ public function isFreeMethod($method, $storeId = null)
$freeMethod = Mage::getStoreConfig('carriers/' . $arr[0] . '/free_method', $storeId);
return $freeMethod == $arr[1];
}
+
+ /**
+ * Retrieve tracking url with params
+ *
+ * @deprecated the non-model usage
+ *
+ * @param string $key
+ * @param int|Mage_Sales_Model_Order|Mage_Sales_Model_Order_Shipment|Mage_Sales_Model_Order_Shipment_Track $model
+ * @param string $method - option
+ * @return string
+ */
+ protected function _getTrackingUrl($key, $model, $method = 'getId')
+ {
+ if (empty($model)) {
+ $param = [$key => '']; // @deprecated after 1.4.0.0-alpha3
+ } elseif (!is_object($model)) {
+ $param = [$key => $model]; // @deprecated after 1.4.0.0-alpha3
+ } else {
+ $param = [
+ 'hash' => Mage::helper('core')->urlEncode("{$key}:{$model->$method()}:{$model->getProtectCode()}"),
+ ];
+ }
+ $storeId = is_object($model) ? $model->getStoreId() : null;
+ $storeModel = Mage::app()->getStore($storeId);
+ return $storeModel->getUrl('shipping/tracking/popup', $param);
+ }
}
diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php
index 8e14ecdf741..411efd77109 100644
--- a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php
+++ b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php
@@ -29,6 +29,15 @@
*/
abstract class Mage_Shipping_Model_Carrier_Abstract extends Varien_Object
{
+ public const USA_COUNTRY_ID = 'US';
+ public const CANADA_COUNTRY_ID = 'CA';
+ public const MEXICO_COUNTRY_ID = 'MX';
+
+ public const HANDLING_TYPE_PERCENT = 'P';
+ public const HANDLING_TYPE_FIXED = 'F';
+
+ public const HANDLING_ACTION_PERPACKAGE = 'P';
+ public const HANDLING_ACTION_PERORDER = 'O';
/**
* Carrier's code
*
@@ -71,16 +80,6 @@ abstract class Mage_Shipping_Model_Carrier_Abstract extends Varien_Object
*/
protected $_customizableContainerTypes = [];
- public const USA_COUNTRY_ID = 'US';
- public const CANADA_COUNTRY_ID = 'CA';
- public const MEXICO_COUNTRY_ID = 'MX';
-
- public const HANDLING_TYPE_PERCENT = 'P';
- public const HANDLING_TYPE_FIXED = 'F';
-
- public const HANDLING_ACTION_PERPACKAGE = 'P';
- public const HANDLING_ACTION_PERORDER = 'O';
-
/**
* Fields that should be replaced in debug with '***'
*
@@ -173,58 +172,6 @@ public function getContainerTypes(?Varien_Object $params = null)
return [];
}
- /**
- * Get allowed containers of carrier
- *
- * @return array|bool
- */
- protected function _getAllowedContainers(?Varien_Object $params = null)
- {
- $containersAll = $this->getContainerTypesAll();
- if (empty($containersAll)) {
- return [];
- }
- if (empty($params)) {
- return $containersAll;
- }
- $containersFilter = $this->getContainerTypesFilter();
- $containersFiltered = [];
- $method = $params->getMethod();
- $countryShipper = $params->getCountryShipper();
- $countryRecipient = $params->getCountryRecipient();
-
- if (empty($containersFilter)) {
- return $containersAll;
- }
- if (!$params || !$method || !$countryShipper || !$countryRecipient) {
- return $containersAll;
- }
-
- if ($countryShipper == self::USA_COUNTRY_ID && $countryRecipient == self::USA_COUNTRY_ID) {
- $direction = 'within_us';
- } elseif ($countryShipper == self::USA_COUNTRY_ID && $countryRecipient != self::USA_COUNTRY_ID) {
- $direction = 'from_us';
- } else {
- return $containersAll;
- }
-
- foreach ($containersFilter as $dataItem) {
- $containers = $dataItem['containers'];
- $filters = $dataItem['filters'];
- if (!empty($filters[$direction]['method'])
- && in_array($method, $filters[$direction]['method'])
- ) {
- foreach ($containers as $container) {
- if (!empty($containersAll[$container])) {
- $containersFiltered[$container] = $containersAll[$container];
- }
- }
- }
- }
-
- return !empty($containersFiltered) ? $containersFiltered : $containersAll;
- }
-
/**
* Get Container Types, that could be customized
*
@@ -342,68 +289,6 @@ public function getSortOrder()
return $this->getConfigData('sort_order');
}
- /**
- * @param Mage_Shipping_Model_Rate_Request $request
- */
- protected function _updateFreeMethodQuote($request)
- {
- if ($request->getFreeMethodWeight() == $request->getPackageWeight() || !$request->hasFreeMethodWeight()) {
- return;
- }
-
- $freeMethod = $this->getConfigData($this->_freeMethod);
- if (!$freeMethod) {
- return;
- }
- $freeRateId = false;
-
- if (is_object($this->_result)) {
- foreach ($this->_result->getAllRates() as $i => $item) {
- if ($item->getMethod() == $freeMethod) {
- $freeRateId = $i;
- break;
- }
- }
- }
-
- if ($freeRateId === false) {
- return;
- }
- $price = null;
- if ($request->getFreeMethodWeight() > 0) {
- $this->_setFreeMethodRequest($freeMethod);
-
- $result = $this->_getQuotes();
- if ($result && ($rates = $result->getAllRates()) && count($rates) > 0) {
- if ((count($rates) == 1) && ($rates[0] instanceof Mage_Shipping_Model_Rate_Result_Method)) {
- $price = $rates[0]->getPrice();
- }
- if (count($rates) > 1) {
- foreach ($rates as $rate) {
- if ($rate instanceof Mage_Shipping_Model_Rate_Result_Method
- && $rate->getMethod() == $freeMethod
- ) {
- $price = $rate->getPrice();
- }
- }
- }
- }
- } else {
- /**
- * if we can apply free shipping for all order we should force price
- * to $0.00 for shipping with out sending second request to carrier
- */
- $price = 0;
- }
-
- /**
- * if we did not get our free shipping method in response we must use its old price
- */
- if (!is_null($price)) {
- $this->_result->getRateById($freeRateId)->setPrice($price);
- }
- }
-
/**
* Calculate price considering free shipping and handling fee
*
@@ -443,40 +328,6 @@ public function getFinalPriceWithHandlingFee($cost)
: $this->_getPerorderPrice($cost, $handlingType, $handlingFee);
}
- /**
- * Get final price for shipping method with handling fee per package
- *
- * @param float $cost
- * @param string $handlingType
- * @param float $handlingFee
- * @return float
- */
- protected function _getPerpackagePrice($cost, $handlingType, $handlingFee)
- {
- if ($handlingType == self::HANDLING_TYPE_PERCENT) {
- return ($cost + ($cost * $handlingFee / 100)) * $this->_numBoxes;
- }
-
- return ($cost + $handlingFee) * $this->_numBoxes;
- }
-
- /**
- * Get final price for shipping method with handling fee per order
- *
- * @param float $cost
- * @param string $handlingType
- * @param float $handlingFee
- * @return float
- */
- protected function _getPerorderPrice($cost, $handlingType, $handlingFee)
- {
- if ($handlingType == self::HANDLING_TYPE_PERCENT) {
- return ($cost * $this->_numBoxes) + ($cost * $this->_numBoxes * $handlingFee / 100);
- }
-
- return ($cost * $this->_numBoxes) + $handlingFee;
- }
-
/**
* Return weight in pounds
*
@@ -540,20 +391,6 @@ public function isZipCodeRequired($countryId = null)
return false;
}
- /**
- * Log debug data to file
- *
- * @param mixed $debugData
- */
- protected function _debug($debugData)
- {
- if ($this->getDebugFlag()) {
- Mage::getModel('core/log_adapter', 'shipping_' . $this->getCarrierCode() . '.log')
- ->setFilterDataKeys($this->_debugReplacePrivateDataKeys)
- ->log($debugData);
- }
- }
-
/**
* Define if debugging is enabled
*
@@ -593,4 +430,166 @@ public function getContentTypes(Varien_Object $params)
{
return [];
}
+
+ /**
+ * Get allowed containers of carrier
+ *
+ * @return array|bool
+ */
+ protected function _getAllowedContainers(?Varien_Object $params = null)
+ {
+ $containersAll = $this->getContainerTypesAll();
+ if (empty($containersAll)) {
+ return [];
+ }
+ if (empty($params)) {
+ return $containersAll;
+ }
+ $containersFilter = $this->getContainerTypesFilter();
+ $containersFiltered = [];
+ $method = $params->getMethod();
+ $countryShipper = $params->getCountryShipper();
+ $countryRecipient = $params->getCountryRecipient();
+
+ if (empty($containersFilter)) {
+ return $containersAll;
+ }
+ if (!$params || !$method || !$countryShipper || !$countryRecipient) {
+ return $containersAll;
+ }
+
+ if ($countryShipper == self::USA_COUNTRY_ID && $countryRecipient == self::USA_COUNTRY_ID) {
+ $direction = 'within_us';
+ } elseif ($countryShipper == self::USA_COUNTRY_ID && $countryRecipient != self::USA_COUNTRY_ID) {
+ $direction = 'from_us';
+ } else {
+ return $containersAll;
+ }
+
+ foreach ($containersFilter as $dataItem) {
+ $containers = $dataItem['containers'];
+ $filters = $dataItem['filters'];
+ if (!empty($filters[$direction]['method'])
+ && in_array($method, $filters[$direction]['method'])
+ ) {
+ foreach ($containers as $container) {
+ if (!empty($containersAll[$container])) {
+ $containersFiltered[$container] = $containersAll[$container];
+ }
+ }
+ }
+ }
+
+ return !empty($containersFiltered) ? $containersFiltered : $containersAll;
+ }
+
+ /**
+ * @param Mage_Shipping_Model_Rate_Request $request
+ */
+ protected function _updateFreeMethodQuote($request)
+ {
+ if ($request->getFreeMethodWeight() == $request->getPackageWeight() || !$request->hasFreeMethodWeight()) {
+ return;
+ }
+
+ $freeMethod = $this->getConfigData($this->_freeMethod);
+ if (!$freeMethod) {
+ return;
+ }
+ $freeRateId = false;
+
+ if (is_object($this->_result)) {
+ foreach ($this->_result->getAllRates() as $i => $item) {
+ if ($item->getMethod() == $freeMethod) {
+ $freeRateId = $i;
+ break;
+ }
+ }
+ }
+
+ if ($freeRateId === false) {
+ return;
+ }
+ $price = null;
+ if ($request->getFreeMethodWeight() > 0) {
+ $this->_setFreeMethodRequest($freeMethod);
+
+ $result = $this->_getQuotes();
+ if ($result && ($rates = $result->getAllRates()) && count($rates) > 0) {
+ if ((count($rates) == 1) && ($rates[0] instanceof Mage_Shipping_Model_Rate_Result_Method)) {
+ $price = $rates[0]->getPrice();
+ }
+ if (count($rates) > 1) {
+ foreach ($rates as $rate) {
+ if ($rate instanceof Mage_Shipping_Model_Rate_Result_Method
+ && $rate->getMethod() == $freeMethod
+ ) {
+ $price = $rate->getPrice();
+ }
+ }
+ }
+ }
+ } else {
+ /**
+ * if we can apply free shipping for all order we should force price
+ * to $0.00 for shipping with out sending second request to carrier
+ */
+ $price = 0;
+ }
+
+ /**
+ * if we did not get our free shipping method in response we must use its old price
+ */
+ if (!is_null($price)) {
+ $this->_result->getRateById($freeRateId)->setPrice($price);
+ }
+ }
+
+ /**
+ * Get final price for shipping method with handling fee per package
+ *
+ * @param float $cost
+ * @param string $handlingType
+ * @param float $handlingFee
+ * @return float
+ */
+ protected function _getPerpackagePrice($cost, $handlingType, $handlingFee)
+ {
+ if ($handlingType == self::HANDLING_TYPE_PERCENT) {
+ return ($cost + ($cost * $handlingFee / 100)) * $this->_numBoxes;
+ }
+
+ return ($cost + $handlingFee) * $this->_numBoxes;
+ }
+
+ /**
+ * Get final price for shipping method with handling fee per order
+ *
+ * @param float $cost
+ * @param string $handlingType
+ * @param float $handlingFee
+ * @return float
+ */
+ protected function _getPerorderPrice($cost, $handlingType, $handlingFee)
+ {
+ if ($handlingType == self::HANDLING_TYPE_PERCENT) {
+ return ($cost * $this->_numBoxes) + ($cost * $this->_numBoxes * $handlingFee / 100);
+ }
+
+ return ($cost * $this->_numBoxes) + $handlingFee;
+ }
+
+ /**
+ * Log debug data to file
+ *
+ * @param mixed $debugData
+ */
+ protected function _debug($debugData)
+ {
+ if ($this->getDebugFlag()) {
+ Mage::getModel('core/log_adapter', 'shipping_' . $this->getCarrierCode() . '.log')
+ ->setFilterDataKeys($this->_debugReplacePrivateDataKeys)
+ ->log($debugData);
+ }
+ }
}
diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php
index 088faca0d4f..699d736faf4 100644
--- a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php
+++ b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php
@@ -72,6 +72,16 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
return $result;
}
+ /**
+ * Get allowed shipping methods
+ *
+ * @return array
+ */
+ public function getAllowedMethods()
+ {
+ return ['freeshipping' => $this->getConfigData('name')];
+ }
+
/**
* Allows free shipping when all product items have free shipping (promotions etc.)
*
@@ -95,14 +105,4 @@ protected function _updateFreeMethodQuote($request)
$request->setFreeShipping(true);
}
}
-
- /**
- * Get allowed shipping methods
- *
- * @return array
- */
- public function getAllowedMethods()
- {
- return ['freeshipping' => $this->getConfigData('name')];
- }
}
diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
index f4fd7c6ce4b..abd04a5a3ef 100644
--- a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
+++ b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
@@ -191,17 +191,6 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
return $result;
}
- /**
- * Get Model
- *
- * @param string $modelName
- * @return Mage_Core_Model_Abstract
- */
- protected function _getModel($modelName)
- {
- return Mage::getModel($modelName);
- }
-
/**
* Get Rate
*
@@ -261,4 +250,15 @@ public function getAllowedMethods()
{
return ['bestway' => $this->getConfigData('name')];
}
+
+ /**
+ * Get Model
+ *
+ * @param string $modelName
+ * @return Mage_Core_Model_Abstract
+ */
+ protected function _getModel($modelName)
+ {
+ return Mage::getModel($modelName);
+ }
}
diff --git a/app/code/core/Mage/Shipping/Model/Info.php b/app/code/core/Mage/Shipping/Model/Info.php
index a9162c11ae8..120eb43a359 100644
--- a/app/code/core/Mage/Shipping/Model/Info.php
+++ b/app/code/core/Mage/Shipping/Model/Info.php
@@ -71,39 +71,6 @@ public function getTrackingInfo()
return $this->_trackingInfo;
}
- /**
- * Instantiate order model
- *
- * @return Mage_Sales_Model_Order|bool
- */
- protected function _initOrder()
- {
- $order = Mage::getModel('sales/order')->load($this->getOrderId());
-
- if (!$order->getId() || $this->getProtectCode() !== $order->getProtectCode()) {
- return false;
- }
-
- return $order;
- }
-
- /**
- * Instantiate ship model
- *
- * @return Mage_Sales_Model_Order_Shipment|bool
- */
- protected function _initShipment()
- {
- /** @var Mage_Sales_Model_Order_Shipment $model */
- $model = Mage::getModel('sales/order_shipment');
- $ship = $model->load($this->getShipId());
- if (!$ship->getEntityId() || $this->getProtectCode() !== $ship->getProtectCode()) {
- return false;
- }
-
- return $ship;
- }
-
/**
* Retrieve all tracking by order id
*
@@ -167,4 +134,37 @@ public function getTrackingInfoByTrackId()
}
return $this->_trackingInfo;
}
+
+ /**
+ * Instantiate order model
+ *
+ * @return Mage_Sales_Model_Order|bool
+ */
+ protected function _initOrder()
+ {
+ $order = Mage::getModel('sales/order')->load($this->getOrderId());
+
+ if (!$order->getId() || $this->getProtectCode() !== $order->getProtectCode()) {
+ return false;
+ }
+
+ return $order;
+ }
+
+ /**
+ * Instantiate ship model
+ *
+ * @return Mage_Sales_Model_Order_Shipment|bool
+ */
+ protected function _initShipment()
+ {
+ /** @var Mage_Sales_Model_Order_Shipment $model */
+ $model = Mage::getModel('sales/order_shipment');
+ $ship = $model->load($this->getShipId());
+ if (!$ship->getEntityId() || $this->getProtectCode() !== $ship->getProtectCode()) {
+ return false;
+ }
+
+ return $ship;
+ }
}
diff --git a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php
index e714e28a4da..719c3e3a267 100644
--- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php
+++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php
@@ -86,11 +86,6 @@ class Mage_Shipping_Model_Resource_Carrier_Tablerate extends Mage_Core_Model_Res
*/
protected $_conditionFullNames = [];
- protected function _construct()
- {
- $this->_init('shipping/tablerate', 'pk');
- }
-
/**
* Return table rate array or false by rate request
*
@@ -270,6 +265,11 @@ public function uploadAndImport(Varien_Object $object)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('shipping/tablerate', 'pk');
+ }
+
/**
* Load directory countries
*
diff --git a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php
index 56473206d24..ed3e3384677 100644
--- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php
+++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php
@@ -44,18 +44,6 @@ class Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection extends Mage_Cor
*/
protected $_regionTable;
- /**
- * Define resource model and item
- *
- */
- protected function _construct()
- {
- $this->_init('shipping/carrier_tablerate');
- $this->_shipTable = $this->getMainTable();
- $this->_countryTable = $this->getTable('directory/country');
- $this->_regionTable = $this->getTable('directory/country_region');
- }
-
/**
* Initialize select, add country iso3 code and region name
*
@@ -117,4 +105,16 @@ public function setCountryFilter($countryId)
{
return $this->addFieldToFilter('dest_country_id', $countryId);
}
+
+ /**
+ * Define resource model and item
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('shipping/carrier_tablerate');
+ $this->_shipTable = $this->getMainTable();
+ $this->_countryTable = $this->getTable('directory/country');
+ $this->_regionTable = $this->getTable('directory/country_region');
+ }
}
diff --git a/app/code/core/Mage/Shipping/Model/Shipping.php b/app/code/core/Mage/Shipping/Model/Shipping.php
index a789a593244..d2b785add49 100644
--- a/app/code/core/Mage/Shipping/Model/Shipping.php
+++ b/app/code/core/Mage/Shipping/Model/Shipping.php
@@ -304,53 +304,6 @@ public function composePackagesForCarrier($carrier, $request)
return $this->_makePieces($fullItems, $maxWeight);
}
- /**
- * Make pieces
- * Compose packeges list based on given items, so that each package is as heavy as possible
- *
- * @param array $items
- * @param float $maxWeight
- * @return array
- */
- protected function _makePieces($items, $maxWeight)
- {
- $pieces = [];
- if (!empty($items)) {
- $sumWeight = 0;
-
- $reverseOrderItems = $items;
- arsort($reverseOrderItems);
-
- foreach ($reverseOrderItems as $key => $weight) {
- if (!isset($items[$key])) {
- continue;
- }
- unset($items[$key]);
- $sumWeight = $weight;
- foreach ($items as $keyItem => $weightItem) {
- if (($sumWeight + $weightItem) < $maxWeight) {
- unset($items[$keyItem]);
- $sumWeight += $weightItem;
- } elseif (($sumWeight + $weightItem) > $maxWeight) {
- $pieces[] = (string) (float) $sumWeight;
- break;
- } else {
- unset($items[$keyItem]);
- $pieces[] = (string) (float) ($sumWeight + $weightItem);
- $sumWeight = 0;
- break;
- }
- }
- }
- if ($sumWeight > 0) {
- $pieces[] = (string) (float) $sumWeight;
- }
- $pieces = array_count_values($pieces);
- }
-
- return $pieces;
- }
-
/**
* Collect rates by address
*
@@ -493,4 +446,51 @@ public function requestToShipment(Mage_Sales_Model_Order_Shipment $orderShipment
return $shipmentCarrier->requestToShipment($request);
}
+
+ /**
+ * Make pieces
+ * Compose packeges list based on given items, so that each package is as heavy as possible
+ *
+ * @param array $items
+ * @param float $maxWeight
+ * @return array
+ */
+ protected function _makePieces($items, $maxWeight)
+ {
+ $pieces = [];
+ if (!empty($items)) {
+ $sumWeight = 0;
+
+ $reverseOrderItems = $items;
+ arsort($reverseOrderItems);
+
+ foreach ($reverseOrderItems as $key => $weight) {
+ if (!isset($items[$key])) {
+ continue;
+ }
+ unset($items[$key]);
+ $sumWeight = $weight;
+ foreach ($items as $keyItem => $weightItem) {
+ if (($sumWeight + $weightItem) < $maxWeight) {
+ unset($items[$keyItem]);
+ $sumWeight += $weightItem;
+ } elseif (($sumWeight + $weightItem) > $maxWeight) {
+ $pieces[] = (string) (float) $sumWeight;
+ break;
+ } else {
+ unset($items[$keyItem]);
+ $pieces[] = (string) (float) ($sumWeight + $weightItem);
+ $sumWeight = 0;
+ break;
+ }
+ }
+ }
+ if ($sumWeight > 0) {
+ $pieces[] = (string) (float) $sumWeight;
+ }
+ $pieces = array_count_values($pieces);
+ }
+
+ return $pieces;
+ }
}
diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php
index 8808a39261a..8131bbfec29 100644
--- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php
+++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php
@@ -22,14 +22,6 @@
*/
class Mage_Sitemap_Model_Resource_Catalog_Category extends Mage_Sitemap_Model_Resource_Catalog_Abstract
{
- /**
- * Init resource model (catalog/category)
- */
- protected function _construct()
- {
- $this->_init('catalog/category', 'entity_id');
- }
-
/**
* Get category collection array
*
@@ -65,6 +57,13 @@ public function getCollection($storeId)
return $this->_loadEntities();
}
+ /**
+ * Init resource model (catalog/category)
+ */
+ protected function _construct()
+ {
+ $this->_init('catalog/category', 'entity_id');
+ }
/**
* Prepare category
diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php
index 3823315b0b5..a8a723eff4e 100644
--- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php
+++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php
@@ -22,11 +22,6 @@
*/
class Mage_Sitemap_Model_Resource_Catalog_Product extends Mage_Sitemap_Model_Resource_Catalog_Abstract
{
- protected function _construct()
- {
- $this->_init('catalog/product', 'entity_id');
- }
-
/**
* Get product collection array
*
@@ -69,6 +64,10 @@ public function getCollection($storeId)
return $this->_loadEntities();
}
+ protected function _construct()
+ {
+ $this->_init('catalog/product', 'entity_id');
+ }
/**
* Prepare product
diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php b/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php
index fc551477f23..73c5830cb16 100644
--- a/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php
+++ b/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php
@@ -22,11 +22,6 @@
*/
class Mage_Sitemap_Model_Resource_Cms_Page extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('cms/page', 'page_id');
- }
-
/**
* Retrieve cms page collection array
*
@@ -57,6 +52,10 @@ public function getCollection($storeId)
return $pages;
}
+ protected function _construct()
+ {
+ $this->_init('cms/page', 'page_id');
+ }
/**
* Prepare page object
diff --git a/app/code/core/Mage/Sitemap/Model/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Sitemap.php
index a0cc4ca3225..b87a00f4f54 100644
--- a/app/code/core/Mage/Sitemap/Model/Sitemap.php
+++ b/app/code/core/Mage/Sitemap/Model/Sitemap.php
@@ -45,68 +45,6 @@ class Mage_Sitemap_Model_Sitemap extends Mage_Core_Model_Abstract
*/
protected $_filePath;
- /**
- * Init model
- */
- protected function _construct()
- {
- $this->_init('sitemap/sitemap');
- }
-
- /**
- * @inheritDoc
- * @throws Mage_Core_Exception
- */
- protected function _beforeSave()
- {
- $io = new Varien_Io_File();
- $realPath = $io->getCleanPath(Mage::getBaseDir() . '/' . $this->getSitemapPath());
-
- /**
- * Check path is allow
- */
- if (!$io->allowedPath($realPath, Mage::getBaseDir())) {
- Mage::throwException(Mage::helper('sitemap')->__('Please define correct path'));
- }
- /**
- * Check exists and writeable path
- */
- if (!$io->fileExists($realPath, false)) {
- Mage::throwException(Mage::helper('sitemap')->__('Please create the specified folder "%s" before saving the sitemap.', Mage::helper('core')->escapeHtml($this->getSitemapPath())));
- }
-
- if (!$io->isWriteable($realPath)) {
- Mage::throwException(Mage::helper('sitemap')->__('Please make sure that "%s" is writable by web-server.', $this->getSitemapPath()));
- }
- /**
- * Check allow filename
- */
- if (!preg_match('#^[a-zA-Z0-9_\.]+$#', $this->getSitemapFilename())) {
- Mage::throwException(Mage::helper('sitemap')->__('Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.'));
- }
- if (!preg_match('#\.xml$#', $this->getSitemapFilename())) {
- $this->setSitemapFilename($this->getSitemapFilename() . '.xml');
- }
-
- $this->setSitemapPath(rtrim(str_replace(str_replace('\\', '/', Mage::getBaseDir()), '', $realPath), '/') . '/');
-
- return parent::_beforeSave();
- }
-
- /**
- * Return real file path
- *
- * @return string
- */
- protected function getPath()
- {
- if (is_null($this->_filePath)) {
- $this->_filePath = str_replace('//', '/', Mage::getBaseDir() .
- $this->getSitemapPath());
- }
- return $this->_filePath;
- }
-
/**
* Return full file name with path
*
@@ -223,6 +161,68 @@ public function generateXml()
return $this;
}
+ /**
+ * Init model
+ */
+ protected function _construct()
+ {
+ $this->_init('sitemap/sitemap');
+ }
+
+ /**
+ * @inheritDoc
+ * @throws Mage_Core_Exception
+ */
+ protected function _beforeSave()
+ {
+ $io = new Varien_Io_File();
+ $realPath = $io->getCleanPath(Mage::getBaseDir() . '/' . $this->getSitemapPath());
+
+ /**
+ * Check path is allow
+ */
+ if (!$io->allowedPath($realPath, Mage::getBaseDir())) {
+ Mage::throwException(Mage::helper('sitemap')->__('Please define correct path'));
+ }
+ /**
+ * Check exists and writeable path
+ */
+ if (!$io->fileExists($realPath, false)) {
+ Mage::throwException(Mage::helper('sitemap')->__('Please create the specified folder "%s" before saving the sitemap.', Mage::helper('core')->escapeHtml($this->getSitemapPath())));
+ }
+
+ if (!$io->isWriteable($realPath)) {
+ Mage::throwException(Mage::helper('sitemap')->__('Please make sure that "%s" is writable by web-server.', $this->getSitemapPath()));
+ }
+ /**
+ * Check allow filename
+ */
+ if (!preg_match('#^[a-zA-Z0-9_\.]+$#', $this->getSitemapFilename())) {
+ Mage::throwException(Mage::helper('sitemap')->__('Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in the filename. No spaces or other characters are allowed.'));
+ }
+ if (!preg_match('#\.xml$#', $this->getSitemapFilename())) {
+ $this->setSitemapFilename($this->getSitemapFilename() . '.xml');
+ }
+
+ $this->setSitemapPath(rtrim(str_replace(str_replace('\\', '/', Mage::getBaseDir()), '', $realPath), '/') . '/');
+
+ return parent::_beforeSave();
+ }
+
+ /**
+ * Return real file path
+ *
+ * @return string
+ */
+ protected function getPath()
+ {
+ if (is_null($this->_filePath)) {
+ $this->_filePath = str_replace('//', '/', Mage::getBaseDir() .
+ $this->getSitemapPath());
+ }
+ return $this->_filePath;
+ }
+
/**
* Get sitemap row
*
diff --git a/app/code/core/Mage/Tag/Block/All.php b/app/code/core/Mage/Tag/Block/All.php
index 900c683917e..f156639b89d 100644
--- a/app/code/core/Mage/Tag/Block/All.php
+++ b/app/code/core/Mage/Tag/Block/All.php
@@ -26,6 +26,32 @@ class Mage_Tag_Block_All extends Mage_Core_Block_Template
protected $_minPopularity;
protected $_maxPopularity;
+ /**
+ * @return Mage_Tag_Model_Tag[]
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ public function getTags()
+ {
+ $this->_loadTags();
+ return $this->_tags;
+ }
+
+ /**
+ * @return int
+ */
+ public function getMaxPopularity()
+ {
+ return $this->_maxPopularity;
+ }
+
+ /**
+ * @return int
+ */
+ public function getMinPopularity()
+ {
+ return $this->_minPopularity;
+ }
+
/**
* @return $this
* @throws Mage_Core_Model_Store_Exception
@@ -58,32 +84,6 @@ protected function _loadTags()
return $this;
}
- /**
- * @return Mage_Tag_Model_Tag[]
- * @throws Mage_Core_Model_Store_Exception
- */
- public function getTags()
- {
- $this->_loadTags();
- return $this->_tags;
- }
-
- /**
- * @return int
- */
- public function getMaxPopularity()
- {
- return $this->_maxPopularity;
- }
-
- /**
- * @return int
- */
- public function getMinPopularity()
- {
- return $this->_minPopularity;
- }
-
/**
* @return string
*/
diff --git a/app/code/core/Mage/Tag/Block/Customer/Recent.php b/app/code/core/Mage/Tag/Block/Customer/Recent.php
index 52648e9fae9..26aa5885dd4 100644
--- a/app/code/core/Mage/Tag/Block/Customer/Recent.php
+++ b/app/code/core/Mage/Tag/Block/Customer/Recent.php
@@ -27,24 +27,6 @@ class Mage_Tag_Block_Customer_Recent extends Mage_Core_Block_Template
*/
protected $_collection;
- protected function _construct()
- {
- parent::_construct();
-
- $this->_collection = Mage::getModel('tag/tag')->getEntityCollection()
- ->addStoreFilter(Mage::app()->getStore()->getId())
- ->addCustomerFilter(Mage::getSingleton('customer/session')->getCustomerId())
- ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes())
- ->setDescOrder()
- ->setPageSize(5)
- ->setActiveFilter()
- ->load()
- ->addProductTags();
-
- Mage::getSingleton('catalog/product_visibility')
- ->addVisibleInSiteFilterToCollection($this->_collection);
- }
-
/**
* @return int
*/
@@ -53,14 +35,6 @@ public function count()
return $this->_collection->getSize();
}
- /**
- * @return Mage_Tag_Model_Resource_Product_Collection
- */
- protected function _getCollection()
- {
- return $this->_collection;
- }
-
/**
* @return Mage_Tag_Model_Resource_Product_Collection
*/
@@ -86,6 +60,32 @@ public function getAllTagsUrl()
return Mage::getUrl('tag/customer');
}
+ protected function _construct()
+ {
+ parent::_construct();
+
+ $this->_collection = Mage::getModel('tag/tag')->getEntityCollection()
+ ->addStoreFilter(Mage::app()->getStore()->getId())
+ ->addCustomerFilter(Mage::getSingleton('customer/session')->getCustomerId())
+ ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes())
+ ->setDescOrder()
+ ->setPageSize(5)
+ ->setActiveFilter()
+ ->load()
+ ->addProductTags();
+
+ Mage::getSingleton('catalog/product_visibility')
+ ->addVisibleInSiteFilterToCollection($this->_collection);
+ }
+
+ /**
+ * @return Mage_Tag_Model_Resource_Product_Collection
+ */
+ protected function _getCollection()
+ {
+ return $this->_collection;
+ }
+
/**
* @return string
*/
diff --git a/app/code/core/Mage/Tag/Block/Customer/Tags.php b/app/code/core/Mage/Tag/Block/Customer/Tags.php
index 679a14c0d38..0730677dc5e 100644
--- a/app/code/core/Mage/Tag/Block/Customer/Tags.php
+++ b/app/code/core/Mage/Tag/Block/Customer/Tags.php
@@ -26,6 +26,31 @@ class Mage_Tag_Block_Customer_Tags extends Mage_Customer_Block_Account_Dashboard
protected $_minPopularity;
protected $_maxPopularity;
+ /**
+ * @return Mage_Tag_Model_Tag[]
+ */
+ public function getTags()
+ {
+ $this->_loadTags();
+ return $this->_tags;
+ }
+
+ /**
+ * @return int
+ */
+ public function getMaxPopularity()
+ {
+ return $this->_maxPopularity;
+ }
+
+ /**
+ * @return int
+ */
+ public function getMinPopularity()
+ {
+ return $this->_minPopularity;
+ }
+
protected function _loadTags()
{
if (empty($this->_tags)) {
@@ -58,29 +83,4 @@ protected function _loadTags()
}
ksort($this->_tags);
}
-
- /**
- * @return Mage_Tag_Model_Tag[]
- */
- public function getTags()
- {
- $this->_loadTags();
- return $this->_tags;
- }
-
- /**
- * @return int
- */
- public function getMaxPopularity()
- {
- return $this->_maxPopularity;
- }
-
- /**
- * @return int
- */
- public function getMinPopularity()
- {
- return $this->_minPopularity;
- }
}
diff --git a/app/code/core/Mage/Tag/Block/Customer/View.php b/app/code/core/Mage/Tag/Block/Customer/View.php
index d3246a5140e..550655eb401 100644
--- a/app/code/core/Mage/Tag/Block/Customer/View.php
+++ b/app/code/core/Mage/Tag/Block/Customer/View.php
@@ -39,16 +39,6 @@ class Mage_Tag_Block_Customer_View extends Mage_Catalog_Block_Product_Abstract
*/
protected $_tagInfo;
- /**
- * Initialize block
- *
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTagId(Mage::registry('tagId'));
- }
-
/**
* Retrieve current Tag object
*
@@ -94,21 +84,6 @@ public function getReviewUrl($productId)
return Mage::getUrl('review/product/list', ['id' => $productId]);
}
- /**
- * Preparing block layout
- *
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- $toolbar = $this->getLayout()
- ->createBlock('page/html_pager', 'customer_tag_list.toolbar')
- ->setCollection($this->_getCollection());
-
- $this->setChild('toolbar', $toolbar);
- return parent::_prepareLayout();
- }
-
/**
* Retrieve Toolbar block HTML
*
@@ -129,6 +104,31 @@ public function getMode()
return $this->getChild('toolbar')->getCurrentMode();
}
+ /**
+ * Initialize block
+ *
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTagId(Mage::registry('tagId'));
+ }
+
+ /**
+ * Preparing block layout
+ *
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ $toolbar = $this->getLayout()
+ ->createBlock('page/html_pager', 'customer_tag_list.toolbar')
+ ->setCollection($this->_getCollection());
+
+ $this->setChild('toolbar', $toolbar);
+ return parent::_prepareLayout();
+ }
+
/**
* Retrieve Tagged product(s) collection
*
diff --git a/app/code/core/Mage/Tag/Block/Popular.php b/app/code/core/Mage/Tag/Block/Popular.php
index 94f9e5fb5c0..2652096122f 100644
--- a/app/code/core/Mage/Tag/Block/Popular.php
+++ b/app/code/core/Mage/Tag/Block/Popular.php
@@ -26,6 +26,32 @@ class Mage_Tag_Block_Popular extends Mage_Core_Block_Template
protected $_minPopularity;
protected $_maxPopularity;
+ /**
+ * @return Mage_Tag_Model_Tag[]
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ public function getTags()
+ {
+ $this->_loadTags();
+ return $this->_tags;
+ }
+
+ /**
+ * @return int
+ */
+ public function getMaxPopularity()
+ {
+ return $this->_maxPopularity;
+ }
+
+ /**
+ * @return int
+ */
+ public function getMinPopularity()
+ {
+ return $this->_minPopularity;
+ }
+
/**
* @return $this
* @throws Mage_Core_Model_Store_Exception
@@ -60,32 +86,6 @@ protected function _loadTags()
return $this;
}
- /**
- * @return Mage_Tag_Model_Tag[]
- * @throws Mage_Core_Model_Store_Exception
- */
- public function getTags()
- {
- $this->_loadTags();
- return $this->_tags;
- }
-
- /**
- * @return int
- */
- public function getMaxPopularity()
- {
- return $this->_maxPopularity;
- }
-
- /**
- * @return int
- */
- public function getMinPopularity()
- {
- return $this->_minPopularity;
- }
-
/**
* @return string
* @throws Mage_Core_Model_Store_Exception
diff --git a/app/code/core/Mage/Tag/Block/Product/List.php b/app/code/core/Mage/Tag/Block/Product/List.php
index a1ba15c838c..ad090d85990 100644
--- a/app/code/core/Mage/Tag/Block/Product/List.php
+++ b/app/code/core/Mage/Tag/Block/Product/List.php
@@ -58,38 +58,6 @@ public function getProductId()
return false;
}
- /**
- * @return mixed
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _getCollection()
- {
- if (!$this->_collection && $this->getProductId()) {
- $model = Mage::getModel('tag/tag');
- $this->_collection = $model->getResourceCollection()
- ->addPopularity()
- ->addStatusFilter($model->getApprovedStatus())
- ->addProductFilter($this->getProductId())
- ->setFlag('relation', true)
- ->addStoreFilter(Mage::app()->getStore()->getId())
- ->setActiveFilter()
- ->load();
- }
- return $this->_collection;
- }
-
- /**
- * @inheritDoc
- */
- protected function _beforeToHtml()
- {
- if (!$this->getProductId()) {
- return $this;
- }
-
- return parent::_beforeToHtml();
- }
-
/**
* @return string
*/
@@ -137,4 +105,36 @@ public function getUniqueHtmlId($prefix = '')
}
return $this->_uniqueHtmlId;
}
+
+ /**
+ * @return mixed
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ protected function _getCollection()
+ {
+ if (!$this->_collection && $this->getProductId()) {
+ $model = Mage::getModel('tag/tag');
+ $this->_collection = $model->getResourceCollection()
+ ->addPopularity()
+ ->addStatusFilter($model->getApprovedStatus())
+ ->addProductFilter($this->getProductId())
+ ->setFlag('relation', true)
+ ->addStoreFilter(Mage::app()->getStore()->getId())
+ ->setActiveFilter()
+ ->load();
+ }
+ return $this->_collection;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _beforeToHtml()
+ {
+ if (!$this->getProductId()) {
+ return $this;
+ }
+
+ return parent::_beforeToHtml();
+ }
}
diff --git a/app/code/core/Mage/Tag/Block/Product/Result.php b/app/code/core/Mage/Tag/Block/Product/Result.php
index dac21a98099..f14d417b145 100644
--- a/app/code/core/Mage/Tag/Block/Product/Result.php
+++ b/app/code/core/Mage/Tag/Block/Product/Result.php
@@ -37,17 +37,6 @@ public function getTag()
return Mage::registry('current_tag');
}
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- $title = $this->getHeaderText();
- $this->getLayout()->getBlock('head')->setTitle($title);
- $this->getLayout()->getBlock('root')->setHeaderTitle($title);
- return parent::_prepareLayout();
- }
-
public function setListOrders()
{
$this->getChild('search_result_list')
@@ -81,32 +70,6 @@ public function getProductListHtml()
return $this->getChildHtml('search_result_list');
}
- /**
- * @return Mage_Tag_Model_Resource_Product_Collection
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _getProductCollection()
- {
- if (is_null($this->_productCollection)) {
- $tagModel = Mage::getModel('tag/tag');
- $this->_productCollection = $tagModel->getEntityCollection()
- ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes())
- ->addTagFilter($this->getTag()->getId())
- ->addStoreFilter(Mage::app()->getStore()->getId())
- ->addAttributeToFilter('status', [
- 'in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds(),
- ])
- ->addMinimalPrice()
- ->addUrlRewrite()
- ->setActiveFilter();
- Mage::getSingleton('catalog/product_visibility')->addVisibleInSiteFilterToCollection(
- $this->_productCollection,
- );
- }
-
- return $this->_productCollection;
- }
-
/**
* @return int
* @throws Mage_Core_Model_Store_Exception
@@ -146,4 +109,41 @@ public function getNoResultText()
{
return Mage::helper('tag')->__('No matches found.');
}
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ $title = $this->getHeaderText();
+ $this->getLayout()->getBlock('head')->setTitle($title);
+ $this->getLayout()->getBlock('root')->setHeaderTitle($title);
+ return parent::_prepareLayout();
+ }
+
+ /**
+ * @return Mage_Tag_Model_Resource_Product_Collection
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ protected function _getProductCollection()
+ {
+ if (is_null($this->_productCollection)) {
+ $tagModel = Mage::getModel('tag/tag');
+ $this->_productCollection = $tagModel->getEntityCollection()
+ ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes())
+ ->addTagFilter($this->getTag()->getId())
+ ->addStoreFilter(Mage::app()->getStore()->getId())
+ ->addAttributeToFilter('status', [
+ 'in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds(),
+ ])
+ ->addMinimalPrice()
+ ->addUrlRewrite()
+ ->setActiveFilter();
+ Mage::getSingleton('catalog/product_visibility')->addVisibleInSiteFilterToCollection(
+ $this->_productCollection,
+ );
+ }
+
+ return $this->_productCollection;
+ }
}
diff --git a/app/code/core/Mage/Tag/Model/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Indexer/Summary.php
index 2c1fa75b6e4..5f212f519c9 100644
--- a/app/code/core/Mage/Tag/Model/Indexer/Summary.php
+++ b/app/code/core/Mage/Tag/Model/Indexer/Summary.php
@@ -58,11 +58,6 @@ class Mage_Tag_Model_Indexer_Summary extends Mage_Index_Model_Indexer_Abstract
],
];
- protected function _construct()
- {
- $this->_init('tag/indexer_summary');
- }
-
/**
* Retrieve Indexer name
*
@@ -83,6 +78,11 @@ public function getDescription()
return Mage::helper('tag')->__('Rebuild Tag aggregation data');
}
+ protected function _construct()
+ {
+ $this->_init('tag/indexer_summary');
+ }
+
/**
* Retrieve attribute list that has an effect on tags
*
diff --git a/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php
index c60f213573d..a579897d421 100644
--- a/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php
@@ -220,30 +220,6 @@ public function addCustomerFilter($customerId)
return $this;
}
- /**
- * Joins tables to select
- *
- */
- protected function _joinFields()
- {
- $tagRelationTable = $this->getTable('tag/relation');
- $tagTable = $this->getTable('tag/tag');
-
- //TODO: add full name logic
- $this->addAttributeToSelect('firstname')
- ->addAttributeToSelect('middlename')
- ->addAttributeToSelect('lastname')
- ->addAttributeToSelect('email');
-
- $this->getSelect()
- ->join(
- ['tr' => $tagRelationTable],
- 'tr.customer_id = e.entity_id',
- ['tag_relation_id', 'product_id', 'active', 'added_in' => 'store_id'],
- )
- ->join(['t' => $tagTable], 't.tag_id = tr.tag_id', ['*']);
- }
-
/**
* Gets number of rows
*
@@ -369,6 +345,30 @@ public function addFieldToFilter($attribute, $condition = null)
}
}
+ /**
+ * Joins tables to select
+ *
+ */
+ protected function _joinFields()
+ {
+ $tagRelationTable = $this->getTable('tag/relation');
+ $tagTable = $this->getTable('tag/tag');
+
+ //TODO: add full name logic
+ $this->addAttributeToSelect('firstname')
+ ->addAttributeToSelect('middlename')
+ ->addAttributeToSelect('lastname')
+ ->addAttributeToSelect('email');
+
+ $this->getSelect()
+ ->join(
+ ['tr' => $tagRelationTable],
+ 'tr.customer_id = e.entity_id',
+ ['tag_relation_id', 'product_id', 'active', 'added_in' => 'store_id'],
+ )
+ ->join(['t' => $tagTable], 't.tag_id = tr.tag_id', ['*']);
+ }
+
/**
* Treat "order by" items as attributes to sort
*
diff --git a/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php
index bb2004ff580..2683e239e7e 100644
--- a/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php
@@ -22,11 +22,6 @@
*/
class Mage_Tag_Model_Resource_Indexer_Summary extends Mage_Catalog_Model_Resource_Product_Indexer_Abstract
{
- protected function _construct()
- {
- $this->_init('tag/summary', 'tag_id');
- }
-
/**
* Process tag save
*
@@ -244,4 +239,8 @@ public function aggregate($tagIds = null)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('tag/summary', 'tag_id');
+ }
}
diff --git a/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php
index 983afa2662f..81a99677e97 100644
--- a/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php
@@ -22,15 +22,6 @@
*/
class Mage_Tag_Model_Resource_Popular_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Defines resource model and model
- *
- */
- protected function _construct()
- {
- $this->_init('tag/tag');
- }
-
/**
* Replacing popularity by sum of popularity and base_popularity
*
@@ -113,4 +104,12 @@ public function getSelectCountSql()
$countSelect->from(['a' => $select], 'COUNT(popularity)');
return $countSelect;
}
+ /**
+ * Defines resource model and model
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('tag/tag');
+ }
}
diff --git a/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php
index f5f51afae22..d59ce9050cc 100644
--- a/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php
@@ -45,26 +45,6 @@ class Mage_Tag_Model_Resource_Product_Collection extends Mage_Catalog_Model_Reso
*/
protected $_joinFlags = [];
- /**
- * Initialize collection select
- *
- * @return $this
- */
- protected function _initSelect()
- {
- parent::_initSelect();
-
- $this->_joinFields();
- $this->getSelect()->group('e.entity_id');
-
- /*
- * Allow analytic function usage
- */
- $this->_useAnalyticFunction = true;
-
- return $this;
- }
-
/**
* Set flag about joined table.
* setFlag method must be used in future.
@@ -120,44 +100,6 @@ public function addStoresVisibility()
return $this;
}
- /**
- * Add tag visibility on stores process
- *
- * @return $this
- */
- protected function _addStoresVisibility()
- {
- $tagIds = [];
- foreach ($this as $item) {
- $tagIds[] = $item->getTagId();
- }
-
- $tagsStores = [];
- if (count($tagIds)) {
- $select = $this->getConnection()->select()
- ->from($this->getTable('tag/relation'), ['store_id', 'tag_id'])
- ->where('tag_id IN(?)', $tagIds);
- $tagsRaw = $this->getConnection()->fetchAll($select);
- foreach ($tagsRaw as $tag) {
- if (!isset($tagsStores[$tag['tag_id']])) {
- $tagsStores[$tag['tag_id']] = [];
- }
-
- $tagsStores[$tag['tag_id']][] = $tag['store_id'];
- }
- }
-
- foreach ($this as $item) {
- if (isset($tagsStores[$item->getTagId()])) {
- $item->setStores($tagsStores[$item->getTagId()]);
- } else {
- $item->setStores([]);
- }
- }
-
- return $this;
- }
-
/**
* Add group by tag
*
@@ -353,6 +295,104 @@ public function addProductTags($storeId = null)
return $this;
}
+ /**
+ * Render SQL for retrieve product count
+ *
+ * @return Varien_Db_Select
+ */
+ public function getSelectCountSql()
+ {
+ $countSelect = clone $this->getSelect();
+
+ $countSelect->reset(Zend_Db_Select::COLUMNS);
+ $countSelect->reset(Zend_Db_Select::ORDER);
+ $countSelect->reset(Zend_Db_Select::LIMIT_COUNT);
+ $countSelect->reset(Zend_Db_Select::LIMIT_OFFSET);
+ $countSelect->reset(Zend_Db_Select::GROUP);
+
+ if ($this->getFlag('group_tag')) {
+ $field = 'relation.tag_id';
+ } else {
+ $field = 'e.entity_id';
+ }
+ $expr = new Zend_Db_Expr('COUNT('
+ . ($this->getFlag('distinct') ? 'DISTINCT ' : '')
+ . $field . ')');
+
+ $countSelect->columns($expr);
+
+ return $countSelect;
+ }
+
+ /**
+ * Set Id Fieldname as Tag Relation Id
+ *
+ * @return $this
+ */
+ public function setRelationId()
+ {
+ $this->_setIdFieldName('tag_relation_id');
+ return $this;
+ }
+
+ /**
+ * Initialize collection select
+ *
+ * @return $this
+ */
+ protected function _initSelect()
+ {
+ parent::_initSelect();
+
+ $this->_joinFields();
+ $this->getSelect()->group('e.entity_id');
+
+ /*
+ * Allow analytic function usage
+ */
+ $this->_useAnalyticFunction = true;
+
+ return $this;
+ }
+
+ /**
+ * Add tag visibility on stores process
+ *
+ * @return $this
+ */
+ protected function _addStoresVisibility()
+ {
+ $tagIds = [];
+ foreach ($this as $item) {
+ $tagIds[] = $item->getTagId();
+ }
+
+ $tagsStores = [];
+ if (count($tagIds)) {
+ $select = $this->getConnection()->select()
+ ->from($this->getTable('tag/relation'), ['store_id', 'tag_id'])
+ ->where('tag_id IN(?)', $tagIds);
+ $tagsRaw = $this->getConnection()->fetchAll($select);
+ foreach ($tagsRaw as $tag) {
+ if (!isset($tagsStores[$tag['tag_id']])) {
+ $tagsStores[$tag['tag_id']] = [];
+ }
+
+ $tagsStores[$tag['tag_id']][] = $tag['store_id'];
+ }
+ }
+
+ foreach ($this as $item) {
+ if (isset($tagsStores[$item->getTagId()])) {
+ $item->setStores($tagsStores[$item->getTagId()]);
+ } else {
+ $item->setStores([]);
+ }
+ }
+
+ return $this;
+ }
+
/**
* Join fields process
*
@@ -412,35 +452,6 @@ protected function _afterLoad()
return $this;
}
- /**
- * Render SQL for retrieve product count
- *
- * @return Varien_Db_Select
- */
- public function getSelectCountSql()
- {
- $countSelect = clone $this->getSelect();
-
- $countSelect->reset(Zend_Db_Select::COLUMNS);
- $countSelect->reset(Zend_Db_Select::ORDER);
- $countSelect->reset(Zend_Db_Select::LIMIT_COUNT);
- $countSelect->reset(Zend_Db_Select::LIMIT_OFFSET);
- $countSelect->reset(Zend_Db_Select::GROUP);
-
- if ($this->getFlag('group_tag')) {
- $field = 'relation.tag_id';
- } else {
- $field = 'e.entity_id';
- }
- $expr = new Zend_Db_Expr('COUNT('
- . ($this->getFlag('distinct') ? 'DISTINCT ' : '')
- . $field . ')');
-
- $countSelect->columns($expr);
-
- return $countSelect;
- }
-
/**
* Treat "order by" items as attributes to sort
*
@@ -467,15 +478,4 @@ protected function _renderOrders()
}
return $this;
}
-
- /**
- * Set Id Fieldname as Tag Relation Id
- *
- * @return $this
- */
- public function setRelationId()
- {
- $this->_setIdFieldName('tag_relation_id');
- return $this;
- }
}
diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag.php b/app/code/core/Mage/Tag/Model/Resource/Tag.php
index 773f9a2a16b..d0d3b1c3e0b 100644
--- a/app/code/core/Mage/Tag/Model/Resource/Tag.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Tag.php
@@ -22,25 +22,6 @@
*/
class Mage_Tag_Model_Resource_Tag extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('tag/tag', 'tag_id');
- }
-
- /**
- * Initialize unique fields
- *
- * @return $this
- */
- protected function _initUniqueFields()
- {
- $this->_uniqueFields = [[
- 'field' => 'name',
- 'title' => Mage::helper('tag')->__('Tag'),
- ]];
- return $this;
- }
-
/**
* Loading tag by name
*
@@ -67,6 +48,137 @@ public function loadByName($model, $name)
}
}
+ /**
+ * Getting statistics data into buffer.
+ * Replacing our buffer array with new statistics and incoming data.
+ *
+ * @deprecated after 1.4.0.0
+ *
+ * @param Mage_Tag_Model_Tag $object
+ * @return Mage_Tag_Model_Tag
+ */
+ public function aggregate($object)
+ {
+ $tagId = (int) $object->getId();
+ $storeId = (int) $object->getStore();
+
+ // create final summary from existing data and add specified base popularity
+ $finalSummary = $this->_getExistingBasePopularity($tagId);
+ if ($object->hasBasePopularity() && $storeId) {
+ $finalSummary[$storeId]['store_id'] = $storeId;
+ $finalSummary[$storeId]['base_popularity'] = $object->getBasePopularity();
+ }
+
+ // calculate aggregation data
+ $summaries = $this->_getAggregationPerStoreView($tagId);
+ $summariesGlobal = $this->_getGlobalAggregation($tagId);
+ if ($summariesGlobal) {
+ $summaries[] = $summariesGlobal;
+ }
+
+ // override final summary with aggregated data
+ foreach ($summaries as $row) {
+ $storeId = (int) $row['store_id'];
+ foreach ($row as $key => $value) {
+ $finalSummary[$storeId][$key] = $value;
+ }
+ }
+
+ // prepare static parameters to final summary for insertion
+ foreach ($finalSummary as $key => $row) {
+ $finalSummary[$key]['tag_id'] = $tagId;
+ foreach (['base_popularity', 'popularity', 'historical_uses', 'uses', 'products', 'customers'] as $k) {
+ if (!isset($row[$k])) {
+ $finalSummary[$key][$k] = 0;
+ }
+ }
+ $finalSummary[$key]['popularity'] = $finalSummary[$key]['historical_uses'];
+ }
+
+ // remove old and insert new data
+ $write = $this->_getWriteAdapter();
+ $write->delete(
+ $this->getTable('tag/summary'),
+ ['tag_id = ?' => $tagId],
+ );
+ $write->insertMultiple($this->getTable('tag/summary'), $finalSummary);
+
+ return $object;
+ }
+
+ /**
+ * Decrementing tag products quantity as action for product delete
+ *
+ * @return int The number of affected rows
+ */
+ public function decrementProducts(array $tagsId)
+ {
+ $writeAdapter = $this->_getWriteAdapter();
+ if (empty($tagsId)) {
+ return 0;
+ }
+
+ return $writeAdapter->update(
+ $this->getTable('tag/summary'),
+ ['products' => new Zend_Db_Expr('products - 1')],
+ ['tag_id IN (?)' => $tagsId],
+ );
+ }
+
+ /**
+ * Add summary data to specified object
+ *
+ * @deprecated after 1.4.0.0
+ *
+ * @param Mage_Tag_Model_Tag $object
+ * @return Mage_Tag_Model_Tag
+ */
+ public function addSummary($object)
+ {
+ $read = $this->_getReadAdapter();
+ $select = $read->select()
+ ->from(['relation' => $this->getTable('tag/relation')], [])
+ ->joinLeft(
+ ['summary' => $this->getTable('tag/summary')],
+ 'relation.tag_id = summary.tag_id AND relation.store_id = summary.store_id',
+ [
+ 'customers',
+ 'products',
+ 'popularity',
+ ],
+ )
+ ->where('relation.tag_id = :tag_id')
+ ->where('relation.store_id = :store_id')
+ ->limit(1);
+ $bind = [
+ 'tag_id' => (int) $object->getId(),
+ 'store_id' => (int) $object->getStoreId(),
+ ];
+ $row = $read->fetchRow($select, $bind);
+ if ($row) {
+ $object->addData($row);
+ }
+ return $object;
+ }
+ protected function _construct()
+ {
+ $this->_init('tag/tag', 'tag_id');
+ }
+
+ /**
+ * Initialize unique fields
+ *
+ * @return $this
+ */
+ protected function _initUniqueFields()
+ {
+ $this->_uniqueFields = [[
+ 'field' => 'name',
+ 'title' => Mage::helper('tag')->__('Tag'),
+ ]];
+ return $this;
+ }
+
/**
* Before saving actions
*
@@ -271,119 +383,6 @@ protected function _getGlobalAggregation($tagId)
return $result;
}
- /**
- * Getting statistics data into buffer.
- * Replacing our buffer array with new statistics and incoming data.
- *
- * @deprecated after 1.4.0.0
- *
- * @param Mage_Tag_Model_Tag $object
- * @return Mage_Tag_Model_Tag
- */
- public function aggregate($object)
- {
- $tagId = (int) $object->getId();
- $storeId = (int) $object->getStore();
-
- // create final summary from existing data and add specified base popularity
- $finalSummary = $this->_getExistingBasePopularity($tagId);
- if ($object->hasBasePopularity() && $storeId) {
- $finalSummary[$storeId]['store_id'] = $storeId;
- $finalSummary[$storeId]['base_popularity'] = $object->getBasePopularity();
- }
-
- // calculate aggregation data
- $summaries = $this->_getAggregationPerStoreView($tagId);
- $summariesGlobal = $this->_getGlobalAggregation($tagId);
- if ($summariesGlobal) {
- $summaries[] = $summariesGlobal;
- }
-
- // override final summary with aggregated data
- foreach ($summaries as $row) {
- $storeId = (int) $row['store_id'];
- foreach ($row as $key => $value) {
- $finalSummary[$storeId][$key] = $value;
- }
- }
-
- // prepare static parameters to final summary for insertion
- foreach ($finalSummary as $key => $row) {
- $finalSummary[$key]['tag_id'] = $tagId;
- foreach (['base_popularity', 'popularity', 'historical_uses', 'uses', 'products', 'customers'] as $k) {
- if (!isset($row[$k])) {
- $finalSummary[$key][$k] = 0;
- }
- }
- $finalSummary[$key]['popularity'] = $finalSummary[$key]['historical_uses'];
- }
-
- // remove old and insert new data
- $write = $this->_getWriteAdapter();
- $write->delete(
- $this->getTable('tag/summary'),
- ['tag_id = ?' => $tagId],
- );
- $write->insertMultiple($this->getTable('tag/summary'), $finalSummary);
-
- return $object;
- }
-
- /**
- * Decrementing tag products quantity as action for product delete
- *
- * @return int The number of affected rows
- */
- public function decrementProducts(array $tagsId)
- {
- $writeAdapter = $this->_getWriteAdapter();
- if (empty($tagsId)) {
- return 0;
- }
-
- return $writeAdapter->update(
- $this->getTable('tag/summary'),
- ['products' => new Zend_Db_Expr('products - 1')],
- ['tag_id IN (?)' => $tagsId],
- );
- }
-
- /**
- * Add summary data to specified object
- *
- * @deprecated after 1.4.0.0
- *
- * @param Mage_Tag_Model_Tag $object
- * @return Mage_Tag_Model_Tag
- */
- public function addSummary($object)
- {
- $read = $this->_getReadAdapter();
- $select = $read->select()
- ->from(['relation' => $this->getTable('tag/relation')], [])
- ->joinLeft(
- ['summary' => $this->getTable('tag/summary')],
- 'relation.tag_id = summary.tag_id AND relation.store_id = summary.store_id',
- [
- 'customers',
- 'products',
- 'popularity',
- ],
- )
- ->where('relation.tag_id = :tag_id')
- ->where('relation.store_id = :store_id')
- ->limit(1);
- $bind = [
- 'tag_id' => (int) $object->getId(),
- 'store_id' => (int) $object->getStoreId(),
- ];
- $row = $read->fetchRow($select, $bind);
- if ($row) {
- $object->addData($row);
- }
- return $object;
- }
-
/**
* Retrieve select object for load object data
* Redeclare parent method just for adding tag's base popularity if flag exists
diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php
index 5e5ed29706e..3ebc7730031 100644
--- a/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php
@@ -22,20 +22,6 @@
*/
class Mage_Tag_Model_Resource_Tag_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Use getFlag('store_filter') & setFlag('store_filter', true) instead.
- *
- * @var bool
- */
- protected $_isStoreFilter = false;
-
- /**
- * Joined tables
- *
- * @var array
- */
- protected $_joinFlags = [];
-
/**
* Mapping for fields
*
@@ -46,15 +32,19 @@ class Mage_Tag_Model_Resource_Tag_Collection extends Mage_Core_Model_Resource_Db
'tag_id' => 'main_table.tag_id',
],
];
+ /**
+ * Use getFlag('store_filter') & setFlag('store_filter', true) instead.
+ *
+ * @var bool
+ */
+ protected $_isStoreFilter = false;
/**
- * Define resource model and model
+ * Joined tables
*
+ * @var array
*/
- protected function _construct()
- {
- $this->_init('tag/tag');
- }
+ protected $_joinFlags = [];
/**
* Loads collection
@@ -209,42 +199,6 @@ public function addStoresVisibility()
return $this;
}
- /**
- * Adds store visibility
- *
- * @return $this
- */
- protected function _addStoresVisibility()
- {
- $tagIds = $this->getColumnValues('tag_id');
-
- $tagsStores = [];
- if (count($tagIds)) {
- $select = $this->getConnection()->select()
- ->from($this->getTable('tag/summary'), ['store_id', 'tag_id'])
- ->where('tag_id IN(?)', $tagIds);
- $tagsRaw = $this->getConnection()->fetchAll($select);
-
- foreach ($tagsRaw as $tag) {
- if (!isset($tagsStores[$tag['tag_id']])) {
- $tagsStores[$tag['tag_id']] = [];
- }
-
- $tagsStores[$tag['tag_id']][] = $tag['store_id'];
- }
- }
-
- foreach ($this as $item) {
- if (isset($tagsStores[$item->getId()])) {
- $item->setStores($tagsStores[$item->getId()]);
- } else {
- $item->setStores([]);
- }
- }
-
- return $this;
- }
-
/**
* Adds field to filter
*
@@ -408,4 +362,49 @@ public function joinRel()
);
return $this;
}
+
+ /**
+ * Define resource model and model
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('tag/tag');
+ }
+
+ /**
+ * Adds store visibility
+ *
+ * @return $this
+ */
+ protected function _addStoresVisibility()
+ {
+ $tagIds = $this->getColumnValues('tag_id');
+
+ $tagsStores = [];
+ if (count($tagIds)) {
+ $select = $this->getConnection()->select()
+ ->from($this->getTable('tag/summary'), ['store_id', 'tag_id'])
+ ->where('tag_id IN(?)', $tagIds);
+ $tagsRaw = $this->getConnection()->fetchAll($select);
+
+ foreach ($tagsRaw as $tag) {
+ if (!isset($tagsStores[$tag['tag_id']])) {
+ $tagsStores[$tag['tag_id']] = [];
+ }
+
+ $tagsStores[$tag['tag_id']][] = $tag['store_id'];
+ }
+ }
+
+ foreach ($this as $item) {
+ if (isset($tagsStores[$item->getId()])) {
+ $item->setStores($tagsStores[$item->getId()]);
+ } else {
+ $item->setStores([]);
+ }
+ }
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php
index 841ce9d944d..8a2c93775a5 100644
--- a/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php
@@ -22,15 +22,6 @@
*/
class Mage_Tag_Model_Resource_Tag_Relation extends Mage_Core_Model_Resource_Db_Abstract
{
- /**
- * Initialize resource connection and define table resource
- *
- */
- protected function _construct()
- {
- $this->_init('tag/relation', 'tag_relation_id');
- }
-
/**
* Load by Tag and Customer
*
@@ -191,4 +182,12 @@ public function addRelations($model)
return $this;
}
+ /**
+ * Initialize resource connection and define table resource
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('tag/relation', 'tag_relation_id');
+ }
}
diff --git a/app/code/core/Mage/Tag/Model/Tag.php b/app/code/core/Mage/Tag/Model/Tag.php
index c7e4f7acc27..bdd27be9284 100644
--- a/app/code/core/Mage/Tag/Model/Tag.php
+++ b/app/code/core/Mage/Tag/Model/Tag.php
@@ -76,11 +76,6 @@ class Mage_Tag_Model_Tag extends Mage_Core_Model_Abstract
*/
protected $_addBasePopularity = false;
- protected function _construct()
- {
- $this->_init('tag/tag');
- }
-
/**
* Init indexing process after tag data commit
*
@@ -119,20 +114,6 @@ public function getAddBasePopularity()
return $this->_addBasePopularity;
}
- /**
- * Product event tags collection getter
- *
- * @return Mage_Tag_Model_Resource_Tag_Collection
- */
- protected function _getProductEventTagsCollection(Varien_Event_Observer $observer)
- {
- return $this->getResourceCollection()
- ->joinRel()
- ->addProductFilter($observer->getEvent()->getProduct()->getId())
- ->addTagGroup()
- ->load();
- }
-
/**
* @return int
*/
@@ -337,16 +318,6 @@ public function isAvailableInStore($storeId = null)
return in_array($storeId, $this->getVisibleInStoreIds());
}
- /**
- * @return Mage_Core_Model_Abstract
- * @throws Mage_Core_Exception
- */
- protected function _beforeDelete()
- {
- $this->_protectFromNonAdmin();
- return parent::_beforeDelete();
- }
-
/**
* Save tag relation with product, customer and store
*
@@ -416,6 +387,35 @@ public function saveRelation($productId, $customerId, $storeId)
return $result;
}
+ protected function _construct()
+ {
+ $this->_init('tag/tag');
+ }
+
+ /**
+ * Product event tags collection getter
+ *
+ * @return Mage_Tag_Model_Resource_Tag_Collection
+ */
+ protected function _getProductEventTagsCollection(Varien_Event_Observer $observer)
+ {
+ return $this->getResourceCollection()
+ ->joinRel()
+ ->addProductFilter($observer->getEvent()->getProduct()->getId())
+ ->addTagGroup()
+ ->load();
+ }
+
+ /**
+ * @return Mage_Core_Model_Abstract
+ * @throws Mage_Core_Exception
+ */
+ protected function _beforeDelete()
+ {
+ $this->_protectFromNonAdmin();
+ return parent::_beforeDelete();
+ }
+
/**
* Check whether product is already marked in store with tag
*
diff --git a/app/code/core/Mage/Tag/Model/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Tag/Relation.php
index e7f89aabb23..632e6cc86f0 100644
--- a/app/code/core/Mage/Tag/Model/Tag/Relation.php
+++ b/app/code/core/Mage/Tag/Model/Tag/Relation.php
@@ -55,11 +55,6 @@ class Mage_Tag_Model_Tag_Relation extends Mage_Core_Model_Abstract
*/
public const ENTITY = 'tag_relation';
- protected function _construct()
- {
- $this->_init('tag/tag_relation');
- }
-
/**
* Init indexing process after tag data commit
*
@@ -151,4 +146,9 @@ public function addRelations(Mage_Tag_Model_Tag $model, $productIds = [])
$this->_getResource()->addRelations($this);
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_init('tag/tag_relation');
+ }
}
diff --git a/app/code/core/Mage/Tag/controllers/CustomerController.php b/app/code/core/Mage/Tag/controllers/CustomerController.php
index fa423fdc030..9266fa758ea 100644
--- a/app/code/core/Mage/Tag/controllers/CustomerController.php
+++ b/app/code/core/Mage/Tag/controllers/CustomerController.php
@@ -22,23 +22,6 @@
*/
class Mage_Tag_CustomerController extends Mage_Core_Controller_Front_Action
{
- /**
- * @return int|false
- * @throws Mage_Core_Exception
- */
- protected function _getTagId()
- {
- $tagId = (int) $this->getRequest()->getParam('tagId');
- if ($tagId) {
- $customerId = Mage::getSingleton('customer/session')->getCustomerId();
- $model = Mage::getModel('tag/tag_relation');
- $model->loadByTagCustomer(null, $tagId, $customerId);
- Mage::register('tagModel', $model);
- return $model->getTagId();
- }
- return false;
- }
-
public function indexAction()
{
if (!Mage::getSingleton('customer/session')->isLoggedIn()) {
@@ -135,4 +118,20 @@ public function saveAction()
{
$this->_forward('noRoute');
}
+ /**
+ * @return int|false
+ * @throws Mage_Core_Exception
+ */
+ protected function _getTagId()
+ {
+ $tagId = (int) $this->getRequest()->getParam('tagId');
+ if ($tagId) {
+ $customerId = Mage::getSingleton('customer/session')->getCustomerId();
+ $model = Mage::getModel('tag/tag_relation');
+ $model->loadByTagCustomer(null, $tagId, $customerId);
+ Mage::register('tagModel', $model);
+ return $model->getTagId();
+ }
+ return false;
+ }
}
diff --git a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php
index bad6eb80167..46973871bcb 100644
--- a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php
+++ b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php
@@ -36,14 +36,6 @@ class Mage_Tax_Block_Sales_Order_Tax extends Mage_Core_Block_Template
*/
protected $_source;
- /**
- * Initialize configuration object
- */
- protected function _construct()
- {
- $this->_config = Mage::getSingleton('tax/config');
- }
-
/**
* Check if we need display full tax total info
*
@@ -90,6 +82,48 @@ public function initTotals()
return $this;
}
+ /**
+ * Get order store object
+ *
+ * @return Mage_Core_Model_Store
+ */
+ public function getStore()
+ {
+ return $this->_order->getStore();
+ }
+
+ /**
+ * @return Mage_Sales_Model_Order
+ */
+ public function getOrder()
+ {
+ return $this->_order;
+ }
+
+ /**
+ * @return mixed
+ */
+ public function getLabelProperties()
+ {
+ return $this->getParentBlock()->getLabelProperties();
+ }
+
+ /**
+ * @return mixed
+ */
+ public function getValueProperties()
+ {
+ return $this->getParentBlock()->getValueProperties();
+ }
+
+ /**
+ * Initialize configuration object
+ */
+ protected function _construct()
+ {
+ $this->_config = Mage::getSingleton('tax/config');
+ }
+
/**
* Add tax total string
*
@@ -106,16 +140,6 @@ protected function _addTax($after = 'discount')
return $this;
}
- /**
- * Get order store object
- *
- * @return Mage_Core_Model_Store
- */
- public function getStore()
- {
- return $this->_order->getStore();
- }
-
/**
* @return $this
*/
@@ -290,28 +314,4 @@ protected function _initGrandTotal()
}
return $this;
}
-
- /**
- * @return Mage_Sales_Model_Order
- */
- public function getOrder()
- {
- return $this->_order;
- }
-
- /**
- * @return mixed
- */
- public function getLabelProperties()
- {
- return $this->getParentBlock()->getLabelProperties();
- }
-
- /**
- * @return mixed
- */
- public function getValueProperties()
- {
- return $this->getParentBlock()->getValueProperties();
- }
}
diff --git a/app/code/core/Mage/Tax/Helper/Data.php b/app/code/core/Mage/Tax/Helper/Data.php
index 5cd4e158f37..a8fad5869f9 100644
--- a/app/code/core/Mage/Tax/Helper/Data.php
+++ b/app/code/core/Mage/Tax/Helper/Data.php
@@ -438,29 +438,6 @@ public function getAllRatesByProductClass($store = null)
return $this->_getAllRatesByProductClass($store);
}
- /**
- * Get all tax rates JSON for all product tax classes of specific store
- *
- * array(
- * value_{$productTaxClassId} => $rate
- * )
- *
- * @param null|string|bool|int|Mage_Core_Model_Store $store
- * @return string
- */
- protected function _getAllRatesByProductClass($store = null)
- {
- $result = [];
- $calc = Mage::getSingleton('tax/calculation');
- $rates = $calc->getRatesForAllProductTaxClasses($calc->getDefaultRateRequest($store));
-
- foreach ($rates as $class => $rate) {
- $result["value_{$class}"] = $rate;
- }
-
- return Mage::helper('core')->jsonEncode($result);
- }
-
/**
* Get product price with all tax settings processing
*
@@ -606,23 +583,6 @@ public function getPrice(
}
}
- /**
- * Given a store price that includes tax at the store rate, this function will back out the store's tax, and add in
- * the customer's tax. Returns this new price which is the customer's price including tax.
- *
- * @param float $storePriceInclTax
- * @param float $storePercent
- * @param float $customerPercent
- * @param Mage_Core_Model_Store $store
- * @return float
- */
- protected function _calculatePriceInclTax($storePriceInclTax, $storePercent, $customerPercent, $store)
- {
- $priceExclTax = $this->_calculatePrice($storePriceInclTax, $storePercent, false, false);
- $customerTax = $this->getCalculator()->calcTaxAmount($priceExclTax, $customerPercent, false, false);
- return $store->roundPrice($priceExclTax + $customerTax);
- }
-
/**
* Check if we have display in catalog prices including tax
*
@@ -654,46 +614,6 @@ public function displayBothPrices($store = null)
return $this->getPriceDisplayType($store) == Mage_Tax_Model_Config::DISPLAY_TYPE_BOTH;
}
- /**
- * Calculate price including/excluding tax base on tax rate percent
- *
- * @param float $price
- * @param float $percent
- * @param bool $type true - to calculate the price including tax and false if calculating price to exclude tax
- * @param bool $roundTaxFirst
- * @return float
- */
- protected function _calculatePrice($price, $percent, $type, $roundTaxFirst = false)
- {
- $calculator = $this->getCalculator();
- if ($type) {
- $taxAmount = $calculator->calcTaxAmount($price, $percent, false, $roundTaxFirst);
- return $price + $taxAmount;
- } else {
- $taxAmount = $calculator->calcTaxAmount($price, $percent, true, $roundTaxFirst);
- return $price - $taxAmount;
- }
- }
-
- /**
- * Calculate price including tax when multiple taxes is applied and rounded
- * independently.
- *
- * @param float $price
- * @param array $appliedRates
- * @return float
- */
- protected function _calculatePriceInclTaxWithMultipleRates($price, $appliedRates)
- {
- $calculator = $this->getCalculator();
- $tax = 0;
- foreach ($appliedRates as $appliedRate) {
- $taxRate = $appliedRate['percent'];
- $tax += $calculator->round($price * $taxRate / 100);
- }
- return $tax + $price;
- }
-
/**
* Returns the include / exclude tax label
*
@@ -1055,28 +975,6 @@ public function getCalculatedTaxes($source)
return $taxClassAmount;
}
- /**
- * Returns the array of tax rates for the order
- *
- * @param Mage_Sales_Model_Order $order
- * @return array
- */
- protected function _getTaxRateSubtotals($order)
- {
- return Mage::getModel('tax/sales_order_tax')->getCollection()->loadByOrder($order)->toArray();
- }
-
- /**
- * Retrieve a value from registry by a key
- *
- * @param string $key
- * @return mixed
- */
- protected function _getFromRegistry($key)
- {
- return Mage::registry($key);
- }
-
/**
* Get calculated Shipping & Handling Tax
*
@@ -1204,6 +1102,118 @@ public function isCrossBorderTradeEnabled($store = null)
return (bool) $this->_config->crossBorderTradeEnabled($store);
}
+ /**
+ * @return void
+ * @throws Throwable
+ */
+ public function setIsIgnored(string $key, bool $value)
+ {
+ $flag = Mage::getModel('core/flag', ['flag_code' => $key])->loadSelf();
+ $flag->setFlagData($value)->save();
+ }
+
+ /**
+ * Get all tax rates JSON for all product tax classes of specific store
+ *
+ * array(
+ * value_{$productTaxClassId} => $rate
+ * )
+ *
+ * @param null|string|bool|int|Mage_Core_Model_Store $store
+ * @return string
+ */
+ protected function _getAllRatesByProductClass($store = null)
+ {
+ $result = [];
+ $calc = Mage::getSingleton('tax/calculation');
+ $rates = $calc->getRatesForAllProductTaxClasses($calc->getDefaultRateRequest($store));
+
+ foreach ($rates as $class => $rate) {
+ $result["value_{$class}"] = $rate;
+ }
+
+ return Mage::helper('core')->jsonEncode($result);
+ }
+
+ /**
+ * Given a store price that includes tax at the store rate, this function will back out the store's tax, and add in
+ * the customer's tax. Returns this new price which is the customer's price including tax.
+ *
+ * @param float $storePriceInclTax
+ * @param float $storePercent
+ * @param float $customerPercent
+ * @param Mage_Core_Model_Store $store
+ * @return float
+ */
+ protected function _calculatePriceInclTax($storePriceInclTax, $storePercent, $customerPercent, $store)
+ {
+ $priceExclTax = $this->_calculatePrice($storePriceInclTax, $storePercent, false, false);
+ $customerTax = $this->getCalculator()->calcTaxAmount($priceExclTax, $customerPercent, false, false);
+ return $store->roundPrice($priceExclTax + $customerTax);
+ }
+
+ /**
+ * Calculate price including/excluding tax base on tax rate percent
+ *
+ * @param float $price
+ * @param float $percent
+ * @param bool $type true - to calculate the price including tax and false if calculating price to exclude tax
+ * @param bool $roundTaxFirst
+ * @return float
+ */
+ protected function _calculatePrice($price, $percent, $type, $roundTaxFirst = false)
+ {
+ $calculator = $this->getCalculator();
+ if ($type) {
+ $taxAmount = $calculator->calcTaxAmount($price, $percent, false, $roundTaxFirst);
+ return $price + $taxAmount;
+ } else {
+ $taxAmount = $calculator->calcTaxAmount($price, $percent, true, $roundTaxFirst);
+ return $price - $taxAmount;
+ }
+ }
+
+ /**
+ * Calculate price including tax when multiple taxes is applied and rounded
+ * independently.
+ *
+ * @param float $price
+ * @param array $appliedRates
+ * @return float
+ */
+ protected function _calculatePriceInclTaxWithMultipleRates($price, $appliedRates)
+ {
+ $calculator = $this->getCalculator();
+ $tax = 0;
+ foreach ($appliedRates as $appliedRate) {
+ $taxRate = $appliedRate['percent'];
+ $tax += $calculator->round($price * $taxRate / 100);
+ }
+ return $tax + $price;
+ }
+
+ /**
+ * Returns the array of tax rates for the order
+ *
+ * @param Mage_Sales_Model_Order $order
+ * @return array
+ */
+ protected function _getTaxRateSubtotals($order)
+ {
+ return Mage::getModel('tax/sales_order_tax')->getCollection()->loadByOrder($order)->toArray();
+ }
+
+ /**
+ * Retrieve a value from registry by a key
+ *
+ * @param string $key
+ * @return mixed
+ */
+ protected function _getFromRegistry($key)
+ {
+ return Mage::registry($key);
+ }
+
/**
* Use flag to store ignore setting rather than config to avoid config re-init/save
* Read config value for backwards compatibility.
@@ -1225,14 +1235,4 @@ protected function _isIgnored(string $key)
}
return false;
}
-
- /**
- * @return void
- * @throws Throwable
- */
- public function setIsIgnored(string $key, bool $value)
- {
- $flag = Mage::getModel('core/flag', ['flag_code' => $key])->loadSelf();
- $flag->setFlagData($value)->save();
- }
}
diff --git a/app/code/core/Mage/Tax/Model/Calculation.php b/app/code/core/Mage/Tax/Model/Calculation.php
index 31f4978736e..d05a31b5e83 100644
--- a/app/code/core/Mage/Tax/Model/Calculation.php
+++ b/app/code/core/Mage/Tax/Model/Calculation.php
@@ -58,19 +58,6 @@ class Mage_Tax_Model_Calculation extends Mage_Core_Model_Abstract
*/
public const CALC_TAX_AFTER_DISCOUNT_ON_INCL = '1_1';
- /**
- * Identifier constant for unit based calculation
- */
- protected $_rates = [];
- /**
- * Identifier constant for row based calculation
- */
- protected $_ctc = [];
- /**
- * Identifier constant for total based calculation
- */
- protected $_ptc = [];
-
/**
* CALC_UNIT_BASE
*/
@@ -86,6 +73,19 @@ class Mage_Tax_Model_Calculation extends Mage_Core_Model_Abstract
*/
public const CALC_TOTAL_BASE = 'TOTAL_BASE_CALCULATION';
+ /**
+ * Identifier constant for unit based calculation
+ */
+ protected $_rates = [];
+ /**
+ * Identifier constant for row based calculation
+ */
+ protected $_ctc = [];
+ /**
+ * Identifier constant for total based calculation
+ */
+ protected $_ptc = [];
+
/**
* Cache to hold the rates
*
@@ -121,11 +121,6 @@ class Mage_Tax_Model_Calculation extends Mage_Core_Model_Abstract
*/
protected $_taxHelper;
- protected function _construct()
- {
- $this->_init('tax/calculation');
- }
-
/**
* Initialize tax helper
*/
@@ -235,28 +230,6 @@ public function getProductTaxClasses($ruleId)
return $this->_ptc[$ruleId];
}
- /**
- * Aggregate tax calculation data to array
- *
- * @return array
- */
- protected function _formCalculationProcess()
- {
- $title = $this->getRateTitle();
- $value = $this->getRateValue();
- $id = $this->getRateId();
-
- $rate = [
- 'code' => $title, 'title' => $title, 'percent' => $value, 'position' => 1, 'priority' => 1];
-
- $process = [];
- $process['percent'] = $value;
- $process['id'] = "{$id}-{$value}";
- $process['rates'][] = $rate;
-
- return [$process];
- }
-
/**
* Get calculation tax rate by specific request
*
@@ -289,19 +262,6 @@ public function getRate($request)
return $this->_rateCache[$cacheKey];
}
- /**
- * Get cache key value for specific tax rate request
- *
- * @param Varien_Object $request
- * @return string
- */
- protected function _getRequestCacheKey($request)
- {
- $key = $request->getStore() ? $request->getStore()->getId() . '|' : '';
- return $key . ($request->getProductClassId() . '|' . $request->getCustomerClassId() . '|'
- . $request->getCountryId() . '|' . $request->getRegionId() . '|' . $request->getPostcode());
- }
-
/**
* Get tax rate based on store shipping origin address settings
* This rate can be used for conversion store price including tax to
@@ -525,29 +485,6 @@ public function compareRequests($first, $second)
return $identical;
}
- /**
- * Gets the tax rates by type
- *
- * @param Varien_Object $request
- * @param string $fieldName
- * @param string $type
- * @return array
- */
- protected function _getRates($request, $fieldName, $type)
- {
- $result = [];
- $classes = Mage::getModel('tax/class')->getCollection()
- ->addFieldToFilter('class_type', $type)
- ->load();
- /** @var Mage_Tax_Model_Class $class */
- foreach ($classes as $class) {
- $request->setData($fieldName, $class->getId());
- $result[$class->getId()] = $this->getRate($request);
- }
-
- return $result;
- }
-
/**
* Gets rates for all the product tax classes
*
@@ -706,4 +643,67 @@ public function roundDown($price)
{
return floor($price * 100) / 100;
}
+
+ protected function _construct()
+ {
+ $this->_init('tax/calculation');
+ }
+
+ /**
+ * Aggregate tax calculation data to array
+ *
+ * @return array
+ */
+ protected function _formCalculationProcess()
+ {
+ $title = $this->getRateTitle();
+ $value = $this->getRateValue();
+ $id = $this->getRateId();
+
+ $rate = [
+ 'code' => $title, 'title' => $title, 'percent' => $value, 'position' => 1, 'priority' => 1];
+
+ $process = [];
+ $process['percent'] = $value;
+ $process['id'] = "{$id}-{$value}";
+ $process['rates'][] = $rate;
+
+ return [$process];
+ }
+
+ /**
+ * Get cache key value for specific tax rate request
+ *
+ * @param Varien_Object $request
+ * @return string
+ */
+ protected function _getRequestCacheKey($request)
+ {
+ $key = $request->getStore() ? $request->getStore()->getId() . '|' : '';
+ return $key . ($request->getProductClassId() . '|' . $request->getCustomerClassId() . '|'
+ . $request->getCountryId() . '|' . $request->getRegionId() . '|' . $request->getPostcode());
+ }
+
+ /**
+ * Gets the tax rates by type
+ *
+ * @param Varien_Object $request
+ * @param string $fieldName
+ * @param string $type
+ * @return array
+ */
+ protected function _getRates($request, $fieldName, $type)
+ {
+ $result = [];
+ $classes = Mage::getModel('tax/class')->getCollection()
+ ->addFieldToFilter('class_type', $type)
+ ->load();
+ /** @var Mage_Tax_Model_Class $class */
+ foreach ($classes as $class) {
+ $request->setData($fieldName, $class->getId());
+ $result[$class->getId()] = $this->getRate($request);
+ }
+
+ return $result;
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Calculation/Rate.php
index 1e49eb589d6..8c0af6ef7d5 100644
--- a/app/code/core/Mage/Tax/Model/Calculation/Rate.php
+++ b/app/code/core/Mage/Tax/Model/Calculation/Rate.php
@@ -62,6 +62,82 @@ class Mage_Tax_Model_Calculation_Rate extends Mage_Core_Model_Abstract
*/
protected $_titleModel = null;
+ /**
+ * Saves the tax titles
+ *
+ * @param array | null $titles
+ */
+ public function saveTitles($titles = null)
+ {
+ if (is_null($titles)) {
+ $titles = $this->getTitle();
+ }
+
+ $this->getTitleModel()->deleteByRateId($this->getId());
+ if (is_array($titles) && $titles) {
+ foreach ($titles as $store => $title) {
+ if ($title !== '') {
+ $this->getTitleModel()
+ ->setId(null)
+ ->setTaxCalculationRateId($this->getId())
+ ->setStoreId((int) $store)
+ ->setValue($title)
+ ->save();
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns the Mage_Tax_Model_Calculation_Rate_Title
+ *
+ * @return Mage_Tax_Model_Calculation_Rate_Title
+ */
+ public function getTitleModel()
+ {
+ if (is_null($this->_titleModel)) {
+ $this->_titleModel = Mage::getModel('tax/calculation_rate_title');
+ }
+ return $this->_titleModel;
+ }
+
+ /**
+ * Returns the list of tax titles
+ *
+ * @return array
+ */
+ public function getTitles()
+ {
+ if (is_null($this->_titles)) {
+ $this->_titles = $this->getTitleModel()->getCollection()->loadByRateId($this->getId());
+ }
+ return $this->_titles;
+ }
+
+ /**
+ * Deletes all tax rates
+ *
+ * @return $this
+ */
+ public function deleteAllRates()
+ {
+ $this->_getResource()->deleteAllRates();
+ Mage::dispatchEvent('tax_settings_change_after');
+ return $this;
+ }
+
+ /**
+ * Load rate model by code
+ *
+ * @param string $code
+ * @return $this
+ */
+ public function loadByCode($code)
+ {
+ $this->load($code, 'code');
+ return $this;
+ }
+
/**
* Varien model constructor
*/
@@ -166,82 +242,6 @@ protected function _afterDelete()
return parent::_afterDelete();
}
- /**
- * Saves the tax titles
- *
- * @param array | null $titles
- */
- public function saveTitles($titles = null)
- {
- if (is_null($titles)) {
- $titles = $this->getTitle();
- }
-
- $this->getTitleModel()->deleteByRateId($this->getId());
- if (is_array($titles) && $titles) {
- foreach ($titles as $store => $title) {
- if ($title !== '') {
- $this->getTitleModel()
- ->setId(null)
- ->setTaxCalculationRateId($this->getId())
- ->setStoreId((int) $store)
- ->setValue($title)
- ->save();
- }
- }
- }
- }
-
- /**
- * Returns the Mage_Tax_Model_Calculation_Rate_Title
- *
- * @return Mage_Tax_Model_Calculation_Rate_Title
- */
- public function getTitleModel()
- {
- if (is_null($this->_titleModel)) {
- $this->_titleModel = Mage::getModel('tax/calculation_rate_title');
- }
- return $this->_titleModel;
- }
-
- /**
- * Returns the list of tax titles
- *
- * @return array
- */
- public function getTitles()
- {
- if (is_null($this->_titles)) {
- $this->_titles = $this->getTitleModel()->getCollection()->loadByRateId($this->getId());
- }
- return $this->_titles;
- }
-
- /**
- * Deletes all tax rates
- *
- * @return $this
- */
- public function deleteAllRates()
- {
- $this->_getResource()->deleteAllRates();
- Mage::dispatchEvent('tax_settings_change_after');
- return $this;
- }
-
- /**
- * Load rate model by code
- *
- * @param string $code
- * @return $this
- */
- public function loadByCode($code)
- {
- $this->load($code, 'code');
- return $this;
- }
-
/**
* Check if rate exists in tax rule
*
diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php
index c907cb92129..f74ebe53040 100644
--- a/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php
+++ b/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php
@@ -33,11 +33,6 @@
*/
class Mage_Tax_Model_Calculation_Rate_Title extends Mage_Core_Model_Abstract
{
- protected function _construct()
- {
- $this->_init('tax/calculation_rate_title');
- }
-
/**
* @param int $rateId
* @return $this
@@ -47,4 +42,8 @@ public function deleteByRateId($rateId)
$this->getResource()->deleteByRateId($rateId);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('tax/calculation_rate_title');
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Calculation/Rule.php
index e17dbad2fda..0a3816e02f3 100644
--- a/app/code/core/Mage/Tax/Model/Calculation/Rule.php
+++ b/app/code/core/Mage/Tax/Model/Calculation/Rule.php
@@ -86,40 +86,6 @@ class Mage_Tax_Model_Calculation_Rule extends Mage_Core_Model_Abstract
*/
protected $_calculationModel = null;
- /**
- * Varien model constructor
- */
- protected function _construct()
- {
- $this->_init('tax/calculation_rule');
- }
-
- /**
- * After save rule
- * Re - declared for populate rate calculations
- *
- * @return $this
- */
- protected function _afterSave()
- {
- parent::_afterSave();
- $this->saveCalculationData();
- Mage::dispatchEvent('tax_settings_change_after');
- return $this;
- }
-
- /**
- * After rule delete
- * redeclared for dispatch tax_settings_change_after event
- *
- * @inheritDoc
- */
- protected function _afterDelete()
- {
- Mage::dispatchEvent('tax_settings_change_after');
- return parent::_afterDelete();
- }
-
/**
* Saves the Calculation Data
*/
@@ -193,4 +159,38 @@ public function fetchRuleCodes($rateId, $customerTaxClassId, $productTaxClassId)
{
return $this->getResource()->fetchRuleCodes($rateId, $customerTaxClassId, $productTaxClassId);
}
+
+ /**
+ * Varien model constructor
+ */
+ protected function _construct()
+ {
+ $this->_init('tax/calculation_rule');
+ }
+
+ /**
+ * After save rule
+ * Re - declared for populate rate calculations
+ *
+ * @return $this
+ */
+ protected function _afterSave()
+ {
+ parent::_afterSave();
+ $this->saveCalculationData();
+ Mage::dispatchEvent('tax_settings_change_after');
+ return $this;
+ }
+
+ /**
+ * After rule delete
+ * redeclared for dispatch tax_settings_change_after event
+ *
+ * @inheritDoc
+ */
+ protected function _afterDelete()
+ {
+ Mage::dispatchEvent('tax_settings_change_after');
+ return parent::_afterDelete();
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Config.php b/app/code/core/Mage/Tax/Model/Config.php
index fbabd8cc268..400fa131204 100644
--- a/app/code/core/Mage/Tax/Model/Config.php
+++ b/app/code/core/Mage/Tax/Model/Config.php
@@ -145,18 +145,6 @@ class Mage_Tax_Model_Config
*/
protected $_shippingPriceIncludeTax = null;
- /**
- * Retrieve config value for store by path
- *
- * @param string $path
- * @param null|string|bool|int|Mage_Core_Model_Store $store
- * @return mixed
- */
- protected function _getStoreConfig($path, $store)
- {
- return Mage::getStoreConfig($path, $store);
- }
-
/**
* Check if product prices inputted include tax
*
@@ -759,4 +747,16 @@ public function crossBorderTradeEnabled($store = null)
{
return $this->_getStoreConfig(self::CONFIG_XML_PATH_CROSS_BORDER_TRADE_ENABLED, $store);
}
+
+ /**
+ * Retrieve config value for store by path
+ *
+ * @param string $path
+ * @param null|string|bool|int|Mage_Core_Model_Store $store
+ * @return mixed
+ */
+ protected function _getStoreConfig($path, $store)
+ {
+ return Mage::getStoreConfig($path, $store);
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation.php b/app/code/core/Mage/Tax/Model/Resource/Calculation.php
index e386a0006fa..9da5daadf0d 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Calculation.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Calculation.php
@@ -36,11 +36,6 @@ class Mage_Tax_Model_Resource_Calculation extends Mage_Core_Model_Resource_Db_Ab
*/
protected $_isPkAutoIncrement = false;
- protected function _construct()
- {
- $this->_setMainTable('tax/tax_calculation');
- }
-
/**
* Delete calculation settings by rule id
*
@@ -185,6 +180,131 @@ public function getCalculationProcess($request, $rates = null)
return $result;
}
+ /**
+ * Get rate ids applicable for some address
+ *
+ * @param Varien_Object $request
+ * @return array
+ */
+ public function getApplicableRateIds($request)
+ {
+ $countryId = $request->getCountryId();
+ $regionId = $request->getRegionId();
+ $postcode = $request->getPostcode();
+
+ $select = $this->_getReadAdapter()->select()
+ ->from(['rate' => $this->getTable('tax/tax_calculation_rate')], ['tax_calculation_rate_id'])
+ ->where('rate.tax_country_id = ?', $countryId)
+ ->where('rate.tax_region_id IN(?)', [0, (int) $regionId]);
+
+ $expr = $this->_getWriteAdapter()->getCheckSql(
+ 'zip_is_range is NULL',
+ $this->_getWriteAdapter()->quoteInto(
+ "rate.tax_postcode IS NULL OR rate.tax_postcode IN('*', '', ?)",
+ $this->_createSearchPostCodeTemplates($postcode),
+ ),
+ $this->_getWriteAdapter()->quoteInto('? BETWEEN rate.zip_from AND rate.zip_to', $postcode),
+ );
+ $select->where($expr);
+ $select->order('tax_calculation_rate_id');
+ return $this->_getReadAdapter()->fetchCol($select);
+ }
+
+ /**
+ * Retrieve rate ids
+ *
+ * @param Varien_Object $request
+ * @return array
+ */
+ public function getRateIds($request)
+ {
+ $result = [];
+ $rates = $this->_getRates($request);
+ $countedRates = count($rates);
+ for ($i = 0; $i < $countedRates; $i++) {
+ $rate = $rates[$i];
+ $rule = $rate['tax_calculation_rule_id'];
+ $result[] = $rate['tax_calculation_rate_id'];
+ while (isset($rates[$i + 1]) && $rates[$i + 1]['tax_calculation_rule_id'] == $rule) {
+ $i++;
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Retrieve rates by customer tax class
+ *
+ * @param int $customerTaxClass
+ * @param int|null $productTaxClass
+ * @return array
+ */
+ public function getRatesByCustomerTaxClass($customerTaxClass, $productTaxClass = null)
+ {
+ $adapter = $this->_getReadAdapter();
+ $customerTaxClassId = (int) $customerTaxClass;
+ $calcJoinConditions = [
+ 'calc_table.tax_calculation_rate_id = main_table.tax_calculation_rate_id',
+ $adapter->quoteInto('calc_table.customer_tax_class_id = ?', $customerTaxClassId),
+
+ ];
+ if ($productTaxClass !== null) {
+ $productTaxClassId = (int) $productTaxClass;
+ $calcJoinConditions[] = $adapter->quoteInto('calc_table.product_tax_class_id = ?', $productTaxClassId);
+ }
+
+ $selectCSP = $adapter->select();
+ $selectCSP
+ ->from(
+ ['main_table' => $this->getTable('tax/tax_calculation_rate')],
+ ['country' => 'tax_country_id', 'region_id' => 'tax_region_id', 'postcode' => 'tax_postcode'],
+ )
+ ->joinInner(
+ ['calc_table' => $this->getTable('tax/tax_calculation')],
+ implode(' AND ', $calcJoinConditions),
+ ['product_class' => 'calc_table.product_tax_class_id'],
+ )
+ ->joinLeft(
+ ['state_table' => $this->getTable('directory/country_region')],
+ 'state_table.region_id = main_table.tax_region_id',
+ ['region_code' => 'state_table.code'],
+ )
+ ->distinct(true);
+
+ $csp = $adapter->fetchAll($selectCSP);
+
+ $result = [];
+ foreach ($csp as $one) {
+ $request = new Varien_Object();
+ $request->setCountryId($one['country'])
+ ->setRegionId($one['region_id'])
+ ->setPostcode($one['postcode'])
+ ->setCustomerClassId($customerTaxClassId)
+ ->setProductClassId($one['product_class']);
+
+ $rate = $this->getRate($request);
+ if ($rate) {
+ $row = [
+ 'value' => $rate / 100,
+ 'country' => $one['country'],
+ 'state' => $one['region_code'],
+ 'postcode' => $one['postcode'],
+ 'product_class' => $one['product_class'],
+ ];
+
+ $result[] = $row;
+ }
+ }
+
+ return $result;
+ }
+
+ protected function _construct()
+ {
+ $this->_setMainTable('tax/tax_calculation');
+ }
+
/**
* Return combined percent value
*
@@ -357,36 +477,6 @@ protected function _getRates($request)
return $this->_ratesCache[$cacheKey];
}
- /**
- * Get rate ids applicable for some address
- *
- * @param Varien_Object $request
- * @return array
- */
- public function getApplicableRateIds($request)
- {
- $countryId = $request->getCountryId();
- $regionId = $request->getRegionId();
- $postcode = $request->getPostcode();
-
- $select = $this->_getReadAdapter()->select()
- ->from(['rate' => $this->getTable('tax/tax_calculation_rate')], ['tax_calculation_rate_id'])
- ->where('rate.tax_country_id = ?', $countryId)
- ->where('rate.tax_region_id IN(?)', [0, (int) $regionId]);
-
- $expr = $this->_getWriteAdapter()->getCheckSql(
- 'zip_is_range is NULL',
- $this->_getWriteAdapter()->quoteInto(
- "rate.tax_postcode IS NULL OR rate.tax_postcode IN('*', '', ?)",
- $this->_createSearchPostCodeTemplates($postcode),
- ),
- $this->_getWriteAdapter()->quoteInto('? BETWEEN rate.zip_from AND rate.zip_to', $postcode),
- );
- $select->where($expr);
- $select->order('tax_calculation_rate_id');
- return $this->_getReadAdapter()->fetchCol($select);
- }
-
/**
* Calculate rate
*
@@ -422,94 +512,4 @@ protected function _calculateRate($rates)
return $result;
}
-
- /**
- * Retrieve rate ids
- *
- * @param Varien_Object $request
- * @return array
- */
- public function getRateIds($request)
- {
- $result = [];
- $rates = $this->_getRates($request);
- $countedRates = count($rates);
- for ($i = 0; $i < $countedRates; $i++) {
- $rate = $rates[$i];
- $rule = $rate['tax_calculation_rule_id'];
- $result[] = $rate['tax_calculation_rate_id'];
- while (isset($rates[$i + 1]) && $rates[$i + 1]['tax_calculation_rule_id'] == $rule) {
- $i++;
- }
- }
-
- return $result;
- }
-
- /**
- * Retrieve rates by customer tax class
- *
- * @param int $customerTaxClass
- * @param int|null $productTaxClass
- * @return array
- */
- public function getRatesByCustomerTaxClass($customerTaxClass, $productTaxClass = null)
- {
- $adapter = $this->_getReadAdapter();
- $customerTaxClassId = (int) $customerTaxClass;
- $calcJoinConditions = [
- 'calc_table.tax_calculation_rate_id = main_table.tax_calculation_rate_id',
- $adapter->quoteInto('calc_table.customer_tax_class_id = ?', $customerTaxClassId),
-
- ];
- if ($productTaxClass !== null) {
- $productTaxClassId = (int) $productTaxClass;
- $calcJoinConditions[] = $adapter->quoteInto('calc_table.product_tax_class_id = ?', $productTaxClassId);
- }
-
- $selectCSP = $adapter->select();
- $selectCSP
- ->from(
- ['main_table' => $this->getTable('tax/tax_calculation_rate')],
- ['country' => 'tax_country_id', 'region_id' => 'tax_region_id', 'postcode' => 'tax_postcode'],
- )
- ->joinInner(
- ['calc_table' => $this->getTable('tax/tax_calculation')],
- implode(' AND ', $calcJoinConditions),
- ['product_class' => 'calc_table.product_tax_class_id'],
- )
- ->joinLeft(
- ['state_table' => $this->getTable('directory/country_region')],
- 'state_table.region_id = main_table.tax_region_id',
- ['region_code' => 'state_table.code'],
- )
- ->distinct(true);
-
- $csp = $adapter->fetchAll($selectCSP);
-
- $result = [];
- foreach ($csp as $one) {
- $request = new Varien_Object();
- $request->setCountryId($one['country'])
- ->setRegionId($one['region_id'])
- ->setPostcode($one['postcode'])
- ->setCustomerClassId($customerTaxClassId)
- ->setProductClassId($one['product_class']);
-
- $rate = $this->getRate($request);
- if ($rate) {
- $row = [
- 'value' => $rate / 100,
- 'country' => $one['country'],
- 'state' => $one['region_code'],
- 'postcode' => $one['postcode'],
- 'product_class' => $one['product_class'],
- ];
-
- $result[] = $row;
- }
- }
-
- return $result;
- }
}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php
index e7546bfdeaf..10db6827d80 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php
@@ -22,25 +22,6 @@
*/
class Mage_Tax_Model_Resource_Calculation_Rate extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('tax/tax_calculation_rate', 'tax_calculation_rate_id');
- }
-
- /**
- * Initialize unique fields
- *
- * @return $this
- */
- protected function _initUniqueFields()
- {
- $this->_uniqueFields = [[
- 'field' => ['code'],
- 'title' => Mage::helper('tax')->__('Code'),
- ]];
- return $this;
- }
-
/**
* Delete all rates
*
@@ -66,4 +47,22 @@ public function isInRule($rateId)
->where('tax_calculation_rate_id = ?', $rateId);
return $adapter->fetchCol($select);
}
+ protected function _construct()
+ {
+ $this->_init('tax/tax_calculation_rate', 'tax_calculation_rate_id');
+ }
+
+ /**
+ * Initialize unique fields
+ *
+ * @return $this
+ */
+ protected function _initUniqueFields()
+ {
+ $this->_uniqueFields = [[
+ 'field' => ['code'],
+ 'title' => Mage::helper('tax')->__('Code'),
+ ]];
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php
index 3477a306b4e..e961763624e 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php
@@ -29,11 +29,6 @@ class Mage_Tax_Model_Resource_Calculation_Rate_Collection extends Mage_Core_Mode
*/
public const TAX_RULES_CHUNK_SIZE = 1000;
- protected function _construct()
- {
- $this->_init('tax/calculation_rate');
- }
-
/**
* Join country table to result
*
@@ -182,4 +177,9 @@ public function getOptionRates()
return $rates;
}
+
+ protected function _construct()
+ {
+ $this->_init('tax/calculation_rate');
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php
index c53d146599c..d6a07d82e32 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php
@@ -22,11 +22,6 @@
*/
class Mage_Tax_Model_Resource_Calculation_Rate_Title extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('tax/tax_calculation_rate_title', 'tax_calculation_rate_title_id');
- }
-
/**
* Delete title by rate identifier
*
@@ -41,4 +36,8 @@ public function deleteByRateId($rateId)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('tax/tax_calculation_rate_title', 'tax_calculation_rate_title_id');
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php
index b6a3db3fe4d..1c23b53588d 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php
@@ -24,11 +24,6 @@
*/
class Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('tax/calculation_rate_title', 'tax/calculation_rate_title');
- }
-
/**
* Add rate id filter
*
@@ -40,4 +35,8 @@ public function loadByRateId($rateId)
$this->addFieldToFilter('main_table.tax_calculation_rate_id', $rateId);
return $this->load();
}
+ protected function _construct()
+ {
+ $this->_init('tax/calculation_rate_title', 'tax/calculation_rate_title');
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php
index 791fc9e89eb..eb92f7a9ede 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php
@@ -22,25 +22,6 @@
*/
class Mage_Tax_Model_Resource_Calculation_Rule extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('tax/tax_calculation_rule', 'tax_calculation_rule_id');
- }
-
- /**
- * Initialize unique fields
- *
- * @return $this
- */
- protected function _initUniqueFields()
- {
- $this->_uniqueFields = [[
- 'field' => ['code'],
- 'title' => Mage::helper('tax')->__('Code'),
- ]];
- return $this;
- }
-
/**
* Fetches rules by rate, customer tax class and product tax class
* Returns array of rule codes
@@ -67,4 +48,22 @@ public function fetchRuleCodes($rateId, $customerTaxClassId, $productTaxClassId)
return $adapter->fetchCol($select);
}
+ protected function _construct()
+ {
+ $this->_init('tax/tax_calculation_rule', 'tax_calculation_rule_id');
+ }
+
+ /**
+ * Initialize unique fields
+ *
+ * @return $this
+ */
+ protected function _initUniqueFields()
+ {
+ $this->_uniqueFields = [[
+ 'field' => ['code'],
+ 'title' => Mage::helper('tax')->__('Code'),
+ ]];
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php
index edd4f23c41c..eca9e7f3f9b 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php
@@ -24,11 +24,6 @@
*/
class Mage_Tax_Model_Resource_Calculation_Rule_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('tax/calculation_rule');
- }
-
/**
* Join calculation data to result
*
@@ -47,52 +42,6 @@ public function joinCalculationData($alias)
return $this;
}
- /**
- * Join tax data to collection
- *
- * @param string $itemTable
- * @param string $primaryJoinField
- * @param string $secondaryJoinField
- * @param string $titleField
- * @param string $dataField
- * @return $this
- */
- protected function _add($itemTable, $primaryJoinField, $secondaryJoinField, $titleField, $dataField)
- {
- $children = [];
- foreach ($this as $rule) {
- $children[$rule->getId()] = [];
- }
- if (!empty($children)) {
- $joinCondition = sprintf('item.%s = calculation.%s', $secondaryJoinField, $primaryJoinField);
- $select = $this->getConnection()->select()
- ->from(
- ['calculation' => $this->getTable('tax/tax_calculation')],
- ['calculation.tax_calculation_rule_id'],
- )
- ->join(
- ['item' => $this->getTable($itemTable)],
- $joinCondition,
- ["item.{$titleField}", "item.{$secondaryJoinField}"],
- )
- ->where('calculation.tax_calculation_rule_id IN (?)', array_keys($children))
- ->distinct(true);
-
- $data = $this->getConnection()->fetchAll($select);
- foreach ($data as $row) {
- $children[$row['tax_calculation_rule_id']][$row[$secondaryJoinField]] = $row[$titleField];
- }
- }
-
- foreach ($this as $rule) {
- if (isset($children[$rule->getId()])) {
- $rule->setData($dataField, array_keys($children[$rule->getId()]));
- }
- }
-
- return $this;
- }
-
/**
* Add product tax classes to result
*
@@ -148,4 +97,54 @@ public function setClassTypeFilter($type, $id)
$this->addFieldToFilter($field, $id);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('tax/calculation_rule');
+ }
+
+ /**
+ * Join tax data to collection
+ *
+ * @param string $itemTable
+ * @param string $primaryJoinField
+ * @param string $secondaryJoinField
+ * @param string $titleField
+ * @param string $dataField
+ * @return $this
+ */
+ protected function _add($itemTable, $primaryJoinField, $secondaryJoinField, $titleField, $dataField)
+ {
+ $children = [];
+ foreach ($this as $rule) {
+ $children[$rule->getId()] = [];
+ }
+ if (!empty($children)) {
+ $joinCondition = sprintf('item.%s = calculation.%s', $secondaryJoinField, $primaryJoinField);
+ $select = $this->getConnection()->select()
+ ->from(
+ ['calculation' => $this->getTable('tax/tax_calculation')],
+ ['calculation.tax_calculation_rule_id'],
+ )
+ ->join(
+ ['item' => $this->getTable($itemTable)],
+ $joinCondition,
+ ["item.{$titleField}", "item.{$secondaryJoinField}"],
+ )
+ ->where('calculation.tax_calculation_rule_id IN (?)', array_keys($children))
+ ->distinct(true);
+
+ $data = $this->getConnection()->fetchAll($select);
+ foreach ($data as $row) {
+ $children[$row['tax_calculation_rule_id']][$row[$secondaryJoinField]] = $row[$titleField];
+ }
+ }
+
+ foreach ($this as $rule) {
+ if (isset($children[$rule->getId()])) {
+ $rule->setData($dataField, array_keys($children[$rule->getId()]));
+ }
+ }
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php
index 36456a458b9..24d4622a7f7 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php
@@ -22,11 +22,6 @@
*/
class Mage_Tax_Model_Resource_Report_Tax extends Mage_Reports_Model_Resource_Report_Abstract
{
- protected function _construct()
- {
- $this->_init('tax/tax_order_aggregated_created', 'id');
- }
-
/**
* Aggregate Tax data
*
@@ -42,4 +37,8 @@ public function aggregate($from = null, $to = null)
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('tax/tax_order_aggregated_created', 'id');
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php
index b2561e8a7eb..a3cd95dbc51 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php
@@ -22,11 +22,6 @@
*/
class Mage_Tax_Model_Resource_Report_Tax_Createdat extends Mage_Reports_Model_Resource_Report_Abstract
{
- protected function _construct()
- {
- $this->_init('tax/tax_order_aggregated_created', 'id');
- }
-
/**
* Aggregate Tax data by order created at
*
@@ -38,6 +33,10 @@ public function aggregate($from = null, $to = null)
{
return $this->_aggregateByOrder('created_at', $from, $to);
}
+ protected function _construct()
+ {
+ $this->_init('tax/tax_order_aggregated_created', 'id');
+ }
/**
* Aggregate Tax data by orders
diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php
index 02a12339836..0f373aa8487 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php
@@ -22,11 +22,6 @@
*/
class Mage_Tax_Model_Resource_Report_Tax_Updatedat extends Mage_Tax_Model_Resource_Report_Tax_Createdat
{
- protected function _construct()
- {
- $this->_init('tax/tax_order_aggregated_updated', 'id');
- }
-
/**
* Aggregate Tax data by order updated at
*
@@ -38,4 +33,8 @@ public function aggregate($from = null, $to = null)
{
return $this->_aggregateByOrder('updated_at', $from, $to);
}
+ protected function _construct()
+ {
+ $this->_init('tax/tax_order_aggregated_updated', 'id');
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Collection.php
index 074ab0c09e0..dbc8aa3dfde 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Collection.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Collection.php
@@ -24,11 +24,6 @@
*/
class Mage_Tax_Model_Resource_Sales_Order_Tax_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('tax/sales_order_tax');
- }
-
/**
* Retrieve order tax collection by order identifier
*
@@ -43,4 +38,8 @@ public function loadByOrder($order)
->order('process');
return $this->load();
}
+ protected function _construct()
+ {
+ $this->_init('tax/sales_order_tax');
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php
index ceaa8fc5244..bfc6f98cf67 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php
@@ -22,11 +22,6 @@
*/
class Mage_Tax_Model_Resource_Sales_Order_Tax_Item extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('tax/sales_order_tax_item', 'tax_item_id');
- }
-
/**
* Get Tax Items with order tax information
*
@@ -48,4 +43,8 @@ public function getTaxItemsByItemId($itemId)
// phpcs:ignore Ecg.Performance.FetchAll.Found
return $adapter->fetchAll($select);
}
+ protected function _construct()
+ {
+ $this->_init('tax/sales_order_tax_item', 'tax_item_id');
+ }
}
diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
index 50a9ab2c3da..7f60f0533ea 100644
--- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
@@ -96,49 +96,6 @@ public function __construct()
$this->_weeeHelper = Mage::helper('weee');
}
- /**
- * Round the total amounts in address
- *
- * @return $this
- */
- protected function _roundTotals(Mage_Sales_Model_Quote_Address $address)
- {
- // initialize the delta to a small number to avoid non-deterministic behavior with rounding of 0.5
- $totalDelta = 0.000001;
- $baseTotalDelta = 0.000001;
- /*
- * The order of rounding is import here.
- * Tax is rounded first, to be consistent with unit based calculation.
- * Hidden tax and shipping_hidden_tax are rounded next, which are really part of tax.
- * Shipping is rounded before subtotal to minimize the chance that subtotal is
- * rounded differently because of the delta.
- * Here is an example: 19.2% tax rate, subtotal = 49.95, shipping = 9.99, discount = 20%
- * subtotalExclTax = 41.90436, tax = 7.7238, hidden_tax = 1.609128, shippingPriceExclTax = 8.38087
- * shipping_hidden_tax = 0.321826, discount = -11.988
- * The grand total is 47.952 ~= 47.95
- * The rounded values are:
- * tax = 7.72, hidden_tax = 1.61, shipping_hidden_tax = 0.32,
- * shipping = 8.39 (instead of 8.38 from simple rounding), subtotal = 41.9, discount = -11.99
- * The grand total calculated from the rounded value is 47.95
- * If we simply round each value and add them up, the result is 47.94, which is one penny off
- */
- $totalCodes = ['tax', 'hidden_tax', 'shipping_hidden_tax', 'shipping', 'subtotal', 'weee', 'discount'];
- foreach ($totalCodes as $totalCode) {
- $exactAmount = $address->getTotalAmount($totalCode);
- $baseExactAmount = $address->getBaseTotalAmount($totalCode);
- if (!$exactAmount && !$baseExactAmount) {
- continue;
- }
- $roundedAmount = $this->_calculator->round($exactAmount + $totalDelta);
- $baseRoundedAmount = $this->_calculator->round($baseExactAmount + $baseTotalDelta);
- $address->setTotalAmount($totalCode, $roundedAmount);
- $address->setBaseTotalAmount($totalCode, $baseRoundedAmount);
- $totalDelta = $exactAmount + $totalDelta - $roundedAmount;
- $baseTotalDelta = $baseExactAmount + $baseTotalDelta - $baseRoundedAmount;
- }
- return $this;
- }
-
/**
* Collect tax totals for quote address
*
@@ -210,6 +167,145 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
return $this;
}
+ /**
+ * Add tax totals information to address object
+ *
+ * @return $this
+ */
+ public function fetch(Mage_Sales_Model_Quote_Address $address)
+ {
+ $applied = $address->getAppliedTaxes();
+ $store = $address->getQuote()->getStore();
+ $amount = $address->getTaxAmount();
+
+ $items = $this->_getAddressItems($address);
+ $discountTaxCompensation = 0;
+ foreach ($items as $item) {
+ $discountTaxCompensation += $item->getDiscountTaxCompensation();
+ }
+ $taxAmount = $amount + $discountTaxCompensation;
+ /*
+ * when weee discount is not included in extraTaxAmount, we need to add it to the total tax
+ */
+ if ($this->_weeeHelper->isEnabled()) {
+ if (!$this->_weeeHelper->includeInSubtotal()) {
+ $taxAmount += $address->getWeeeDiscount();
+ }
+ }
+
+ $area = null;
+ if ($this->_config->displayCartTaxWithGrandTotal($store) && $address->getGrandTotal()) {
+ $area = 'taxes';
+ }
+
+ if (($amount != 0) || ($this->_config->displayCartZeroTax($store))) {
+ $address->addTotal([
+ 'code' => $this->getCode(),
+ 'title' => Mage::helper('tax')->__('Tax'),
+ 'full_info' => $applied ? $applied : [],
+ 'value' => $amount,
+ 'area' => $area,
+ ]);
+ }
+
+ $store = $address->getQuote()->getStore();
+ /**
+ * Modify subtotal
+ */
+ if ($this->_config->displayCartSubtotalBoth($store) || $this->_config->displayCartSubtotalInclTax($store)) {
+ if ($address->getSubtotalInclTax() > 0) {
+ $subtotalInclTax = $address->getSubtotalInclTax();
+ } else {
+ $subtotalInclTax = $address->getSubtotal() + $taxAmount - $address->getShippingTaxAmount();
+ }
+
+ $address->addTotal([
+ 'code' => 'subtotal',
+ 'title' => Mage::helper('sales')->__('Subtotal'),
+ 'value' => $subtotalInclTax,
+ 'value_incl_tax' => $subtotalInclTax,
+ 'value_excl_tax' => $address->getSubtotal(),
+ ]);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Process model configuration array.
+ * This method can be used for changing totals collect sort order
+ *
+ * @param array $config
+ * @param Mage_Core_Model_Store $store
+ * @return array
+ */
+ public function processConfigArray($config, $store)
+ {
+ $calculationSequence = $this->_helper->getCalculationSequence($store);
+ switch ($calculationSequence) {
+ case Mage_Tax_Model_Calculation::CALC_TAX_BEFORE_DISCOUNT_ON_INCL:
+ $config['before'][] = 'discount';
+ break;
+ default:
+ $config['after'][] = 'discount';
+ break;
+ }
+ return $config;
+ }
+
+ /**
+ * Get Tax label
+ *
+ * @return string
+ */
+ public function getLabel()
+ {
+ return Mage::helper('tax')->__('Tax');
+ }
+
+ /**
+ * Round the total amounts in address
+ *
+ * @return $this
+ */
+ protected function _roundTotals(Mage_Sales_Model_Quote_Address $address)
+ {
+ // initialize the delta to a small number to avoid non-deterministic behavior with rounding of 0.5
+ $totalDelta = 0.000001;
+ $baseTotalDelta = 0.000001;
+ /*
+ * The order of rounding is import here.
+ * Tax is rounded first, to be consistent with unit based calculation.
+ * Hidden tax and shipping_hidden_tax are rounded next, which are really part of tax.
+ * Shipping is rounded before subtotal to minimize the chance that subtotal is
+ * rounded differently because of the delta.
+ * Here is an example: 19.2% tax rate, subtotal = 49.95, shipping = 9.99, discount = 20%
+ * subtotalExclTax = 41.90436, tax = 7.7238, hidden_tax = 1.609128, shippingPriceExclTax = 8.38087
+ * shipping_hidden_tax = 0.321826, discount = -11.988
+ * The grand total is 47.952 ~= 47.95
+ * The rounded values are:
+ * tax = 7.72, hidden_tax = 1.61, shipping_hidden_tax = 0.32,
+ * shipping = 8.39 (instead of 8.38 from simple rounding), subtotal = 41.9, discount = -11.99
+ * The grand total calculated from the rounded value is 47.95
+ * If we simply round each value and add them up, the result is 47.94, which is one penny off
+ */
+ $totalCodes = ['tax', 'hidden_tax', 'shipping_hidden_tax', 'shipping', 'subtotal', 'weee', 'discount'];
+ foreach ($totalCodes as $totalCode) {
+ $exactAmount = $address->getTotalAmount($totalCode);
+ $baseExactAmount = $address->getBaseTotalAmount($totalCode);
+ if (!$exactAmount && !$baseExactAmount) {
+ continue;
+ }
+ $roundedAmount = $this->_calculator->round($exactAmount + $totalDelta);
+ $baseRoundedAmount = $this->_calculator->round($baseExactAmount + $baseTotalDelta);
+ $address->setTotalAmount($totalCode, $roundedAmount);
+ $address->setBaseTotalAmount($totalCode, $baseRoundedAmount);
+ $totalDelta = $exactAmount + $totalDelta - $roundedAmount;
+ $baseTotalDelta = $baseExactAmount + $baseTotalDelta - $baseRoundedAmount;
+ }
+ return $this;
+ }
+
/**
* Process hidden taxes for items and shipping (in accordance with hidden tax type)
*/
@@ -1433,37 +1529,6 @@ protected function _calculateRowWeeeTax($discountAmount, $item, $rate, $base = t
return $this->_getWeeeTax($rate, $item, $discountAmount, $totalWeeeAmountInclTax, $totalWeeeAmountExclTax);
}
- /**
- * Calculate the Weee tax based on the discount and rate
- *
- * @param float $rate
- * @param Mage_Sales_Model_Quote_Item_Abstract $item
- * @param float $discountAmount
- * @param float $weeeAmountIncludingTax
- * @param float $weeeAmountExclTax
- * @return mixed
- */
- // phpcs:ignore Ecg.PHP.PrivateClassMember.PrivateClassMemberError
- private function _getWeeeTax($rate, $item, $discountAmount, $weeeAmountIncludingTax, $weeeAmountExclTax)
- {
- $isWeeeTaxAlreadyIncluded = $this->_weeeHelper->isTaxIncluded($this->_store);
-
- $sameRateAsStore = $this->_helper->isCrossBorderTradeEnabled($this->_store) ||
- ($rate == $this->_calculator->getStoreRateForItem($item));
- if ($sameRateAsStore && $isWeeeTaxAlreadyIncluded) {
- if (!$discountAmount || $discountAmount <= 0) {
- //We want to skip the re calculation and return the difference
- return max($weeeAmountIncludingTax - $weeeAmountExclTax, 0);
- } else {
- return $this->_calculator->calcTaxAmount($weeeAmountIncludingTax - $discountAmount, $rate, true, true);
- }
- }
- $discountAmount = !$discountAmount ? 0 : $discountAmount;
-
- ///Regular case where weee does not have the tax and we want to calculate the tax
- return $this->_calculator->calcTaxAmount($weeeAmountExclTax - $discountAmount, $rate, false, true);
- }
-
/**
* Round price based on previous rounding operation delta
*
@@ -1560,98 +1625,33 @@ protected function _saveAppliedTaxes(
}
/**
- * Add tax totals information to address object
+ * Calculate the Weee tax based on the discount and rate
*
- * @return $this
+ * @param float $rate
+ * @param Mage_Sales_Model_Quote_Item_Abstract $item
+ * @param float $discountAmount
+ * @param float $weeeAmountIncludingTax
+ * @param float $weeeAmountExclTax
+ * @return mixed
*/
- public function fetch(Mage_Sales_Model_Quote_Address $address)
+ // phpcs:ignore Ecg.PHP.PrivateClassMember.PrivateClassMemberError
+ private function _getWeeeTax($rate, $item, $discountAmount, $weeeAmountIncludingTax, $weeeAmountExclTax)
{
- $applied = $address->getAppliedTaxes();
- $store = $address->getQuote()->getStore();
- $amount = $address->getTaxAmount();
-
- $items = $this->_getAddressItems($address);
- $discountTaxCompensation = 0;
- foreach ($items as $item) {
- $discountTaxCompensation += $item->getDiscountTaxCompensation();
- }
- $taxAmount = $amount + $discountTaxCompensation;
- /*
- * when weee discount is not included in extraTaxAmount, we need to add it to the total tax
- */
- if ($this->_weeeHelper->isEnabled()) {
- if (!$this->_weeeHelper->includeInSubtotal()) {
- $taxAmount += $address->getWeeeDiscount();
- }
- }
-
- $area = null;
- if ($this->_config->displayCartTaxWithGrandTotal($store) && $address->getGrandTotal()) {
- $area = 'taxes';
- }
-
- if (($amount != 0) || ($this->_config->displayCartZeroTax($store))) {
- $address->addTotal([
- 'code' => $this->getCode(),
- 'title' => Mage::helper('tax')->__('Tax'),
- 'full_info' => $applied ? $applied : [],
- 'value' => $amount,
- 'area' => $area,
- ]);
- }
+ $isWeeeTaxAlreadyIncluded = $this->_weeeHelper->isTaxIncluded($this->_store);
- $store = $address->getQuote()->getStore();
- /**
- * Modify subtotal
- */
- if ($this->_config->displayCartSubtotalBoth($store) || $this->_config->displayCartSubtotalInclTax($store)) {
- if ($address->getSubtotalInclTax() > 0) {
- $subtotalInclTax = $address->getSubtotalInclTax();
+ $sameRateAsStore = $this->_helper->isCrossBorderTradeEnabled($this->_store) ||
+ ($rate == $this->_calculator->getStoreRateForItem($item));
+ if ($sameRateAsStore && $isWeeeTaxAlreadyIncluded) {
+ if (!$discountAmount || $discountAmount <= 0) {
+ //We want to skip the re calculation and return the difference
+ return max($weeeAmountIncludingTax - $weeeAmountExclTax, 0);
} else {
- $subtotalInclTax = $address->getSubtotal() + $taxAmount - $address->getShippingTaxAmount();
+ return $this->_calculator->calcTaxAmount($weeeAmountIncludingTax - $discountAmount, $rate, true, true);
}
-
- $address->addTotal([
- 'code' => 'subtotal',
- 'title' => Mage::helper('sales')->__('Subtotal'),
- 'value' => $subtotalInclTax,
- 'value_incl_tax' => $subtotalInclTax,
- 'value_excl_tax' => $address->getSubtotal(),
- ]);
}
+ $discountAmount = !$discountAmount ? 0 : $discountAmount;
- return $this;
- }
-
- /**
- * Process model configuration array.
- * This method can be used for changing totals collect sort order
- *
- * @param array $config
- * @param Mage_Core_Model_Store $store
- * @return array
- */
- public function processConfigArray($config, $store)
- {
- $calculationSequence = $this->_helper->getCalculationSequence($store);
- switch ($calculationSequence) {
- case Mage_Tax_Model_Calculation::CALC_TAX_BEFORE_DISCOUNT_ON_INCL:
- $config['before'][] = 'discount';
- break;
- default:
- $config['after'][] = 'discount';
- break;
- }
- return $config;
- }
-
- /**
- * Get Tax label
- *
- * @return string
- */
- public function getLabel()
- {
- return Mage::helper('tax')->__('Tax');
+ ///Regular case where weee does not have the tax and we want to calculate the tax
+ return $this->_calculator->calcTaxAmount($weeeAmountExclTax - $discountAmount, $rate, false, true);
}
}
diff --git a/app/code/core/Mage/Uploader/Block/Abstract.php b/app/code/core/Mage/Uploader/Block/Abstract.php
index 587a84e8280..707c1a38a47 100644
--- a/app/code/core/Mage/Uploader/Block/Abstract.php
+++ b/app/code/core/Mage/Uploader/Block/Abstract.php
@@ -22,6 +22,10 @@
*/
abstract class Mage_Uploader_Block_Abstract extends Mage_Adminhtml_Block_Widget
{
+ /**
+ * Default browse button ID suffix
+ */
+ public const DEFAULT_BROWSE_BUTTON_ID_SUFFIX = 'browse';
/**
* Template used for uploader
*
@@ -54,11 +58,6 @@ abstract class Mage_Uploader_Block_Abstract extends Mage_Adminhtml_Block_Widget
*/
protected $_idsMapping = [];
- /**
- * Default browse button ID suffix
- */
- public const DEFAULT_BROWSE_BUTTON_ID_SUFFIX = 'browse';
-
/**
* Constructor for uploader block
*
@@ -71,16 +70,6 @@ public function __construct()
$this->setId($this->getId() . '_Uploader');
}
- /**
- * Helper for file manipulation
- *
- * @return Mage_Uploader_Helper_File
- */
- protected function _getHelper()
- {
- return Mage::helper('uploader/file');
- }
-
/**
* @return string
*/
@@ -96,72 +85,6 @@ public function getJsonConfig()
]);
}
- /**
- * Get mapping of ids for front-end use
- *
- * @return array
- */
- protected function _getElementIdsMapping()
- {
- return $this->_idsMapping;
- }
-
- /**
- * Add mapping ids for front-end use
- *
- * @param array $additionalButtons
- * @return $this
- */
- protected function _addElementIdsMapping($additionalButtons = [])
- {
- $this->_idsMapping = array_merge($this->_idsMapping, $additionalButtons);
-
- return $this;
- }
-
- /**
- * Prepare layout, create buttons, set front-end elements ids
- *
- * @return Mage_Core_Block_Abstract
- */
- protected function _prepareLayout()
- {
- $this->setChild(
- 'browse_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->addData([
- // Workaround for IE9
- 'before_html' => sprintf(
- '',
- $this->getElementId(self::DEFAULT_BROWSE_BUTTON_ID_SUFFIX),
- ),
- 'after_html' => '
',
- 'id' => $this->getElementId(self::DEFAULT_BROWSE_BUTTON_ID_SUFFIX . '_button'),
- 'label' => Mage::helper('uploader')->__('Browse Files...'),
- 'type' => 'button',
- ]),
- );
-
- $this->setChild(
- 'delete_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->addData([
- 'id' => '{{id}}',
- 'class' => 'delete',
- 'type' => 'button',
- 'label' => Mage::helper('uploader')->__('Remove'),
- ]),
- );
-
- $this->_addElementIdsMapping([
- 'container' => $this->getHtmlId(),
- 'templateFile' => $this->getElementId('template'),
- 'browse' => $this->_prepareElementsIds([self::DEFAULT_BROWSE_BUTTON_ID_SUFFIX]),
- ]);
-
- return parent::_prepareLayout();
- }
-
/**
* Get browse button html
*
@@ -232,6 +155,82 @@ public function getElementId($suffix)
return $this->getHtmlId() . '-' . $suffix;
}
+ /**
+ * Helper for file manipulation
+ *
+ * @return Mage_Uploader_Helper_File
+ */
+ protected function _getHelper()
+ {
+ return Mage::helper('uploader/file');
+ }
+
+ /**
+ * Get mapping of ids for front-end use
+ *
+ * @return array
+ */
+ protected function _getElementIdsMapping()
+ {
+ return $this->_idsMapping;
+ }
+
+ /**
+ * Add mapping ids for front-end use
+ *
+ * @param array $additionalButtons
+ * @return $this
+ */
+ protected function _addElementIdsMapping($additionalButtons = [])
+ {
+ $this->_idsMapping = array_merge($this->_idsMapping, $additionalButtons);
+
+ return $this;
+ }
+
+ /**
+ * Prepare layout, create buttons, set front-end elements ids
+ *
+ * @return Mage_Core_Block_Abstract
+ */
+ protected function _prepareLayout()
+ {
+ $this->setChild(
+ 'browse_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->addData([
+ // Workaround for IE9
+ 'before_html' => sprintf(
+ '',
+ $this->getElementId(self::DEFAULT_BROWSE_BUTTON_ID_SUFFIX),
+ ),
+ 'after_html' => '
',
+ 'id' => $this->getElementId(self::DEFAULT_BROWSE_BUTTON_ID_SUFFIX . '_button'),
+ 'label' => Mage::helper('uploader')->__('Browse Files...'),
+ 'type' => 'button',
+ ]),
+ );
+
+ $this->setChild(
+ 'delete_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->addData([
+ 'id' => '{{id}}',
+ 'class' => 'delete',
+ 'type' => 'button',
+ 'label' => Mage::helper('uploader')->__('Remove'),
+ ]),
+ );
+
+ $this->_addElementIdsMapping([
+ 'container' => $this->getHtmlId(),
+ 'templateFile' => $this->getElementId('template'),
+ 'browse' => $this->_prepareElementsIds([self::DEFAULT_BROWSE_BUTTON_ID_SUFFIX]),
+ ]);
+
+ return parent::_prepareLayout();
+ }
+
/**
* Prepare actual elements ids from suffixes
*
diff --git a/app/code/core/Mage/Uploader/Block/Multiple.php b/app/code/core/Mage/Uploader/Block/Multiple.php
index 55fc7c006fe..19f6599353c 100644
--- a/app/code/core/Mage/Uploader/Block/Multiple.php
+++ b/app/code/core/Mage/Uploader/Block/Multiple.php
@@ -22,6 +22,16 @@ class Mage_Uploader_Block_Multiple extends Mage_Uploader_Block_Abstract
{
public const DEFAULT_UPLOAD_BUTTON_ID_SUFFIX = 'upload';
+ /**
+ * Get upload button html
+ *
+ * @return string
+ */
+ public function getUploadButtonHtml()
+ {
+ return $this->getChildHtml('upload_button');
+ }
+
/**
* @return $this
*/
@@ -45,14 +55,4 @@ protected function _prepareLayout()
return $this;
}
-
- /**
- * Get upload button html
- *
- * @return string
- */
- public function getUploadButtonHtml()
- {
- return $this->getChildHtml('upload_button');
- }
}
diff --git a/app/code/core/Mage/Uploader/Block/Single.php b/app/code/core/Mage/Uploader/Block/Single.php
index 2573fa2a185..3a9b3016923 100644
--- a/app/code/core/Mage/Uploader/Block/Single.php
+++ b/app/code/core/Mage/Uploader/Block/Single.php
@@ -20,6 +20,13 @@
*/
class Mage_Uploader_Block_Single extends Mage_Uploader_Block_Abstract
{
+ public function __construct()
+ {
+ parent::__construct();
+
+ $this->getUploaderConfig()->setSingleFile(true);
+ $this->getButtonConfig()->setSingleFile(true);
+ }
/**
* Prepare layout, change button and set front-end element ids mapping
*
@@ -32,12 +39,4 @@ protected function _prepareLayout()
return $this;
}
-
- public function __construct()
- {
- parent::__construct();
-
- $this->getUploaderConfig()->setSingleFile(true);
- $this->getButtonConfig()->setSingleFile(true);
- }
}
diff --git a/app/code/core/Mage/Uploader/Model/Config/Abstract.php b/app/code/core/Mage/Uploader/Model/Config/Abstract.php
index 0d0b2fa0dd2..063918ed611 100644
--- a/app/code/core/Mage/Uploader/Model/Config/Abstract.php
+++ b/app/code/core/Mage/Uploader/Model/Config/Abstract.php
@@ -22,16 +22,6 @@
*/
abstract class Mage_Uploader_Model_Config_Abstract extends Varien_Object
{
- /**
- * Get file helper
- *
- * @return Mage_Uploader_Helper_File
- */
- protected function _getHelper()
- {
- return Mage::helper('uploader/file');
- }
-
/**
* Set/Get attribute wrapper
* Also set data in cameCase for config values
@@ -60,4 +50,13 @@ public function __call($method, $args)
}
throw new Varien_Exception('Invalid method ' . get_class($this) . '::' . $method . '(' . print_r($args, true) . ')');
}
+ /**
+ * Get file helper
+ *
+ * @return Mage_Uploader_Helper_File
+ */
+ protected function _getHelper()
+ {
+ return Mage::helper('uploader/file');
+ }
}
diff --git a/app/code/core/Mage/Uploader/Model/Config/Browsebutton.php b/app/code/core/Mage/Uploader/Model/Config/Browsebutton.php
index f8ec98b2c75..6ff3239f96c 100644
--- a/app/code/core/Mage/Uploader/Model/Config/Browsebutton.php
+++ b/app/code/core/Mage/Uploader/Model/Config/Browsebutton.php
@@ -31,14 +31,6 @@
*/
class Mage_Uploader_Model_Config_Browsebutton extends Mage_Uploader_Model_Config_Abstract
{
- /**
- * Set params for browse button
- */
- protected function _construct()
- {
- $this->setIsDirectory(false);
- }
-
/**
* Get MIME types from files extensions
*
@@ -54,4 +46,11 @@ public function getMimeTypesByExtensions($exts)
return implode(',', $mimes);
}
+ /**
+ * Set params for browse button
+ */
+ protected function _construct()
+ {
+ $this->setIsDirectory(false);
+ }
}
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php
index 3c30902a207..a79d6b30379 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php
@@ -210,86 +210,6 @@ public function proccessAdditionalValidation(Mage_Shipping_Model_Rate_Request $r
return $this;
}
- /**
- * Returns cache key for some request to carrier quotes service
- *
- * @param string|array $requestParams
- * @return int
- */
- protected function _getQuotesCacheKey($requestParams)
- {
- if (is_array($requestParams)) {
- $requestParams = implode(
- ',',
- array_merge(
- [$this->getCarrierCode()],
- array_keys($requestParams),
- $requestParams,
- ),
- );
- }
- return crc32($requestParams);
- }
-
- /**
- * Checks whether some request to rates have already been done, so we have cache for it
- * Used to reduce number of same requests done to carrier service during one session
- *
- * Returns cached response or null
- *
- * @param string|array $requestParams
- * @return null|string
- */
- protected function _getCachedQuotes($requestParams)
- {
- $key = $this->_getQuotesCacheKey($requestParams);
- return self::$_quotesCache[$key] ?? null;
- }
-
- /**
- * Sets received carrier quotes to cache
- *
- * @param string|array $requestParams
- * @param string $response
- * @return Mage_Usa_Model_Shipping_Carrier_Abstract
- */
- protected function _setCachedQuotes($requestParams, $response)
- {
- $key = $this->_getQuotesCacheKey($requestParams);
- self::$_quotesCache[$key] = $response;
- return $this;
- }
-
- /**
- * Prepare service name. Strip tags and entities from name
- *
- * @param string|object $name service name or object with implemented __toString() method
- * @return string prepared service name
- */
- protected function _prepareServiceName($name)
- {
- $name = html_entity_decode((string) $name);
- $name = strip_tags(preg_replace('#&\w+;#', '', $name));
- return trim($name);
- }
-
- /**
- * Prepare shipment request.
- * Validate and correct request information
- *
- *
- */
- protected function _prepareShipmentRequest(Varien_Object $request)
- {
- $phonePattern = '/[\s\_\-\(\)]+/';
- $phoneNumber = $request->getShipperContactPhoneNumber();
- $phoneNumber = preg_replace($phonePattern, '', $phoneNumber);
- $request->setShipperContactPhoneNumber($phoneNumber);
- $phoneNumber = $request->getRecipientContactPhoneNumber();
- $phoneNumber = preg_replace($phonePattern, '', $phoneNumber);
- $request->setRecipientContactPhoneNumber($phoneNumber);
- }
-
/**
* Do request to shipment
*
@@ -399,6 +319,97 @@ public function rollBack($data)
return true;
}
+ /**
+ * Check whether girth is allowed for the carrier
+ *
+ * @param null|string $countyDest
+ * @return bool
+ */
+ public function isGirthAllowed($countyDest = null)
+ {
+ return false;
+ }
+
+ /**
+ * Returns cache key for some request to carrier quotes service
+ *
+ * @param string|array $requestParams
+ * @return int
+ */
+ protected function _getQuotesCacheKey($requestParams)
+ {
+ if (is_array($requestParams)) {
+ $requestParams = implode(
+ ',',
+ array_merge(
+ [$this->getCarrierCode()],
+ array_keys($requestParams),
+ $requestParams,
+ ),
+ );
+ }
+ return crc32($requestParams);
+ }
+
+ /**
+ * Checks whether some request to rates have already been done, so we have cache for it
+ * Used to reduce number of same requests done to carrier service during one session
+ *
+ * Returns cached response or null
+ *
+ * @param string|array $requestParams
+ * @return null|string
+ */
+ protected function _getCachedQuotes($requestParams)
+ {
+ $key = $this->_getQuotesCacheKey($requestParams);
+ return self::$_quotesCache[$key] ?? null;
+ }
+
+ /**
+ * Sets received carrier quotes to cache
+ *
+ * @param string|array $requestParams
+ * @param string $response
+ * @return Mage_Usa_Model_Shipping_Carrier_Abstract
+ */
+ protected function _setCachedQuotes($requestParams, $response)
+ {
+ $key = $this->_getQuotesCacheKey($requestParams);
+ self::$_quotesCache[$key] = $response;
+ return $this;
+ }
+
+ /**
+ * Prepare service name. Strip tags and entities from name
+ *
+ * @param string|object $name service name or object with implemented __toString() method
+ * @return string prepared service name
+ */
+ protected function _prepareServiceName($name)
+ {
+ $name = html_entity_decode((string) $name);
+ $name = strip_tags(preg_replace('#&\w+;#', '', $name));
+ return trim($name);
+ }
+
+ /**
+ * Prepare shipment request.
+ * Validate and correct request information
+ *
+ *
+ */
+ protected function _prepareShipmentRequest(Varien_Object $request)
+ {
+ $phonePattern = '/[\s\_\-\(\)]+/';
+ $phoneNumber = $request->getShipperContactPhoneNumber();
+ $phoneNumber = preg_replace($phonePattern, '', $phoneNumber);
+ $request->setShipperContactPhoneNumber($phoneNumber);
+ $phoneNumber = $request->getRecipientContactPhoneNumber();
+ $phoneNumber = preg_replace($phonePattern, '', $phoneNumber);
+ $request->setRecipientContactPhoneNumber($phoneNumber);
+ }
+
/**
* Do shipment request to carrier web service, obtain Print Shipping Labels and process errors in response
*
@@ -438,15 +449,4 @@ protected function _isCanada($countryId)
{
return $countryId == 'CA';
}
-
- /**
- * Check whether girth is allowed for the carrier
- *
- * @param null|string $countyDest
- * @return bool
- */
- public function isGirthAllowed($countyDest = null)
- {
- return false;
- }
}
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php
index e8a9ffa0979..2b74a4bfe1d 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php
@@ -37,16 +37,6 @@ abstract class Mage_Usa_Model_Shipping_Carrier_Abstract_Backend_Abstract extends
*/
protected $_nameErrorField;
- /**
- * Set source model to get allowed values
- */
- abstract protected function _setSourceModelData();
-
- /**
- * Set field name to display in error block
- */
- abstract protected function _setNameErrorField();
-
/**
* Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Abstract constructor.
*/
@@ -57,6 +47,16 @@ public function __construct()
$this->_setNameErrorField();
}
+ /**
+ * Set source model to get allowed values
+ */
+ abstract protected function _setSourceModelData();
+
+ /**
+ * Set field name to display in error block
+ */
+ abstract protected function _setNameErrorField();
+
/**
* Check for presence in array with allow value.
*
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
index 93ee932b9f1..ce271b4d73e 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
@@ -29,6 +29,20 @@ class Mage_Usa_Model_Shipping_Carrier_Dhl extends Mage_Usa_Model_Shipping_Carrie
*/
public const CODE = 'dhl';
+ public const SUCCESS_CODE = 203;
+ public const SUCCESS_LABEL_CODE = 100;
+
+ public const ADDITIONAL_PROTECTION_ASSET = 'AP';
+ public const ADDITIONAL_PROTECTION_NOT_REQUIRED = 'NR';
+
+ public const ADDITIONAL_PROTECTION_VALUE_CONFIG = 0;
+ public const ADDITIONAL_PROTECTION_VALUE_SUBTOTAL = 1;
+ public const ADDITIONAL_PROTECTION_VALUE_SUBTOTAL_WITH_DISCOUNT = 2;
+
+ public const ADDITIONAL_PROTECTION_ROUNDING_FLOOR = 0;
+ public const ADDITIONAL_PROTECTION_ROUNDING_CEIL = 1;
+ public const ADDITIONAL_PROTECTION_ROUNDING_ROUND = 2;
+
/**
* Code of the carrier
*
@@ -85,20 +99,6 @@ class Mage_Usa_Model_Shipping_Carrier_Dhl extends Mage_Usa_Model_Shipping_Carrie
*/
protected $_customizableContainerTypes = ['P'];
- public const SUCCESS_CODE = 203;
- public const SUCCESS_LABEL_CODE = 100;
-
- public const ADDITIONAL_PROTECTION_ASSET = 'AP';
- public const ADDITIONAL_PROTECTION_NOT_REQUIRED = 'NR';
-
- public const ADDITIONAL_PROTECTION_VALUE_CONFIG = 0;
- public const ADDITIONAL_PROTECTION_VALUE_SUBTOTAL = 1;
- public const ADDITIONAL_PROTECTION_VALUE_SUBTOTAL_WITH_DISCOUNT = 2;
-
- public const ADDITIONAL_PROTECTION_ROUNDING_FLOOR = 0;
- public const ADDITIONAL_PROTECTION_ROUNDING_CEIL = 1;
- public const ADDITIONAL_PROTECTION_ROUNDING_ROUND = 2;
-
/**
* Collect and get rates
*
@@ -379,6 +379,166 @@ public function getResult()
return $this->_result;
}
+ /**
+ * Get configuration data of carrier
+ *
+ * @param string $type
+ * @param string $code
+ * @return array|bool
+ */
+ public function getCode($type, $code = '')
+ {
+ static $codes;
+ $codes = [
+ 'service' => [
+ 'IE' => Mage::helper('usa')->__('International Express'),
+ 'E SAT' => Mage::helper('usa')->__('Express Saturday'),
+ 'E 10:30AM' => Mage::helper('usa')->__('Express 10:30 AM'),
+ 'E' => Mage::helper('usa')->__('Express'),
+ 'N' => Mage::helper('usa')->__('Next Afternoon'),
+ 'S' => Mage::helper('usa')->__('Second Day Service'),
+ 'G' => Mage::helper('usa')->__('Ground'),
+ ],
+ 'shipment_type' => [
+ 'L' => Mage::helper('usa')->__('Letter'),
+ 'P' => Mage::helper('usa')->__('Package'),
+ ],
+ 'international_searvice' => 'IE',
+ 'dutypayment_type' => [
+ 'S' => Mage::helper('usa')->__('Sender'),
+ 'R' => Mage::helper('usa')->__('Receiver'),
+ '3' => Mage::helper('usa')->__('Third Party'),
+ ],
+
+ 'special_express' => [
+ 'E SAT' => 'SAT',
+ 'E 10:30AM' => '1030',
+ ],
+
+ 'descr_to_service' => [
+ 'E SAT' => 'Saturday',
+ 'E 10:30AM' => '10:30 A.M',
+ ],
+
+ ];
+
+ if (!isset($codes[$type])) {
+ return false;
+ } elseif ($code === '') {
+ return $codes[$type];
+ }
+
+ return $codes[$type][$code] ?? false;
+ }
+
+ /**
+ * Get tracking
+ *
+ * @param mixed $trackings
+ * @return Mage_Shipping_Model_Rate_Result|null
+ */
+ public function getTracking($trackings)
+ {
+ $this->setTrackingReqeust();
+
+ if (!is_array($trackings)) {
+ $trackings = [$trackings];
+ }
+ $this->_getXMLTracking($trackings);
+
+ return $this->_result;
+ }
+
+ /**
+ * Get tracking response
+ *
+ * @return string
+ */
+ public function getResponse()
+ {
+ $statuses = '';
+ if ($this->_result instanceof Mage_Shipping_Model_Tracking_Result) {
+ if ($trackings = $this->_result->getAllTrackings()) {
+ foreach ($trackings as $tracking) {
+ if ($data = $tracking->getAllData()) {
+ if (isset($data['status'])) {
+ $statuses .= Mage::helper('usa')->__($data['status']) . "\n
";
+ } else {
+ $statuses .= Mage::helper('usa')->__($data['error_message']) . "\n
";
+ }
+ }
+ }
+ }
+ }
+ if (empty($statuses)) {
+ $statuses = Mage::helper('usa')->__('Empty response');
+ }
+ return $statuses;
+ }
+
+ /**
+ * Get allowed shipping methods
+ *
+ * @return array
+ */
+ public function getAllowedMethods()
+ {
+ $allowed = explode(',', $this->getConfigData('allowed_methods'));
+ $arr = [];
+ foreach ($allowed as $k) {
+ $arr[$k] = $this->getCode('service', $k);
+ }
+ return $arr;
+ }
+
+ /**
+ * Is state province required
+ *
+ * @return bool
+ */
+ public function isStateProvinceRequired()
+ {
+ return true;
+ }
+
+ /**
+ * Get additional protection value types
+ *
+ * @return array
+ */
+ public function getAdditionalProtectionValueTypes()
+ {
+ return [
+ self::ADDITIONAL_PROTECTION_VALUE_CONFIG => Mage::helper('usa')->__('Configuration'),
+ self::ADDITIONAL_PROTECTION_VALUE_SUBTOTAL => Mage::helper('usa')->__('Subtotal'),
+ self::ADDITIONAL_PROTECTION_VALUE_SUBTOTAL_WITH_DISCOUNT => Mage::helper('usa')->__('Subtotal With Discount'),
+ ];
+ }
+
+ /**
+ * Get additional protection rounding types
+ *
+ * @return array
+ */
+ public function getAdditionalProtectionRoundingTypes()
+ {
+ return [
+ self::ADDITIONAL_PROTECTION_ROUNDING_FLOOR => Mage::helper('usa')->__('To Lower'),
+ self::ADDITIONAL_PROTECTION_ROUNDING_CEIL => Mage::helper('usa')->__('To Upper'),
+ self::ADDITIONAL_PROTECTION_ROUNDING_ROUND => Mage::helper('usa')->__('Round'),
+ ];
+ }
+
+ /**
+ * Return container types of carrier
+ *
+ * @return array|bool
+ */
+ public function getContainerTypes(?Varien_Object $params = null)
+ {
+ return $this->getCode('shipment_type');
+ }
+
/**
* Get quotes
*
@@ -844,58 +1004,6 @@ protected function _parseXmlObject($shipXml)
return $this;
}
- /**
- * Get configuration data of carrier
- *
- * @param string $type
- * @param string $code
- * @return array|bool
- */
- public function getCode($type, $code = '')
- {
- static $codes;
- $codes = [
- 'service' => [
- 'IE' => Mage::helper('usa')->__('International Express'),
- 'E SAT' => Mage::helper('usa')->__('Express Saturday'),
- 'E 10:30AM' => Mage::helper('usa')->__('Express 10:30 AM'),
- 'E' => Mage::helper('usa')->__('Express'),
- 'N' => Mage::helper('usa')->__('Next Afternoon'),
- 'S' => Mage::helper('usa')->__('Second Day Service'),
- 'G' => Mage::helper('usa')->__('Ground'),
- ],
- 'shipment_type' => [
- 'L' => Mage::helper('usa')->__('Letter'),
- 'P' => Mage::helper('usa')->__('Package'),
- ],
- 'international_searvice' => 'IE',
- 'dutypayment_type' => [
- 'S' => Mage::helper('usa')->__('Sender'),
- 'R' => Mage::helper('usa')->__('Receiver'),
- '3' => Mage::helper('usa')->__('Third Party'),
- ],
-
- 'special_express' => [
- 'E SAT' => 'SAT',
- 'E 10:30AM' => '1030',
- ],
-
- 'descr_to_service' => [
- 'E SAT' => 'Saturday',
- 'E 10:30AM' => '10:30 A.M',
- ],
-
- ];
-
- if (!isset($codes[$type])) {
- return false;
- } elseif ($code === '') {
- return $codes[$type];
- }
-
- return $codes[$type][$code] ?? false;
- }
-
/**
* Parse xml and add rates to instance property
*
@@ -932,24 +1040,6 @@ protected function _addRate($shipXml)
}
}
- /**
- * Get tracking
- *
- * @param mixed $trackings
- * @return Mage_Shipping_Model_Rate_Result|null
- */
- public function getTracking($trackings)
- {
- $this->setTrackingReqeust();
-
- if (!is_array($trackings)) {
- $trackings = [$trackings];
- }
- $this->_getXMLTracking($trackings);
-
- return $this->_result;
- }
-
/**
* Set tracking request
*/
@@ -1176,86 +1266,6 @@ protected function _parseXmlTrackingResponse($trackings, $response)
$this->_result = $result;
}
- /**
- * Get tracking response
- *
- * @return string
- */
- public function getResponse()
- {
- $statuses = '';
- if ($this->_result instanceof Mage_Shipping_Model_Tracking_Result) {
- if ($trackings = $this->_result->getAllTrackings()) {
- foreach ($trackings as $tracking) {
- if ($data = $tracking->getAllData()) {
- if (isset($data['status'])) {
- $statuses .= Mage::helper('usa')->__($data['status']) . "\n
";
- } else {
- $statuses .= Mage::helper('usa')->__($data['error_message']) . "\n
";
- }
- }
- }
- }
- }
- if (empty($statuses)) {
- $statuses = Mage::helper('usa')->__('Empty response');
- }
- return $statuses;
- }
-
- /**
- * Get allowed shipping methods
- *
- * @return array
- */
- public function getAllowedMethods()
- {
- $allowed = explode(',', $this->getConfigData('allowed_methods'));
- $arr = [];
- foreach ($allowed as $k) {
- $arr[$k] = $this->getCode('service', $k);
- }
- return $arr;
- }
-
- /**
- * Is state province required
- *
- * @return bool
- */
- public function isStateProvinceRequired()
- {
- return true;
- }
-
- /**
- * Get additional protection value types
- *
- * @return array
- */
- public function getAdditionalProtectionValueTypes()
- {
- return [
- self::ADDITIONAL_PROTECTION_VALUE_CONFIG => Mage::helper('usa')->__('Configuration'),
- self::ADDITIONAL_PROTECTION_VALUE_SUBTOTAL => Mage::helper('usa')->__('Subtotal'),
- self::ADDITIONAL_PROTECTION_VALUE_SUBTOTAL_WITH_DISCOUNT => Mage::helper('usa')->__('Subtotal With Discount'),
- ];
- }
-
- /**
- * Get additional protection rounding types
- *
- * @return array
- */
- public function getAdditionalProtectionRoundingTypes()
- {
- return [
- self::ADDITIONAL_PROTECTION_ROUNDING_FLOOR => Mage::helper('usa')->__('To Lower'),
- self::ADDITIONAL_PROTECTION_ROUNDING_CEIL => Mage::helper('usa')->__('To Upper'),
- self::ADDITIONAL_PROTECTION_ROUNDING_ROUND => Mage::helper('usa')->__('Round'),
- ];
- }
-
/**
* Map request to shipment
*/
@@ -1306,14 +1316,4 @@ protected function _doShipmentRequest(Varien_Object $request)
return $this->_doRequest();
}
-
- /**
- * Return container types of carrier
- *
- * @return array|bool
- */
- public function getContainerTypes(?Varien_Object $params = null)
- {
- return $this->getCode('shipment_type');
- }
}
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
index 447bef796f1..741c5cd5675 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
@@ -34,6 +34,11 @@ class Mage_Usa_Model_Shipping_Carrier_Dhl_International extends Mage_Usa_Model_S
public const DIMENSION_MIN_CM = 3;
public const DIMENSION_MIN_IN = 1;
+ /**
+ * Code of the carrier
+ */
+ public const CODE = 'dhlint';
+
/**
* Container types that could be customized
*
@@ -41,11 +46,6 @@ class Mage_Usa_Model_Shipping_Carrier_Dhl_International extends Mage_Usa_Model_S
*/
protected $_customizableContainerTypes = [self::DHL_CONTENT_TYPE_NON_DOC];
- /**
- * Code of the carrier
- */
- public const CODE = 'dhlint';
-
/**
* Rate request data
*
@@ -140,37 +140,6 @@ class Mage_Usa_Model_Shipping_Carrier_Dhl_International extends Mage_Usa_Model_S
*/
protected $_isDomestic = false;
- /**
- * Dhl International Class constructor
- *
- * Sets necessary data
- */
- protected function _construct()
- {
- if ($this->getConfigData('content_type') == self::DHL_CONTENT_TYPE_DOC) {
- $this->_freeMethod = 'free_method_doc';
- }
- }
-
- /**
- * Returns value of given variable
- *
- * @param mixed $origValue
- * @param string $pathToValue
- * @return mixed
- */
- protected function _getDefaultValue($origValue, $pathToValue)
- {
- if (!$origValue) {
- $origValue = Mage::getStoreConfig(
- $pathToValue,
- $this->getStore(),
- );
- }
-
- return $origValue;
- }
-
/**
* Collect and get rates
*
@@ -220,21 +189,6 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
return $this->_result;
}
- /**
- * Set Free Method Request
- *
- * @param string $freeMethod
- */
- protected function _setFreeMethodRequest($freeMethod)
- {
- $rawRequest = $this->_rawRequest;
-
- $rawRequest->setFreeMethodRequest(true);
- $freeWeight = $this->getTotalNumOfBoxes($rawRequest->getFreeMethodWeight());
- $rawRequest->setWeight($freeWeight);
- $rawRequest->setService($freeMethod);
- }
-
/**
* Returns request result
*
@@ -245,20 +199,6 @@ public function getResult()
return $this->_result;
}
- protected function _addParams($requestObject)
- {
- $request = $this->_request;
- foreach ($this->_requestVariables as $code => $objectCode) {
- if ($request->getDhlId()) {
- $value = $request->getData($objectCode['code']);
- } else {
- $value = $this->getConfigData($code);
- }
- $requestObject->setData($objectCode['setCode'], $value);
- }
- return $requestObject;
- }
-
/**
* Prepare and set request in property of current instance
*
@@ -526,6 +466,146 @@ public function getDhlProductTitle($code)
return $dhlProducts[$code] ?? false;
}
+ /**
+ * Processing additional validation to check is carrier applicable.
+ *
+ * @return Mage_Shipping_Model_Carrier_Abstract|Mage_Shipping_Model_Rate_Result_Error|bool
+ */
+ public function proccessAdditionalValidation(Mage_Shipping_Model_Rate_Request $request)
+ {
+ //Skip by item validation if there is no items in request
+ if (!count($this->getAllItems($request))) {
+ $this->_errors[] = Mage::helper('usa')->__('There is no items in this order');
+ }
+
+ $countryParams = $this->getCountryParams(
+ Mage::getStoreConfig(Mage_Shipping_Model_Shipping::XML_PATH_STORE_COUNTRY_ID, $request->getStoreId()),
+ );
+ if (!$countryParams->getData()) {
+ $this->_errors[] = Mage::helper('usa')->__('Please, specify origin country');
+ }
+
+ if (!empty($this->_errors)) {
+ return $this->_showError();
+ }
+
+ return $this;
+ }
+
+ /**
+ * Return container types of carrier
+ *
+ * @return array
+ */
+ public function getContainerTypes(?Varien_Object $params = null)
+ {
+ return [
+ self::DHL_CONTENT_TYPE_DOC => Mage::helper('usa')->__('Documents'),
+ self::DHL_CONTENT_TYPE_NON_DOC => Mage::helper('usa')->__('Non Documents'),
+ ];
+ }
+
+ /**
+ * Get tracking
+ *
+ * @param mixed $trackings
+ * @return Mage_Shipping_Model_Rate_Result|null
+ */
+ public function getTracking($trackings)
+ {
+ if (!is_array($trackings)) {
+ $trackings = [$trackings];
+ }
+ $this->_getXMLTracking($trackings);
+
+ return $this->_result;
+ }
+
+ /**
+ * Do request to shipment
+ *
+ * @return Varien_Object
+ */
+ public function requestToShipment(Mage_Shipping_Model_Shipment_Request $request)
+ {
+ $packages = $request->getPackages();
+ if (!is_array($packages) || !$packages) {
+ Mage::throwException(Mage::helper('usa')->__('No packages for request'));
+ }
+ $result = $this->_doShipmentRequest($request);
+
+ $response = new Varien_Object([
+ 'info' => [[
+ 'tracking_number' => $result->getTrackingNumber(),
+ 'label_content' => $result->getShippingLabelContent(),
+ ]],
+ ]);
+
+ $request->setMasterTrackingId($result->getTrackingNumber());
+
+ return $response;
+ }
+
+ /**
+ * Dhl International Class constructor
+ *
+ * Sets necessary data
+ */
+ protected function _construct()
+ {
+ if ($this->getConfigData('content_type') == self::DHL_CONTENT_TYPE_DOC) {
+ $this->_freeMethod = 'free_method_doc';
+ }
+ }
+
+ /**
+ * Returns value of given variable
+ *
+ * @param mixed $origValue
+ * @param string $pathToValue
+ * @return mixed
+ */
+ protected function _getDefaultValue($origValue, $pathToValue)
+ {
+ if (!$origValue) {
+ $origValue = Mage::getStoreConfig(
+ $pathToValue,
+ $this->getStore(),
+ );
+ }
+
+ return $origValue;
+ }
+
+ /**
+ * Set Free Method Request
+ *
+ * @param string $freeMethod
+ */
+ protected function _setFreeMethodRequest($freeMethod)
+ {
+ $rawRequest = $this->_rawRequest;
+
+ $rawRequest->setFreeMethodRequest(true);
+ $freeWeight = $this->getTotalNumOfBoxes($rawRequest->getFreeMethodWeight());
+ $rawRequest->setWeight($freeWeight);
+ $rawRequest->setService($freeMethod);
+ }
+
+ protected function _addParams($requestObject)
+ {
+ $request = $this->_request;
+ foreach ($this->_requestVariables as $code => $objectCode) {
+ if ($request->getDhlId()) {
+ $value = $request->getData($objectCode['code']);
+ } else {
+ $value = $this->getConfigData($code);
+ }
+ $requestObject->setData($objectCode['setCode'], $value);
+ }
+ return $requestObject;
+ }
+
/**
* Convert item weight to needed weight based on config weight unit dimensions
*
@@ -1115,32 +1195,6 @@ protected function _doShipmentRequest(Varien_Object $request)
return $this->_doRequest();
}
- /**
- * Processing additional validation to check is carrier applicable.
- *
- * @return Mage_Shipping_Model_Carrier_Abstract|Mage_Shipping_Model_Rate_Result_Error|bool
- */
- public function proccessAdditionalValidation(Mage_Shipping_Model_Rate_Request $request)
- {
- //Skip by item validation if there is no items in request
- if (!count($this->getAllItems($request))) {
- $this->_errors[] = Mage::helper('usa')->__('There is no items in this order');
- }
-
- $countryParams = $this->getCountryParams(
- Mage::getStoreConfig(Mage_Shipping_Model_Shipping::XML_PATH_STORE_COUNTRY_ID, $request->getStoreId()),
- );
- if (!$countryParams->getData()) {
- $this->_errors[] = Mage::helper('usa')->__('Please, specify origin country');
- }
-
- if (!empty($this->_errors)) {
- return $this->_showError();
- }
-
- return $this;
- }
-
/**
* Show default error
*
@@ -1163,19 +1217,6 @@ protected function _showError()
}
}
- /**
- * Return container types of carrier
- *
- * @return array
- */
- public function getContainerTypes(?Varien_Object $params = null)
- {
- return [
- self::DHL_CONTENT_TYPE_DOC => Mage::helper('usa')->__('Documents'),
- self::DHL_CONTENT_TYPE_NON_DOC => Mage::helper('usa')->__('Non Documents'),
- ];
- }
-
/**
* Map request to shipment
*/
@@ -1522,22 +1563,6 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
}
}
- /**
- * Get tracking
- *
- * @param mixed $trackings
- * @return Mage_Shipping_Model_Rate_Result|null
- */
- public function getTracking($trackings)
- {
- if (!is_array($trackings)) {
- $trackings = [$trackings];
- }
- $this->_getXMLTracking($trackings);
-
- return $this->_result;
- }
-
/**
* Send request for tracking
*
@@ -1717,31 +1742,6 @@ protected function _getPerpackagePrice($cost, $handlingType, $handlingFee)
return $cost + $this->_numBoxes * $handlingFee;
}
- /**
- * Do request to shipment
- *
- * @return Varien_Object
- */
- public function requestToShipment(Mage_Shipping_Model_Shipment_Request $request)
- {
- $packages = $request->getPackages();
- if (!is_array($packages) || !$packages) {
- Mage::throwException(Mage::helper('usa')->__('No packages for request'));
- }
- $result = $this->_doShipmentRequest($request);
-
- $response = new Varien_Object([
- 'info' => [[
- 'tracking_number' => $result->getTrackingNumber(),
- 'label_content' => $result->getShippingLabelContent(),
- ]],
- ]);
-
- $request->setMasterTrackingId($result->getTrackingNumber());
-
- return $response;
- }
-
/**
* Check if shipping is domestic
*
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php
index 79634a09e8f..a2b5dd7f836 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php
@@ -73,30 +73,6 @@ public function setPage(Zend_Pdf_Page $page)
return $this;
}
- /**
- * Calculate x coordinate with indentation
- *
- * @param int $pt
- * @return int
- * @SuppressWarnings("PHPMD.ShortMethodName")
- */
- protected function _x($pt)
- {
- return $pt + self::X_INDENT;
- }
-
- /**
- * Calculate y coordinate with indentation
- *
- * @param int $pt
- * @return int
- * @SuppressWarnings("PHPMD.ShortMethodName")
- */
- protected function _y($pt)
- {
- return 595 - self::Y_INDENT - $pt;
- }
-
/**
* Add Border
*
@@ -280,37 +256,6 @@ public function addSenderInfo(SimpleXMLElement $sender)
return $this;
}
- /**
- * Draw Sender Address
- *
- * @param string $phoneNumber
- * @return float
- */
- protected function _drawSenderAddress(SimpleXMLElement $addressLines, $phoneNumber)
- {
- $lines = [];
- foreach ($addressLines as $line) {
- $lines [] = $line;
- }
-
- $pageY = 0;
- if (strlen($lines[0]) > 28) {
- $firstLine = array_shift($lines);
- $pageY = $this->_page->drawLines([$firstLine], $this->_x(25), $this->_y(42), 28);
- $this->_page->drawText($phoneNumber, $this->_x(103), $this->_y(42));
- } else {
- $pageY = $this->_y(42);
- $lineLength = $this->_page->getTextWidth(
- $lines[0] . ' ',
- $this->_page->getFont(),
- $this->_page->getFontSize(),
- );
- $this->_page->drawText($phoneNumber, $this->_x(25 + $lineLength), $this->_y(42));
- }
-
- return $this->_page->drawLines($lines, $this->_x(25), $pageY, 49);
- }
-
/**
* Add Origin Info
*
@@ -656,4 +601,59 @@ public function addPieceNumber($pieceNumber, $piecesTotal)
$this->_page->restoreGS();
return $this;
}
+
+ /**
+ * Calculate x coordinate with indentation
+ *
+ * @param int $pt
+ * @return int
+ * @SuppressWarnings("PHPMD.ShortMethodName")
+ */
+ protected function _x($pt)
+ {
+ return $pt + self::X_INDENT;
+ }
+
+ /**
+ * Calculate y coordinate with indentation
+ *
+ * @param int $pt
+ * @return int
+ * @SuppressWarnings("PHPMD.ShortMethodName")
+ */
+ protected function _y($pt)
+ {
+ return 595 - self::Y_INDENT - $pt;
+ }
+
+ /**
+ * Draw Sender Address
+ *
+ * @param string $phoneNumber
+ * @return float
+ */
+ protected function _drawSenderAddress(SimpleXMLElement $addressLines, $phoneNumber)
+ {
+ $lines = [];
+ foreach ($addressLines as $line) {
+ $lines [] = $line;
+ }
+
+ $pageY = 0;
+ if (strlen($lines[0]) > 28) {
+ $firstLine = array_shift($lines);
+ $pageY = $this->_page->drawLines([$firstLine], $this->_x(25), $this->_y(42), 28);
+ $this->_page->drawText($phoneNumber, $this->_x(103), $this->_y(42));
+ } else {
+ $pageY = $this->_y(42);
+ $lineLength = $this->_page->getTextWidth(
+ $lines[0] . ' ',
+ $this->_page->getFont(),
+ $this->_page->getFontSize(),
+ );
+ $this->_page->drawText($phoneNumber, $this->_x(25 + $lineLength), $this->_y(42));
+ }
+
+ return $this->_page->drawLines($lines, $this->_x(25), $pageY, 49);
+ }
}
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
index 1912f9f3307..26d245d955c 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
@@ -108,55 +108,6 @@ public function __construct()
$this->_trackServiceWsdl = $wsdlBasePath . 'TrackService_v5.wsdl';
}
- /**
- * Create soap client with selected wsdl
- *
- * @param string $wsdl
- * @param bool|int $trace
- * @return SoapClient
- */
- protected function _createSoapClient($wsdl, $trace = false)
- {
- $client = new SoapClient($wsdl, ['trace' => $trace]);
- $client->__setLocation(
- $this->getConfigFlag('sandbox_mode')
- ? 'https://wsbeta.fedex.com:443/web-services'
- : 'https://ws.fedex.com:443/web-services',
- );
-
- return $client;
- }
-
- /**
- * Create rate soap client
- *
- * @return SoapClient
- */
- protected function _createRateSoapClient()
- {
- return $this->_createSoapClient($this->_rateServiceWsdl);
- }
-
- /**
- * Create ship soap client
- *
- * @return SoapClient
- */
- protected function _createShipSoapClient()
- {
- return $this->_createSoapClient($this->_shipServiceWsdl, 1);
- }
-
- /**
- * Create track soap client
- *
- * @return SoapClient
- */
- protected function _createTrackSoapClient()
- {
- return $this->_createSoapClient($this->_trackServiceWsdl, 1);
- }
-
/**
* Collect and get rates
*
@@ -290,677 +241,853 @@ public function getVersionInfo()
}
/**
- * Forming request for rate estimation depending to the purpose
+ * Get configuration data of carrier
*
- * @param string $purpose
- * @return array
+ * @param string $type
+ * @param string $code
+ * @return array|bool
*/
- protected function _formRateRequest($purpose)
+ public function getCode($type, $code = '')
{
- $r = $this->_rawRequest;
- $ratesRequest = [
- 'WebAuthenticationDetail' => [
- 'UserCredential' => [
- 'Key' => $r->getKey(),
- 'Password' => $r->getPassword(),
- ],
+ $codes = [
+ 'method' => [
+ 'EUROPE_FIRST_INTERNATIONAL_PRIORITY' => Mage::helper('usa')->__('Europe First Priority'),
+ 'FEDEX_1_DAY_FREIGHT' => Mage::helper('usa')->__('1 Day Freight'),
+ 'FEDEX_2_DAY_FREIGHT' => Mage::helper('usa')->__('2 Day Freight'),
+ 'FEDEX_2_DAY' => Mage::helper('usa')->__('2 Day'),
+ 'FEDEX_2_DAY_AM' => Mage::helper('usa')->__('2 Day AM'),
+ 'FEDEX_3_DAY_FREIGHT' => Mage::helper('usa')->__('3 Day Freight'),
+ 'FEDEX_EXPRESS_SAVER' => Mage::helper('usa')->__('Express Saver'),
+ 'FEDEX_GROUND' => Mage::helper('usa')->__('Ground'),
+ 'FIRST_OVERNIGHT' => Mage::helper('usa')->__('First Overnight'),
+ 'GROUND_HOME_DELIVERY' => Mage::helper('usa')->__('Home Delivery'),
+ 'INTERNATIONAL_ECONOMY' => Mage::helper('usa')->__('International Economy'),
+ 'INTERNATIONAL_ECONOMY_FREIGHT' => Mage::helper('usa')->__('Intl Economy Freight'),
+ 'INTERNATIONAL_FIRST' => Mage::helper('usa')->__('International First'),
+ 'INTERNATIONAL_GROUND' => Mage::helper('usa')->__('International Ground'),
+ 'INTERNATIONAL_PRIORITY' => Mage::helper('usa')->__('International Priority'),
+ 'INTERNATIONAL_PRIORITY_FREIGHT' => Mage::helper('usa')->__('Intl Priority Freight'),
+ 'PRIORITY_OVERNIGHT' => Mage::helper('usa')->__('Priority Overnight'),
+ 'SMART_POST' => Mage::helper('usa')->__('Smart Post'),
+ 'STANDARD_OVERNIGHT' => Mage::helper('usa')->__('Standard Overnight'),
+ 'FEDEX_FREIGHT' => Mage::helper('usa')->__('Freight'),
+ 'FEDEX_NATIONAL_FREIGHT' => Mage::helper('usa')->__('National Freight'),
],
- 'ClientDetail' => [
- 'AccountNumber' => $r->getAccount(),
- 'MeterNumber' => $r->getMeterNumber(),
+ 'dropoff' => [
+ 'REGULAR_PICKUP' => Mage::helper('usa')->__('Regular Pickup'),
+ 'REQUEST_COURIER' => Mage::helper('usa')->__('Request Courier'),
+ 'DROP_BOX' => Mage::helper('usa')->__('Drop Box'),
+ 'BUSINESS_SERVICE_CENTER' => Mage::helper('usa')->__('Business Service Center'),
+ 'STATION' => Mage::helper('usa')->__('Station'),
],
- 'Version' => $this->getVersionInfo(),
- 'RequestedShipment' => [
- 'DropoffType' => $r->getDropoffType(),
- 'ShipTimestamp' => date('c'),
- 'PackagingType' => $r->getPackaging(),
- 'TotalInsuredValue' => [
- 'Amount' => $r->getValue(),
- 'Currency' => $this->getCurrencyCode(),
- ],
- 'Shipper' => [
- 'Address' => [
- 'PostalCode' => $r->getOrigPostal(),
- 'CountryCode' => $r->getOrigCountry(),
- ],
- ],
- 'Recipient' => [
- 'Address' => [
- 'PostalCode' => $r->getDestPostal(),
- 'CountryCode' => $r->getDestCountry(),
- 'Residential' => (bool) $this->getConfigData('residence_delivery'),
+ 'packaging' => [
+ 'FEDEX_ENVELOPE' => Mage::helper('usa')->__('FedEx Envelope'),
+ 'FEDEX_PAK' => Mage::helper('usa')->__('FedEx Pak'),
+ 'FEDEX_BOX' => Mage::helper('usa')->__('FedEx Box'),
+ 'FEDEX_TUBE' => Mage::helper('usa')->__('FedEx Tube'),
+ 'FEDEX_10KG_BOX' => Mage::helper('usa')->__('FedEx 10kg Box'),
+ 'FEDEX_25KG_BOX' => Mage::helper('usa')->__('FedEx 25kg Box'),
+ 'YOUR_PACKAGING' => Mage::helper('usa')->__('Your Packaging'),
+ ],
+ 'containers_filter' => [
+ [
+ 'containers' => ['FEDEX_ENVELOPE', 'FEDEX_PAK'],
+ 'filters' => [
+ 'within_us' => [
+ 'method' => [
+ 'FEDEX_EXPRESS_SAVER',
+ 'FEDEX_2_DAY',
+ 'FEDEX_2_DAY_AM',
+ 'STANDARD_OVERNIGHT',
+ 'PRIORITY_OVERNIGHT',
+ 'FIRST_OVERNIGHT',
+ ],
+ ],
+ 'from_us' => [
+ 'method' => [
+ 'INTERNATIONAL_FIRST',
+ 'INTERNATIONAL_ECONOMY',
+ 'INTERNATIONAL_PRIORITY',
+ ],
+ ],
],
],
- 'ShippingChargesPayment' => [
- 'PaymentType' => 'SENDER',
- 'Payor' => [
- 'AccountNumber' => $r->getAccount(),
- 'CountryCode' => $r->getOrigCountry(),
+ [
+ 'containers' => ['FEDEX_BOX', 'FEDEX_TUBE'],
+ 'filters' => [
+ 'within_us' => [
+ 'method' => [
+ 'FEDEX_2_DAY',
+ 'FEDEX_2_DAY_AM',
+ 'STANDARD_OVERNIGHT',
+ 'PRIORITY_OVERNIGHT',
+ 'FIRST_OVERNIGHT',
+ 'FEDEX_FREIGHT',
+ 'FEDEX_1_DAY_FREIGHT',
+ 'FEDEX_2_DAY_FREIGHT',
+ 'FEDEX_3_DAY_FREIGHT',
+ 'FEDEX_NATIONAL_FREIGHT',
+ ],
+ ],
+ 'from_us' => [
+ 'method' => [
+ 'INTERNATIONAL_FIRST',
+ 'INTERNATIONAL_ECONOMY',
+ 'INTERNATIONAL_PRIORITY',
+ ],
+ ],
],
],
- 'CustomsClearanceDetail' => [
- 'CustomsValue' => [
- 'Amount' => $r->getValue(),
- 'Currency' => $this->getCurrencyCode(),
+ [
+ 'containers' => ['FEDEX_10KG_BOX', 'FEDEX_25KG_BOX'],
+ 'filters' => [
+ 'within_us' => [],
+ 'from_us' => ['method' => ['INTERNATIONAL_PRIORITY']],
],
],
- 'RateRequestTypes' => 'LIST',
- 'PackageCount' => '1',
- 'PackageDetail' => 'INDIVIDUAL_PACKAGES',
- 'RequestedPackageLineItems' => [
- '0' => [
- 'Weight' => [
- 'Value' => (float) $r->getWeight(),
- 'Units' => $this->getConfigData('unit_of_measure'),
+ [
+ 'containers' => ['YOUR_PACKAGING'],
+ 'filters' => [
+ 'within_us' => [
+ 'method' => [
+ 'FEDEX_GROUND',
+ 'GROUND_HOME_DELIVERY',
+ 'SMART_POST',
+ 'FEDEX_EXPRESS_SAVER',
+ 'FEDEX_2_DAY',
+ 'FEDEX_2_DAY_AM',
+ 'STANDARD_OVERNIGHT',
+ 'PRIORITY_OVERNIGHT',
+ 'FIRST_OVERNIGHT',
+ 'FEDEX_FREIGHT',
+ 'FEDEX_1_DAY_FREIGHT',
+ 'FEDEX_2_DAY_FREIGHT',
+ 'FEDEX_3_DAY_FREIGHT',
+ 'FEDEX_NATIONAL_FREIGHT',
+ ],
+ ],
+ 'from_us' => [
+ 'method' => [
+ 'INTERNATIONAL_FIRST',
+ 'INTERNATIONAL_ECONOMY',
+ 'INTERNATIONAL_PRIORITY',
+ 'INTERNATIONAL_GROUND',
+ 'FEDEX_FREIGHT',
+ 'FEDEX_1_DAY_FREIGHT',
+ 'FEDEX_2_DAY_FREIGHT',
+ 'FEDEX_3_DAY_FREIGHT',
+ 'FEDEX_NATIONAL_FREIGHT',
+ 'INTERNATIONAL_ECONOMY_FREIGHT',
+ 'INTERNATIONAL_PRIORITY_FREIGHT',
+ ],
],
- 'GroupPackageCount' => 1,
],
],
],
+
+ 'delivery_confirmation_types' => [
+ 'NO_SIGNATURE_REQUIRED' => Mage::helper('usa')->__('Not Required'),
+ 'ADULT' => Mage::helper('usa')->__('Adult'),
+ 'DIRECT' => Mage::helper('usa')->__('Direct'),
+ 'INDIRECT' => Mage::helper('usa')->__('Indirect'),
+ ],
+
+ 'unit_of_measure' => [
+ 'LB' => Mage::helper('usa')->__('Pounds'),
+ 'KG' => Mage::helper('usa')->__('Kilograms'),
+ ],
];
- if ($purpose == self::RATE_REQUEST_GENERAL) {
- $ratesRequest['RequestedShipment']['RequestedPackageLineItems'][0]['InsuredValue'] = [
- 'Amount' => $r->getValue(),
- 'Currency' => $this->getCurrencyCode(),
- ];
- } elseif ($purpose == self::RATE_REQUEST_SMARTPOST) {
- $ratesRequest['RequestedShipment']['ServiceType'] = self::RATE_REQUEST_SMARTPOST;
- $ratesRequest['RequestedShipment']['SmartPostDetail'] = [
- 'Indicia' => ((float) $r->getWeight() >= 1) ? 'PARCEL_SELECT' : 'PRESORTED_STANDARD',
- 'HubId' => $this->getConfigData('smartpost_hubid'),
- ];
+ if (!isset($codes[$type])) {
+ return false;
+ } elseif ($code === '') {
+ return $codes[$type];
}
- return $ratesRequest;
+ return $codes[$type][$code] ?? false;
}
/**
- * Makes remote request to the carrier and returns a response
+ * Return FeDex currency ISO code by Magento Base Currency Code
*
- * @param string $purpose
- * @return mixed
+ * @return string 3-digit currency code
*/
- protected function _doRatesRequest($purpose)
+ public function getCurrencyCode()
{
- $ratesRequest = $this->_formRateRequest($purpose);
- $requestString = serialize($ratesRequest);
- $response = $this->_getCachedQuotes($requestString);
- $debugData = ['request' => $ratesRequest];
- if ($response === null) {
- try {
- $client = $this->_createRateSoapClient();
- $response = $client->getRates($ratesRequest);
- $this->_setCachedQuotes($requestString, serialize($response));
- $debugData['result'] = $response;
- } catch (Exception $e) {
- $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
- Mage::logException($e);
- }
- } else {
- $response = unserialize($response);
- $debugData['result'] = $response;
- }
- $this->_debug($debugData);
- return $response;
+ $codes = [
+ 'DOP' => 'RDD', // Dominican Peso
+ 'XCD' => 'ECD', // Caribbean Dollars
+ 'ARS' => 'ARN', // Argentina Peso
+ 'SGD' => 'SID', // Singapore Dollars
+ 'KRW' => 'WON', // South Korea Won
+ 'JMD' => 'JAD', // Jamaican Dollars
+ 'CHF' => 'SFR', // Swiss Francs
+ 'JPY' => 'JYE', // Japanese Yen
+ 'KWD' => 'KUD', // Kuwaiti Dinars
+ 'GBP' => 'UKL', // British Pounds
+ 'AED' => 'DHS', // UAE Dirhams
+ 'MXN' => 'NMP', // Mexican Pesos
+ 'UYU' => 'UYP', // Uruguay New Pesos
+ 'CLP' => 'CHP', // Chilean Pesos
+ 'TWD' => 'NTD', // New Taiwan Dollars
+ ];
+ $currencyCode = Mage::app()->getStore()->getBaseCurrencyCode();
+ return $codes[$currencyCode] ?? $currencyCode;
}
/**
- * Do remote request for and handle errors
+ * Get tracking
*
- * @return Mage_Shipping_Model_Rate_Result
+ * @param mixed $trackings
+ * @return Mage_Shipping_Model_Rate_Result|null
*/
- protected function _getQuotes()
+ public function getTracking($trackings)
{
- $this->_result = Mage::getModel('shipping/rate_result');
- $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
- if (in_array(self::RATE_REQUEST_SMARTPOST, $allowedMethods)) {
- $response = $this->_doRatesRequest(self::RATE_REQUEST_SMARTPOST);
- $preparedSmartpost = $this->_prepareRateResponse($response);
- $this->_result->append($preparedSmartpost);
- }
- $response = $this->_doRatesRequest(self::RATE_REQUEST_GENERAL);
- $preparedGeneral = $this->_prepareRateResponse($response);
- if ($this->_result->getError() && $preparedGeneral->getError()) {
- return $this->_result->getError();
- }
- $this->_result->append($preparedGeneral);
- $this->_removeErrorsIfRateExist();
-
- return $this->_result;
- }
+ $this->setTrackingReqeust();
- /**
- * Remove Errors in Case When Rate Exist
- *
- * @return Mage_Shipping_Model_Rate_Result
- */
- protected function _removeErrorsIfRateExist()
- {
- $rateResultExist = false;
- $rates = [];
- foreach ($this->_result->getAllRates() as $rate) {
- if (!($rate instanceof Mage_Shipping_Model_Rate_Result_Error)) {
- $rateResultExist = true;
- $rates[] = $rate;
- }
+ if (!is_array($trackings)) {
+ $trackings = [$trackings];
}
- if ($rateResultExist) {
- $this->_result->reset();
- $this->_result->setError(false);
- foreach ($rates as $rate) {
- $this->_result->append($rate);
- }
+ foreach ($trackings as $tracking) {
+ $this->_getXMLTracking($tracking);
}
return $this->_result;
}
/**
- * Prepare shipping rate result based on response
+ * Get tracking response
*
- * @param mixed $response
- * @return Mage_Shipping_Model_Rate_Result
+ * @return string
*/
- protected function _prepareRateResponse($response)
+ public function getResponse()
{
- $costArr = [];
- $priceArr = [];
- $errorTitle = 'Unable to retrieve tracking';
-
- if (is_object($response)) {
- if ($response->HighestSeverity == 'FAILURE' || $response->HighestSeverity == 'ERROR') {
- if (is_array($response->Notifications)) {
- $notification = array_pop($response->Notifications);
- $errorTitle = (string) $notification->Message;
- } else {
- $errorTitle = (string) $response->Notifications->Message;
- }
- } elseif (isset($response->RateReplyDetails)) {
- $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
-
- if (is_array($response->RateReplyDetails)) {
- foreach ($response->RateReplyDetails as $rate) {
- $serviceName = (string) $rate->ServiceType;
- if (in_array($serviceName, $allowedMethods)) {
- $amount = $this->_getRateAmountOriginBased($rate);
- $costArr[$serviceName] = $amount;
- $priceArr[$serviceName] = $this->getMethodPrice($amount, $serviceName);
+ $statuses = '';
+ if ($this->_result instanceof Mage_Shipping_Model_Tracking_Result) {
+ if ($trackings = $this->_result->getAllTrackings()) {
+ foreach ($trackings as $tracking) {
+ if ($data = $tracking->getAllData()) {
+ if (!empty($data['status'])) {
+ $statuses .= Mage::helper('usa')->__($data['status']) . "\n
";
+ } else {
+ $statuses .= Mage::helper('usa')->__('Empty response') . "\n
";
}
}
- asort($priceArr);
- } else {
- $rate = $response->RateReplyDetails;
- $serviceName = (string) $rate->ServiceType;
- if (in_array($serviceName, $allowedMethods)) {
- $amount = $this->_getRateAmountOriginBased($rate);
- $costArr[$serviceName] = $amount;
- $priceArr[$serviceName] = $this->getMethodPrice($amount, $serviceName);
- }
}
}
}
-
- $result = Mage::getModel('shipping/rate_result');
- if (empty($priceArr)) {
- $error = Mage::getModel('shipping/rate_result_error');
- $error->setCarrier($this->_code);
- $error->setCarrierTitle($this->getConfigData('title'));
- $error->setErrorMessage($errorTitle);
- $error->setErrorMessage($this->getConfigData('specificerrmsg'));
- $result->append($error);
- } else {
- foreach ($priceArr as $method => $price) {
- $rate = Mage::getModel('shipping/rate_result_method');
- $rate->setCarrier($this->_code);
- $rate->setCarrierTitle($this->getConfigData('title'));
- $rate->setMethod($method);
- $rate->setMethodTitle($this->getCode('method', $method));
- $rate->setCost($costArr[$method]);
- $rate->setPrice($price);
- $result->append($rate);
- }
+ if (empty($statuses)) {
+ $statuses = Mage::helper('usa')->__('Empty response');
}
- return $result;
+ return $statuses;
}
/**
- * Get origin based amount form response of rate estimation
+ * Get allowed shipping methods
*
- * @param stdClass $rate
- * @return null|float
+ * @return array
*/
- protected function _getRateAmountOriginBased($rate)
+ public function getAllowedMethods()
{
- $amount = null;
- $rateTypeAmounts = [];
-
- if (is_object($rate)) {
- // The "RATED..." rates are expressed in the currency of the origin country
- foreach ($rate->RatedShipmentDetails as $ratedShipmentDetail) {
- $netAmount = (string) $ratedShipmentDetail->ShipmentRateDetail->TotalNetCharge->Amount;
- $rateType = (string) $ratedShipmentDetail->ShipmentRateDetail->RateType;
- $rateTypeAmounts[$rateType] = $netAmount;
- }
-
- // Order is important
- $ratesOrder = [
- 'RATED_ACCOUNT_PACKAGE',
- 'PAYOR_ACCOUNT_PACKAGE',
- 'RATED_ACCOUNT_SHIPMENT',
- 'PAYOR_ACCOUNT_SHIPMENT',
- 'RATED_LIST_PACKAGE',
- 'PAYOR_LIST_PACKAGE',
- 'RATED_LIST_SHIPMENT',
- 'PAYOR_LIST_SHIPMENT',
- ];
- foreach ($ratesOrder as $rateType) {
- if (!empty($rateTypeAmounts[$rateType])) {
- $amount = $rateTypeAmounts[$rateType];
- break;
- }
- }
-
- if (is_null($amount)) {
- $amount = (string) $rate->RatedShipmentDetails[0]->ShipmentRateDetail->TotalNetCharge->Amount;
- }
+ $allowed = explode(',', $this->getConfigData('allowed_methods'));
+ $arr = [];
+ foreach ($allowed as $k) {
+ $arr[$k] = $this->getCode('method', $k);
}
-
- return $amount;
+ return $arr;
}
/**
- * Set free method request
+ * For multi package shipments. Delete requested shipments if the current shipment
+ * request is failed
*
- * @param $freeMethod
+ * @param array $data
+ * @return bool
*/
- protected function _setFreeMethodRequest($freeMethod)
+ public function rollBack($data)
{
- $r = $this->_rawRequest;
- $weight = $this->getTotalNumOfBoxes($r->getFreeMethodWeight());
- $r->setWeight($weight);
- $r->setService($freeMethod);
+ $requestData = $this->_getAuthDetails();
+ $requestData['DeletionControl'] = 'DELETE_ONE_PACKAGE';
+ foreach ($data as &$item) {
+ $requestData['TrackingId'] = $item['tracking_number'];
+ $client = $this->_createShipSoapClient();
+ $client->deleteShipment($requestData);
+ }
+ return true;
}
/**
- * Get xml quotes
+ * Return container types of carrier
*
- * @deprecated
- * @return Mage_Shipping_Model_Rate_Result
+ * @return array|bool
*/
- protected function _getXmlQuotes()
+ public function getContainerTypes(?Varien_Object $params = null)
{
- $r = $this->_rawRequest;
- $xml = new SimpleXMLElement('');
-
- $xml->addAttribute('xmlns:api', 'http://www.fedex.com/fsmapi');
- $xml->addAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
- $xml->addAttribute('xsi:noNamespaceSchemaLocation', 'FDXRateAvailableServicesRequest.xsd');
+ if ($params == null) {
+ return $this->_getAllowedContainers($params);
+ }
+ $method = $params->getMethod();
+ $countryShipper = $params->getCountryShipper();
+ $countryRecipient = $params->getCountryRecipient();
- $requestHeader = $xml->addChild('RequestHeader');
- $requestHeader->addChild('AccountNumber', $r->getAccount());
- $requestHeader->addChild('MeterNumber', '0');
-
- $xml->addChild('ShipDate', date('Y-m-d'));
- $xml->addChild('DropoffType', $r->getDropoffType());
- if ($r->hasService()) {
- $xml->addChild('Service', $r->getService());
- }
- $xml->addChild('Packaging', $r->getPackaging());
- $xml->addChild('WeightUnits', 'LBS');
- $xml->addChild('Weight', $r->getWeight());
-
- $originAddress = $xml->addChild('OriginAddress');
- $originAddress->addChild('PostalCode', $r->getOrigPostal());
- $originAddress->addChild('CountryCode', $r->getOrigCountry());
-
- $destinationAddress = $xml->addChild('DestinationAddress');
- $destinationAddress->addChild('PostalCode', $r->getDestPostal());
- $destinationAddress->addChild('CountryCode', $r->getDestCountry());
-
- $payment = $xml->addChild('Payment');
- $payment->addChild('PayorType', 'SENDER');
-
- $declaredValue = $xml->addChild('DeclaredValue');
- $declaredValue->addChild('Value', $r->getValue());
- $declaredValue->addChild('CurrencyCode', $this->getCurrencyCode());
-
- if ($this->getConfigData('residence_delivery')) {
- $specialServices = $xml->addChild('SpecialServices');
- $specialServices->addChild('ResidentialDelivery', 'true');
+ if (($countryShipper == self::USA_COUNTRY_ID && $countryRecipient == self::CANADA_COUNTRY_ID
+ || $countryShipper == self::CANADA_COUNTRY_ID && $countryRecipient == self::USA_COUNTRY_ID)
+ && $method == 'FEDEX_GROUND'
+ ) {
+ return ['YOUR_PACKAGING' => Mage::helper('usa')->__('Your Packaging')];
+ } elseif ($method == 'INTERNATIONAL_ECONOMY' || $method == 'INTERNATIONAL_FIRST') {
+ $allTypes = $this->getContainerTypesAll();
+ $exclude = ['FEDEX_10KG_BOX' => '', 'FEDEX_25KG_BOX' => ''];
+ return array_diff_key($allTypes, $exclude);
+ } elseif ($method == 'EUROPE_FIRST_INTERNATIONAL_PRIORITY') {
+ $allTypes = $this->getContainerTypesAll();
+ $exclude = ['FEDEX_BOX' => '', 'FEDEX_TUBE' => ''];
+ return array_diff_key($allTypes, $exclude);
+ } elseif ($countryShipper == self::CANADA_COUNTRY_ID && $countryRecipient == self::CANADA_COUNTRY_ID) {
+ // hack for Canada domestic. Apply the same filter rules as for US domestic
+ $params->setCountryShipper(self::USA_COUNTRY_ID);
+ $params->setCountryRecipient(self::USA_COUNTRY_ID);
}
- $xml->addChild('PackageCount', '1');
-
- $request = $xml->asXML();
-
- $responseBody = $this->_getCachedQuotes($request);
- if ($responseBody === null) {
- $debugData = ['request' => $request];
- try {
- $url = $this->getConfigData('gateway_url');
- if (!$url) {
- $url = $this->_defaultGatewayUrl;
- }
- $ch = curl_init();
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_URL, $url);
- curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
- curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
- curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
- $responseBody = curl_exec($ch);
- curl_close($ch);
+ return $this->_getAllowedContainers($params);
+ }
- $debugData['result'] = $responseBody;
- $this->_setCachedQuotes($request, $responseBody);
- } catch (Exception $e) {
- $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
- $responseBody = '';
- }
- $this->_debug($debugData);
- }
- return $this->_parseXmlResponse($responseBody);
+ /**
+ * Return all container types of carrier
+ *
+ * @return array|bool
+ */
+ public function getContainerTypesAll()
+ {
+ return $this->getCode('packaging');
}
/**
- * Prepare shipping rate result based on response
+ * Return structured data of containers witch related with shipping methods
*
- * @param mixed $response
- * @return Mage_Shipping_Model_Rate_Result
+ * @return array|bool
*/
- protected function _parseXmlResponse($response)
+ public function getContainerTypesFilter()
{
- $costArr = [];
- $priceArr = [];
+ return $this->getCode('containers_filter');
+ }
- if (strlen(trim($response)) > 0) {
- if ($xml = $this->_parseXml($response)) {
- if (is_object($xml->Error) && is_object($xml->Error->Message)) {
- $errorTitle = (string) $xml->Error->Message;
- } elseif (is_object($xml->SoftError) && is_object($xml->SoftError->Message)) {
- $errorTitle = (string) $xml->SoftError->Message;
- } else {
- $errorTitle = 'Unknown error';
- }
+ /**
+ * Return delivery confirmation types of carrier
+ *
+ * @return array
+ */
+ public function getDeliveryConfirmationTypes(?Varien_Object $params = null)
+ {
+ return $this->getCode('delivery_confirmation_types');
+ }
- $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
+ /**
+ * Create soap client with selected wsdl
+ *
+ * @param string $wsdl
+ * @param bool|int $trace
+ * @return SoapClient
+ */
+ protected function _createSoapClient($wsdl, $trace = false)
+ {
+ $client = new SoapClient($wsdl, ['trace' => $trace]);
+ $client->__setLocation(
+ $this->getConfigFlag('sandbox_mode')
+ ? 'https://wsbeta.fedex.com:443/web-services'
+ : 'https://ws.fedex.com:443/web-services',
+ );
- foreach ($xml->Entry as $entry) {
- if (in_array((string) $entry->Service, $allowedMethods)) {
- $costArr[(string) $entry->Service] =
- (string) $entry->EstimatedCharges->DiscountedCharges->NetCharge;
- $priceArr[(string) $entry->Service] = $this->getMethodPrice(
- (float) $entry->EstimatedCharges->DiscountedCharges->NetCharge,
- (string) $entry->Service,
- );
- }
- }
+ return $client;
+ }
- asort($priceArr);
- } else {
- $errorTitle = 'Response is in the wrong format.';
- }
- } else {
- $errorTitle = 'Unable to retrieve tracking';
- }
+ /**
+ * Create rate soap client
+ *
+ * @return SoapClient
+ */
+ protected function _createRateSoapClient()
+ {
+ return $this->_createSoapClient($this->_rateServiceWsdl);
+ }
- $result = Mage::getModel('shipping/rate_result');
- if (empty($priceArr)) {
- $error = Mage::getModel('shipping/rate_result_error');
- $error->setCarrier('fedex');
- $error->setCarrierTitle($this->getConfigData('title'));
- $error->setErrorMessage($this->getConfigData('specificerrmsg'));
- $result->append($error);
- } else {
- foreach ($priceArr as $method => $price) {
- $rate = Mage::getModel('shipping/rate_result_method');
- $rate->setCarrier('fedex');
- $rate->setCarrierTitle($this->getConfigData('title'));
- $rate->setMethod($method);
- $rate->setMethodTitle($this->getCode('method', $method));
- $rate->setCost($costArr[$method]);
- $rate->setPrice($price);
- $result->append($rate);
- }
- }
- return $result;
+ /**
+ * Create ship soap client
+ *
+ * @return SoapClient
+ */
+ protected function _createShipSoapClient()
+ {
+ return $this->_createSoapClient($this->_shipServiceWsdl, 1);
}
/**
- * Parse XML string and return XML document object or false
+ * Create track soap client
*
- * @param string $xmlContent
- * @return SimpleXMLElement|bool
+ * @return SoapClient
*/
- protected function _parseXml($xmlContent)
+ protected function _createTrackSoapClient()
{
- try {
- try {
- return simplexml_load_string($xmlContent);
- } catch (Exception $e) {
- throw new Exception(Mage::helper('usa')->__('Failed to parse xml document: %s', $xmlContent));
- }
- } catch (Exception $e) {
- Mage::logException($e);
- return false;
- }
+ return $this->_createSoapClient($this->_trackServiceWsdl, 1);
}
/**
- * Get configuration data of carrier
+ * Forming request for rate estimation depending to the purpose
*
- * @param string $type
- * @param string $code
- * @return array|bool
+ * @param string $purpose
+ * @return array
*/
- public function getCode($type, $code = '')
+ protected function _formRateRequest($purpose)
{
- $codes = [
- 'method' => [
- 'EUROPE_FIRST_INTERNATIONAL_PRIORITY' => Mage::helper('usa')->__('Europe First Priority'),
- 'FEDEX_1_DAY_FREIGHT' => Mage::helper('usa')->__('1 Day Freight'),
- 'FEDEX_2_DAY_FREIGHT' => Mage::helper('usa')->__('2 Day Freight'),
- 'FEDEX_2_DAY' => Mage::helper('usa')->__('2 Day'),
- 'FEDEX_2_DAY_AM' => Mage::helper('usa')->__('2 Day AM'),
- 'FEDEX_3_DAY_FREIGHT' => Mage::helper('usa')->__('3 Day Freight'),
- 'FEDEX_EXPRESS_SAVER' => Mage::helper('usa')->__('Express Saver'),
- 'FEDEX_GROUND' => Mage::helper('usa')->__('Ground'),
- 'FIRST_OVERNIGHT' => Mage::helper('usa')->__('First Overnight'),
- 'GROUND_HOME_DELIVERY' => Mage::helper('usa')->__('Home Delivery'),
- 'INTERNATIONAL_ECONOMY' => Mage::helper('usa')->__('International Economy'),
- 'INTERNATIONAL_ECONOMY_FREIGHT' => Mage::helper('usa')->__('Intl Economy Freight'),
- 'INTERNATIONAL_FIRST' => Mage::helper('usa')->__('International First'),
- 'INTERNATIONAL_GROUND' => Mage::helper('usa')->__('International Ground'),
- 'INTERNATIONAL_PRIORITY' => Mage::helper('usa')->__('International Priority'),
- 'INTERNATIONAL_PRIORITY_FREIGHT' => Mage::helper('usa')->__('Intl Priority Freight'),
- 'PRIORITY_OVERNIGHT' => Mage::helper('usa')->__('Priority Overnight'),
- 'SMART_POST' => Mage::helper('usa')->__('Smart Post'),
- 'STANDARD_OVERNIGHT' => Mage::helper('usa')->__('Standard Overnight'),
- 'FEDEX_FREIGHT' => Mage::helper('usa')->__('Freight'),
- 'FEDEX_NATIONAL_FREIGHT' => Mage::helper('usa')->__('National Freight'),
+ $r = $this->_rawRequest;
+ $ratesRequest = [
+ 'WebAuthenticationDetail' => [
+ 'UserCredential' => [
+ 'Key' => $r->getKey(),
+ 'Password' => $r->getPassword(),
+ ],
],
- 'dropoff' => [
- 'REGULAR_PICKUP' => Mage::helper('usa')->__('Regular Pickup'),
- 'REQUEST_COURIER' => Mage::helper('usa')->__('Request Courier'),
- 'DROP_BOX' => Mage::helper('usa')->__('Drop Box'),
- 'BUSINESS_SERVICE_CENTER' => Mage::helper('usa')->__('Business Service Center'),
- 'STATION' => Mage::helper('usa')->__('Station'),
+ 'ClientDetail' => [
+ 'AccountNumber' => $r->getAccount(),
+ 'MeterNumber' => $r->getMeterNumber(),
],
- 'packaging' => [
- 'FEDEX_ENVELOPE' => Mage::helper('usa')->__('FedEx Envelope'),
- 'FEDEX_PAK' => Mage::helper('usa')->__('FedEx Pak'),
- 'FEDEX_BOX' => Mage::helper('usa')->__('FedEx Box'),
- 'FEDEX_TUBE' => Mage::helper('usa')->__('FedEx Tube'),
- 'FEDEX_10KG_BOX' => Mage::helper('usa')->__('FedEx 10kg Box'),
- 'FEDEX_25KG_BOX' => Mage::helper('usa')->__('FedEx 25kg Box'),
- 'YOUR_PACKAGING' => Mage::helper('usa')->__('Your Packaging'),
- ],
- 'containers_filter' => [
- [
- 'containers' => ['FEDEX_ENVELOPE', 'FEDEX_PAK'],
- 'filters' => [
- 'within_us' => [
- 'method' => [
- 'FEDEX_EXPRESS_SAVER',
- 'FEDEX_2_DAY',
- 'FEDEX_2_DAY_AM',
- 'STANDARD_OVERNIGHT',
- 'PRIORITY_OVERNIGHT',
- 'FIRST_OVERNIGHT',
- ],
- ],
- 'from_us' => [
- 'method' => [
- 'INTERNATIONAL_FIRST',
- 'INTERNATIONAL_ECONOMY',
- 'INTERNATIONAL_PRIORITY',
- ],
- ],
+ 'Version' => $this->getVersionInfo(),
+ 'RequestedShipment' => [
+ 'DropoffType' => $r->getDropoffType(),
+ 'ShipTimestamp' => date('c'),
+ 'PackagingType' => $r->getPackaging(),
+ 'TotalInsuredValue' => [
+ 'Amount' => $r->getValue(),
+ 'Currency' => $this->getCurrencyCode(),
+ ],
+ 'Shipper' => [
+ 'Address' => [
+ 'PostalCode' => $r->getOrigPostal(),
+ 'CountryCode' => $r->getOrigCountry(),
],
],
- [
- 'containers' => ['FEDEX_BOX', 'FEDEX_TUBE'],
- 'filters' => [
- 'within_us' => [
- 'method' => [
- 'FEDEX_2_DAY',
- 'FEDEX_2_DAY_AM',
- 'STANDARD_OVERNIGHT',
- 'PRIORITY_OVERNIGHT',
- 'FIRST_OVERNIGHT',
- 'FEDEX_FREIGHT',
- 'FEDEX_1_DAY_FREIGHT',
- 'FEDEX_2_DAY_FREIGHT',
- 'FEDEX_3_DAY_FREIGHT',
- 'FEDEX_NATIONAL_FREIGHT',
- ],
- ],
- 'from_us' => [
- 'method' => [
- 'INTERNATIONAL_FIRST',
- 'INTERNATIONAL_ECONOMY',
- 'INTERNATIONAL_PRIORITY',
- ],
- ],
+ 'Recipient' => [
+ 'Address' => [
+ 'PostalCode' => $r->getDestPostal(),
+ 'CountryCode' => $r->getDestCountry(),
+ 'Residential' => (bool) $this->getConfigData('residence_delivery'),
],
],
- [
- 'containers' => ['FEDEX_10KG_BOX', 'FEDEX_25KG_BOX'],
- 'filters' => [
- 'within_us' => [],
- 'from_us' => ['method' => ['INTERNATIONAL_PRIORITY']],
+ 'ShippingChargesPayment' => [
+ 'PaymentType' => 'SENDER',
+ 'Payor' => [
+ 'AccountNumber' => $r->getAccount(),
+ 'CountryCode' => $r->getOrigCountry(),
],
],
- [
- 'containers' => ['YOUR_PACKAGING'],
- 'filters' => [
- 'within_us' => [
- 'method' => [
- 'FEDEX_GROUND',
- 'GROUND_HOME_DELIVERY',
- 'SMART_POST',
- 'FEDEX_EXPRESS_SAVER',
- 'FEDEX_2_DAY',
- 'FEDEX_2_DAY_AM',
- 'STANDARD_OVERNIGHT',
- 'PRIORITY_OVERNIGHT',
- 'FIRST_OVERNIGHT',
- 'FEDEX_FREIGHT',
- 'FEDEX_1_DAY_FREIGHT',
- 'FEDEX_2_DAY_FREIGHT',
- 'FEDEX_3_DAY_FREIGHT',
- 'FEDEX_NATIONAL_FREIGHT',
- ],
- ],
- 'from_us' => [
- 'method' => [
- 'INTERNATIONAL_FIRST',
- 'INTERNATIONAL_ECONOMY',
- 'INTERNATIONAL_PRIORITY',
- 'INTERNATIONAL_GROUND',
- 'FEDEX_FREIGHT',
- 'FEDEX_1_DAY_FREIGHT',
- 'FEDEX_2_DAY_FREIGHT',
- 'FEDEX_3_DAY_FREIGHT',
- 'FEDEX_NATIONAL_FREIGHT',
- 'INTERNATIONAL_ECONOMY_FREIGHT',
- 'INTERNATIONAL_PRIORITY_FREIGHT',
- ],
+ 'CustomsClearanceDetail' => [
+ 'CustomsValue' => [
+ 'Amount' => $r->getValue(),
+ 'Currency' => $this->getCurrencyCode(),
+ ],
+ ],
+ 'RateRequestTypes' => 'LIST',
+ 'PackageCount' => '1',
+ 'PackageDetail' => 'INDIVIDUAL_PACKAGES',
+ 'RequestedPackageLineItems' => [
+ '0' => [
+ 'Weight' => [
+ 'Value' => (float) $r->getWeight(),
+ 'Units' => $this->getConfigData('unit_of_measure'),
],
+ 'GroupPackageCount' => 1,
],
],
],
+ ];
- 'delivery_confirmation_types' => [
- 'NO_SIGNATURE_REQUIRED' => Mage::helper('usa')->__('Not Required'),
- 'ADULT' => Mage::helper('usa')->__('Adult'),
- 'DIRECT' => Mage::helper('usa')->__('Direct'),
- 'INDIRECT' => Mage::helper('usa')->__('Indirect'),
- ],
+ if ($purpose == self::RATE_REQUEST_GENERAL) {
+ $ratesRequest['RequestedShipment']['RequestedPackageLineItems'][0]['InsuredValue'] = [
+ 'Amount' => $r->getValue(),
+ 'Currency' => $this->getCurrencyCode(),
+ ];
+ } elseif ($purpose == self::RATE_REQUEST_SMARTPOST) {
+ $ratesRequest['RequestedShipment']['ServiceType'] = self::RATE_REQUEST_SMARTPOST;
+ $ratesRequest['RequestedShipment']['SmartPostDetail'] = [
+ 'Indicia' => ((float) $r->getWeight() >= 1) ? 'PARCEL_SELECT' : 'PRESORTED_STANDARD',
+ 'HubId' => $this->getConfigData('smartpost_hubid'),
+ ];
+ }
- 'unit_of_measure' => [
- 'LB' => Mage::helper('usa')->__('Pounds'),
- 'KG' => Mage::helper('usa')->__('Kilograms'),
- ],
- ];
+ return $ratesRequest;
+ }
+
+ /**
+ * Makes remote request to the carrier and returns a response
+ *
+ * @param string $purpose
+ * @return mixed
+ */
+ protected function _doRatesRequest($purpose)
+ {
+ $ratesRequest = $this->_formRateRequest($purpose);
+ $requestString = serialize($ratesRequest);
+ $response = $this->_getCachedQuotes($requestString);
+ $debugData = ['request' => $ratesRequest];
+ if ($response === null) {
+ try {
+ $client = $this->_createRateSoapClient();
+ $response = $client->getRates($ratesRequest);
+ $this->_setCachedQuotes($requestString, serialize($response));
+ $debugData['result'] = $response;
+ } catch (Exception $e) {
+ $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
+ Mage::logException($e);
+ }
+ } else {
+ $response = unserialize($response);
+ $debugData['result'] = $response;
+ }
+ $this->_debug($debugData);
+ return $response;
+ }
+
+ /**
+ * Do remote request for and handle errors
+ *
+ * @return Mage_Shipping_Model_Rate_Result
+ */
+ protected function _getQuotes()
+ {
+ $this->_result = Mage::getModel('shipping/rate_result');
+ $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
+ if (in_array(self::RATE_REQUEST_SMARTPOST, $allowedMethods)) {
+ $response = $this->_doRatesRequest(self::RATE_REQUEST_SMARTPOST);
+ $preparedSmartpost = $this->_prepareRateResponse($response);
+ $this->_result->append($preparedSmartpost);
+ }
+ $response = $this->_doRatesRequest(self::RATE_REQUEST_GENERAL);
+ $preparedGeneral = $this->_prepareRateResponse($response);
+ if ($this->_result->getError() && $preparedGeneral->getError()) {
+ return $this->_result->getError();
+ }
+ $this->_result->append($preparedGeneral);
+ $this->_removeErrorsIfRateExist();
+
+ return $this->_result;
+ }
+
+ /**
+ * Remove Errors in Case When Rate Exist
+ *
+ * @return Mage_Shipping_Model_Rate_Result
+ */
+ protected function _removeErrorsIfRateExist()
+ {
+ $rateResultExist = false;
+ $rates = [];
+ foreach ($this->_result->getAllRates() as $rate) {
+ if (!($rate instanceof Mage_Shipping_Model_Rate_Result_Error)) {
+ $rateResultExist = true;
+ $rates[] = $rate;
+ }
+ }
+
+ if ($rateResultExist) {
+ $this->_result->reset();
+ $this->_result->setError(false);
+ foreach ($rates as $rate) {
+ $this->_result->append($rate);
+ }
+ }
+
+ return $this->_result;
+ }
+
+ /**
+ * Prepare shipping rate result based on response
+ *
+ * @param mixed $response
+ * @return Mage_Shipping_Model_Rate_Result
+ */
+ protected function _prepareRateResponse($response)
+ {
+ $costArr = [];
+ $priceArr = [];
+ $errorTitle = 'Unable to retrieve tracking';
+
+ if (is_object($response)) {
+ if ($response->HighestSeverity == 'FAILURE' || $response->HighestSeverity == 'ERROR') {
+ if (is_array($response->Notifications)) {
+ $notification = array_pop($response->Notifications);
+ $errorTitle = (string) $notification->Message;
+ } else {
+ $errorTitle = (string) $response->Notifications->Message;
+ }
+ } elseif (isset($response->RateReplyDetails)) {
+ $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
+
+ if (is_array($response->RateReplyDetails)) {
+ foreach ($response->RateReplyDetails as $rate) {
+ $serviceName = (string) $rate->ServiceType;
+ if (in_array($serviceName, $allowedMethods)) {
+ $amount = $this->_getRateAmountOriginBased($rate);
+ $costArr[$serviceName] = $amount;
+ $priceArr[$serviceName] = $this->getMethodPrice($amount, $serviceName);
+ }
+ }
+ asort($priceArr);
+ } else {
+ $rate = $response->RateReplyDetails;
+ $serviceName = (string) $rate->ServiceType;
+ if (in_array($serviceName, $allowedMethods)) {
+ $amount = $this->_getRateAmountOriginBased($rate);
+ $costArr[$serviceName] = $amount;
+ $priceArr[$serviceName] = $this->getMethodPrice($amount, $serviceName);
+ }
+ }
+ }
+ }
+
+ $result = Mage::getModel('shipping/rate_result');
+ if (empty($priceArr)) {
+ $error = Mage::getModel('shipping/rate_result_error');
+ $error->setCarrier($this->_code);
+ $error->setCarrierTitle($this->getConfigData('title'));
+ $error->setErrorMessage($errorTitle);
+ $error->setErrorMessage($this->getConfigData('specificerrmsg'));
+ $result->append($error);
+ } else {
+ foreach ($priceArr as $method => $price) {
+ $rate = Mage::getModel('shipping/rate_result_method');
+ $rate->setCarrier($this->_code);
+ $rate->setCarrierTitle($this->getConfigData('title'));
+ $rate->setMethod($method);
+ $rate->setMethodTitle($this->getCode('method', $method));
+ $rate->setCost($costArr[$method]);
+ $rate->setPrice($price);
+ $result->append($rate);
+ }
+ }
+ return $result;
+ }
+
+ /**
+ * Get origin based amount form response of rate estimation
+ *
+ * @param stdClass $rate
+ * @return null|float
+ */
+ protected function _getRateAmountOriginBased($rate)
+ {
+ $amount = null;
+ $rateTypeAmounts = [];
+
+ if (is_object($rate)) {
+ // The "RATED..." rates are expressed in the currency of the origin country
+ foreach ($rate->RatedShipmentDetails as $ratedShipmentDetail) {
+ $netAmount = (string) $ratedShipmentDetail->ShipmentRateDetail->TotalNetCharge->Amount;
+ $rateType = (string) $ratedShipmentDetail->ShipmentRateDetail->RateType;
+ $rateTypeAmounts[$rateType] = $netAmount;
+ }
+
+ // Order is important
+ $ratesOrder = [
+ 'RATED_ACCOUNT_PACKAGE',
+ 'PAYOR_ACCOUNT_PACKAGE',
+ 'RATED_ACCOUNT_SHIPMENT',
+ 'PAYOR_ACCOUNT_SHIPMENT',
+ 'RATED_LIST_PACKAGE',
+ 'PAYOR_LIST_PACKAGE',
+ 'RATED_LIST_SHIPMENT',
+ 'PAYOR_LIST_SHIPMENT',
+ ];
+ foreach ($ratesOrder as $rateType) {
+ if (!empty($rateTypeAmounts[$rateType])) {
+ $amount = $rateTypeAmounts[$rateType];
+ break;
+ }
+ }
+
+ if (is_null($amount)) {
+ $amount = (string) $rate->RatedShipmentDetails[0]->ShipmentRateDetail->TotalNetCharge->Amount;
+ }
+ }
+
+ return $amount;
+ }
+
+ /**
+ * Set free method request
+ *
+ * @param $freeMethod
+ */
+ protected function _setFreeMethodRequest($freeMethod)
+ {
+ $r = $this->_rawRequest;
+ $weight = $this->getTotalNumOfBoxes($r->getFreeMethodWeight());
+ $r->setWeight($weight);
+ $r->setService($freeMethod);
+ }
+
+ /**
+ * Get xml quotes
+ *
+ * @deprecated
+ * @return Mage_Shipping_Model_Rate_Result
+ */
+ protected function _getXmlQuotes()
+ {
+ $r = $this->_rawRequest;
+ $xml = new SimpleXMLElement('');
+
+ $xml->addAttribute('xmlns:api', 'http://www.fedex.com/fsmapi');
+ $xml->addAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+ $xml->addAttribute('xsi:noNamespaceSchemaLocation', 'FDXRateAvailableServicesRequest.xsd');
+
+ $requestHeader = $xml->addChild('RequestHeader');
+ $requestHeader->addChild('AccountNumber', $r->getAccount());
+ $requestHeader->addChild('MeterNumber', '0');
+
+ $xml->addChild('ShipDate', date('Y-m-d'));
+ $xml->addChild('DropoffType', $r->getDropoffType());
+ if ($r->hasService()) {
+ $xml->addChild('Service', $r->getService());
+ }
+ $xml->addChild('Packaging', $r->getPackaging());
+ $xml->addChild('WeightUnits', 'LBS');
+ $xml->addChild('Weight', $r->getWeight());
+
+ $originAddress = $xml->addChild('OriginAddress');
+ $originAddress->addChild('PostalCode', $r->getOrigPostal());
+ $originAddress->addChild('CountryCode', $r->getOrigCountry());
+
+ $destinationAddress = $xml->addChild('DestinationAddress');
+ $destinationAddress->addChild('PostalCode', $r->getDestPostal());
+ $destinationAddress->addChild('CountryCode', $r->getDestCountry());
+
+ $payment = $xml->addChild('Payment');
+ $payment->addChild('PayorType', 'SENDER');
+
+ $declaredValue = $xml->addChild('DeclaredValue');
+ $declaredValue->addChild('Value', $r->getValue());
+ $declaredValue->addChild('CurrencyCode', $this->getCurrencyCode());
+
+ if ($this->getConfigData('residence_delivery')) {
+ $specialServices = $xml->addChild('SpecialServices');
+ $specialServices->addChild('ResidentialDelivery', 'true');
+ }
+
+ $xml->addChild('PackageCount', '1');
+
+ $request = $xml->asXML();
+
+ $responseBody = $this->_getCachedQuotes($request);
+ if ($responseBody === null) {
+ $debugData = ['request' => $request];
+ try {
+ $url = $this->getConfigData('gateway_url');
+ if (!$url) {
+ $url = $this->_defaultGatewayUrl;
+ }
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_URL, $url);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
+ $responseBody = curl_exec($ch);
+ curl_close($ch);
- if (!isset($codes[$type])) {
- return false;
- } elseif ($code === '') {
- return $codes[$type];
+ $debugData['result'] = $responseBody;
+ $this->_setCachedQuotes($request, $responseBody);
+ } catch (Exception $e) {
+ $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
+ $responseBody = '';
+ }
+ $this->_debug($debugData);
}
-
- return $codes[$type][$code] ?? false;
+ return $this->_parseXmlResponse($responseBody);
}
/**
- * Return FeDex currency ISO code by Magento Base Currency Code
+ * Prepare shipping rate result based on response
*
- * @return string 3-digit currency code
+ * @param mixed $response
+ * @return Mage_Shipping_Model_Rate_Result
*/
- public function getCurrencyCode()
+ protected function _parseXmlResponse($response)
{
- $codes = [
- 'DOP' => 'RDD', // Dominican Peso
- 'XCD' => 'ECD', // Caribbean Dollars
- 'ARS' => 'ARN', // Argentina Peso
- 'SGD' => 'SID', // Singapore Dollars
- 'KRW' => 'WON', // South Korea Won
- 'JMD' => 'JAD', // Jamaican Dollars
- 'CHF' => 'SFR', // Swiss Francs
- 'JPY' => 'JYE', // Japanese Yen
- 'KWD' => 'KUD', // Kuwaiti Dinars
- 'GBP' => 'UKL', // British Pounds
- 'AED' => 'DHS', // UAE Dirhams
- 'MXN' => 'NMP', // Mexican Pesos
- 'UYU' => 'UYP', // Uruguay New Pesos
- 'CLP' => 'CHP', // Chilean Pesos
- 'TWD' => 'NTD', // New Taiwan Dollars
- ];
- $currencyCode = Mage::app()->getStore()->getBaseCurrencyCode();
- return $codes[$currencyCode] ?? $currencyCode;
+ $costArr = [];
+ $priceArr = [];
+
+ if (strlen(trim($response)) > 0) {
+ if ($xml = $this->_parseXml($response)) {
+ if (is_object($xml->Error) && is_object($xml->Error->Message)) {
+ $errorTitle = (string) $xml->Error->Message;
+ } elseif (is_object($xml->SoftError) && is_object($xml->SoftError->Message)) {
+ $errorTitle = (string) $xml->SoftError->Message;
+ } else {
+ $errorTitle = 'Unknown error';
+ }
+
+ $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
+
+ foreach ($xml->Entry as $entry) {
+ if (in_array((string) $entry->Service, $allowedMethods)) {
+ $costArr[(string) $entry->Service] =
+ (string) $entry->EstimatedCharges->DiscountedCharges->NetCharge;
+ $priceArr[(string) $entry->Service] = $this->getMethodPrice(
+ (float) $entry->EstimatedCharges->DiscountedCharges->NetCharge,
+ (string) $entry->Service,
+ );
+ }
+ }
+
+ asort($priceArr);
+ } else {
+ $errorTitle = 'Response is in the wrong format.';
+ }
+ } else {
+ $errorTitle = 'Unable to retrieve tracking';
+ }
+
+ $result = Mage::getModel('shipping/rate_result');
+ if (empty($priceArr)) {
+ $error = Mage::getModel('shipping/rate_result_error');
+ $error->setCarrier('fedex');
+ $error->setCarrierTitle($this->getConfigData('title'));
+ $error->setErrorMessage($this->getConfigData('specificerrmsg'));
+ $result->append($error);
+ } else {
+ foreach ($priceArr as $method => $price) {
+ $rate = Mage::getModel('shipping/rate_result_method');
+ $rate->setCarrier('fedex');
+ $rate->setCarrierTitle($this->getConfigData('title'));
+ $rate->setMethod($method);
+ $rate->setMethodTitle($this->getCode('method', $method));
+ $rate->setCost($costArr[$method]);
+ $rate->setPrice($price);
+ $result->append($rate);
+ }
+ }
+ return $result;
}
/**
- * Get tracking
+ * Parse XML string and return XML document object or false
*
- * @param mixed $trackings
- * @return Mage_Shipping_Model_Rate_Result|null
+ * @param string $xmlContent
+ * @return SimpleXMLElement|bool
*/
- public function getTracking($trackings)
+ protected function _parseXml($xmlContent)
{
- $this->setTrackingReqeust();
-
- if (!is_array($trackings)) {
- $trackings = [$trackings];
- }
-
- foreach ($trackings as $tracking) {
- $this->_getXMLTracking($tracking);
+ try {
+ try {
+ return simplexml_load_string($xmlContent);
+ } catch (Exception $e) {
+ throw new Exception(Mage::helper('usa')->__('Failed to parse xml document: %s', $xmlContent));
+ }
+ } catch (Exception $e) {
+ Mage::logException($e);
+ return false;
}
-
- return $this->_result;
}
/**
@@ -1220,48 +1347,6 @@ protected function _parseXmlTrackingResponse($trackingvalue, $response)
}
}
- /**
- * Get tracking response
- *
- * @return string
- */
- public function getResponse()
- {
- $statuses = '';
- if ($this->_result instanceof Mage_Shipping_Model_Tracking_Result) {
- if ($trackings = $this->_result->getAllTrackings()) {
- foreach ($trackings as $tracking) {
- if ($data = $tracking->getAllData()) {
- if (!empty($data['status'])) {
- $statuses .= Mage::helper('usa')->__($data['status']) . "\n
";
- } else {
- $statuses .= Mage::helper('usa')->__('Empty response') . "\n
";
- }
- }
- }
- }
- }
- if (empty($statuses)) {
- $statuses = Mage::helper('usa')->__('Empty response');
- }
- return $statuses;
- }
-
- /**
- * Get allowed shipping methods
- *
- * @return array
- */
- public function getAllowedMethods()
- {
- $allowed = explode(',', $this->getConfigData('allowed_methods'));
- $arr = [];
- foreach ($allowed as $k) {
- $arr[$k] = $this->getCode('method', $k);
- }
- return $arr;
- }
-
/**
* Return array of authenticated information
*
@@ -1520,89 +1605,4 @@ protected function _doShipmentRequest(Varien_Object $request)
return $result;
}
-
- /**
- * For multi package shipments. Delete requested shipments if the current shipment
- * request is failed
- *
- * @param array $data
- * @return bool
- */
- public function rollBack($data)
- {
- $requestData = $this->_getAuthDetails();
- $requestData['DeletionControl'] = 'DELETE_ONE_PACKAGE';
- foreach ($data as &$item) {
- $requestData['TrackingId'] = $item['tracking_number'];
- $client = $this->_createShipSoapClient();
- $client->deleteShipment($requestData);
- }
- return true;
- }
-
- /**
- * Return container types of carrier
- *
- * @return array|bool
- */
- public function getContainerTypes(?Varien_Object $params = null)
- {
- if ($params == null) {
- return $this->_getAllowedContainers($params);
- }
- $method = $params->getMethod();
- $countryShipper = $params->getCountryShipper();
- $countryRecipient = $params->getCountryRecipient();
-
- if (($countryShipper == self::USA_COUNTRY_ID && $countryRecipient == self::CANADA_COUNTRY_ID
- || $countryShipper == self::CANADA_COUNTRY_ID && $countryRecipient == self::USA_COUNTRY_ID)
- && $method == 'FEDEX_GROUND'
- ) {
- return ['YOUR_PACKAGING' => Mage::helper('usa')->__('Your Packaging')];
- } elseif ($method == 'INTERNATIONAL_ECONOMY' || $method == 'INTERNATIONAL_FIRST') {
- $allTypes = $this->getContainerTypesAll();
- $exclude = ['FEDEX_10KG_BOX' => '', 'FEDEX_25KG_BOX' => ''];
- return array_diff_key($allTypes, $exclude);
- } elseif ($method == 'EUROPE_FIRST_INTERNATIONAL_PRIORITY') {
- $allTypes = $this->getContainerTypesAll();
- $exclude = ['FEDEX_BOX' => '', 'FEDEX_TUBE' => ''];
- return array_diff_key($allTypes, $exclude);
- } elseif ($countryShipper == self::CANADA_COUNTRY_ID && $countryRecipient == self::CANADA_COUNTRY_ID) {
- // hack for Canada domestic. Apply the same filter rules as for US domestic
- $params->setCountryShipper(self::USA_COUNTRY_ID);
- $params->setCountryRecipient(self::USA_COUNTRY_ID);
- }
-
- return $this->_getAllowedContainers($params);
- }
-
- /**
- * Return all container types of carrier
- *
- * @return array|bool
- */
- public function getContainerTypesAll()
- {
- return $this->getCode('packaging');
- }
-
- /**
- * Return structured data of containers witch related with shipping methods
- *
- * @return array|bool
- */
- public function getContainerTypesFilter()
- {
- return $this->getCode('containers_filter');
- }
-
- /**
- * Return delivery confirmation types of carrier
- *
- * @return array
- */
- public function getDeliveryConfirmationTypes(?Varien_Object $params = null)
- {
- return $this->getCode('delivery_confirmation_types');
- }
}
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
index 7992c7b9521..c8bad3e5ace 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
@@ -279,30 +279,6 @@ public function setRequest(Mage_Shipping_Model_Rate_Request $request)
return $this;
}
- /**
- * Get correct weight.
- *
- * Namely:
- * Checks the current weight to comply with the minimum weight standards set by the carrier.
- * Then strictly rounds the weight up until the first significant digit after the decimal point.
- *
- * @param float|int $weight
- * @return float
- */
- protected function _getCorrectWeight($weight)
- {
- $minWeight = $this->getConfigData('min_package_weight');
-
- if ($weight < $minWeight) {
- $weight = $minWeight;
- }
-
- //rounds a number to one significant figure
- $weight = ceil($weight * 10) / 10;
-
- return $weight;
- }
-
/**
* Get result of request
*
@@ -313,39 +289,6 @@ public function getResult()
return $this->_result;
}
- /**
- * Do remote request for and handle errors
- *
- * @return Mage_Shipping_Model_Rate_Result
- */
- protected function _getQuotes()
- {
- // this "if" will be removed after XML APIs will be shut down
- if ($this->getConfigData('type') == 'UPS_XML') {
- return $this->_getXmlQuotes();
- }
-
- // REST is default
- return $this->_getRestQuotes();
- }
-
- /**
- * Set free method request
- *
- * @param string $freeMethod
- * @return void
- */
- protected function _setFreeMethodRequest($freeMethod)
- {
- $r = $this->_rawRequest;
-
- $weight = $this->getTotalNumOfBoxes($r->getFreeMethodWeight());
- $weight = $this->_getCorrectWeight($weight);
- $r->setWeight($weight);
- $r->setAction($this->getCode('action', 'single'));
- $r->setProduct($freeMethod);
- }
-
/**
* Get shipment by code
*
@@ -668,6 +611,260 @@ public function getCode($type, $code = '')
return $codes[$type][$code] ?? false;
}
+ /**
+ * Get tracking
+ *
+ * @param mixed $trackings
+ * @return Mage_Shipping_Model_Tracking_Result|null
+ */
+ public function getTracking($trackings)
+ {
+ if (!is_array($trackings)) {
+ $trackings = [$trackings];
+ }
+
+ if ($this->getConfigData('type') === 'UPS_XML') {
+ $this->setXMLAccessRequest();
+ $this->_getXmlTracking($trackings);
+ } else {
+ $this->_getRestTracking($trackings);
+ }
+
+ return $this->_trackingResult;
+ }
+
+ /**
+ * Get tracking response
+ *
+ * @return string
+ */
+ public function getResponse()
+ {
+ if ($this->_trackingResult === null) {
+ $trackings = [];
+ } else {
+ $trackings = $this->_trackingResult->getAllTrackings();
+ }
+
+ $statuses = '';
+ foreach ($trackings as $tracking) {
+ if ($data = $tracking->getAllData()) {
+ if (isset($data['status'])) {
+ $statuses .= Mage::helper('usa')->__($data['status']);
+ } else {
+ $statuses .= Mage::helper('usa')->__($data['error_message']);
+ }
+ }
+ }
+ if (empty($statuses)) {
+ $statuses = Mage::helper('usa')->__('Empty response');
+ }
+ return $statuses;
+ }
+
+ /**
+ * Get allowed shipping methods.
+ *
+ * @return array
+ */
+ public function getAllowedMethods()
+ {
+ $allowedMethods = explode(',', (string) $this->getConfigData('allowed_methods'));
+ $availableByTypeMethods = $this->getCode('originShipment', $this->getConfigData('origin_shipment'));
+
+ $methods = [];
+ foreach ($availableByTypeMethods as $methodCode => $methodData) {
+ if (in_array($methodCode, $allowedMethods)) {
+ $methods[$methodCode] = $methodData;
+ }
+ }
+
+ return $methods;
+ }
+
+ /**
+ * Return container types of carrier
+ *
+ * @return array|bool
+ */
+ public function getContainerTypes(?Varien_Object $params = null)
+ {
+ if ($params == null) {
+ return $this->_getAllowedContainers($params);
+ }
+ $method = $params->getMethod();
+ $countryShipper = $params->getCountryShipper();
+ $countryRecipient = $params->getCountryRecipient();
+
+ if (($countryShipper == self::USA_COUNTRY_ID && $countryRecipient == self::CANADA_COUNTRY_ID)
+ || ($countryShipper == self::CANADA_COUNTRY_ID && $countryRecipient == self::USA_COUNTRY_ID)
+ || ($countryShipper == self::MEXICO_COUNTRY_ID && $countryRecipient == self::USA_COUNTRY_ID)
+ && $method == '11' // UPS Standard
+ ) {
+ $containerTypes = [];
+ if ($method == '07' // Worldwide Express
+ || $method == '08' // Worldwide Expedited
+ || $method == '65' // Worldwide Saver
+ ) {
+ // Worldwide Expedited
+ if ($method != '08') {
+ $containerTypes = [
+ '01' => Mage::helper('usa')->__('UPS Letter Envelope'),
+ '24' => Mage::helper('usa')->__('UPS Worldwide 25 kilo'),
+ '25' => Mage::helper('usa')->__('UPS Worldwide 10 kilo'),
+ ];
+ }
+ $containerTypes = $containerTypes + [
+ '03' => Mage::helper('usa')->__('UPS Tube'),
+ '04' => Mage::helper('usa')->__('PAK'),
+ '2a' => Mage::helper('usa')->__('Small Express Box'),
+ '2b' => Mage::helper('usa')->__('Medium Express Box'),
+ '2c' => Mage::helper('usa')->__('Large Express Box'),
+ ];
+ }
+ return ['00' => Mage::helper('usa')->__('Customer Packaging')] + $containerTypes;
+ } elseif ($countryShipper == self::USA_COUNTRY_ID && $countryRecipient == self::PUERTORICO_COUNTRY_ID
+ && (
+ $method == '03' // UPS Ground
+ || $method == '02' // UPS Second Day Air
+ || $method == '01' // UPS Next Day Air
+ )
+ ) {
+ // Container types should be the same as for domestic
+ $params->setCountryRecipient(self::USA_COUNTRY_ID);
+ $containerTypes = $this->_getAllowedContainers($params);
+ $params->setCountryRecipient($countryRecipient);
+ return $containerTypes;
+ }
+ return $this->_getAllowedContainers($params);
+ }
+
+ /**
+ * Return all container types of carrier
+ *
+ * @return array
+ */
+ public function getContainerTypesAll()
+ {
+ $codes = $this->getCode('container');
+ $descriptions = $this->getCode('container_description');
+ $result = [];
+ foreach ($codes as $key => &$code) {
+ $result[$code] = $descriptions[$key];
+ }
+ return $result;
+ }
+
+ /**
+ * Return structured data of containers witch related with shipping methods
+ *
+ * @return array|false
+ */
+ public function getContainerTypesFilter()
+ {
+ return $this->getCode('containers_filter');
+ }
+
+ /**
+ * Return delivery confirmation types of carrier
+ *
+ * @return array
+ */
+ public function getDeliveryConfirmationTypes(?Varien_Object $params = null)
+ {
+ $countryRecipient = $params != null ? $params->getCountryRecipient() : null;
+ $deliveryConfirmationTypes = [];
+ switch ($this->_getDeliveryConfirmationLevel($countryRecipient)) {
+ case self::DELIVERY_CONFIRMATION_PACKAGE:
+ $deliveryConfirmationTypes = [
+ 1 => Mage::helper('usa')->__('Delivery Confirmation'),
+ 2 => Mage::helper('usa')->__('Signature Required'),
+ 3 => Mage::helper('usa')->__('Adult Signature Required'),
+ ];
+ break;
+ case self::DELIVERY_CONFIRMATION_SHIPMENT:
+ $deliveryConfirmationTypes = [
+ 1 => Mage::helper('usa')->__('Signature Required'),
+ 2 => Mage::helper('usa')->__('Adult Signature Required'),
+ ];
+ }
+ array_unshift($deliveryConfirmationTypes, Mage::helper('usa')->__('Not Required'));
+
+ return $deliveryConfirmationTypes;
+ }
+
+ /**
+ * Get Container Types, that could be customized for UPS carrier
+ *
+ * @return array
+ */
+ public function getCustomizableContainerTypes()
+ {
+ $result = [];
+ $containerTypes = $this->getCode('container');
+ foreach (parent::getCustomizableContainerTypes() as $containerType) {
+ $result[$containerType] = $containerTypes[$containerType];
+ }
+ return $result;
+ }
+
+ /**
+ * Get correct weight.
+ *
+ * Namely:
+ * Checks the current weight to comply with the minimum weight standards set by the carrier.
+ * Then strictly rounds the weight up until the first significant digit after the decimal point.
+ *
+ * @param float|int $weight
+ * @return float
+ */
+ protected function _getCorrectWeight($weight)
+ {
+ $minWeight = $this->getConfigData('min_package_weight');
+
+ if ($weight < $minWeight) {
+ $weight = $minWeight;
+ }
+
+ //rounds a number to one significant figure
+ $weight = ceil($weight * 10) / 10;
+
+ return $weight;
+ }
+
+ /**
+ * Do remote request for and handle errors
+ *
+ * @return Mage_Shipping_Model_Rate_Result
+ */
+ protected function _getQuotes()
+ {
+ // this "if" will be removed after XML APIs will be shut down
+ if ($this->getConfigData('type') == 'UPS_XML') {
+ return $this->_getXmlQuotes();
+ }
+
+ // REST is default
+ return $this->_getRestQuotes();
+ }
+
+ /**
+ * Set free method request
+ *
+ * @param string $freeMethod
+ * @return void
+ */
+ protected function _setFreeMethodRequest($freeMethod)
+ {
+ $r = $this->_rawRequest;
+
+ $weight = $this->getTotalNumOfBoxes($r->getFreeMethodWeight());
+ $weight = $this->_getCorrectWeight($weight);
+ $r->setWeight($weight);
+ $r->setAction($this->getCode('action', 'single'));
+ $r->setProduct($freeMethod);
+ }
+
/**
* Get xml rates
*
@@ -926,28 +1123,6 @@ protected function _parseXmlResponse($xmlResponse)
return $result;
}
- /**
- * Get tracking
- *
- * @param mixed $trackings
- * @return Mage_Shipping_Model_Tracking_Result|null
- */
- public function getTracking($trackings)
- {
- if (!is_array($trackings)) {
- $trackings = [$trackings];
- }
-
- if ($this->getConfigData('type') === 'UPS_XML') {
- $this->setXMLAccessRequest();
- $this->_getXmlTracking($trackings);
- } else {
- $this->_getRestTracking($trackings);
- }
-
- return $this->_trackingResult;
- }
-
/**
* Set xml access request
*
@@ -1260,87 +1435,6 @@ protected function _parseRestTrackingResponse($trackingValue, $jsonResponse)
$this->setTrackingResultData($resultArr, $trackingValue, $errorTitle);
}
- /**
- * Set Tracking Response Data
- *
- * @param array $resultArr
- * @param string $trackingValue
- * @param string $errorTitle
- */
- private function setTrackingResultData($resultArr, $trackingValue, $errorTitle)
- {
- if (!$this->_trackingResult) {
- $this->_trackingResult = Mage::getModel('shipping/tracking_result');
- }
-
- if ($resultArr) {
- /** @var Mage_Shipping_Model_Tracking_Result_Status $tracking */
- $tracking = Mage::getModel('shipping/tracking_result_status');
- $tracking->setCarrier('ups');
- $tracking->setCarrierTitle($this->getConfigData('title'));
- $tracking->setTracking($trackingValue);
- $tracking->addData($resultArr);
- $this->_trackingResult->append($tracking);
- } else {
- /** @var Mage_Shipping_Model_Tracking_Result_Error $error */
- $error = Mage::getModel('shipping/tracking_result_error');
- $error->setCarrier('ups');
- $error->setCarrierTitle($this->getConfigData('title'));
- $error->setTracking($trackingValue);
- $error->setErrorMessage($errorTitle);
- $this->_trackingResult->append($error);
- }
- }
-
- /**
- * Get tracking response
- *
- * @return string
- */
- public function getResponse()
- {
- if ($this->_trackingResult === null) {
- $trackings = [];
- } else {
- $trackings = $this->_trackingResult->getAllTrackings();
- }
-
- $statuses = '';
- foreach ($trackings as $tracking) {
- if ($data = $tracking->getAllData()) {
- if (isset($data['status'])) {
- $statuses .= Mage::helper('usa')->__($data['status']);
- } else {
- $statuses .= Mage::helper('usa')->__($data['error_message']);
- }
- }
- }
- if (empty($statuses)) {
- $statuses = Mage::helper('usa')->__('Empty response');
- }
- return $statuses;
- }
-
- /**
- * Get allowed shipping methods.
- *
- * @return array
- */
- public function getAllowedMethods()
- {
- $allowedMethods = explode(',', (string) $this->getConfigData('allowed_methods'));
- $availableByTypeMethods = $this->getCode('originShipment', $this->getConfigData('origin_shipment'));
-
- $methods = [];
- foreach ($availableByTypeMethods as $methodCode => $methodData) {
- if (in_array($methodCode, $allowedMethods)) {
- $methods[$methodCode] = $methodData;
- }
- }
-
- return $methods;
- }
-
/**
* Form XML for shipment request
*
@@ -1708,43 +1802,15 @@ protected function _doShipmentRequestRest(Varien_Object $request): Varien_Object
}
if ($package !== null) {
- $result->setTrackingNumber($package->TrackingNumber);
- // ShippingLabel is not guaranteed to be set, but if it is, GraphicImage will be set.
- if (isset($package->ShippingLabel->GraphicImage)) {
- $result->setShippingLabelContent(base64_decode($package->ShippingLabel->GraphicImage));
- }
- }
-
- $this->_debug($debugData);
- return $result;
- }
-
- /**
- * Return country code according to UPS
- *
- * @param string $countryCode
- * @param string $regionCode
- * @param string $postCode
- * @return string
- */
- private function getNormalizedCountryCode($countryCode, $regionCode, $postCode)
- {
- //for UPS, puerto rico state for US will assume as puerto rico country
- if ($countryCode == self::USA_COUNTRY_ID && ($postCode == '00912' || $regionCode == self::PUERTORICO_COUNTRY_ID)) {
- $countryCode = self::PUERTORICO_COUNTRY_ID;
- }
-
- // For UPS, Guam state of the USA will be represented by Guam country
- if ($countryCode == self::USA_COUNTRY_ID && $regionCode == self::GUAM_REGION_CODE) {
- $countryCode = self::GUAM_COUNTRY_ID;
- }
-
- // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
- if ($countryCode === 'ES' && ($regionCode === 'Las Palmas' || $regionCode === 'Santa Cruz de Tenerife')) {
- $countryCode = 'IC';
+ $result->setTrackingNumber($package->TrackingNumber);
+ // ShippingLabel is not guaranteed to be set, but if it is, GraphicImage will be set.
+ if (isset($package->ShippingLabel->GraphicImage)) {
+ $result->setShippingLabelContent(base64_decode($package->ShippingLabel->GraphicImage));
+ }
}
- return $countryCode;
+ $this->_debug($debugData);
+ return $result;
}
protected function _formShipmentRestRequest(Varien_Object $request): string
@@ -1932,19 +1998,6 @@ protected function _formShipmentRestRequest(Varien_Object $request): string
return json_encode($shipParams);
}
- private function generateShipmentDescription(array $items): string
- {
- $itemsDesc = [];
- $itemsShipment = $items;
- foreach ($itemsShipment as $itemShipment) {
- $item = new Varien_Object();
- $item->setData($itemShipment);
- $itemsDesc[] = $item->getName();
- }
-
- return substr(implode(' ', $itemsDesc), 0, 35);
- }
-
/**
* Do shipment request to carrier web service, obtain Print Shipping Labels and process errors in response
*/
@@ -2005,132 +2058,6 @@ protected function _doShipmentRequestXML(Varien_Object $request): Varien_Object
}
}
- /**
- * Return container types of carrier
- *
- * @return array|bool
- */
- public function getContainerTypes(?Varien_Object $params = null)
- {
- if ($params == null) {
- return $this->_getAllowedContainers($params);
- }
- $method = $params->getMethod();
- $countryShipper = $params->getCountryShipper();
- $countryRecipient = $params->getCountryRecipient();
-
- if (($countryShipper == self::USA_COUNTRY_ID && $countryRecipient == self::CANADA_COUNTRY_ID)
- || ($countryShipper == self::CANADA_COUNTRY_ID && $countryRecipient == self::USA_COUNTRY_ID)
- || ($countryShipper == self::MEXICO_COUNTRY_ID && $countryRecipient == self::USA_COUNTRY_ID)
- && $method == '11' // UPS Standard
- ) {
- $containerTypes = [];
- if ($method == '07' // Worldwide Express
- || $method == '08' // Worldwide Expedited
- || $method == '65' // Worldwide Saver
- ) {
- // Worldwide Expedited
- if ($method != '08') {
- $containerTypes = [
- '01' => Mage::helper('usa')->__('UPS Letter Envelope'),
- '24' => Mage::helper('usa')->__('UPS Worldwide 25 kilo'),
- '25' => Mage::helper('usa')->__('UPS Worldwide 10 kilo'),
- ];
- }
- $containerTypes = $containerTypes + [
- '03' => Mage::helper('usa')->__('UPS Tube'),
- '04' => Mage::helper('usa')->__('PAK'),
- '2a' => Mage::helper('usa')->__('Small Express Box'),
- '2b' => Mage::helper('usa')->__('Medium Express Box'),
- '2c' => Mage::helper('usa')->__('Large Express Box'),
- ];
- }
- return ['00' => Mage::helper('usa')->__('Customer Packaging')] + $containerTypes;
- } elseif ($countryShipper == self::USA_COUNTRY_ID && $countryRecipient == self::PUERTORICO_COUNTRY_ID
- && (
- $method == '03' // UPS Ground
- || $method == '02' // UPS Second Day Air
- || $method == '01' // UPS Next Day Air
- )
- ) {
- // Container types should be the same as for domestic
- $params->setCountryRecipient(self::USA_COUNTRY_ID);
- $containerTypes = $this->_getAllowedContainers($params);
- $params->setCountryRecipient($countryRecipient);
- return $containerTypes;
- }
- return $this->_getAllowedContainers($params);
- }
-
- /**
- * Return all container types of carrier
- *
- * @return array
- */
- public function getContainerTypesAll()
- {
- $codes = $this->getCode('container');
- $descriptions = $this->getCode('container_description');
- $result = [];
- foreach ($codes as $key => &$code) {
- $result[$code] = $descriptions[$key];
- }
- return $result;
- }
-
- /**
- * Return structured data of containers witch related with shipping methods
- *
- * @return array|false
- */
- public function getContainerTypesFilter()
- {
- return $this->getCode('containers_filter');
- }
-
- /**
- * Return delivery confirmation types of carrier
- *
- * @return array
- */
- public function getDeliveryConfirmationTypes(?Varien_Object $params = null)
- {
- $countryRecipient = $params != null ? $params->getCountryRecipient() : null;
- $deliveryConfirmationTypes = [];
- switch ($this->_getDeliveryConfirmationLevel($countryRecipient)) {
- case self::DELIVERY_CONFIRMATION_PACKAGE:
- $deliveryConfirmationTypes = [
- 1 => Mage::helper('usa')->__('Delivery Confirmation'),
- 2 => Mage::helper('usa')->__('Signature Required'),
- 3 => Mage::helper('usa')->__('Adult Signature Required'),
- ];
- break;
- case self::DELIVERY_CONFIRMATION_SHIPMENT:
- $deliveryConfirmationTypes = [
- 1 => Mage::helper('usa')->__('Signature Required'),
- 2 => Mage::helper('usa')->__('Adult Signature Required'),
- ];
- }
- array_unshift($deliveryConfirmationTypes, Mage::helper('usa')->__('Not Required'));
-
- return $deliveryConfirmationTypes;
- }
-
- /**
- * Get Container Types, that could be customized for UPS carrier
- *
- * @return array
- */
- public function getCustomizableContainerTypes()
- {
- $result = [];
- $containerTypes = $this->getCode('container');
- foreach (parent::getCustomizableContainerTypes() as $containerType) {
- $result[$containerType] = $containerTypes[$containerType];
- }
- return $result;
- }
-
/**
* Get delivery confirmation level based on origin/destination
* Return null if delivery confirmation is not acceptable
@@ -2356,6 +2283,97 @@ protected function _parseRestResponse(string $rateResponse)
return $this->setRatePriceData($priceArr, $costArr, $errorTitle);
}
+ /**
+ * To receive access token
+ *
+ * @return string
+ * @throws Exception
+ */
+ protected function setAPIAccessRequest()
+ {
+ $userId = $this->getConfigData('client_id');
+ $userIdPass = $this->getConfigData('client_secret');
+ if ($this->getConfigFlag('mode_xml')) {
+ $authUrl = $this->_liveUrls['AuthUrl'];
+ } else {
+ $authUrl = $this->_defaultUrls['AuthUrl'];
+ }
+ return Mage::getModel('usa/shipping_carrier_upsAuth')->getAccessToken($userId, $userIdPass, $authUrl);
+ }
+
+ /**
+ * Set Tracking Response Data
+ *
+ * @param array $resultArr
+ * @param string $trackingValue
+ * @param string $errorTitle
+ */
+ private function setTrackingResultData($resultArr, $trackingValue, $errorTitle)
+ {
+ if (!$this->_trackingResult) {
+ $this->_trackingResult = Mage::getModel('shipping/tracking_result');
+ }
+
+ if ($resultArr) {
+ /** @var Mage_Shipping_Model_Tracking_Result_Status $tracking */
+ $tracking = Mage::getModel('shipping/tracking_result_status');
+ $tracking->setCarrier('ups');
+ $tracking->setCarrierTitle($this->getConfigData('title'));
+ $tracking->setTracking($trackingValue);
+ $tracking->addData($resultArr);
+ $this->_trackingResult->append($tracking);
+ } else {
+ /** @var Mage_Shipping_Model_Tracking_Result_Error $error */
+ $error = Mage::getModel('shipping/tracking_result_error');
+ $error->setCarrier('ups');
+ $error->setCarrierTitle($this->getConfigData('title'));
+ $error->setTracking($trackingValue);
+ $error->setErrorMessage($errorTitle);
+ $this->_trackingResult->append($error);
+ }
+ }
+
+ /**
+ * Return country code according to UPS
+ *
+ * @param string $countryCode
+ * @param string $regionCode
+ * @param string $postCode
+ * @return string
+ */
+ private function getNormalizedCountryCode($countryCode, $regionCode, $postCode)
+ {
+ //for UPS, puerto rico state for US will assume as puerto rico country
+ if ($countryCode == self::USA_COUNTRY_ID && ($postCode == '00912' || $regionCode == self::PUERTORICO_COUNTRY_ID)) {
+ $countryCode = self::PUERTORICO_COUNTRY_ID;
+ }
+
+ // For UPS, Guam state of the USA will be represented by Guam country
+ if ($countryCode == self::USA_COUNTRY_ID && $regionCode == self::GUAM_REGION_CODE) {
+ $countryCode = self::GUAM_COUNTRY_ID;
+ }
+
+ // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
+ if ($countryCode === 'ES' && ($regionCode === 'Las Palmas' || $regionCode === 'Santa Cruz de Tenerife')) {
+ $countryCode = 'IC';
+ }
+
+ return $countryCode;
+ }
+
+ private function generateShipmentDescription(array $items): string
+ {
+ $itemsDesc = [];
+ $itemsShipment = $items;
+ foreach ($itemsShipment as $itemShipment) {
+ $item = new Varien_Object();
+ $item->setData($itemShipment);
+ $itemsDesc[] = $item->getName();
+ }
+
+ return substr(implode(' ', $itemsDesc), 0, 35);
+ }
+
private function setRatePriceData(array $priceArr, array $costArr, string $errorTitle): Mage_Shipping_Model_Rate_Result
{
$result = Mage::getModel('shipping/rate_result');
@@ -2463,24 +2481,6 @@ private function processShippingRestRateForItem(
}
}
- /**
- * To receive access token
- *
- * @return string
- * @throws Exception
- */
- protected function setAPIAccessRequest()
- {
- $userId = $this->getConfigData('client_id');
- $userIdPass = $this->getConfigData('client_secret');
- if ($this->getConfigFlag('mode_xml')) {
- $authUrl = $this->_liveUrls['AuthUrl'];
- } else {
- $authUrl = $this->_defaultUrls['AuthUrl'];
- }
- return Mage::getModel('usa/shipping_carrier_upsAuth')->getAccessToken($userId, $userIdPass, $authUrl);
- }
-
/**
* Setting common request params for Rate Request
*/
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php
index 628e984136b..710caa2e8bc 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php
@@ -96,16 +96,16 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
/**
* @inheritDoc
*/
- protected function _doShipmentRequest(Varien_Object $request)
+ public function getAllowedMethods(): array
{
- return new Varien_Object();
+ return [];
}
/**
* @inheritDoc
*/
- public function getAllowedMethods(): array
+ protected function _doShipmentRequest(Varien_Object $request)
{
- return [];
+ return new Varien_Object();
}
}
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
index acc2742bfac..54617027906 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
@@ -278,249 +278,6 @@ public function isShippingLabelsAvailable()
return false;
}
- /**
- * Get quotes
- *
- * @return Mage_Shipping_Model_Rate_Result
- */
- protected function _getQuotes()
- {
- return $this->_getXmlQuotes();
- }
-
- /**
- * Set free method request
- *
- * @param $freeMethod
- */
- protected function _setFreeMethodRequest($freeMethod)
- {
- $r = $this->_rawRequest;
-
- $weight = $this->getTotalNumOfBoxes($r->getFreeMethodWeight());
- $r->setWeightPounds(floor($weight));
- $r->setWeightOunces(round(($weight - floor($weight)) * self::OUNCES_POUND, 1));
- $r->setService($freeMethod);
- }
-
- /**
- * Build RateV3 request, send it to USPS gateway and retrieve quotes in XML format
- *
- * @link http://www.usps.com/webtools/htm/Rate-Calculators-v2-3.htm
- * @return Mage_Shipping_Model_Rate_Result
- */
- protected function _getXmlQuotes()
- {
- $r = $this->_rawRequest;
-
- // The origin address(shipper) must be only in USA
- if (!$this->_isUSCountry($r->getOrigCountryId())) {
- $responseBody = '';
- return $this->_parseXmlResponse($responseBody);
- }
-
- if ($this->_isUSCountry($r->getDestCountryId())) {
- $xml = new SimpleXMLElement('');
- $xml->addAttribute('USERID', $r->getUserId());
- // according to usps v4 documentation
- $xml->addChild('Revision', '2');
-
- $package = $xml->addChild('Package');
- $package->addAttribute('ID', '0');
- $service = $this->getCode('service_to_code', $r->getService());
- if (!$service) {
- $service = $r->getService();
- }
- if ($r->getContainer() == 'FLAT RATE BOX' || $r->getContainer() == 'FLAT RATE ENVELOPE') {
- $service = 'Priority';
- }
- $package->addChild('Service', $service);
-
- // no matter Letter, Flat or Parcel, use Parcel
- if ($r->getService() == 'FIRST CLASS' || $r->getService() == 'FIRST CLASS HFP COMMERCIAL') {
- $package->addChild('FirstClassMailType', 'PARCEL');
- }
- if ($r->getService() == 'FIRST CLASS COMMERCIAL') {
- $package->addChild('FirstClassMailType', 'PACKAGE SERVICE');
- }
-
- $package->addChild('ZipOrigination', $r->getOrigPostal());
- //only 5 chars available
- $package->addChild('ZipDestination', substr($r->getDestPostal(), 0, 5));
- $package->addChild('Pounds', $r->getWeightPounds());
- $package->addChild('Ounces', $r->getWeightOunces());
- // Because some methods don't accept VARIABLE and (NON)RECTANGULAR containers
- $package->addChild('Container', $r->getContainer());
- $package->addChild('Size', $r->getSize());
- if ($r->getSize() == 'LARGE') {
- $package->addChild('Width', $r->getWidth());
- $package->addChild('Length', $r->getLength());
- $package->addChild('Height', $r->getHeight());
- if ($r->getContainer() == 'NONRECTANGULAR' || $r->getContainer() == 'VARIABLE') {
- $package->addChild('Girth', $r->getGirth());
- }
- }
- $package->addChild('Machinable', $r->getMachinable());
-
- $api = 'RateV4';
- } else {
- $xml = new SimpleXMLElement('');
- $xml->addAttribute('USERID', $r->getUserId());
- // according to usps v4 documentation
- $xml->addChild('Revision', '2');
-
- $package = $xml->addChild('Package');
- $package->addAttribute('ID', '0');
- $package->addChild('Pounds', $r->getWeightPounds());
- $package->addChild('Ounces', $r->getWeightOunces());
- $package->addChild('MailType', 'All');
- $package->addChild('ValueOfContents', $r->getValue());
- $package->addChild('Country', $r->getDestCountryName());
- $package->addChild('Container', $r->getContainer());
- $package->addChild('Size', $r->getSize());
- $width = $length = $height = $girth = '';
- if ($r->getSize() == 'LARGE') {
- $width = $r->getWidth();
- $length = $r->getLength();
- $height = $r->getHeight();
- if ($r->getContainer() == 'NONRECTANGULAR') {
- $girth = $r->getGirth();
- }
- }
- $package->addChild('Width', $width);
- $package->addChild('Length', $length);
- $package->addChild('Height', $height);
- $package->addChild('Girth', $girth);
-
- if ($this->_isCanada($r->getDestCountryId())) {
- //only 5 chars available
- $package->addChild('OriginZip', substr($r->getOrigPostal(), 0, 5));
- }
- $api = 'IntlRateV2';
- }
- $request = $xml->asXML();
-
- $responseBody = $this->_getCachedQuotes($request);
- if ($responseBody === null) {
- $debugData = ['request' => $request];
- try {
- $url = $this->getConfigData('gateway_url');
- if (!$url) {
- $url = $this->_defaultGatewayUrl;
- }
- $client = new Zend_Http_Client();
- $client->setUri($url);
- $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
- $client->setParameterGet('API', $api);
- $client->setParameterGet('XML', $request);
- $response = $client->request();
- $responseBody = $response->getBody();
-
- $debugData['result'] = $responseBody;
- $this->_setCachedQuotes($request, $responseBody);
- } catch (Exception $e) {
- $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
- $responseBody = '';
- }
- $this->_debug($debugData);
- }
- return $this->_parseXmlResponse($responseBody);
- }
-
- /**
- * Parse calculated rates
- *
- * @link http://www.usps.com/webtools/htm/Rate-Calculators-v2-3.htm
- * @param string $response
- * @return Mage_Shipping_Model_Rate_Result|void
- */
- protected function _parseXmlResponse($response)
- {
- $r = $this->_rawRequest;
- $costArr = [];
- $priceArr = [];
- if (strlen(trim($response)) > 0) {
- if (strpos(trim($response), '') !== false) {
- $response = str_replace(
- '',
- '',
- $response,
- );
- }
- $xml = simplexml_load_string($response);
-
- if (is_object($xml)) {
- $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
- $serviceCodeToActualNameMap = [];
- /**
- * US Rates
- */
- if ($this->_isUSCountry($r->getDestCountryId())) {
- if (is_object($xml->Package) && is_object($xml->Package->Postage)) {
- foreach ($xml->Package->Postage as $postage) {
- $serviceName = $this->_filterServiceName((string) $postage->MailService);
- $serviceCodeMethod = $this->getCode('method_to_code', $serviceName);
- $serviceCode = $serviceCodeMethod ?: (string) $postage->attributes()->CLASSID;
- $serviceCodeToActualNameMap[$serviceCode] = $serviceName;
- if (in_array($serviceCode, $allowedMethods)) {
- $costArr[$serviceCode] = (string) $postage->Rate;
- $priceArr[$serviceCode] = $this->getMethodPrice(
- (float) $postage->Rate,
- $serviceCode,
- );
- }
- }
- asort($priceArr);
- }
- } else { // International Rates
- if (is_object($xml->Package) && is_object($xml->Package->Service)) {
- foreach ($xml->Package->Service as $service) {
- // phpcs:ignore Ecg.Performance.Loop.ArraySize
- if ($service->ServiceErrors->count()) {
- continue;
- }
- $serviceName = $this->_filterServiceName((string) $service->SvcDescription);
- $serviceCode = 'INT_' . (string) $service->attributes()->ID;
- $serviceCodeToActualNameMap[$serviceCode] = $serviceName;
- if (in_array($serviceCode, $allowedMethods)) {
- $costArr[$serviceCode] = (string) $service->Postage;
- $priceArr[$serviceCode] = $this->getMethodPrice(
- (float) $service->Postage,
- $serviceCode,
- );
- }
- }
- asort($priceArr);
- }
- }
- }
-
- $result = Mage::getModel('shipping/rate_result');
- if (empty($priceArr)) {
- $error = Mage::getModel('shipping/rate_result_error');
- $error->setCarrier('usps');
- $error->setCarrierTitle($this->getConfigData('title'));
- $error->setErrorMessage($this->getConfigData('specificerrmsg'));
- $result->append($error);
- } else {
- foreach ($priceArr as $method => $price) {
- $rate = Mage::getModel('shipping/rate_result_method');
- $rate->setCarrier('usps');
- $rate->setCarrierTitle($this->getConfigData('title'));
- $rate->setMethod($method);
- $rate->setMethodTitle($serviceCodeToActualNameMap[$method] ?? $this->getCode('method', $method));
- $rate->setCost($costArr[$method]);
- $rate->setPrice($price);
- $result->append($rate);
- }
- }
-
- return $result;
- }
- }
- }
-
/**
* Get configuration data of carrier
*
@@ -880,31 +637,420 @@ public function getCode($type, $code = '')
],
];
- if (!isset($codes[$type])) {
- return false;
- } elseif ($code === '') {
- return $codes[$type];
+ if (!isset($codes[$type])) {
+ return false;
+ } elseif ($code === '') {
+ return $codes[$type];
+ }
+
+ return $codes[$type][$code] ?? false;
+ }
+ /**
+ * Get tracking
+ *
+ * @param mixed $trackingData
+ * @return Mage_Shipping_Model_Rate_Result|null
+ */
+ public function getTracking($trackingData)
+ {
+ $this->setTrackingRequest();
+
+ if (!is_array($trackingData)) {
+ $trackingData = [$trackingData];
+ }
+
+ $this->_getXmlTracking($trackingData);
+
+ return $this->_result;
+ }
+
+ /**
+ * Get tracking response
+ *
+ * @return string
+ */
+ public function getResponse()
+ {
+ $statuses = '';
+ if ($this->_result instanceof Mage_Shipping_Model_Tracking_Result) {
+ if ($trackingData = $this->_result->getAllTrackings()) {
+ foreach ($trackingData as $tracking) {
+ if ($data = $tracking->getAllData()) {
+ if (!empty($data['track_summary'])) {
+ $statuses .= Mage::helper('usa')->__($data['track_summary']);
+ } else {
+ $statuses .= Mage::helper('usa')->__('Empty response');
+ }
+ }
+ }
+ }
+ }
+ if (empty($statuses)) {
+ $statuses = Mage::helper('usa')->__('Empty response');
+ }
+ return $statuses;
+ }
+
+ /**
+ * Get allowed shipping methods
+ *
+ * @return array
+ */
+ public function getAllowedMethods()
+ {
+ $allowed = explode(',', $this->getConfigData('allowed_methods'));
+ $arr = [];
+ foreach ($allowed as $k) {
+ $arr[$k] = $this->getCode('method', $k);
+ }
+ return $arr;
+ }
+
+ /**
+ * Return container types of carrier
+ *
+ * @return array|bool
+ */
+ public function getContainerTypes(?Varien_Object $params = null)
+ {
+ if (is_null($params)) {
+ return $this->_getAllowedContainers();
+ }
+ return $this->_isUSCountry($params->getCountryRecipient()) ? [] : $this->_getAllowedContainers($params);
+ }
+
+ /**
+ * Return all container types of carrier
+ *
+ * @return array|bool
+ */
+ public function getContainerTypesAll()
+ {
+ return $this->getCode('container');
+ }
+
+ /**
+ * Return structured data of containers witch related with shipping methods
+ *
+ * @return array|bool
+ */
+ public function getContainerTypesFilter()
+ {
+ return $this->getCode('containers_filter');
+ }
+
+ /**
+ * Return delivery confirmation types of carrier
+ *
+ * @return array
+ */
+ public function getDeliveryConfirmationTypes(?Varien_Object $params = null)
+ {
+ if ($params == null) {
+ return [];
+ }
+ $countryRecipient = $params->getCountryRecipient();
+ if ($this->_isUSCountry($countryRecipient)) {
+ return $this->getCode('delivery_confirmation_types');
+ } else {
+ return [];
+ }
+ }
+
+ /**
+ * Check whether girth is allowed for the USPS
+ *
+ * @param null|string $countyDest
+ * @return bool
+ */
+ public function isGirthAllowed($countyDest = null)
+ {
+ return $this->_isUSCountry($countyDest) ? false : true;
+ }
+
+ /**
+ * Return content types of package
+ *
+ * @return array
+ */
+ public function getContentTypes(Varien_Object $params)
+ {
+ $countryShipper = $params->getCountryShipper();
+ $countryRecipient = $params->getCountryRecipient();
+
+ if ($countryShipper == self::USA_COUNTRY_ID
+ && $countryRecipient != self::USA_COUNTRY_ID
+ ) {
+ return [
+ 'MERCHANDISE' => Mage::helper('usa')->__('Merchandise'),
+ 'SAMPLE' => Mage::helper('usa')->__('Sample'),
+ 'GIFT' => Mage::helper('usa')->__('Gift'),
+ 'DOCUMENTS' => Mage::helper('usa')->__('Documents'),
+ 'RETURN' => Mage::helper('usa')->__('Return'),
+ 'OTHER' => Mage::helper('usa')->__('Other'),
+ ];
+ }
+ return [];
+ }
+
+ /**
+ * @deprecated
+ */
+ public function getMethodLabel($value)
+ {
+ return $this->_methodsMapper($value, true);
+ }
+
+ /**
+ * Get value of method by its label
+ * @deprecated
+ */
+ public function getMethodValue($label)
+ {
+ return $this->_methodsMapper($label, false);
+ }
+
+ /**
+ * Get quotes
+ *
+ * @return Mage_Shipping_Model_Rate_Result
+ */
+ protected function _getQuotes()
+ {
+ return $this->_getXmlQuotes();
+ }
+
+ /**
+ * Set free method request
+ *
+ * @param $freeMethod
+ */
+ protected function _setFreeMethodRequest($freeMethod)
+ {
+ $r = $this->_rawRequest;
+
+ $weight = $this->getTotalNumOfBoxes($r->getFreeMethodWeight());
+ $r->setWeightPounds(floor($weight));
+ $r->setWeightOunces(round(($weight - floor($weight)) * self::OUNCES_POUND, 1));
+ $r->setService($freeMethod);
+ }
+
+ /**
+ * Build RateV3 request, send it to USPS gateway and retrieve quotes in XML format
+ *
+ * @link http://www.usps.com/webtools/htm/Rate-Calculators-v2-3.htm
+ * @return Mage_Shipping_Model_Rate_Result
+ */
+ protected function _getXmlQuotes()
+ {
+ $r = $this->_rawRequest;
+
+ // The origin address(shipper) must be only in USA
+ if (!$this->_isUSCountry($r->getOrigCountryId())) {
+ $responseBody = '';
+ return $this->_parseXmlResponse($responseBody);
+ }
+
+ if ($this->_isUSCountry($r->getDestCountryId())) {
+ $xml = new SimpleXMLElement('');
+ $xml->addAttribute('USERID', $r->getUserId());
+ // according to usps v4 documentation
+ $xml->addChild('Revision', '2');
+
+ $package = $xml->addChild('Package');
+ $package->addAttribute('ID', '0');
+ $service = $this->getCode('service_to_code', $r->getService());
+ if (!$service) {
+ $service = $r->getService();
+ }
+ if ($r->getContainer() == 'FLAT RATE BOX' || $r->getContainer() == 'FLAT RATE ENVELOPE') {
+ $service = 'Priority';
+ }
+ $package->addChild('Service', $service);
+
+ // no matter Letter, Flat or Parcel, use Parcel
+ if ($r->getService() == 'FIRST CLASS' || $r->getService() == 'FIRST CLASS HFP COMMERCIAL') {
+ $package->addChild('FirstClassMailType', 'PARCEL');
+ }
+ if ($r->getService() == 'FIRST CLASS COMMERCIAL') {
+ $package->addChild('FirstClassMailType', 'PACKAGE SERVICE');
+ }
+
+ $package->addChild('ZipOrigination', $r->getOrigPostal());
+ //only 5 chars available
+ $package->addChild('ZipDestination', substr($r->getDestPostal(), 0, 5));
+ $package->addChild('Pounds', $r->getWeightPounds());
+ $package->addChild('Ounces', $r->getWeightOunces());
+ // Because some methods don't accept VARIABLE and (NON)RECTANGULAR containers
+ $package->addChild('Container', $r->getContainer());
+ $package->addChild('Size', $r->getSize());
+ if ($r->getSize() == 'LARGE') {
+ $package->addChild('Width', $r->getWidth());
+ $package->addChild('Length', $r->getLength());
+ $package->addChild('Height', $r->getHeight());
+ if ($r->getContainer() == 'NONRECTANGULAR' || $r->getContainer() == 'VARIABLE') {
+ $package->addChild('Girth', $r->getGirth());
+ }
+ }
+ $package->addChild('Machinable', $r->getMachinable());
+
+ $api = 'RateV4';
+ } else {
+ $xml = new SimpleXMLElement('');
+ $xml->addAttribute('USERID', $r->getUserId());
+ // according to usps v4 documentation
+ $xml->addChild('Revision', '2');
+
+ $package = $xml->addChild('Package');
+ $package->addAttribute('ID', '0');
+ $package->addChild('Pounds', $r->getWeightPounds());
+ $package->addChild('Ounces', $r->getWeightOunces());
+ $package->addChild('MailType', 'All');
+ $package->addChild('ValueOfContents', $r->getValue());
+ $package->addChild('Country', $r->getDestCountryName());
+ $package->addChild('Container', $r->getContainer());
+ $package->addChild('Size', $r->getSize());
+ $width = $length = $height = $girth = '';
+ if ($r->getSize() == 'LARGE') {
+ $width = $r->getWidth();
+ $length = $r->getLength();
+ $height = $r->getHeight();
+ if ($r->getContainer() == 'NONRECTANGULAR') {
+ $girth = $r->getGirth();
+ }
+ }
+ $package->addChild('Width', $width);
+ $package->addChild('Length', $length);
+ $package->addChild('Height', $height);
+ $package->addChild('Girth', $girth);
+
+ if ($this->_isCanada($r->getDestCountryId())) {
+ //only 5 chars available
+ $package->addChild('OriginZip', substr($r->getOrigPostal(), 0, 5));
+ }
+ $api = 'IntlRateV2';
+ }
+ $request = $xml->asXML();
+
+ $responseBody = $this->_getCachedQuotes($request);
+ if ($responseBody === null) {
+ $debugData = ['request' => $request];
+ try {
+ $url = $this->getConfigData('gateway_url');
+ if (!$url) {
+ $url = $this->_defaultGatewayUrl;
+ }
+ $client = new Zend_Http_Client();
+ $client->setUri($url);
+ $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
+ $client->setParameterGet('API', $api);
+ $client->setParameterGet('XML', $request);
+ $response = $client->request();
+ $responseBody = $response->getBody();
+
+ $debugData['result'] = $responseBody;
+ $this->_setCachedQuotes($request, $responseBody);
+ } catch (Exception $e) {
+ $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
+ $responseBody = '';
+ }
+ $this->_debug($debugData);
}
-
- return $codes[$type][$code] ?? false;
+ return $this->_parseXmlResponse($responseBody);
}
+
/**
- * Get tracking
+ * Parse calculated rates
*
- * @param mixed $trackingData
- * @return Mage_Shipping_Model_Rate_Result|null
+ * @link http://www.usps.com/webtools/htm/Rate-Calculators-v2-3.htm
+ * @param string $response
+ * @return Mage_Shipping_Model_Rate_Result|void
*/
- public function getTracking($trackingData)
+ protected function _parseXmlResponse($response)
{
- $this->setTrackingRequest();
+ $r = $this->_rawRequest;
+ $costArr = [];
+ $priceArr = [];
+ if (strlen(trim($response)) > 0) {
+ if (strpos(trim($response), '') !== false) {
+ $response = str_replace(
+ '',
+ '',
+ $response,
+ );
+ }
+ $xml = simplexml_load_string($response);
- if (!is_array($trackingData)) {
- $trackingData = [$trackingData];
- }
+ if (is_object($xml)) {
+ $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
+ $serviceCodeToActualNameMap = [];
+ /**
+ * US Rates
+ */
+ if ($this->_isUSCountry($r->getDestCountryId())) {
+ if (is_object($xml->Package) && is_object($xml->Package->Postage)) {
+ foreach ($xml->Package->Postage as $postage) {
+ $serviceName = $this->_filterServiceName((string) $postage->MailService);
+ $serviceCodeMethod = $this->getCode('method_to_code', $serviceName);
+ $serviceCode = $serviceCodeMethod ?: (string) $postage->attributes()->CLASSID;
+ $serviceCodeToActualNameMap[$serviceCode] = $serviceName;
+ if (in_array($serviceCode, $allowedMethods)) {
+ $costArr[$serviceCode] = (string) $postage->Rate;
+ $priceArr[$serviceCode] = $this->getMethodPrice(
+ (float) $postage->Rate,
+ $serviceCode,
+ );
+ }
+ }
+ asort($priceArr);
+ }
+ } else { // International Rates
+ if (is_object($xml->Package) && is_object($xml->Package->Service)) {
+ foreach ($xml->Package->Service as $service) {
+ // phpcs:ignore Ecg.Performance.Loop.ArraySize
+ if ($service->ServiceErrors->count()) {
+ continue;
+ }
+ $serviceName = $this->_filterServiceName((string) $service->SvcDescription);
+ $serviceCode = 'INT_' . (string) $service->attributes()->ID;
+ $serviceCodeToActualNameMap[$serviceCode] = $serviceName;
+ if (in_array($serviceCode, $allowedMethods)) {
+ $costArr[$serviceCode] = (string) $service->Postage;
+ $priceArr[$serviceCode] = $this->getMethodPrice(
+ (float) $service->Postage,
+ $serviceCode,
+ );
+ }
+ }
+ asort($priceArr);
+ }
+ }
+ }
- $this->_getXmlTracking($trackingData);
+ $result = Mage::getModel('shipping/rate_result');
+ if (empty($priceArr)) {
+ $error = Mage::getModel('shipping/rate_result_error');
+ $error->setCarrier('usps');
+ $error->setCarrierTitle($this->getConfigData('title'));
+ $error->setErrorMessage($this->getConfigData('specificerrmsg'));
+ $result->append($error);
+ } else {
+ foreach ($priceArr as $method => $price) {
+ $rate = Mage::getModel('shipping/rate_result_method');
+ $rate->setCarrier('usps');
+ $rate->setCarrierTitle($this->getConfigData('title'));
+ $rate->setMethod($method);
+ $rate->setMethodTitle($serviceCodeToActualNameMap[$method] ?? $this->getCode('method', $method));
+ $rate->setCost($costArr[$method]);
+ $rate->setPrice($price);
+ $result->append($rate);
+ }
+ }
- return $this->_result;
+ return $result;
+ }
+ }
}
/**
@@ -1019,48 +1165,6 @@ protected function _parseXmlTrackingResponse($trackingValue, $response)
}
}
- /**
- * Get tracking response
- *
- * @return string
- */
- public function getResponse()
- {
- $statuses = '';
- if ($this->_result instanceof Mage_Shipping_Model_Tracking_Result) {
- if ($trackingData = $this->_result->getAllTrackings()) {
- foreach ($trackingData as $tracking) {
- if ($data = $tracking->getAllData()) {
- if (!empty($data['track_summary'])) {
- $statuses .= Mage::helper('usa')->__($data['track_summary']);
- } else {
- $statuses .= Mage::helper('usa')->__('Empty response');
- }
- }
- }
- }
- }
- if (empty($statuses)) {
- $statuses = Mage::helper('usa')->__('Empty response');
- }
- return $statuses;
- }
-
- /**
- * Get allowed shipping methods
- *
- * @return array
- */
- public function getAllowedMethods()
- {
- $allowed = explode(',', $this->getConfigData('allowed_methods'));
- $arr = [];
- foreach ($allowed as $k) {
- $arr[$k] = $this->getCode('method', $k);
- }
- return $arr;
- }
-
/**
* Return USPS county name by country ISO 3166-1-alpha-2 code
* Return false for unknown countries
@@ -1795,93 +1899,6 @@ protected function _doShipmentRequest(Varien_Object $request)
return $result;
}
- /**
- * Return container types of carrier
- *
- * @return array|bool
- */
- public function getContainerTypes(?Varien_Object $params = null)
- {
- if (is_null($params)) {
- return $this->_getAllowedContainers();
- }
- return $this->_isUSCountry($params->getCountryRecipient()) ? [] : $this->_getAllowedContainers($params);
- }
-
- /**
- * Return all container types of carrier
- *
- * @return array|bool
- */
- public function getContainerTypesAll()
- {
- return $this->getCode('container');
- }
-
- /**
- * Return structured data of containers witch related with shipping methods
- *
- * @return array|bool
- */
- public function getContainerTypesFilter()
- {
- return $this->getCode('containers_filter');
- }
-
- /**
- * Return delivery confirmation types of carrier
- *
- * @return array
- */
- public function getDeliveryConfirmationTypes(?Varien_Object $params = null)
- {
- if ($params == null) {
- return [];
- }
- $countryRecipient = $params->getCountryRecipient();
- if ($this->_isUSCountry($countryRecipient)) {
- return $this->getCode('delivery_confirmation_types');
- } else {
- return [];
- }
- }
-
- /**
- * Check whether girth is allowed for the USPS
- *
- * @param null|string $countyDest
- * @return bool
- */
- public function isGirthAllowed($countyDest = null)
- {
- return $this->_isUSCountry($countyDest) ? false : true;
- }
-
- /**
- * Return content types of package
- *
- * @return array
- */
- public function getContentTypes(Varien_Object $params)
- {
- $countryShipper = $params->getCountryShipper();
- $countryRecipient = $params->getCountryRecipient();
-
- if ($countryShipper == self::USA_COUNTRY_ID
- && $countryRecipient != self::USA_COUNTRY_ID
- ) {
- return [
- 'MERCHANDISE' => Mage::helper('usa')->__('Merchandise'),
- 'SAMPLE' => Mage::helper('usa')->__('Sample'),
- 'GIFT' => Mage::helper('usa')->__('Gift'),
- 'DOCUMENTS' => Mage::helper('usa')->__('Documents'),
- 'RETURN' => Mage::helper('usa')->__('Return'),
- 'OTHER' => Mage::helper('usa')->__('Other'),
- ];
- }
- return [];
- }
-
/**
* Parse zip from string to zip5-zip4
*
@@ -1920,23 +1937,6 @@ protected function _methodsMapper($method, $valuesToLabels = true)
return $method;
}
- /**
- * @deprecated
- */
- public function getMethodLabel($value)
- {
- return $this->_methodsMapper($value, true);
- }
-
- /**
- * Get value of method by its label
- * @deprecated
- */
- public function getMethodValue($label)
- {
- return $this->_methodsMapper($label, false);
- }
-
/**
* @deprecated
*/
diff --git a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
index 9168a2862c8..6d429b70f34 100644
--- a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
+++ b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
@@ -113,25 +113,6 @@ public function getValues()
return $values;
}
- /**
- * Sorts Weee Taxes
- *
- * @param array $a
- * @param array $b
- *
- * @return int
- */
- protected function _sortWeeeTaxes($a, $b)
- {
- if ($a['website_id'] != $b['website_id']) {
- return $a['website_id'] < $b['website_id'] ? -1 : 1;
- }
- if ($a['country'] != $b['country']) {
- return $a['country'] < $b['country'] ? -1 : 1;
- }
- return 0;
- }
-
/**
* Retrieves number of websites
*
@@ -206,6 +187,35 @@ public function getWebsites()
return $this->_websites;
}
+ /**
+ * Retrieve add button html
+ *
+ * @return string
+ */
+ public function getAddButtonHtml()
+ {
+ return $this->getChildHtml('add_button');
+ }
+
+ /**
+ * Sorts Weee Taxes
+ *
+ * @param array $a
+ * @param array $b
+ *
+ * @return int
+ */
+ protected function _sortWeeeTaxes($a, $b)
+ {
+ if ($a['website_id'] != $b['website_id']) {
+ return $a['website_id'] < $b['website_id'] ? -1 : 1;
+ }
+ if ($a['country'] != $b['country']) {
+ return $a['country'] < $b['country'] ? -1 : 1;
+ }
+ return 0;
+ }
+
/**
* Set add button and its properties
*/
@@ -221,14 +231,4 @@ protected function _setAddButton()
]),
);
}
-
- /**
- * Retrieve add button html
- *
- * @return string
- */
- public function getAddButtonHtml()
- {
- return $this->getChildHtml('add_button');
- }
}
diff --git a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php
index 03da17c1307..c5c8092c2bd 100644
--- a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -23,16 +23,6 @@ public static function getBackendModelName()
return 'weee/attribute_backend_weee_tax';
}
- /**
- * Retrieve resource model
- *
- * @return Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax
- */
- protected function _getResource()
- {
- return Mage::getResourceSingleton(self::getBackendModelName());
- }
-
/**
* Validate data
*
@@ -151,4 +141,14 @@ public function getTable()
{
return $this->_getResource()->getTable('weee/tax');
}
+
+ /**
+ * Retrieve resource model
+ *
+ * @return Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax
+ */
+ protected function _getResource()
+ {
+ return Mage::getResourceSingleton(self::getBackendModelName());
+ }
}
diff --git a/app/code/core/Mage/Weee/Model/Observer.php b/app/code/core/Mage/Weee/Model/Observer.php
index 0b86eab3b76..fb4f603d41d 100644
--- a/app/code/core/Mage/Weee/Model/Observer.php
+++ b/app/code/core/Mage/Weee/Model/Observer.php
@@ -160,16 +160,6 @@ public function prepareCatalogIndexSelect(Varien_Event_Observer $observer)
return $this;
}
- /**
- * Get empty select object
- *
- * @return Varien_Db_Select
- */
- protected function _getSelect()
- {
- return Mage::getSingleton('weee/tax')->getResource()->getReadConnection()->select();
- }
-
/**
* Add new attribute type to manage attributes interface
*
@@ -385,4 +375,14 @@ public function setSessionQuoteStore(Varien_Event_Observer $observer)
return $this;
}
+
+ /**
+ * Get empty select object
+ *
+ * @return Varien_Db_Select
+ */
+ protected function _getSelect()
+ {
+ return Mage::getSingleton('weee/tax')->getResource()->getReadConnection()->select();
+ }
}
diff --git a/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
index f66c6f5add1..b65a73faa80 100644
--- a/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
+++ b/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
@@ -22,15 +22,6 @@
*/
class Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax extends Mage_Core_Model_Resource_Db_Abstract
{
- /**
- * Defines main resource table and table identifier field
- *
- */
- protected function _construct()
- {
- $this->_init('weee/tax', 'value_id');
- }
-
/**
* Load product data
*
@@ -100,4 +91,12 @@ public function insertProductData($product, $data)
$this->_getWriteAdapter()->insert($this->getMainTable(), $data);
return $this;
}
+ /**
+ * Defines main resource table and table identifier field
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('weee/tax', 'value_id');
+ }
}
diff --git a/app/code/core/Mage/Weee/Model/Resource/Tax.php b/app/code/core/Mage/Weee/Model/Resource/Tax.php
index d11ef452cde..613ab3c7e5d 100644
--- a/app/code/core/Mage/Weee/Model/Resource/Tax.php
+++ b/app/code/core/Mage/Weee/Model/Resource/Tax.php
@@ -22,11 +22,6 @@
*/
class Mage_Weee_Model_Resource_Tax extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('weee/tax', 'value_id');
- }
-
/**
* Fetch one
*
@@ -70,6 +65,29 @@ public function updateProductsDiscountPercent($condition)
return $this->_updateDiscountPercents($condition);
}
+ /**
+ * Retrieve product discount percent
+ *
+ * @param int $productId
+ * @param int $websiteId
+ * @param int $customerGroupId
+ * @return string
+ */
+ public function getProductDiscountPercent($productId, $websiteId, $customerGroupId)
+ {
+ $select = $this->_getReadAdapter()->select();
+ $select->from($this->getTable('weee/discount'), 'value')
+ ->where('website_id = ?', (int) $websiteId)
+ ->where('entity_id = ?', (int) $productId)
+ ->where('customer_group_id = ?', (int) $customerGroupId);
+
+ return $this->_getReadAdapter()->fetchOne($select);
+ }
+ protected function _construct()
+ {
+ $this->_init('weee/tax', 'value_id');
+ }
+
/**
* Update tax percents for WEEE based on products condition
*
@@ -146,23 +164,4 @@ protected function _updateDiscountPercents($productCondition = null)
return $this;
}
-
- /**
- * Retrieve product discount percent
- *
- * @param int $productId
- * @param int $websiteId
- * @param int $customerGroupId
- * @return string
- */
- public function getProductDiscountPercent($productId, $websiteId, $customerGroupId)
- {
- $select = $this->_getReadAdapter()->select();
- $select->from($this->getTable('weee/discount'), 'value')
- ->where('website_id = ?', (int) $websiteId)
- ->where('entity_id = ?', (int) $productId)
- ->where('customer_group_id = ?', (int) $customerGroupId);
-
- return $this->_getReadAdapter()->fetchOne($select);
- }
}
diff --git a/app/code/core/Mage/Weee/Model/Tax.php b/app/code/core/Mage/Weee/Model/Tax.php
index 06a1c3b462d..bdeb5814d3e 100644
--- a/app/code/core/Mage/Weee/Model/Tax.php
+++ b/app/code/core/Mage/Weee/Model/Tax.php
@@ -63,14 +63,6 @@ class Mage_Weee_Model_Tax extends Mage_Core_Model_Abstract
*/
protected $_taxHelper;
- /**
- * Initialize resource
- */
- protected function _construct()
- {
- $this->_init('weee/tax', 'weee/tax');
- }
-
/**
* Initialize tax helper
*/
@@ -265,29 +257,6 @@ public function getProductWeeeAttributes(
return $result;
}
- /**
- * Get discount percentage for a product
- *
- * @param Mage_Catalog_Model_Product $product
- * @return int
- */
- protected function _getDiscountPercentForProduct($product)
- {
- $website = Mage::app()->getStore()->getWebsiteId();
- $group = Mage::getSingleton('customer/session')->getCustomerGroupId();
- $key = implode('-', [$website, $group, $product->getId()]);
- if (!isset($this->_productDiscounts[$key])) {
- $this->_productDiscounts[$key] = (int) $this->getResource()
- ->getProductDiscountPercent($product->getId(), $website, $group);
- }
- $value = $this->_productDiscounts[$key];
- if ($value) {
- return 100 - min(100, max(0, $value));
- } else {
- return 0;
- }
- }
-
/**
* Update discounts for FPT amounts of all products
*
@@ -310,4 +279,35 @@ public function updateProductsDiscountPercent($products)
$this->getResource()->updateProductsDiscountPercent($products);
return $this;
}
+
+ /**
+ * Initialize resource
+ */
+ protected function _construct()
+ {
+ $this->_init('weee/tax', 'weee/tax');
+ }
+
+ /**
+ * Get discount percentage for a product
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @return int
+ */
+ protected function _getDiscountPercentForProduct($product)
+ {
+ $website = Mage::app()->getStore()->getWebsiteId();
+ $group = Mage::getSingleton('customer/session')->getCustomerGroupId();
+ $key = implode('-', [$website, $group, $product->getId()]);
+ if (!isset($this->_productDiscounts[$key])) {
+ $this->_productDiscounts[$key] = (int) $this->getResource()
+ ->getProductDiscountPercent($product->getId(), $website, $group);
+ }
+ $value = $this->_productDiscounts[$key];
+ if ($value) {
+ return 100 - min(100, max(0, $value));
+ } else {
+ return 0;
+ }
+ }
}
diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php
index 63536207fb3..2d1cfa02af2 100644
--- a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php
+++ b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php
@@ -104,6 +104,59 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
return $this;
}
+ /**
+ * Fetch FPT data to address object for display in totals block
+ *
+ * @return $this
+ */
+ public function fetch(Mage_Sales_Model_Quote_Address $address)
+ {
+ return $this;
+ }
+
+ /**
+ * Process model configuration array.
+ * This method can be used for changing totals collect sort order
+ *
+ * @param array $config
+ * @param Mage_Core_Model_Store $store
+ * @return array
+ */
+ public function processConfigArray($config, $store)
+ {
+ return $config;
+ }
+
+ /**
+ * Set the helper object.
+ *
+ * @param Mage_Weee_Helper_Data $helper
+ */
+ public function setHelper($helper)
+ {
+ $this->_helper = $helper;
+ }
+
+ /**
+ * Set the store Object
+ *
+ * @param Mage_Core_Model_Store $store
+ */
+ public function setStore($store)
+ {
+ $this->_store = $store;
+ }
+
+ /**
+ * No aggregated label for fixed product tax
+ *
+ * TODO: fix
+ */
+ public function getLabel()
+ {
+ return '';
+ }
+
/**
* Calculate item fixed tax and prepare information for discount and recular taxation
*
@@ -362,29 +415,6 @@ protected function _resetItemData($item)
$item->setWeeeTaxAppliedRowAmount(0);
}
- /**
- * Fetch FPT data to address object for display in totals block
- *
- * @return $this
- */
- public function fetch(Mage_Sales_Model_Quote_Address $address)
- {
- return $this;
- }
-
- /**
- * Process model configuration array.
- * This method can be used for changing totals collect sort order
- *
- * @param array $config
- * @param Mage_Core_Model_Store $store
- * @return array
- */
- public function processConfigArray($config, $store)
- {
- return $config;
- }
-
/**
* Process item fixed taxes
*
@@ -608,34 +638,4 @@ protected function _getCalculator()
{
return Mage::getSingleton('tax/calculation');
}
-
- /**
- * Set the helper object.
- *
- * @param Mage_Weee_Helper_Data $helper
- */
- public function setHelper($helper)
- {
- $this->_helper = $helper;
- }
-
- /**
- * Set the store Object
- *
- * @param Mage_Core_Model_Store $store
- */
- public function setStore($store)
- {
- $this->_store = $store;
- }
-
- /**
- * No aggregated label for fixed product tax
- *
- * TODO: fix
- */
- public function getLabel()
- {
- return '';
- }
}
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
index 8e55e480226..8291fbb98b1 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
@@ -22,14 +22,6 @@
*/
class Mage_Widget_Block_Adminhtml_Widget_Instance_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
{
- protected function _construct()
- {
- parent::_construct();
- $this->_objectId = 'instance_id';
- $this->_blockGroup = 'widget';
- $this->_controller = 'adminhtml_widget_instance';
- }
-
/**
* Getter
*
@@ -40,30 +32,6 @@ public function getWidgetInstance()
return Mage::registry('current_widget_instance');
}
- /**
- * Prepare layout.
- * Adding save_and_continue button
- *
- * @inheritDoc
- */
- protected function _preparelayout()
- {
- if ($this->getWidgetInstance()->isCompleteToCreate()) {
- $this->_addButton(
- 'save_and_edit_button',
- [
- 'label' => Mage::helper('widget')->__('Save and Continue Edit'),
- 'class' => 'save',
- 'onclick' => 'saveAndContinueEdit()',
- ],
- 100,
- );
- } else {
- $this->removeButton('save');
- }
- return parent::_prepareLayout();
- }
-
/**
* Return translated header text depending on creating/editing action
*
@@ -96,4 +64,35 @@ public function getSaveUrl()
{
return $this->getUrl('*/*/save', ['_current' => true, 'back' => null]);
}
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_objectId = 'instance_id';
+ $this->_blockGroup = 'widget';
+ $this->_controller = 'adminhtml_widget_instance';
+ }
+
+ /**
+ * Prepare layout.
+ * Adding save_and_continue button
+ *
+ * @inheritDoc
+ */
+ protected function _preparelayout()
+ {
+ if ($this->getWidgetInstance()->isCompleteToCreate()) {
+ $this->_addButton(
+ 'save_and_edit_button',
+ [
+ 'label' => Mage::helper('widget')->__('Save and Continue Edit'),
+ 'class' => 'save',
+ 'onclick' => 'saveAndContinueEdit()',
+ ],
+ 100,
+ );
+ } else {
+ $this->removeButton('save');
+ }
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Block.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Block.php
index ff41f830a7f..035e3a5a9ff 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Block.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Block.php
@@ -145,23 +145,6 @@ public function getTheme()
return $this->_getData('theme');
}
- /**
- * Prepare html output
- *
- * @return string
- */
- protected function _toHtml()
- {
- $selectBlock = $this->getLayout()->createBlock('core/html_select')
- ->setName('block')
- ->setClass('required-entry select')
- ->setExtraParams('onchange="WidgetInstance.loadSelectBoxByType(\'block_template\','
- . ' this.up(\'div.group_container\'), this.value)"')
- ->setOptions($this->getBlocks())
- ->setValue($this->getSelected());
- return parent::_toHtml() . $selectBlock->toHtml();
- }
-
/**
* Retrieve blocks array
*
@@ -186,18 +169,6 @@ public function getBlocks()
return $this->_blocks;
}
- /**
- * Merging layout handles and create xml of merged layout handles
- */
- protected function _collectLayoutHandles()
- {
- foreach ($this->getLayoutHandle() as $handle) {
- $this->_mergeLayoutHandles($handle);
- }
- $updatesStr = '<' . '?xml version="1.0"?' . '>' . implode('', $this->_layoutHandleUpdates) . '';
- $this->_layoutHandleUpdatesXml = simplexml_load_string($updatesStr, 'Varien_Simplexml_Element');
- }
-
/**
* Adding layout handle that specified in node 'update' to general layout handles
*
@@ -215,6 +186,35 @@ public function _mergeLayoutHandles($handle)
}
}
+ /**
+ * Prepare html output
+ *
+ * @return string
+ */
+ protected function _toHtml()
+ {
+ $selectBlock = $this->getLayout()->createBlock('core/html_select')
+ ->setName('block')
+ ->setClass('required-entry select')
+ ->setExtraParams('onchange="WidgetInstance.loadSelectBoxByType(\'block_template\','
+ . ' this.up(\'div.group_container\'), this.value)"')
+ ->setOptions($this->getBlocks())
+ ->setValue($this->getSelected());
+ return parent::_toHtml() . $selectBlock->toHtml();
+ }
+
+ /**
+ * Merging layout handles and create xml of merged layout handles
+ */
+ protected function _collectLayoutHandles()
+ {
+ foreach ($this->getLayoutHandle() as $handle) {
+ $this->_mergeLayoutHandles($handle);
+ }
+ $updatesStr = '<' . '?xml version="1.0"?' . '>' . implode('', $this->_layoutHandleUpdates) . '';
+ $this->_layoutHandleUpdatesXml = simplexml_load_string($updatesStr, 'Varien_Simplexml_Element');
+ }
+
/**
* Filter and collect blocks into array
*/
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php
index 71acf7b6673..745416dee40 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php
@@ -103,6 +103,25 @@ public function getTheme()
return $this->_getData('theme');
}
+ /**
+ * Retrieve layout handles
+ *
+ * @param string $area
+ * @param string $package
+ * @param string $theme
+ * @return array
+ */
+ public function getLayoutHandles($area, $package, $theme)
+ {
+ if (empty($this->_layoutHandles)) {
+ /** @var Mage_Core_Model_Layout_Update $update */
+ $update = Mage::getModel('core/layout')->getUpdate();
+ $this->_layoutHandles[''] = Mage::helper('widget')->__('-- Please Select --');
+ $this->_collectLayoutHandles($update->getFileLayoutUpdatesXml($area, $package, $theme));
+ }
+ return $this->_layoutHandles;
+ }
+
/**
* Prepare html output
*
@@ -124,25 +143,6 @@ protected function _toHtml()
return parent::_toHtml() . $selectBlock->toHtml();
}
- /**
- * Retrieve layout handles
- *
- * @param string $area
- * @param string $package
- * @param string $theme
- * @return array
- */
- public function getLayoutHandles($area, $package, $theme)
- {
- if (empty($this->_layoutHandles)) {
- /** @var Mage_Core_Model_Layout_Update $update */
- $update = Mage::getModel('core/layout')->getUpdate();
- $this->_layoutHandles[''] = Mage::helper('widget')->__('-- Please Select --');
- $this->_collectLayoutHandles($update->getFileLayoutUpdatesXml($area, $package, $theme));
- }
- return $this->_layoutHandles;
- }
-
/**
* Filter and collect layout handles into array
*
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
index 82db4d77318..a4dfc3d78b0 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
@@ -22,12 +22,6 @@
*/
class Mage_Widget_Block_Adminhtml_Widget_Instance_Edit_Tab_Main extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface
{
- protected function _construct()
- {
- parent::_construct();
- $this->setActive(true);
- }
-
/**
* Prepare label for tab
*
@@ -78,6 +72,32 @@ public function getWidgetInstance()
return Mage::registry('current_widget_instance');
}
+ /**
+ * Retrieve array (widget_type => widget_name) of available widgets
+ *
+ * @return array
+ */
+ public function getTypesOptionsArray()
+ {
+ return $this->getWidgetInstance()->getWidgetsOptionArray();
+ }
+
+ /**
+ * Retrieve design package/theme options array
+ *
+ * @return array
+ */
+ public function getPackegeThemeOptionsArray()
+ {
+ return Mage::getModel('core/design_source_design')
+ ->setIsFullLabel(true)->getAllOptions(true);
+ }
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setActive(true);
+ }
+
/**
* Prepare form before rendering HTML
*
@@ -167,27 +187,6 @@ protected function _prepareForm()
return parent::_prepareForm();
}
- /**
- * Retrieve array (widget_type => widget_name) of available widgets
- *
- * @return array
- */
- public function getTypesOptionsArray()
- {
- return $this->getWidgetInstance()->getWidgetsOptionArray();
- }
-
- /**
- * Retrieve design package/theme options array
- *
- * @return array
- */
- public function getPackegeThemeOptionsArray()
- {
- return Mage::getModel('core/design_source_design')
- ->setIsFullLabel(true)->getAllOptions(true);
- }
-
/**
* Initialize form fields values
*
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index c3bb8285b6b..86d5f1d914f 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -30,15 +30,6 @@ class Mage_Widget_Block_Adminhtml_Widget_Instance_Edit_Tab_Main_Layout extends M
*/
protected $_element = null;
- /**
- * Internal constructor
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('widget/instance/edit/layout.phtml');
- }
-
/**
* Render given element (return html of element)
*
@@ -127,64 +118,6 @@ public function getDisplayOnSelectHtml()
return $selectBlock->toHtml();
}
- /**
- * Retrieve Display On options array.
- * - Categories (anchor and not anchor)
- * - Products (product types depend on configuration)
- * - Generic (predefined) pages (all pages and single layout update)
- *
- * @return array
- */
- protected function _getDisplayOnOptions()
- {
- $options = [];
- $options[] = [
- 'value' => '',
- 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('-- Please Select --')),
- ];
- $options[] = [
- 'label' => Mage::helper('widget')->__('Categories'),
- 'value' => [
- [
- 'value' => 'anchor_categories',
- 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Anchor Categories')),
- ],
- [
- 'value' => 'notanchor_categories',
- 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Non-Anchor Categories')),
- ],
- ],
- ];
- foreach (Mage_Catalog_Model_Product_Type::getTypes() as $typeId => $type) {
- $productsOptions[] = [
- 'value' => $typeId . '_products',
- 'label' => $this->helper('core')->jsQuoteEscape($type['label']),
- ];
- }
- array_unshift($productsOptions, [
- 'value' => 'all_products',
- 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('All Product Types')),
- ]);
- $options[] = [
- 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Products')),
- 'value' => $productsOptions,
- ];
- $options[] = [
- 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Generic Pages')),
- 'value' => [
- [
- 'value' => 'all_pages',
- 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('All Pages')),
- ],
- [
- 'value' => 'pages',
- 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Specified Page')),
- ],
- ],
- ];
- return $options;
- }
-
/**
* Generate array of parameters for every container type to create html template
*
@@ -302,4 +235,71 @@ public function getPageGroups()
}
return $pageGroups;
}
+
+ /**
+ * Internal constructor
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('widget/instance/edit/layout.phtml');
+ }
+
+ /**
+ * Retrieve Display On options array.
+ * - Categories (anchor and not anchor)
+ * - Products (product types depend on configuration)
+ * - Generic (predefined) pages (all pages and single layout update)
+ *
+ * @return array
+ */
+ protected function _getDisplayOnOptions()
+ {
+ $options = [];
+ $options[] = [
+ 'value' => '',
+ 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('-- Please Select --')),
+ ];
+ $options[] = [
+ 'label' => Mage::helper('widget')->__('Categories'),
+ 'value' => [
+ [
+ 'value' => 'anchor_categories',
+ 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Anchor Categories')),
+ ],
+ [
+ 'value' => 'notanchor_categories',
+ 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Non-Anchor Categories')),
+ ],
+ ],
+ ];
+ foreach (Mage_Catalog_Model_Product_Type::getTypes() as $typeId => $type) {
+ $productsOptions[] = [
+ 'value' => $typeId . '_products',
+ 'label' => $this->helper('core')->jsQuoteEscape($type['label']),
+ ];
+ }
+ array_unshift($productsOptions, [
+ 'value' => 'all_products',
+ 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('All Product Types')),
+ ]);
+ $options[] = [
+ 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Products')),
+ 'value' => $productsOptions,
+ ];
+ $options[] = [
+ 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Generic Pages')),
+ 'value' => [
+ [
+ 'value' => 'all_pages',
+ 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('All Pages')),
+ ],
+ [
+ 'value' => 'pages',
+ 'label' => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Specified Page')),
+ ],
+ ],
+ ];
+ return $options;
+ }
}
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
index efe02e63cc8..2029c9935e7 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
@@ -22,12 +22,6 @@
*/
class Mage_Widget_Block_Adminhtml_Widget_Instance_Edit_Tab_Settings extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface
{
- protected function _construct()
- {
- parent::_construct();
- $this->setActive(true);
- }
-
/**
* Prepare label for tab
*
@@ -78,6 +72,52 @@ public function getWidgetInstance()
return Mage::registry('current_widget_instance');
}
+ /**
+ * Return url for continue button
+ *
+ * @return string
+ */
+ public function getContinueUrl()
+ {
+ return $this->getUrl('*/*/*', [
+ '_current' => true,
+ 'type' => '{{type}}',
+ 'package' => '{{package}}',
+ 'theme' => '{{theme}}',
+ ]);
+ }
+
+ /**
+ * Retrieve array (widget_type => widget_name) of available widgets
+ *
+ * @return array
+ */
+ public function getTypesOptionsArray()
+ {
+ $widgets = $this->getWidgetInstance()->getWidgetsOptionArray();
+ array_unshift($widgets, [
+ 'value' => '',
+ 'label' => Mage::helper('widget')->__('-- Please Select --'),
+ ]);
+ return $widgets;
+ }
+
+ /**
+ * Retrieve package/theme options array
+ *
+ * @return array
+ */
+ public function getPackegeThemeOptionsArray()
+ {
+ return Mage::getModel('core/design_source_design')
+ ->setIsFullLabel(true)->getAllOptions(true);
+ }
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setActive(true);
+ }
+
/**
* Prepare form before rendering HTML
*
@@ -130,36 +170,6 @@ protected function _prepareForm()
return parent::_prepareForm();
}
- /**
- * Return url for continue button
- *
- * @return string
- */
- public function getContinueUrl()
- {
- return $this->getUrl('*/*/*', [
- '_current' => true,
- 'type' => '{{type}}',
- 'package' => '{{package}}',
- 'theme' => '{{theme}}',
- ]);
- }
-
- /**
- * Retrieve array (widget_type => widget_name) of available widgets
- *
- * @return array
- */
- public function getTypesOptionsArray()
- {
- $widgets = $this->getWidgetInstance()->getWidgetsOptionArray();
- array_unshift($widgets, [
- 'value' => '',
- 'label' => Mage::helper('widget')->__('-- Please Select --'),
- ]);
- return $widgets;
- }
-
/**
* User-defined widgets sorting by Name
*
@@ -171,15 +181,4 @@ protected function _sortWidgets($a, $b)
{
return strcmp($a['label'], $b['label']);
}
-
- /**
- * Retrieve package/theme options array
- *
- * @return array
- */
- public function getPackegeThemeOptionsArray()
- {
- return Mage::getModel('core/design_source_design')
- ->setIsFullLabel(true)->getAllOptions(true);
- }
}
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php
index 86afc855543..48dca349a2b 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php
@@ -22,6 +22,53 @@
*/
class Mage_Widget_Block_Adminhtml_Widget_Instance_Grid extends Mage_Adminhtml_Block_Widget_Grid
{
+ /**
+ * Retrieve array (widget_type => widget_name) of available widgets
+ *
+ * @return array
+ */
+ public function getTypesOptionsArray()
+ {
+ $widgets = [];
+ $widgetsOptionsArr = Mage::getModel('widget/widget_instance')->getWidgetsOptionArray();
+ foreach ($widgetsOptionsArr as $widget) {
+ $widgets[$widget['value']] = $widget['label'];
+ }
+ return $widgets;
+ }
+
+ /**
+ * Retrieve design package/theme options array
+ *
+ * @return array
+ */
+ public function getPackageThemeOptionsArray()
+ {
+ $packageThemeArray = [];
+ $packageThemeOptions = Mage::getModel('core/design_source_design')
+ ->setIsFullLabel(true)->getAllOptions(false);
+ foreach ($packageThemeOptions as $item) {
+ if (is_array($item['value'])) {
+ foreach ($item['value'] as $valueItem) {
+ $packageThemeArray[$valueItem['value']] = $valueItem['label'];
+ }
+ } else {
+ $packageThemeArray[$item['value']] = $item['label'];
+ }
+ }
+ return $packageThemeArray;
+ }
+
+ /**
+ * Row click url
+ *
+ * @param Mage_Widget_Model_Widget_Instance $row
+ * @return string
+ */
+ public function getRowUrl($row)
+ {
+ return $this->getUrl('*/*/edit', ['instance_id' => $row->getId()]);
+ }
/**
* Internal constructor
*
@@ -91,52 +138,4 @@ protected function _prepareColumns()
return parent::_prepareColumns();
}
-
- /**
- * Retrieve array (widget_type => widget_name) of available widgets
- *
- * @return array
- */
- public function getTypesOptionsArray()
- {
- $widgets = [];
- $widgetsOptionsArr = Mage::getModel('widget/widget_instance')->getWidgetsOptionArray();
- foreach ($widgetsOptionsArr as $widget) {
- $widgets[$widget['value']] = $widget['label'];
- }
- return $widgets;
- }
-
- /**
- * Retrieve design package/theme options array
- *
- * @return array
- */
- public function getPackageThemeOptionsArray()
- {
- $packageThemeArray = [];
- $packageThemeOptions = Mage::getModel('core/design_source_design')
- ->setIsFullLabel(true)->getAllOptions(false);
- foreach ($packageThemeOptions as $item) {
- if (is_array($item['value'])) {
- foreach ($item['value'] as $valueItem) {
- $packageThemeArray[$valueItem['value']] = $valueItem['label'];
- }
- } else {
- $packageThemeArray[$item['value']] = $item['label'];
- }
- }
- return $packageThemeArray;
- }
-
- /**
- * Row click url
- *
- * @param Mage_Widget_Model_Widget_Instance $row
- * @return string
- */
- public function getRowUrl($row)
- {
- return $this->getUrl('*/*/edit', ['instance_id' => $row->getId()]);
- }
}
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php
index fd1ec16a7d4..4845aaefced 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php
@@ -39,21 +39,6 @@ class Mage_Widget_Block_Adminhtml_Widget_Options extends Mage_Adminhtml_Block_Wi
*/
protected $_translationHelper = null;
- /**
- * Prepare Widget Options Form and values according to specified type
- *
- * widget_type must be set in data before
- * widget_values may be set before to render element values
- *
- * @return $this
- */
- protected function _prepareForm()
- {
- $this->getForm()->setUseContainer(false);
- $this->addFields();
- return $this;
- }
-
/**
* Form getter/instantiation
*
@@ -118,6 +103,21 @@ public function addFields()
return $this;
}
+ /**
+ * Prepare Widget Options Form and values according to specified type
+ *
+ * widget_type must be set in data before
+ * widget_values may be set before to render element values
+ *
+ * @return $this
+ */
+ protected function _prepareForm()
+ {
+ $this->getForm()->setUseContainer(false);
+ $this->addFields();
+ return $this;
+ }
+
/**
* Add field to Options form based on parameter configuration
*
diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget.php b/app/code/core/Mage/Widget/Model/Resource/Widget.php
index 2d5356ea89d..a293aa38b18 100644
--- a/app/code/core/Mage/Widget/Model/Resource/Widget.php
+++ b/app/code/core/Mage/Widget/Model/Resource/Widget.php
@@ -22,11 +22,6 @@
*/
class Mage_Widget_Model_Resource_Widget extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('widget/widget', 'widget_id');
- }
-
/**
* Retrieves pre-configured parameters for widget
*
@@ -49,4 +44,8 @@ public function loadPreconfiguredWidget($widgetId)
}
return false;
}
+ protected function _construct()
+ {
+ $this->_init('widget/widget', 'widget_id');
+ }
}
diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php
index 0d65f9ab166..3c7fbdfa009 100644
--- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php
+++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php
@@ -22,6 +22,21 @@
*/
class Mage_Widget_Model_Resource_Widget_Instance extends Mage_Core_Model_Resource_Db_Abstract
{
+ /**
+ * Get store ids to which specified item is assigned
+ *
+ * @param int $id
+ * @return array
+ */
+ public function lookupStoreIds($id)
+ {
+ $adapter = $this->_getReadAdapter();
+ $select = $adapter->select()
+ ->from($this->getMainTable(), 'store_ids')
+ ->where("{$this->getIdFieldName()} = ?", (int) $id);
+ $storeIds = $adapter->fetchOne($select);
+ return $storeIds ? explode(',', $storeIds) : [];
+ }
protected function _construct()
{
$this->_init('widget/widget_instance', 'instance_id');
@@ -247,20 +262,4 @@ protected function _deleteLayoutUpdates($layoutUpdateIds)
}
return $this;
}
-
- /**
- * Get store ids to which specified item is assigned
- *
- * @param int $id
- * @return array
- */
- public function lookupStoreIds($id)
- {
- $adapter = $this->_getReadAdapter();
- $select = $adapter->select()
- ->from($this->getMainTable(), 'store_ids')
- ->where("{$this->getIdFieldName()} = ?", (int) $id);
- $storeIds = $adapter->fetchOne($select);
- return $storeIds ? explode(',', $storeIds) : [];
- }
}
diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php
index d1531471b19..e5e82476eb2 100644
--- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php
+++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php
@@ -29,12 +29,6 @@ class Mage_Widget_Model_Resource_Widget_Instance_Collection extends Mage_Core_Mo
*/
protected $_map = ['fields' => ['type' => 'instance_type']];
- protected function _construct()
- {
- parent::_construct();
- $this->_init('widget/widget_instance');
- }
-
/**
* Filter by store ids
*
@@ -59,4 +53,10 @@ public function addStoreFilter($storeIds = [], $withDefaultStore = true)
return $this;
}
+
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->_init('widget/widget_instance');
+ }
}
diff --git a/app/code/core/Mage/Widget/Model/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Widget/Instance.php
index b275f301ddf..a0cff661b20 100644
--- a/app/code/core/Mage/Widget/Model/Widget/Instance.php
+++ b/app/code/core/Mage/Widget/Model/Widget/Instance.php
@@ -64,109 +64,6 @@ class Mage_Widget_Model_Widget_Instance extends Mage_Core_Model_Abstract
*/
protected $_eventPrefix = 'widget_widget_instance';
- /**
- * Internal Constructor
- */
- protected function _construct()
- {
- $this->_cacheTag = 'widget_instance';
- parent::_construct();
- $this->_init('widget/widget_instance');
- $this->_layoutHandles = [
- 'anchor_categories' => self::ANCHOR_CATEGORY_LAYOUT_HANDLE,
- 'notanchor_categories' => self::NOTANCHOR_CATEGORY_LAYOUT_HANDLE,
- 'all_products' => self::PRODUCT_LAYOUT_HANDLE,
- 'all_pages' => self::DEFAULT_LAYOUT_HANDLE,
- ];
- $this->_specificEntitiesLayoutHandles = [
- 'anchor_categories' => self::SINGLE_CATEGORY_LAYOUT_HANDLE,
- 'notanchor_categories' => self::SINGLE_CATEGORY_LAYOUT_HANDLE,
- 'all_products' => self::SINGLE_PRODUCT_LAYOUT_HANLDE,
- ];
- foreach (Mage_Catalog_Model_Product_Type::getTypes() as $typeId => $type) {
- $layoutHandle = str_replace('{{TYPE}}', $typeId, self::PRODUCT_TYPE_LAYOUT_HANDLE);
- $this->_layoutHandles[$typeId . '_products'] = $layoutHandle;
- $this->_specificEntitiesLayoutHandles[$typeId . '_products'] = self::SINGLE_PRODUCT_LAYOUT_HANLDE;
- }
- }
-
- /**
- * Init mapping array of short fields to
- * its full names
- *
- * @return Varien_Object
- */
- protected function _initOldFieldsMap()
- {
- $this->_oldFieldsMap = [
- 'type' => 'instance_type',
- ];
- return $this;
- }
-
- /**
- * Processing object before save data
- *
- * @inheritDoc
- */
- protected function _beforeSave()
- {
- $pageGroupIds = [];
- $tmpPageGroups = [];
- $pageGroups = $this->getData('page_groups');
- if ($pageGroups) {
- foreach ($pageGroups as $pageGroup) {
- if (isset($pageGroup[$pageGroup['page_group']])) {
- $pageGroupData = $pageGroup[$pageGroup['page_group']];
- if ($pageGroupData['page_id']) {
- $pageGroupIds[] = $pageGroupData['page_id'];
- }
- if ($pageGroup['page_group'] == 'pages') {
- $layoutHandle = $pageGroupData['layout_handle'];
- } else {
- $layoutHandle = $this->_layoutHandles[$pageGroup['page_group']];
- }
- if (!isset($pageGroupData['template'])) {
- $pageGroupData['template'] = '';
- }
- $tmpPageGroup = [
- 'page_id' => $pageGroupData['page_id'],
- 'group' => $pageGroup['page_group'],
- 'layout_handle' => $layoutHandle,
- 'for' => $pageGroupData['for'],
- 'block_reference' => $pageGroupData['block'],
- 'entities' => '',
- 'layout_handle_updates' => [$layoutHandle],
- 'template' => $pageGroupData['template'] ? $pageGroupData['template'] : '',
- ];
- if ($pageGroupData['for'] == self::SPECIFIC_ENTITIES) {
- $layoutHandleUpdates = [];
- foreach (explode(',', $pageGroupData['entities']) as $entity) {
- $layoutHandleUpdates[] = str_replace(
- '{{ID}}',
- $entity,
- $this->_specificEntitiesLayoutHandles[$pageGroup['page_group']],
- );
- }
- $tmpPageGroup['entities'] = $pageGroupData['entities'];
- $tmpPageGroup['layout_handle_updates'] = $layoutHandleUpdates;
- }
- $tmpPageGroups[] = $tmpPageGroup;
- }
- }
- }
- if (is_array($this->getData('store_ids'))) {
- $this->setData('store_ids', implode(',', $this->getData('store_ids')));
- }
- if (is_array($this->getData('widget_parameters'))) {
- $this->setData('widget_parameters', serialize($this->getData('widget_parameters')));
- }
- $this->setData('page_groups', $tmpPageGroups);
- $this->setData('page_group_ids', $pageGroupIds);
-
- return parent::_beforeSave();
- }
-
/**
* Validate widget instance data
*
@@ -216,19 +113,6 @@ public function getType()
return $this->_getData('type');
}
- /**
- * Replace '-' to '/', if was passed from request(GET request)
- *
- * @return $this
- */
- protected function _prepareType()
- {
- if (str_contains((string) $this->_getData('type'), '-')) {
- $this->setData('type', str_replace('-', '/', $this->_getData('type')));
- }
- return $this;
- }
-
/**
* Setter
* Prepare widget package theme
@@ -253,18 +137,6 @@ public function getPackageTheme()
return $this->_getData('package_theme');
}
- /**
- * Replace '_' to '/', if was set from request(GET request)
- *
- * @deprecated after 1.6.1.0-alpha1
- *
- * @return $this
- */
- protected function _preparePackageTheme()
- {
- return $this;
- }
-
/**
* Getter.
* If not set return default
@@ -305,21 +177,6 @@ public function getTheme()
return $this->_getData('theme');
}
- /**
- * Parse packageTheme and set parsed package and theme
- *
- * @return $this
- */
- protected function _parsePackageTheme()
- {
- if ($this->getPackageTheme() && strpos($this->getPackageTheme(), '/')) {
- list($package, $theme) = explode('/', $this->getPackageTheme());
- $this->setData('package', $package);
- $this->setData('theme', $theme);
- }
- return $this;
- }
-
/**
* Getter
* Explode to array if string is set
@@ -527,6 +384,149 @@ public function generateLayoutUpdateXml($blockReference, $templatePath = '')
return $xml . '';
}
+ /**
+ * Internal Constructor
+ */
+ protected function _construct()
+ {
+ $this->_cacheTag = 'widget_instance';
+ parent::_construct();
+ $this->_init('widget/widget_instance');
+ $this->_layoutHandles = [
+ 'anchor_categories' => self::ANCHOR_CATEGORY_LAYOUT_HANDLE,
+ 'notanchor_categories' => self::NOTANCHOR_CATEGORY_LAYOUT_HANDLE,
+ 'all_products' => self::PRODUCT_LAYOUT_HANDLE,
+ 'all_pages' => self::DEFAULT_LAYOUT_HANDLE,
+ ];
+ $this->_specificEntitiesLayoutHandles = [
+ 'anchor_categories' => self::SINGLE_CATEGORY_LAYOUT_HANDLE,
+ 'notanchor_categories' => self::SINGLE_CATEGORY_LAYOUT_HANDLE,
+ 'all_products' => self::SINGLE_PRODUCT_LAYOUT_HANLDE,
+ ];
+ foreach (Mage_Catalog_Model_Product_Type::getTypes() as $typeId => $type) {
+ $layoutHandle = str_replace('{{TYPE}}', $typeId, self::PRODUCT_TYPE_LAYOUT_HANDLE);
+ $this->_layoutHandles[$typeId . '_products'] = $layoutHandle;
+ $this->_specificEntitiesLayoutHandles[$typeId . '_products'] = self::SINGLE_PRODUCT_LAYOUT_HANLDE;
+ }
+ }
+
+ /**
+ * Init mapping array of short fields to
+ * its full names
+ *
+ * @return Varien_Object
+ */
+ protected function _initOldFieldsMap()
+ {
+ $this->_oldFieldsMap = [
+ 'type' => 'instance_type',
+ ];
+ return $this;
+ }
+
+ /**
+ * Processing object before save data
+ *
+ * @inheritDoc
+ */
+ protected function _beforeSave()
+ {
+ $pageGroupIds = [];
+ $tmpPageGroups = [];
+ $pageGroups = $this->getData('page_groups');
+ if ($pageGroups) {
+ foreach ($pageGroups as $pageGroup) {
+ if (isset($pageGroup[$pageGroup['page_group']])) {
+ $pageGroupData = $pageGroup[$pageGroup['page_group']];
+ if ($pageGroupData['page_id']) {
+ $pageGroupIds[] = $pageGroupData['page_id'];
+ }
+ if ($pageGroup['page_group'] == 'pages') {
+ $layoutHandle = $pageGroupData['layout_handle'];
+ } else {
+ $layoutHandle = $this->_layoutHandles[$pageGroup['page_group']];
+ }
+ if (!isset($pageGroupData['template'])) {
+ $pageGroupData['template'] = '';
+ }
+ $tmpPageGroup = [
+ 'page_id' => $pageGroupData['page_id'],
+ 'group' => $pageGroup['page_group'],
+ 'layout_handle' => $layoutHandle,
+ 'for' => $pageGroupData['for'],
+ 'block_reference' => $pageGroupData['block'],
+ 'entities' => '',
+ 'layout_handle_updates' => [$layoutHandle],
+ 'template' => $pageGroupData['template'] ? $pageGroupData['template'] : '',
+ ];
+ if ($pageGroupData['for'] == self::SPECIFIC_ENTITIES) {
+ $layoutHandleUpdates = [];
+ foreach (explode(',', $pageGroupData['entities']) as $entity) {
+ $layoutHandleUpdates[] = str_replace(
+ '{{ID}}',
+ $entity,
+ $this->_specificEntitiesLayoutHandles[$pageGroup['page_group']],
+ );
+ }
+ $tmpPageGroup['entities'] = $pageGroupData['entities'];
+ $tmpPageGroup['layout_handle_updates'] = $layoutHandleUpdates;
+ }
+ $tmpPageGroups[] = $tmpPageGroup;
+ }
+ }
+ }
+ if (is_array($this->getData('store_ids'))) {
+ $this->setData('store_ids', implode(',', $this->getData('store_ids')));
+ }
+ if (is_array($this->getData('widget_parameters'))) {
+ $this->setData('widget_parameters', serialize($this->getData('widget_parameters')));
+ }
+ $this->setData('page_groups', $tmpPageGroups);
+ $this->setData('page_group_ids', $pageGroupIds);
+
+ return parent::_beforeSave();
+ }
+
+ /**
+ * Replace '-' to '/', if was passed from request(GET request)
+ *
+ * @return $this
+ */
+ protected function _prepareType()
+ {
+ if (str_contains((string) $this->_getData('type'), '-')) {
+ $this->setData('type', str_replace('-', '/', $this->_getData('type')));
+ }
+ return $this;
+ }
+
+ /**
+ * Replace '_' to '/', if was set from request(GET request)
+ *
+ * @deprecated after 1.6.1.0-alpha1
+ *
+ * @return $this
+ */
+ protected function _preparePackageTheme()
+ {
+ return $this;
+ }
+
+ /**
+ * Parse packageTheme and set parsed package and theme
+ *
+ * @return $this
+ */
+ protected function _parsePackageTheme()
+ {
+ if ($this->getPackageTheme() && strpos($this->getPackageTheme(), '/')) {
+ list($package, $theme) = explode('/', $this->getPackageTheme());
+ $this->setData('package', $package);
+ $this->setData('theme', $theme);
+ }
+ return $this;
+ }
+
/**
* Invalidate related cache types
*
diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
index f513de4a090..1181eb9309c 100644
--- a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
+++ b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
@@ -28,69 +28,6 @@ class Mage_Widget_Adminhtml_Widget_InstanceController extends Mage_Adminhtml_Con
*/
public const ADMIN_RESOURCE = 'cms/widget_instance';
- /**
- * Session getter
- *
- * @return Mage_Adminhtml_Model_Session
- */
- protected function _getSession()
- {
- return Mage::getSingleton('adminhtml/session');
- }
-
- /**
- * Load layout, set active menu and breadcrumbs
- *
- * @return $this
- */
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('cms/widget_instance')
- ->_addBreadcrumb(
- Mage::helper('widget')->__('CMS'),
- Mage::helper('widget')->__('CMS'),
- )
- ->_addBreadcrumb(
- Mage::helper('widget')->__('Manage Widget Instances'),
- Mage::helper('widget')->__('Manage Widget Instances'),
- );
- return $this;
- }
-
- /**
- * Init widget instance object and set it to registry
- *
- * @return Mage_Widget_Model_Widget_Instance|bool
- * @throws Mage_Core_Exception
- */
- protected function _initWidgetInstance()
- {
- $this->_title($this->__('CMS'))->_title($this->__('Widgets'));
-
- /** @var Mage_Widget_Model_Widget_Instance $widgetInstance */
- $widgetInstance = Mage::getModel('widget/widget_instance');
-
- $instanceId = $this->getRequest()->getParam('instance_id', null);
- $type = $this->getRequest()->getParam('type', null);
- $package = $this->getRequest()->getParam('package', null);
- $theme = $this->getRequest()->getParam('theme', null);
-
- if ($instanceId) {
- $widgetInstance->load($instanceId);
- if (!$widgetInstance->getId()) {
- $this->_getSession()->addError(Mage::helper('widget')->__('Wrong widget instance specified.'));
- return false;
- }
- } else {
- $packageTheme = $package . '/' . $theme == '/' ? null : $package . '/' . $theme;
- $widgetInstance->setType($type)
- ->setPackageTheme($packageTheme);
- }
- Mage::register('current_widget_instance', $widgetInstance);
- return $widgetInstance;
- }
-
/**
* Widget Instances Grid
*/
@@ -127,17 +64,6 @@ public function editAction()
$this->renderLayout();
}
- /**
- * Set body to response
- *
- * @param string $body
- */
- private function setBody($body)
- {
- Mage::getSingleton('core/translate_inline')->processResponseBody($body);
- $this->getResponse()->setBody($body);
- }
-
/**
* Validate action
*/
@@ -297,6 +223,69 @@ public function preDispatch()
return parent::preDispatch();
}
+ /**
+ * Session getter
+ *
+ * @return Mage_Adminhtml_Model_Session
+ */
+ protected function _getSession()
+ {
+ return Mage::getSingleton('adminhtml/session');
+ }
+
+ /**
+ * Load layout, set active menu and breadcrumbs
+ *
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('cms/widget_instance')
+ ->_addBreadcrumb(
+ Mage::helper('widget')->__('CMS'),
+ Mage::helper('widget')->__('CMS'),
+ )
+ ->_addBreadcrumb(
+ Mage::helper('widget')->__('Manage Widget Instances'),
+ Mage::helper('widget')->__('Manage Widget Instances'),
+ );
+ return $this;
+ }
+
+ /**
+ * Init widget instance object and set it to registry
+ *
+ * @return Mage_Widget_Model_Widget_Instance|bool
+ * @throws Mage_Core_Exception
+ */
+ protected function _initWidgetInstance()
+ {
+ $this->_title($this->__('CMS'))->_title($this->__('Widgets'));
+
+ /** @var Mage_Widget_Model_Widget_Instance $widgetInstance */
+ $widgetInstance = Mage::getModel('widget/widget_instance');
+
+ $instanceId = $this->getRequest()->getParam('instance_id', null);
+ $type = $this->getRequest()->getParam('type', null);
+ $package = $this->getRequest()->getParam('package', null);
+ $theme = $this->getRequest()->getParam('theme', null);
+
+ if ($instanceId) {
+ $widgetInstance->load($instanceId);
+ if (!$widgetInstance->getId()) {
+ $this->_getSession()->addError(Mage::helper('widget')->__('Wrong widget instance specified.'));
+ return false;
+ }
+ } else {
+ $packageTheme = $package . '/' . $theme == '/' ? null : $package . '/' . $theme;
+ $widgetInstance->setType($type)
+ ->setPackageTheme($packageTheme);
+ }
+ Mage::register('current_widget_instance', $widgetInstance);
+ return $widgetInstance;
+ }
+
/**
* Prepare widget parameters
*
@@ -352,4 +341,15 @@ protected function _validatePostData($widgetInstance, $data)
}
return $errorNo;
}
+
+ /**
+ * Set body to response
+ *
+ * @param string $body
+ */
+ private function setBody($body)
+ {
+ Mage::getSingleton('core/translate_inline')->processResponseBody($body);
+ $this->getResponse()->setBody($body);
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Block/Abstract.php b/app/code/core/Mage/Wishlist/Block/Abstract.php
index 7081e6cc6b4..6f8c1ea4558 100644
--- a/app/code/core/Mage/Wishlist/Block/Abstract.php
+++ b/app/code/core/Mage/Wishlist/Block/Abstract.php
@@ -50,67 +50,6 @@ abstract class Mage_Wishlist_Block_Abstract extends Mage_Catalog_Block_Product_A
*/
protected $_cachedItemPriceBlocks = [];
- /**
- * Internal constructor, that is called from real constructor
- *
- */
- protected function _construct()
- {
- parent::_construct();
- $this->addItemPriceBlockType('default', 'wishlist/render_item_price', 'wishlist/render/item/price.phtml');
- }
-
- /**
- * Retrieve Wishlist Data Helper
- *
- * @return Mage_Wishlist_Helper_Data
- */
- protected function _getHelper()
- {
- return Mage::helper('wishlist');
- }
-
- /**
- * Retrieve Customer Session instance
- *
- * @return Mage_Customer_Model_Session
- */
- protected function _getCustomerSession()
- {
- return Mage::getSingleton('customer/session');
- }
-
- /**
- * Retrieve Wishlist model
- *
- * @return Mage_Wishlist_Model_Wishlist
- */
- protected function _getWishlist()
- {
- return $this->_getHelper()->getWishlist();
- }
-
- /**
- * Prepare additional conditions to collection
- *
- * @param Mage_Wishlist_Model_Resource_Item_Collection $collection
- * @return $this
- */
- protected function _prepareCollection($collection)
- {
- return $this;
- }
-
- /**
- * Create wishlist item collection
- *
- * @return Mage_Wishlist_Model_Resource_Item_Collection
- */
- protected function _createWishlistItemCollection()
- {
- return $this->_getWishlist()->getItemCollection();
- }
-
/**
* Retrieve Wishlist Product Items collection
*
@@ -315,28 +254,6 @@ public function addItemPriceBlockType($type, $block = '', $template = '')
}
}
- /**
- * Returns block to render item with some product type
- *
- * @param string $productType
- * @return Mage_Core_Block_Template
- */
- protected function _getItemPriceBlock($productType)
- {
- if (!isset($this->_itemPriceBlockTypes[$productType])) {
- $productType = 'default';
- }
-
- if (!isset($this->_cachedItemPriceBlocks[$productType])) {
- $blockType = $this->_itemPriceBlockTypes[$productType]['block'];
- $template = $this->_itemPriceBlockTypes[$productType]['template'];
- $block = $this->getLayout()->createBlock($blockType)
- ->setTemplate($template);
- $this->_cachedItemPriceBlocks[$productType] = $block;
- }
- return $this->_cachedItemPriceBlocks[$productType];
- }
-
/**
* Returns product price block html
* Overwrites parent price html return to be ready to show configured, partially configured and
@@ -440,4 +357,87 @@ public function getItemAddToCartUrlCustom($item, $addFormKey = true)
}
return $this->_getHelper()->getAddToCartUrl($item);
}
+
+ /**
+ * Internal constructor, that is called from real constructor
+ *
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->addItemPriceBlockType('default', 'wishlist/render_item_price', 'wishlist/render/item/price.phtml');
+ }
+
+ /**
+ * Retrieve Wishlist Data Helper
+ *
+ * @return Mage_Wishlist_Helper_Data
+ */
+ protected function _getHelper()
+ {
+ return Mage::helper('wishlist');
+ }
+
+ /**
+ * Retrieve Customer Session instance
+ *
+ * @return Mage_Customer_Model_Session
+ */
+ protected function _getCustomerSession()
+ {
+ return Mage::getSingleton('customer/session');
+ }
+
+ /**
+ * Retrieve Wishlist model
+ *
+ * @return Mage_Wishlist_Model_Wishlist
+ */
+ protected function _getWishlist()
+ {
+ return $this->_getHelper()->getWishlist();
+ }
+
+ /**
+ * Prepare additional conditions to collection
+ *
+ * @param Mage_Wishlist_Model_Resource_Item_Collection $collection
+ * @return $this
+ */
+ protected function _prepareCollection($collection)
+ {
+ return $this;
+ }
+
+ /**
+ * Create wishlist item collection
+ *
+ * @return Mage_Wishlist_Model_Resource_Item_Collection
+ */
+ protected function _createWishlistItemCollection()
+ {
+ return $this->_getWishlist()->getItemCollection();
+ }
+
+ /**
+ * Returns block to render item with some product type
+ *
+ * @param string $productType
+ * @return Mage_Core_Block_Template
+ */
+ protected function _getItemPriceBlock($productType)
+ {
+ if (!isset($this->_itemPriceBlockTypes[$productType])) {
+ $productType = 'default';
+ }
+
+ if (!isset($this->_cachedItemPriceBlocks[$productType])) {
+ $blockType = $this->_itemPriceBlockTypes[$productType]['block'];
+ $template = $this->_itemPriceBlockTypes[$productType]['template'];
+ $block = $this->getLayout()->createBlock($blockType)
+ ->setTemplate($template);
+ $this->_cachedItemPriceBlocks[$productType] = $block;
+ }
+ return $this->_cachedItemPriceBlocks[$productType];
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php
index 36a22a37b51..8c468b4139e 100644
--- a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php
@@ -29,20 +29,6 @@ class Mage_Wishlist_Block_Customer_Sharing extends Mage_Core_Block_Template
*/
protected $_enteredData = null;
- /**
- * Prepare Global Layout
- *
- * @return $this
- */
- protected function _prepareLayout()
- {
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $headBlock->setTitle($this->__('Wishlist Sharing'));
- }
- return $this;
- }
-
/**
* Retrieve Send Form Action URL
*
@@ -82,4 +68,18 @@ public function getBackUrl()
{
return $this->getUrl('*/*/index');
}
+
+ /**
+ * Prepare Global Layout
+ *
+ * @return $this
+ */
+ protected function _prepareLayout()
+ {
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $headBlock->setTitle($this->__('Wishlist Sharing'));
+ }
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php
index 1cdc473c4a8..767b0302edd 100644
--- a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php
@@ -32,36 +32,6 @@ public function getTitle()
return $this->__('My Wishlist (%d)', $this->getItemCount());
}
- /**
- * Add sidebar conditions to collection
- *
- * @param Mage_Wishlist_Model_Resource_Item_Collection $collection
- * @return $this
- */
- protected function _prepareCollection($collection)
- {
- $collection->setCurPage(1)
- ->setPageSize(3)
- ->setInStockFilter(true)
- ->setOrder('added_at');
-
- return $this;
- }
-
- /**
- * Prepare before to html
- *
- * @return string
- */
- protected function _toHtml()
- {
- if ($this->getItemCount()) {
- return parent::_toHtml();
- }
-
- return '';
- }
-
/**
* Can Display wishlist
*
@@ -145,4 +115,34 @@ public function getCacheTags()
}
return parent::getCacheTags();
}
+
+ /**
+ * Add sidebar conditions to collection
+ *
+ * @param Mage_Wishlist_Model_Resource_Item_Collection $collection
+ * @return $this
+ */
+ protected function _prepareCollection($collection)
+ {
+ $collection->setCurPage(1)
+ ->setPageSize(3)
+ ->setInStockFilter(true)
+ ->setOrder('added_at');
+
+ return $this;
+ }
+
+ /**
+ * Prepare before to html
+ *
+ * @return string
+ */
+ protected function _toHtml()
+ {
+ if ($this->getItemCount()) {
+ return parent::_toHtml();
+ }
+
+ return '';
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php
index 7693b5a9249..075c5e8d5e8 100644
--- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php
@@ -27,33 +27,6 @@ class Mage_Wishlist_Block_Customer_Wishlist extends Mage_Wishlist_Block_Abstract
*/
protected $_optionsCfg = [];
- /**
- * Add wishlist conditions to collection
- *
- * @param Mage_Wishlist_Model_Resource_Item_Collection $collection
- * @return $this
- */
- protected function _prepareCollection($collection)
- {
- $collection->setInStockFilter(true)->setOrder('added_at', 'ASC');
- return $this;
- }
-
- /**
- * Preparing global layout
- *
- * @return $this
- */
- protected function _prepareLayout()
- {
- parent::_prepareLayout();
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $headBlock->setTitle($this->__('My Wishlist'));
- }
- return $this;
- }
-
/**
* Retrieve Back URL
*
@@ -170,4 +143,31 @@ public function getAddToCartQty(Mage_Wishlist_Model_Item $item)
$qty = $this->getQty($item);
return $qty ? $qty : 1;
}
+
+ /**
+ * Add wishlist conditions to collection
+ *
+ * @param Mage_Wishlist_Model_Resource_Item_Collection $collection
+ * @return $this
+ */
+ protected function _prepareCollection($collection)
+ {
+ $collection->setInStockFilter(true)->setOrder('added_at', 'ASC');
+ return $this;
+ }
+
+ /**
+ * Preparing global layout
+ *
+ * @return $this
+ */
+ protected function _prepareLayout()
+ {
+ parent::_prepareLayout();
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $headBlock->setTitle($this->__('My Wishlist'));
+ }
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php
index 589d17a6aef..8e6b8321e61 100644
--- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php
@@ -32,6 +32,20 @@ public function isEnabled()
return true;
}
+ /**
+ * Retrieve column related javascript code
+ *
+ * @return string
+ */
+ public function getJs()
+ {
+ $js = '';
+ foreach ($this->getSortedChildBlocks() as $child) {
+ $js .= $child->getJs();
+ }
+ return $js;
+ }
+
/**
* Retrieve block html
*
@@ -55,18 +69,4 @@ protected function _beforeChildToHtml($name, $child)
{
$child->setItem($this->getItem());
}
-
- /**
- * Retrieve column related javascript code
- *
- * @return string
- */
- public function getJs()
- {
- $js = '';
- foreach ($this->getSortedChildBlocks() as $child) {
- $js .= $child->getJs();
- }
- return $js;
- }
}
diff --git a/app/code/core/Mage/Wishlist/Block/Links.php b/app/code/core/Mage/Wishlist/Block/Links.php
index 28717c83b2a..656cb2b6cd2 100644
--- a/app/code/core/Mage/Wishlist/Block/Links.php
+++ b/app/code/core/Mage/Wishlist/Block/Links.php
@@ -28,6 +28,48 @@ class Mage_Wishlist_Block_Links extends Mage_Page_Block_Template_Links_Block
*/
protected $_position = 30;
+ /**
+ * Define label, title and url for wishlist link
+ *
+ * @deprecated after 1.6.2.0
+ */
+ public function initLinkProperties()
+ {
+ $text = $this->_createLabel($this->_getItemCount());
+ $this->_label = $text;
+ $this->_title = $text;
+ $this->_url = $this->getUrl('wishlist');
+ }
+
+ /**
+ * @return Mage_Wishlist_Block_Links
+ * @see Mage_Wishlist_Block_Links::__construct
+ *
+ * @deprecated after 1.4.2.0
+ */
+ public function addWishlistLink()
+ {
+ return $this;
+ }
+
+ /**
+ * Retrieve block cache tags
+ *
+ * @return array
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ public function getCacheTags()
+ {
+ /** @var Mage_Wishlist_Helper_Data $helper */
+ $helper = $this->helper('wishlist');
+ $wishlist = $helper->getWishlist();
+ $this->addModelTags($wishlist);
+ foreach ($wishlist->getItemCollection() as $item) {
+ $this->addModelTags($item);
+ }
+ return parent::getCacheTags();
+ }
+
/**
* @return string
*/
@@ -45,19 +87,6 @@ protected function _toHtml()
return '';
}
- /**
- * Define label, title and url for wishlist link
- *
- * @deprecated after 1.6.2.0
- */
- public function initLinkProperties()
- {
- $text = $this->_createLabel($this->_getItemCount());
- $this->_label = $text;
- $this->_title = $text;
- $this->_url = $this->getUrl('wishlist');
- }
-
/**
* Count items in wishlist
*
@@ -88,33 +117,4 @@ protected function _createLabel($count)
return $this->__('My Wishlist');
}
-
- /**
- * @return Mage_Wishlist_Block_Links
- * @see Mage_Wishlist_Block_Links::__construct
- *
- * @deprecated after 1.4.2.0
- */
- public function addWishlistLink()
- {
- return $this;
- }
-
- /**
- * Retrieve block cache tags
- *
- * @return array
- * @throws Mage_Core_Model_Store_Exception
- */
- public function getCacheTags()
- {
- /** @var Mage_Wishlist_Helper_Data $helper */
- $helper = $this->helper('wishlist');
- $wishlist = $helper->getWishlist();
- $this->addModelTags($wishlist);
- foreach ($wishlist->getItemCollection() as $item) {
- $this->addModelTags($item);
- }
- return parent::getCacheTags();
- }
}
diff --git a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php
index 6c23171e22e..d668c621d94 100644
--- a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php
@@ -29,23 +29,6 @@ class Mage_Wishlist_Block_Share_Wishlist extends Mage_Wishlist_Block_Abstract
*/
protected $_customer = null;
- /**
- * Prepare global layout
- *
- * @return $this
- *
- */
- protected function _prepareLayout()
- {
- parent::_prepareLayout();
-
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $headBlock->setTitle($this->getHeader());
- }
- return $this;
- }
-
/**
* Retrieve Shared Wishlist Customer instance
*
@@ -70,4 +53,21 @@ public function getHeader()
{
return Mage::helper('wishlist')->__("%s's Wishlist", $this->escapeHtml($this->getWishlistCustomer()->getFirstname()));
}
+
+ /**
+ * Prepare global layout
+ *
+ * @return $this
+ *
+ */
+ protected function _prepareLayout()
+ {
+ parent::_prepareLayout();
+
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $headBlock->setTitle($this->getHeader());
+ }
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Controller/Abstract.php b/app/code/core/Mage/Wishlist/Controller/Abstract.php
index 022b62b9881..e5dc2074c0e 100644
--- a/app/code/core/Mage/Wishlist/Controller/Abstract.php
+++ b/app/code/core/Mage/Wishlist/Controller/Abstract.php
@@ -34,29 +34,6 @@ abstract class Mage_Wishlist_Controller_Abstract extends Mage_Core_Controller_Fr
*/
protected $_isCheckFormKey = true;
- /**
- * Processes localized qty (entered by user at frontend) into internal php format
- *
- * @param string $qty
- * @return float|int|null
- * @deprecated
- */
- protected function _processLocalizedQty($qty)
- {
- $qty = (float) $qty;
- if ($qty < 0) {
- $qty = null;
- }
- return $qty;
- }
-
- /**
- * Retrieve current wishlist instance
- *
- * @return Mage_Wishlist_Model_Wishlist|false
- */
- abstract protected function _getWishlist();
-
/**
* Add all items from wishlist to shopping cart
*
@@ -198,4 +175,27 @@ public function allcartAction()
$this->_redirectUrl($redirectUrl);
}
+
+ /**
+ * Processes localized qty (entered by user at frontend) into internal php format
+ *
+ * @param string $qty
+ * @return float|int|null
+ * @deprecated
+ */
+ protected function _processLocalizedQty($qty)
+ {
+ $qty = (float) $qty;
+ if ($qty < 0) {
+ $qty = null;
+ }
+ return $qty;
+ }
+
+ /**
+ * Retrieve current wishlist instance
+ *
+ * @return Mage_Wishlist_Model_Wishlist|false
+ */
+ abstract protected function _getWishlist();
}
diff --git a/app/code/core/Mage/Wishlist/Helper/Data.php b/app/code/core/Mage/Wishlist/Helper/Data.php
index ca70f7a563f..2ca1a00a8b2 100644
--- a/app/code/core/Mage/Wishlist/Helper/Data.php
+++ b/app/code/core/Mage/Wishlist/Helper/Data.php
@@ -60,36 +60,6 @@ class Mage_Wishlist_Helper_Data extends Mage_Core_Helper_Abstract
*/
protected $_wishlistItemCollection = null;
- /**
- * Retrieve customer session
- *
- * @return Mage_Customer_Model_Session
- */
- protected function _getCustomerSession()
- {
- return Mage::getSingleton('customer/session');
- }
-
- /**
- * Retrieve customer login status
- *
- * @return bool
- */
- protected function _isCustomerLogIn()
- {
- return $this->_getCustomerSession()->isLoggedIn();
- }
-
- /**
- * Retrieve logged in customer
- *
- * @return Mage_Customer_Model_Customer
- */
- protected function _getCurrentCustomer()
- {
- return $this->getCustomer();
- }
-
/**
* Set current customer
*/
@@ -184,16 +154,6 @@ public function getItemCollection()
return $this->getProductCollection();
}
- /**
- * Create wishlist item collection
- *
- * @return Mage_Wishlist_Model_Resource_Item_Collection
- */
- protected function _createWishlistItemCollection()
- {
- return $this->getWishlist()->getItemCollection();
- }
-
/**
* Retrieve wishlist items collection
*
@@ -227,31 +187,6 @@ public function getProductCollection()
return $this->_productCollection;
}
- /**
- * Retrieve Item Store for URL
- *
- * @param Mage_Catalog_Model_Product|Mage_Wishlist_Model_Item $item
- * @return Mage_Core_Model_Store
- */
- protected function _getUrlStore($item)
- {
- $storeId = null;
- $product = null;
- if ($item instanceof Mage_Wishlist_Model_Item) {
- $product = $item->getProduct();
- } elseif ($item instanceof Mage_Catalog_Model_Product) {
- $product = $item;
- }
- if ($product) {
- if ($product->isVisibleInSiteVisibility()) {
- $storeId = $product->getStoreId();
- } elseif ($product->hasUrlDataObject()) {
- $storeId = $product->getUrlDataObject()->getStoreId();
- }
- }
- return Mage::app()->getStore($storeId);
- }
-
/**
* Retrieve URL for removing item from wishlist
*
@@ -347,29 +282,6 @@ public function getAddToCartUrl($item)
return $this->getAddToCartUrlCustom($item);
}
- /**
- * Return helper instance
- *
- * @param string $helperName
- * @return Mage_Core_Helper_Abstract
- */
- protected function _getHelperInstance($helperName)
- {
- return Mage::helper($helperName);
- }
-
- /**
- * Return model instance
- *
- * @param string $className
- * @param array $arguments
- * @return Mage_Core_Model_Abstract
- */
- protected function _getSingletonModel($className, $arguments = [])
- {
- return Mage::getSingleton($className, $arguments);
- }
-
/**
* Retrieve URL for adding item to shoping cart from shared wishlist
*
@@ -620,4 +532,92 @@ public function getAddToCartUrlCustom($item, $addFormKey = true)
}
return $this->_getUrlStore($item)->getUrl('wishlist/index/cart', $params);
}
+
+ /**
+ * Retrieve customer session
+ *
+ * @return Mage_Customer_Model_Session
+ */
+ protected function _getCustomerSession()
+ {
+ return Mage::getSingleton('customer/session');
+ }
+
+ /**
+ * Retrieve customer login status
+ *
+ * @return bool
+ */
+ protected function _isCustomerLogIn()
+ {
+ return $this->_getCustomerSession()->isLoggedIn();
+ }
+
+ /**
+ * Retrieve logged in customer
+ *
+ * @return Mage_Customer_Model_Customer
+ */
+ protected function _getCurrentCustomer()
+ {
+ return $this->getCustomer();
+ }
+
+ /**
+ * Create wishlist item collection
+ *
+ * @return Mage_Wishlist_Model_Resource_Item_Collection
+ */
+ protected function _createWishlistItemCollection()
+ {
+ return $this->getWishlist()->getItemCollection();
+ }
+
+ /**
+ * Retrieve Item Store for URL
+ *
+ * @param Mage_Catalog_Model_Product|Mage_Wishlist_Model_Item $item
+ * @return Mage_Core_Model_Store
+ */
+ protected function _getUrlStore($item)
+ {
+ $storeId = null;
+ $product = null;
+ if ($item instanceof Mage_Wishlist_Model_Item) {
+ $product = $item->getProduct();
+ } elseif ($item instanceof Mage_Catalog_Model_Product) {
+ $product = $item;
+ }
+ if ($product) {
+ if ($product->isVisibleInSiteVisibility()) {
+ $storeId = $product->getStoreId();
+ } elseif ($product->hasUrlDataObject()) {
+ $storeId = $product->getUrlDataObject()->getStoreId();
+ }
+ }
+ return Mage::app()->getStore($storeId);
+ }
+
+ /**
+ * Return helper instance
+ *
+ * @param string $helperName
+ * @return Mage_Core_Helper_Abstract
+ */
+ protected function _getHelperInstance($helperName)
+ {
+ return Mage::helper($helperName);
+ }
+
+ /**
+ * Return model instance
+ *
+ * @param string $className
+ * @param array $arguments
+ * @return Mage_Core_Model_Abstract
+ */
+ protected function _getSingletonModel($className, $arguments = [])
+ {
+ return Mage::getSingleton($className, $arguments);
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Item.php b/app/code/core/Mage/Wishlist/Model/Item.php
index 43863a1a1d5..47d24e85ca8 100644
--- a/app/code/core/Mage/Wishlist/Model/Item.php
+++ b/app/code/core/Mage/Wishlist/Model/Item.php
@@ -104,12 +104,6 @@ class Mage_Wishlist_Model_Item extends Mage_Core_Model_Abstract implements Mage_
*/
protected $_flagOptionsSaved = null;
- protected function _construct()
- {
- $this->_cacheTag = 'wishlist_item';
- $this->_init('wishlist/item');
- }
-
/**
* Set quantity. If quantity is less than 0 - set it to 1
*
@@ -122,82 +116,6 @@ public function setQty($qty)
return $this;
}
- /**
- * Check if two options array are identical
- *
- * @param array $options1
- * @param array $options2
- * @return bool
- */
- protected function _compareOptions($options1, $options2)
- {
- $skipOptions = ['id', 'qty', 'return_url'];
- foreach ($options1 as $code => $value) {
- if (in_array($code, $skipOptions)) {
- continue;
- }
- if (!isset($options2[$code]) || $options2[$code] != $value) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Register option code
- *
- * @param Mage_Wishlist_Model_Item_Option $option
- * @return $this
- */
- protected function _addOptionCode($option)
- {
- if (!isset($this->_optionsByCode[$option->getCode()])) {
- $this->_optionsByCode[$option->getCode()] = $option;
- } else {
- Mage::throwException(Mage::helper('sales')->__('An item option with code %s already exists.', $option->getCode()));
- }
- return $this;
- }
-
- /**
- * Checks that item model has data changes.
- * Call save item options if model isn't need to save in DB
- *
- * @return bool
- */
- protected function _hasModelChanged()
- {
- if (!$this->hasDataChanges()) {
- return false;
- }
-
- return $this->_getResource()->hasDataChanged($this);
- }
-
- /**
- * Save item options
- *
- * @return $this
- */
- protected function _saveItemOptions()
- {
- foreach ($this->_options as $index => $option) {
- if ($option->isDeleted()) {
- // phpcs:ignore Ecg.Performance.Loop.ModelLSD
- $option->delete();
- unset($this->_options[$index]);
- unset($this->_optionsByCode[$option->getCode()]);
- } else {
- // phpcs:ignore Ecg.Performance.Loop.ModelLSD
- $option->save();
- }
- }
-
- $this->_flagOptionsSaved = true; // Report to watchers that options were saved
-
- return $this;
- }
-
/**
* Save model plus its options
* Ensures saving options in case when resource model was not changed
@@ -216,17 +134,6 @@ public function save()
return $this;
}
- /**
- * Save item options after item saved
- *
- * @inheritDoc
- */
- protected function _afterSave()
- {
- $this->_saveItemOptions();
- return parent::_afterSave();
- }
-
/**
* Validate wish list item data
*
@@ -245,31 +152,6 @@ public function validate()
return true;
}
- /**
- * Check required data
- *
- * @return $this
- */
- protected function _beforeSave()
- {
- parent::_beforeSave();
-
- // validate required item data
- $this->validate();
-
- // set current store id if it is not defined
- if (is_null($this->getStoreId())) {
- $this->setStoreId(Mage::app()->getStore()->getId());
- }
-
- // set current date if added at data is not defined
- if (is_null($this->getAddedAt())) {
- $this->setAddedAt(Mage::getSingleton('core/date')->gmtDate());
- }
-
- return $this;
- }
-
/**
* Retrieve wishlist item data as array
*
@@ -719,4 +601,122 @@ public function loadWithOptions($id, $optionsFilter = null)
$this->setOptions($options->getOptionsByItem($this));
return $this;
}
+
+ protected function _construct()
+ {
+ $this->_cacheTag = 'wishlist_item';
+ $this->_init('wishlist/item');
+ }
+
+ /**
+ * Check if two options array are identical
+ *
+ * @param array $options1
+ * @param array $options2
+ * @return bool
+ */
+ protected function _compareOptions($options1, $options2)
+ {
+ $skipOptions = ['id', 'qty', 'return_url'];
+ foreach ($options1 as $code => $value) {
+ if (in_array($code, $skipOptions)) {
+ continue;
+ }
+ if (!isset($options2[$code]) || $options2[$code] != $value) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Register option code
+ *
+ * @param Mage_Wishlist_Model_Item_Option $option
+ * @return $this
+ */
+ protected function _addOptionCode($option)
+ {
+ if (!isset($this->_optionsByCode[$option->getCode()])) {
+ $this->_optionsByCode[$option->getCode()] = $option;
+ } else {
+ Mage::throwException(Mage::helper('sales')->__('An item option with code %s already exists.', $option->getCode()));
+ }
+ return $this;
+ }
+
+ /**
+ * Checks that item model has data changes.
+ * Call save item options if model isn't need to save in DB
+ *
+ * @return bool
+ */
+ protected function _hasModelChanged()
+ {
+ if (!$this->hasDataChanges()) {
+ return false;
+ }
+
+ return $this->_getResource()->hasDataChanged($this);
+ }
+
+ /**
+ * Save item options
+ *
+ * @return $this
+ */
+ protected function _saveItemOptions()
+ {
+ foreach ($this->_options as $index => $option) {
+ if ($option->isDeleted()) {
+ // phpcs:ignore Ecg.Performance.Loop.ModelLSD
+ $option->delete();
+ unset($this->_options[$index]);
+ unset($this->_optionsByCode[$option->getCode()]);
+ } else {
+ // phpcs:ignore Ecg.Performance.Loop.ModelLSD
+ $option->save();
+ }
+ }
+
+ $this->_flagOptionsSaved = true; // Report to watchers that options were saved
+
+ return $this;
+ }
+
+ /**
+ * Save item options after item saved
+ *
+ * @inheritDoc
+ */
+ protected function _afterSave()
+ {
+ $this->_saveItemOptions();
+ return parent::_afterSave();
+ }
+
+ /**
+ * Check required data
+ *
+ * @return $this
+ */
+ protected function _beforeSave()
+ {
+ parent::_beforeSave();
+
+ // validate required item data
+ $this->validate();
+
+ // set current store id if it is not defined
+ if (is_null($this->getStoreId())) {
+ $this->setStoreId(Mage::app()->getStore()->getId());
+ }
+
+ // set current date if added at data is not defined
+ if (is_null($this->getAddedAt())) {
+ $this->setAddedAt(Mage::getSingleton('core/date')->gmtDate());
+ }
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Item/Option.php
index 967df847f08..45f0133a939 100644
--- a/app/code/core/Mage/Wishlist/Model/Item/Option.php
+++ b/app/code/core/Mage/Wishlist/Model/Item/Option.php
@@ -33,23 +33,13 @@ class Mage_Wishlist_Model_Item_Option extends Mage_Core_Model_Abstract implement
protected $_item;
protected $_product;
- protected function _construct()
- {
- $this->_init('wishlist/item_option');
- }
-
/**
- * Checks that item option model has data changes
- *
- * @return bool
+ * Clone option object
*/
- protected function _hasModelChanged()
+ public function __clone()
{
- if (!$this->hasDataChanges()) {
- return false;
- }
-
- return $this->_getResource()->hasDataChanged($this);
+ $this->setId(null);
+ $this->_item = null;
}
/**
@@ -112,6 +102,25 @@ public function getValue()
return $this->_getData('value');
}
+ protected function _construct()
+ {
+ $this->_init('wishlist/item_option');
+ }
+
+ /**
+ * Checks that item option model has data changes
+ *
+ * @return bool
+ */
+ protected function _hasModelChanged()
+ {
+ if (!$this->hasDataChanges()) {
+ return false;
+ }
+
+ return $this->_getResource()->hasDataChanged($this);
+ }
+
/**
* Initialize item identifier before save data
*
@@ -124,13 +133,4 @@ protected function _beforeSave()
}
return parent::_beforeSave();
}
-
- /**
- * Clone option object
- */
- public function __clone()
- {
- $this->setId(null);
- $this->_item = null;
- }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Observer.php b/app/code/core/Mage/Wishlist/Model/Observer.php
index 4f858ff7f0f..cb922d8c128 100644
--- a/app/code/core/Mage/Wishlist/Model/Observer.php
+++ b/app/code/core/Mage/Wishlist/Model/Observer.php
@@ -22,20 +22,6 @@
*/
class Mage_Wishlist_Model_Observer extends Mage_Core_Model_Abstract
{
- /**
- * Get customer wishlist model instance
- *
- * @param int $customerId
- * @return Mage_Wishlist_Model_Wishlist|false
- */
- protected function _getWishlist($customerId)
- {
- if (!$customerId) {
- return false;
- }
- return Mage::getModel('wishlist/wishlist')->loadByCustomer($customerId, true);
- }
-
/**
* Check move quote item to wishlist request
*
@@ -157,4 +143,17 @@ public function customerLogout(Varien_Event_Observer $observer)
return $this;
}
+ /**
+ * Get customer wishlist model instance
+ *
+ * @param int $customerId
+ * @return Mage_Wishlist_Model_Wishlist|false
+ */
+ protected function _getWishlist($customerId)
+ {
+ if (!$customerId) {
+ return false;
+ }
+ return Mage::getModel('wishlist/wishlist')->loadByCustomer($customerId, true);
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item.php b/app/code/core/Mage/Wishlist/Model/Resource/Item.php
index 192d92fa39c..08fe0afd7c6 100644
--- a/app/code/core/Mage/Wishlist/Model/Resource/Item.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Item.php
@@ -22,11 +22,6 @@
*/
class Mage_Wishlist_Model_Resource_Item extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('wishlist/item', 'wishlist_item_id');
- }
-
/**
* Load item by wishlist, product and shared stores
*
@@ -57,4 +52,8 @@ public function loadByProductWishlist($object, $wishlistId, $productId, $sharedS
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('wishlist/item', 'wishlist_item_id');
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php
index 5de7dafe43c..69895d6688e 100644
--- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php
@@ -101,123 +101,6 @@ public function _construct()
$this->addFilterToMap('store_id', 'main_table.store_id');
}
- /**
- * After load processing
- *
- * @return $this
- */
- protected function _afterLoad()
- {
- parent::_afterLoad();
-
- /**
- * Assign products
- */
- $this->_assignOptions();
- $this->_assignProducts();
- $this->resetItemsDataChanged();
-
- $this->getPageSize();
-
- return $this;
- }
-
- /**
- * Add options to items
- *
- * @return $this
- */
- protected function _assignOptions()
- {
- $itemIds = array_keys($this->_items);
- /** @var Mage_Wishlist_Model_Resource_Item_Option_Collection $optionCollection */
- $optionCollection = Mage::getModel('wishlist/item_option')->getCollection();
- $optionCollection->addItemFilter($itemIds);
-
- /** @var Mage_Wishlist_Model_Item $item */
- foreach ($this as $item) {
- $item->setOptions($optionCollection->getOptionsByItem($item));
- }
- $productIds = $optionCollection->getProductIds();
- $this->_productIds = array_merge($this->_productIds, $productIds);
-
- return $this;
- }
-
- /**
- * Add products to items and item options
- *
- * @return $this
- */
- protected function _assignProducts()
- {
- Varien_Profiler::start('WISHLIST:' . __METHOD__);
- $productIds = [];
-
- $isStoreAdmin = Mage::app()->getStore()->isAdmin();
-
- $storeIds = [];
- foreach ($this as $item) {
- $productIds[$item->getProductId()] = 1;
- if ($isStoreAdmin && !in_array($item->getStoreId(), $storeIds)) {
- $storeIds[] = $item->getStoreId();
- }
- }
- if (!$isStoreAdmin) {
- $storeIds = $this->_storeIds;
- }
-
- $this->_productIds = array_merge($this->_productIds, array_keys($productIds));
- $attributes = Mage::getSingleton('wishlist/config')->getProductAttributes();
- $productCollection = Mage::getModel('catalog/product')->getCollection();
- foreach ($storeIds as $id) {
- $productCollection->addWebsiteFilter(Mage::app()->getStore($id)->getWebsiteId());
- }
-
- if ($this->_productVisible) {
- Mage::getSingleton('catalog/product_visibility')->addVisibleInSiteFilterToCollection($productCollection);
- }
-
- $productCollection->addPriceData($this->_customerGroupId, $this->_websiteId)
- ->addTaxPercents()
- ->addIdFilter($this->_productIds)
- ->addAttributeToSelect($attributes)
- ->addOptionsToResult()
- ->addUrlRewrite();
-
- if ($this->_productSalable) {
- $productCollection = Mage::helper('adminhtml/sales')->applySalableProductTypesFilter($productCollection);
- }
-
- Mage::dispatchEvent('wishlist_item_collection_products_after_load', [
- 'product_collection' => $productCollection,
- ]);
-
- $checkInStock = $this->_productInStock && !Mage::helper('cataloginventory')->isShowOutOfStock();
-
- foreach ($this as $item) {
- /** @var Mage_Catalog_Model_Product $product */
- $product = $productCollection->getItemById($item->getProductId());
- if ($product) {
- if ($checkInStock && !$product->isInStock()) {
- $this->removeItemByKey($item->getId());
- } else {
- $product->setCustomOptions([]);
- $item->setProduct($product);
- $item->setProductName($product->getName());
- $item->setName($product->getName());
- $item->setPrice($product->getPrice());
- }
- } else {
- $item->isDeleted(true);
- }
- }
-
- Varien_Profiler::stop('WISHLIST:' . __METHOD__);
-
- return $this;
- }
-
/**
* Add filter by wishlist object
*
@@ -415,36 +298,6 @@ public function addDaysFilter($constraints)
return $this;
}
- /**
- * Joins product name attribute value to use it in WHERE and ORDER clauses
- *
- * @return $this
- */
- protected function _joinProductNameTable()
- {
- if (!$this->_isProductNameJoined) {
- $entityTypeId = Mage::getResourceModel('catalog/config')
- ->getEntityTypeId();
- $attribute = Mage::getModel('catalog/entity_attribute')
- ->loadByCode($entityTypeId, 'name');
-
- $storeId = Mage::app()->getStore()->getId();
-
- $this->getSelect()
- ->join(
- ['product_name_table' => $attribute->getBackendTable()],
- 'product_name_table.entity_id=main_table.product_id' .
- ' AND product_name_table.store_id=' . $storeId .
- ' AND product_name_table.attribute_id=' . $attribute->getId() .
- ' AND product_name_table.entity_type_id=' . $entityTypeId,
- [],
- );
-
- $this->_isProductNameJoined = true;
- }
- return $this;
- }
-
/**
* Adds filter on product name
*
@@ -514,4 +367,151 @@ public function setCustomerGroupId($customerGroupId)
$this->_customerGroupId = $customerGroupId;
return $this;
}
+
+ /**
+ * After load processing
+ *
+ * @return $this
+ */
+ protected function _afterLoad()
+ {
+ parent::_afterLoad();
+
+ /**
+ * Assign products
+ */
+ $this->_assignOptions();
+ $this->_assignProducts();
+ $this->resetItemsDataChanged();
+
+ $this->getPageSize();
+
+ return $this;
+ }
+
+ /**
+ * Add options to items
+ *
+ * @return $this
+ */
+ protected function _assignOptions()
+ {
+ $itemIds = array_keys($this->_items);
+ /** @var Mage_Wishlist_Model_Resource_Item_Option_Collection $optionCollection */
+ $optionCollection = Mage::getModel('wishlist/item_option')->getCollection();
+ $optionCollection->addItemFilter($itemIds);
+
+ /** @var Mage_Wishlist_Model_Item $item */
+ foreach ($this as $item) {
+ $item->setOptions($optionCollection->getOptionsByItem($item));
+ }
+ $productIds = $optionCollection->getProductIds();
+ $this->_productIds = array_merge($this->_productIds, $productIds);
+
+ return $this;
+ }
+
+ /**
+ * Add products to items and item options
+ *
+ * @return $this
+ */
+ protected function _assignProducts()
+ {
+ Varien_Profiler::start('WISHLIST:' . __METHOD__);
+ $productIds = [];
+
+ $isStoreAdmin = Mage::app()->getStore()->isAdmin();
+
+ $storeIds = [];
+ foreach ($this as $item) {
+ $productIds[$item->getProductId()] = 1;
+ if ($isStoreAdmin && !in_array($item->getStoreId(), $storeIds)) {
+ $storeIds[] = $item->getStoreId();
+ }
+ }
+ if (!$isStoreAdmin) {
+ $storeIds = $this->_storeIds;
+ }
+
+ $this->_productIds = array_merge($this->_productIds, array_keys($productIds));
+ $attributes = Mage::getSingleton('wishlist/config')->getProductAttributes();
+ $productCollection = Mage::getModel('catalog/product')->getCollection();
+ foreach ($storeIds as $id) {
+ $productCollection->addWebsiteFilter(Mage::app()->getStore($id)->getWebsiteId());
+ }
+
+ if ($this->_productVisible) {
+ Mage::getSingleton('catalog/product_visibility')->addVisibleInSiteFilterToCollection($productCollection);
+ }
+
+ $productCollection->addPriceData($this->_customerGroupId, $this->_websiteId)
+ ->addTaxPercents()
+ ->addIdFilter($this->_productIds)
+ ->addAttributeToSelect($attributes)
+ ->addOptionsToResult()
+ ->addUrlRewrite();
+
+ if ($this->_productSalable) {
+ $productCollection = Mage::helper('adminhtml/sales')->applySalableProductTypesFilter($productCollection);
+ }
+
+ Mage::dispatchEvent('wishlist_item_collection_products_after_load', [
+ 'product_collection' => $productCollection,
+ ]);
+
+ $checkInStock = $this->_productInStock && !Mage::helper('cataloginventory')->isShowOutOfStock();
+
+ foreach ($this as $item) {
+ /** @var Mage_Catalog_Model_Product $product */
+ $product = $productCollection->getItemById($item->getProductId());
+ if ($product) {
+ if ($checkInStock && !$product->isInStock()) {
+ $this->removeItemByKey($item->getId());
+ } else {
+ $product->setCustomOptions([]);
+ $item->setProduct($product);
+ $item->setProductName($product->getName());
+ $item->setName($product->getName());
+ $item->setPrice($product->getPrice());
+ }
+ } else {
+ $item->isDeleted(true);
+ }
+ }
+
+ Varien_Profiler::stop('WISHLIST:' . __METHOD__);
+
+ return $this;
+ }
+
+ /**
+ * Joins product name attribute value to use it in WHERE and ORDER clauses
+ *
+ * @return $this
+ */
+ protected function _joinProductNameTable()
+ {
+ if (!$this->_isProductNameJoined) {
+ $entityTypeId = Mage::getResourceModel('catalog/config')
+ ->getEntityTypeId();
+ $attribute = Mage::getModel('catalog/entity_attribute')
+ ->loadByCode($entityTypeId, 'name');
+
+ $storeId = Mage::app()->getStore()->getId();
+
+ $this->getSelect()
+ ->join(
+ ['product_name_table' => $attribute->getBackendTable()],
+ 'product_name_table.entity_id=main_table.product_id' .
+ ' AND product_name_table.store_id=' . $storeId .
+ ' AND product_name_table.attribute_id=' . $attribute->getId() .
+ ' AND product_name_table.entity_type_id=' . $entityTypeId,
+ [],
+ );
+
+ $this->_isProductNameJoined = true;
+ }
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php
index 86a75c865ce..7374ad87c1b 100644
--- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php
@@ -36,42 +36,6 @@ class Mage_Wishlist_Model_Resource_Item_Option_Collection extends Mage_Core_Mode
*/
protected $_optionsByProduct = [];
- /**
- * Define resource model for collection
- */
- protected function _construct()
- {
- $this->_init('wishlist/item_option');
- }
-
- /**
- * Fill array of options by item and product
- *
- * @return $this
- */
- protected function _afterLoad()
- {
- parent::_afterLoad();
-
- foreach ($this as $option) {
- $optionId = $option->getId();
- $itemId = $option->getWishlistItemId();
- $productId = $option->getProductId();
- if (isset($this->_optionsByItem[$itemId])) {
- $this->_optionsByItem[$itemId][] = $optionId;
- } else {
- $this->_optionsByItem[$itemId] = [$optionId];
- }
- if (isset($this->_optionsByProduct[$productId])) {
- $this->_optionsByProduct[$productId][] = $optionId;
- } else {
- $this->_optionsByProduct[$productId] = [$optionId];
- }
- }
-
- return $this;
- }
-
/**
* Apply quote item(s) filter to collection
*
@@ -157,4 +121,40 @@ public function getOptionsByProduct($product)
return $options;
}
+
+ /**
+ * Define resource model for collection
+ */
+ protected function _construct()
+ {
+ $this->_init('wishlist/item_option');
+ }
+
+ /**
+ * Fill array of options by item and product
+ *
+ * @return $this
+ */
+ protected function _afterLoad()
+ {
+ parent::_afterLoad();
+
+ foreach ($this as $option) {
+ $optionId = $option->getId();
+ $itemId = $option->getWishlistItemId();
+ $productId = $option->getProductId();
+ if (isset($this->_optionsByItem[$itemId])) {
+ $this->_optionsByItem[$itemId][] = $optionId;
+ } else {
+ $this->_optionsByItem[$itemId] = [$optionId];
+ }
+ if (isset($this->_optionsByProduct[$productId])) {
+ $this->_optionsByProduct[$productId][] = $optionId;
+ } else {
+ $this->_optionsByProduct[$productId] = [$optionId];
+ }
+ }
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php
index f74ad1739f2..d2ebcbf8e79 100644
--- a/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php
@@ -145,19 +145,6 @@ public function addStoreData()
return $this;
}
- /**
- * Rewrite retrieve attribute field name for wishlist attributes
- *
- * @inheritDoc
- */
- protected function _getAttributeFieldName($attributeCode)
- {
- if ($attributeCode === 'days_in_wishlist') {
- return $this->_joinFields[$attributeCode]['field'];
- }
- return parent::_getAttributeFieldName($attributeCode);
- }
-
/**
* Prevent loading collection because after Magento 1.4.2.0 it's impossible
* to use product collection in wishlist
@@ -170,4 +157,17 @@ public function load($printQuery = false, $logQuery = false)
{
return $this;
}
+
+ /**
+ * Rewrite retrieve attribute field name for wishlist attributes
+ *
+ * @inheritDoc
+ */
+ protected function _getAttributeFieldName($attributeCode)
+ {
+ if ($attributeCode === 'days_in_wishlist') {
+ return $this->_joinFields[$attributeCode]['field'];
+ }
+ return parent::_getAttributeFieldName($attributeCode);
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php
index b21dda17ef0..6c610d1cb0e 100644
--- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php
@@ -36,32 +36,6 @@ class Mage_Wishlist_Model_Resource_Wishlist extends Mage_Core_Model_Resource_Db_
*/
protected $_customerIdFieldName = 'customer_id';
- /**
- * Set main entity table name and primary key field name
- */
- protected function _construct()
- {
- $this->_init('wishlist/wishlist', 'wishlist_id');
- }
-
- /**
- * Prepare wishlist load select query
- *
- * @param string $field
- * @param mixed $value
- * @param mixed $object
- * @return Zend_Db_Select
- */
- protected function _getLoadSelect($field, $value, $object)
- {
- $select = parent::_getLoadSelect($field, $value, $object);
- if ($field == $this->_customerIdFieldName) {
- $select->order('wishlist_id ' . Zend_Db_Select::SQL_ASC)
- ->limit(1);
- }
- return $select;
- }
-
/**
* Getter for customer ID field name
*
@@ -101,4 +75,30 @@ public function fetchItemsCount(Mage_Wishlist_Model_Wishlist $wishlist)
return $this->_itemsCount;
}
+
+ /**
+ * Set main entity table name and primary key field name
+ */
+ protected function _construct()
+ {
+ $this->_init('wishlist/wishlist', 'wishlist_id');
+ }
+
+ /**
+ * Prepare wishlist load select query
+ *
+ * @param string $field
+ * @param mixed $value
+ * @param mixed $object
+ * @return Zend_Db_Select
+ */
+ protected function _getLoadSelect($field, $value, $object)
+ {
+ $select = parent::_getLoadSelect($field, $value, $object);
+ if ($field == $this->_customerIdFieldName) {
+ $select->order('wishlist_id ' . Zend_Db_Select::SQL_ASC)
+ ->limit(1);
+ }
+ return $select;
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php
index ed4a0e027c8..45c90dba73b 100644
--- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php
@@ -24,15 +24,6 @@
*/
class Mage_Wishlist_Model_Resource_Wishlist_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Initialize resource
- *
- */
- protected function _construct()
- {
- $this->_init('wishlist/wishlist');
- }
-
/**
* Filter collection by customer
*
@@ -65,4 +56,12 @@ public function filterByCustomerIds(array $customerIds)
$this->addFieldToFilter('customer_id', ['in' => $customerIds]);
return $this;
}
+ /**
+ * Initialize resource
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('wishlist/wishlist');
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php
index 8dd3d2eada8..c856048b64b 100644
--- a/app/code/core/Mage/Wishlist/Model/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Model/Wishlist.php
@@ -68,14 +68,6 @@ class Mage_Wishlist_Model_Wishlist extends Mage_Core_Model_Abstract
*/
protected $_cacheTag = 'wishlist';
- /**
- * Initialize resource model
- */
- protected function _construct()
- {
- $this->_init('wishlist/wishlist');
- }
-
/**
* Load wishlist by customer
*
@@ -142,88 +134,6 @@ public function loadByCode($code)
return $this;
}
- /**
- * Retrieve sharing code (random string)
- *
- * @return string
- */
- protected function _getSharingRandomCode()
- {
- return Mage::helper('core')->uniqHash();
- }
-
- /**
- * Set date of last update for wishlist
- *
- * @return $this
- */
- protected function _beforeSave()
- {
- parent::_beforeSave();
- $this->setUpdatedAt(Mage::getSingleton('core/date')->gmtDate());
- return $this;
- }
-
- /**
- * Save related items
- *
- * @return $this
- */
- protected function _afterSave()
- {
- parent::_afterSave();
-
- if ($this->_itemCollection !== null) {
- $this->getItemCollection()->save();
- }
- return $this;
- }
-
- /**
- * Add catalog product object data to wishlist
- *
- * @param int $qty
- * @param bool $forciblySetQty
- * @return Mage_Wishlist_Model_Item
- */
- protected function _addCatalogProduct(Mage_Catalog_Model_Product $product, $qty = 1, $forciblySetQty = false)
- {
- $item = null;
- foreach ($this->getItemCollection() as $wishlistItem) {
- if ($wishlistItem->representProduct($product)) {
- $item = $wishlistItem;
- break;
- }
- }
-
- if ($item === null) {
- $storeId = $product->hasWishlistStoreId() ? $product->getWishlistStoreId() : $this->getStore()->getId();
- $item = Mage::getModel('wishlist/item');
- $item->setProductId($product->getId())
- ->setWishlistId($this->getId())
- ->setAddedAt(Varien_Date::now())
- ->setStoreId($storeId)
- ->setOptions($product->getCustomOptions())
- ->setProduct($product)
- ->setQty($qty)
- ->save();
-
- Mage::dispatchEvent('wishlist_item_add_after', ['wishlist' => $this]);
-
- if ($item->getId()) {
- $this->getItemCollection()->addItem($item);
- }
- } else {
- $qty = $forciblySetQty ? $qty : $item->getQty() + $qty;
- $item->setQty($qty)
- ->save();
- }
-
- $this->addItem($item);
-
- return $item;
- }
-
/**
* Retrieve wishlist item collection
*
@@ -603,4 +513,94 @@ public function save()
$this->_hasDataChanges = true;
return parent::save();
}
+
+ /**
+ * Initialize resource model
+ */
+ protected function _construct()
+ {
+ $this->_init('wishlist/wishlist');
+ }
+
+ /**
+ * Retrieve sharing code (random string)
+ *
+ * @return string
+ */
+ protected function _getSharingRandomCode()
+ {
+ return Mage::helper('core')->uniqHash();
+ }
+
+ /**
+ * Set date of last update for wishlist
+ *
+ * @return $this
+ */
+ protected function _beforeSave()
+ {
+ parent::_beforeSave();
+ $this->setUpdatedAt(Mage::getSingleton('core/date')->gmtDate());
+ return $this;
+ }
+
+ /**
+ * Save related items
+ *
+ * @return $this
+ */
+ protected function _afterSave()
+ {
+ parent::_afterSave();
+
+ if ($this->_itemCollection !== null) {
+ $this->getItemCollection()->save();
+ }
+ return $this;
+ }
+
+ /**
+ * Add catalog product object data to wishlist
+ *
+ * @param int $qty
+ * @param bool $forciblySetQty
+ * @return Mage_Wishlist_Model_Item
+ */
+ protected function _addCatalogProduct(Mage_Catalog_Model_Product $product, $qty = 1, $forciblySetQty = false)
+ {
+ $item = null;
+ foreach ($this->getItemCollection() as $wishlistItem) {
+ if ($wishlistItem->representProduct($product)) {
+ $item = $wishlistItem;
+ break;
+ }
+ }
+
+ if ($item === null) {
+ $storeId = $product->hasWishlistStoreId() ? $product->getWishlistStoreId() : $this->getStore()->getId();
+ $item = Mage::getModel('wishlist/item');
+ $item->setProductId($product->getId())
+ ->setWishlistId($this->getId())
+ ->setAddedAt(Varien_Date::now())
+ ->setStoreId($storeId)
+ ->setOptions($product->getCustomOptions())
+ ->setProduct($product)
+ ->setQty($qty)
+ ->save();
+
+ Mage::dispatchEvent('wishlist_item_add_after', ['wishlist' => $this]);
+
+ if ($item->getId()) {
+ $this->getItemCollection()->addItem($item);
+ }
+ } else {
+ $qty = $forciblySetQty ? $qty : $item->getQty() + $qty;
+ $item->setQty($qty)
+ ->save();
+ }
+
+ $this->addItem($item);
+
+ return $item;
+ }
}
diff --git a/app/code/core/Mage/Wishlist/controllers/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php
index 73634edfaa4..12289f2f0a9 100644
--- a/app/code/core/Mage/Wishlist/controllers/IndexController.php
+++ b/app/code/core/Mage/Wishlist/controllers/IndexController.php
@@ -73,52 +73,6 @@ public function skipAuthentication()
return $this;
}
- /**
- * Retrieve wishlist object
- * @param int $wishlistId
- * @return Mage_Wishlist_Model_Wishlist|false
- */
- protected function _getWishlist($wishlistId = null)
- {
- $wishlist = Mage::registry('wishlist');
- if ($wishlist) {
- return $wishlist;
- }
-
- try {
- if (!$wishlistId) {
- $wishlistId = $this->getRequest()->getParam('wishlist_id');
- }
- $customerId = Mage::getSingleton('customer/session')->getCustomerId();
- $wishlist = Mage::getModel('wishlist/wishlist');
- if ($wishlistId) {
- $wishlist->load($wishlistId);
- } else {
- $wishlist->loadByCustomer($customerId, true);
- }
-
- if (!$wishlist->getId() || $wishlist->getCustomerId() != $customerId) {
- $wishlist = null;
- Mage::throwException(
- Mage::helper('wishlist')->__("Requested wishlist doesn't exist"),
- );
- }
-
- Mage::register('wishlist', $wishlist);
- } catch (Mage_Core_Exception $e) {
- Mage::getSingleton('wishlist/session')->addError($e->getMessage());
- return false;
- } catch (Exception $e) {
- Mage::getSingleton('wishlist/session')->addException(
- $e,
- Mage::helper('wishlist')->__('Wishlist could not be created.'),
- );
- return false;
- }
-
- return $wishlist;
- }
-
/**
* Display customer wishlist
*
@@ -170,87 +124,6 @@ public function addAction()
$this->_addItemToWishList();
}
- /**
- * Add the item to wish list
- *
- * @return void
- * @throws Throwable
- */
- protected function _addItemToWishList()
- {
- $wishlist = $this->_getWishlist();
- if (!$wishlist) {
- $this->norouteAction();
- return;
- }
-
- $session = Mage::getSingleton('customer/session');
-
- $productId = (int) $this->getRequest()->getParam('product');
- if (!$productId) {
- $this->_redirect('*/');
- return;
- }
-
- $product = Mage::getModel('catalog/product')->load($productId);
- if (!$product->getId() || !$product->isVisibleInCatalog()) {
- $session->addError($this->__('Cannot specify product.'));
- $this->_redirect('*/');
- return;
- }
-
- try {
- $requestParams = $this->getRequest()->getParams();
- if ($session->getBeforeWishlistRequest()) {
- $requestParams = $session->getBeforeWishlistRequest();
- $session->unsBeforeWishlistRequest();
- }
- $buyRequest = new Varien_Object($requestParams);
-
- $result = $wishlist->addNewItem($product, $buyRequest);
- if (is_string($result)) {
- Mage::throwException($result);
- }
- $wishlist->save();
-
- Mage::dispatchEvent(
- 'wishlist_add_product',
- [
- 'wishlist' => $wishlist,
- 'product' => $product,
- 'item' => $result,
- ],
- );
-
- $referer = $session->getBeforeWishlistUrl();
- if ($referer) {
- $session->setBeforeWishlistUrl(null);
- } else {
- $referer = $this->_getRefererUrl();
- }
-
- /**
- * Set referer to avoid referring to the compare popup window
- */
- $session->setAddActionReferer($referer);
-
- Mage::helper('wishlist')->calculate();
-
- $message = $this->__(
- '%1$s has been added to your wishlist. Click here to continue shopping.',
- $product->getName(),
- Mage::helper('core')->escapeUrl($referer),
- );
- $session->addSuccess($message);
- } catch (Mage_Core_Exception $e) {
- $session->addError($this->__('An error occurred while adding item to wishlist: %s', $e->getMessage()));
- } catch (Exception $e) {
- $session->addError($this->__('An error occurred while adding item to wishlist.'));
- }
-
- $this->_redirect('*', ['wishlist_id' => $wishlist->getId()]);
- }
-
/**
* Action to reconfigure wishlist item
*
@@ -779,4 +652,131 @@ public function downloadCustomOptionAction()
}
exit(0);
}
+
+ /**
+ * Retrieve wishlist object
+ * @param int $wishlistId
+ * @return Mage_Wishlist_Model_Wishlist|false
+ */
+ protected function _getWishlist($wishlistId = null)
+ {
+ $wishlist = Mage::registry('wishlist');
+ if ($wishlist) {
+ return $wishlist;
+ }
+
+ try {
+ if (!$wishlistId) {
+ $wishlistId = $this->getRequest()->getParam('wishlist_id');
+ }
+ $customerId = Mage::getSingleton('customer/session')->getCustomerId();
+ $wishlist = Mage::getModel('wishlist/wishlist');
+ if ($wishlistId) {
+ $wishlist->load($wishlistId);
+ } else {
+ $wishlist->loadByCustomer($customerId, true);
+ }
+
+ if (!$wishlist->getId() || $wishlist->getCustomerId() != $customerId) {
+ $wishlist = null;
+ Mage::throwException(
+ Mage::helper('wishlist')->__("Requested wishlist doesn't exist"),
+ );
+ }
+
+ Mage::register('wishlist', $wishlist);
+ } catch (Mage_Core_Exception $e) {
+ Mage::getSingleton('wishlist/session')->addError($e->getMessage());
+ return false;
+ } catch (Exception $e) {
+ Mage::getSingleton('wishlist/session')->addException(
+ $e,
+ Mage::helper('wishlist')->__('Wishlist could not be created.'),
+ );
+ return false;
+ }
+
+ return $wishlist;
+ }
+
+ /**
+ * Add the item to wish list
+ *
+ * @return void
+ * @throws Throwable
+ */
+ protected function _addItemToWishList()
+ {
+ $wishlist = $this->_getWishlist();
+ if (!$wishlist) {
+ $this->norouteAction();
+ return;
+ }
+
+ $session = Mage::getSingleton('customer/session');
+
+ $productId = (int) $this->getRequest()->getParam('product');
+ if (!$productId) {
+ $this->_redirect('*/');
+ return;
+ }
+
+ $product = Mage::getModel('catalog/product')->load($productId);
+ if (!$product->getId() || !$product->isVisibleInCatalog()) {
+ $session->addError($this->__('Cannot specify product.'));
+ $this->_redirect('*/');
+ return;
+ }
+
+ try {
+ $requestParams = $this->getRequest()->getParams();
+ if ($session->getBeforeWishlistRequest()) {
+ $requestParams = $session->getBeforeWishlistRequest();
+ $session->unsBeforeWishlistRequest();
+ }
+ $buyRequest = new Varien_Object($requestParams);
+
+ $result = $wishlist->addNewItem($product, $buyRequest);
+ if (is_string($result)) {
+ Mage::throwException($result);
+ }
+ $wishlist->save();
+
+ Mage::dispatchEvent(
+ 'wishlist_add_product',
+ [
+ 'wishlist' => $wishlist,
+ 'product' => $product,
+ 'item' => $result,
+ ],
+ );
+
+ $referer = $session->getBeforeWishlistUrl();
+ if ($referer) {
+ $session->setBeforeWishlistUrl(null);
+ } else {
+ $referer = $this->_getRefererUrl();
+ }
+
+ /**
+ * Set referer to avoid referring to the compare popup window
+ */
+ $session->setAddActionReferer($referer);
+
+ Mage::helper('wishlist')->calculate();
+
+ $message = $this->__(
+ '%1$s has been added to your wishlist. Click here to continue shopping.',
+ $product->getName(),
+ Mage::helper('core')->escapeUrl($referer),
+ );
+ $session->addSuccess($message);
+ } catch (Mage_Core_Exception $e) {
+ $session->addError($this->__('An error occurred while adding item to wishlist: %s', $e->getMessage()));
+ } catch (Exception $e) {
+ $session->addError($this->__('An error occurred while adding item to wishlist.'));
+ }
+
+ $this->_redirect('*', ['wishlist_id' => $wishlist->getId()]);
+ }
}
diff --git a/app/code/core/Mage/Wishlist/controllers/SharedController.php b/app/code/core/Mage/Wishlist/controllers/SharedController.php
index 42c5db5e336..59c94893f32 100644
--- a/app/code/core/Mage/Wishlist/controllers/SharedController.php
+++ b/app/code/core/Mage/Wishlist/controllers/SharedController.php
@@ -28,28 +28,6 @@ class Mage_Wishlist_SharedController extends Mage_Wishlist_Controller_Abstract
*/
protected $_isCheckFormKey = false;
- /**
- * Retrieve wishlist instance by requested code
- *
- * @return Mage_Wishlist_Model_Wishlist|false
- */
- protected function _getWishlist()
- {
- $code = (string) $this->getRequest()->getParam('code');
- if (empty($code)) {
- return false;
- }
-
- $wishlist = Mage::getModel('wishlist/wishlist')->loadByCode($code);
- if (!$wishlist->getId()) {
- return false;
- }
-
- Mage::getSingleton('checkout/session')->setSharedWishlist($code);
-
- return $wishlist;
- }
-
/**
* Shared wishlist view page
*
@@ -124,4 +102,26 @@ public function cartAction()
return $this->_redirectUrl($redirectUrl);
}
+
+ /**
+ * Retrieve wishlist instance by requested code
+ *
+ * @return Mage_Wishlist_Model_Wishlist|false
+ */
+ protected function _getWishlist()
+ {
+ $code = (string) $this->getRequest()->getParam('code');
+ if (empty($code)) {
+ return false;
+ }
+
+ $wishlist = Mage::getModel('wishlist/wishlist')->loadByCode($code);
+ if (!$wishlist->getId()) {
+ return false;
+ }
+
+ Mage::getSingleton('checkout/session')->setSharedWishlist($code);
+
+ return $wishlist;
+ }
}
diff --git a/errors/processor.php b/errors/processor.php
index 99b117c7e4d..240a6c9a4c6 100644
--- a/errors/processor.php
+++ b/errors/processor.php
@@ -47,9 +47,6 @@ class Error_Processor
/** @var string */
public $reportUrl;
- /** @var string report file name */
- protected $_reportFile;
-
/** @var bool */
public $showErrorMsg;
@@ -63,6 +60,9 @@ class Error_Processor
/** @var bool */
public $showSendForm;
+ /** @var string report file name */
+ protected $_reportFile;
+
/**
* Server script name
*
@@ -203,6 +203,114 @@ public function getBaseUrl(bool $param = false): string
return $this->getHostUrl() . ($basePath === '/' ? '' : $basePath) . '/';
}
+ /**
+ * @throws Exception
+ */
+ public function saveReport(array $reportData)
+ {
+ $this->reportData = $reportData;
+ $this->reportId = abs((int) (microtime(true) * random_int(100, 1000)));
+ $this->_reportFile = $this->_reportDir . '/' . $this->reportId;
+ $this->_setReportData($reportData);
+
+ if (!file_exists($this->_reportDir)) {
+ @mkdir($this->_reportDir, 0750, true);
+ }
+
+ $reportData = array_map('strip_tags', $reportData);
+ @file_put_contents($this->_reportFile, serialize($reportData));
+ @chmod($this->_reportFile, 0640);
+
+ if (isset($reportData['skin']) && self::DEFAULT_SKIN !== $reportData['skin']) {
+ $this->_setSkin($reportData['skin']);
+ }
+ $this->_setReportUrl();
+
+ if (headers_sent()) {
+ echo '';
+ exit();
+ }
+ }
+
+ /**
+ * @return void|no-return
+ */
+ public function loadReport(int $reportId)
+ {
+ $reportData = false;
+ $this->reportId = $reportId;
+ $this->_reportFile = $this->_reportDir . '/' . $reportId;
+
+ if (!file_exists($this->_reportFile) || !is_readable($this->_reportFile)) {
+ header('Location: ' . $this->getBaseUrl());
+ exit();
+ }
+
+ $reportContent = file_get_contents($this->_reportFile);
+ if (!preg_match('/[oc]:[+\-]?\d+:"/i', $reportContent)) {
+ $reportData = unserialize($reportContent, ['allowed_classes' => false]);
+ }
+ if (is_array($reportData)) {
+ $this->_setReportData($reportData);
+ }
+ }
+
+ /**
+ * @return void
+ */
+ public function sendReport()
+ {
+ $this->pageTitle = 'Error Submission Form';
+
+ $this->postData['firstName'] = (isset($_POST['firstname'])) ? trim(htmlspecialchars($_POST['firstname'])) : '';
+ $this->postData['lastName'] = (isset($_POST['lastname'])) ? trim(htmlspecialchars($_POST['lastname'])) : '';
+ $this->postData['email'] = (isset($_POST['email'])) ? trim(htmlspecialchars($_POST['email'])) : '';
+ $this->postData['telephone'] = (isset($_POST['telephone'])) ? trim(htmlspecialchars($_POST['telephone'])) : '';
+ $this->postData['comment'] = (isset($_POST['comment'])) ? trim(htmlspecialchars($_POST['comment'])) : '';
+ $url = htmlspecialchars($this->reportData['url'], ENT_COMPAT | ENT_HTML401);
+
+ if (isset($_POST['submit'])) {
+ if ($this->_validate()) {
+ $msg = "URL: {$url}\n"
+ . "IP Address: {$this->_getClientIp()}\n"
+ . "First Name: {$this->postData['firstName']}\n"
+ . "Last Name: {$this->postData['lastName']}\n"
+ . "E-mail Address: {$this->postData['email']}\n";
+ if ($this->postData['telephone']) {
+ $msg .= "Telephone: {$this->postData['telephone']}\n";
+ }
+ if ($this->postData['comment']) {
+ $msg .= "Comment: {$this->postData['comment']}\n";
+ }
+
+ $subject = sprintf('%s [%s]', $this->_config->subject, $this->reportId);
+ @mail($this->_config->email_address, $subject, $msg);
+
+ $this->showSendForm = false;
+ $this->showSentMsg = true;
+ } else {
+ $this->showErrorMsg = true;
+ }
+ } else {
+ $time = gmdate('Y-m-d H:i:s \G\M\T');
+
+ $msg = "URL: {$url}\n"
+ . "IP Address: {$this->_getClientIp()}\n"
+ . "Time: {$time}\n"
+ . "Error:\n{$this->reportData[0]}\n\n"
+ . "Trace:\n{$this->reportData[1]}";
+
+ $subject = sprintf('%s [%s]', $this->_config->subject, $this->reportId);
+ @mail($this->_config->email_address, $subject, $msg);
+
+ if ($this->_config->trash === 'delete') {
+ @unlink($this->_reportFile);
+ }
+ }
+ }
+
/**
* Retrieve client IP address
*/
@@ -375,114 +483,6 @@ protected function _setReportData(array $reportData)
}
}
- /**
- * @throws Exception
- */
- public function saveReport(array $reportData)
- {
- $this->reportData = $reportData;
- $this->reportId = abs((int) (microtime(true) * random_int(100, 1000)));
- $this->_reportFile = $this->_reportDir . '/' . $this->reportId;
- $this->_setReportData($reportData);
-
- if (!file_exists($this->_reportDir)) {
- @mkdir($this->_reportDir, 0750, true);
- }
-
- $reportData = array_map('strip_tags', $reportData);
- @file_put_contents($this->_reportFile, serialize($reportData));
- @chmod($this->_reportFile, 0640);
-
- if (isset($reportData['skin']) && self::DEFAULT_SKIN !== $reportData['skin']) {
- $this->_setSkin($reportData['skin']);
- }
- $this->_setReportUrl();
-
- if (headers_sent()) {
- echo '';
- exit();
- }
- }
-
- /**
- * @return void|no-return
- */
- public function loadReport(int $reportId)
- {
- $reportData = false;
- $this->reportId = $reportId;
- $this->_reportFile = $this->_reportDir . '/' . $reportId;
-
- if (!file_exists($this->_reportFile) || !is_readable($this->_reportFile)) {
- header('Location: ' . $this->getBaseUrl());
- exit();
- }
-
- $reportContent = file_get_contents($this->_reportFile);
- if (!preg_match('/[oc]:[+\-]?\d+:"/i', $reportContent)) {
- $reportData = unserialize($reportContent, ['allowed_classes' => false]);
- }
- if (is_array($reportData)) {
- $this->_setReportData($reportData);
- }
- }
-
- /**
- * @return void
- */
- public function sendReport()
- {
- $this->pageTitle = 'Error Submission Form';
-
- $this->postData['firstName'] = (isset($_POST['firstname'])) ? trim(htmlspecialchars($_POST['firstname'])) : '';
- $this->postData['lastName'] = (isset($_POST['lastname'])) ? trim(htmlspecialchars($_POST['lastname'])) : '';
- $this->postData['email'] = (isset($_POST['email'])) ? trim(htmlspecialchars($_POST['email'])) : '';
- $this->postData['telephone'] = (isset($_POST['telephone'])) ? trim(htmlspecialchars($_POST['telephone'])) : '';
- $this->postData['comment'] = (isset($_POST['comment'])) ? trim(htmlspecialchars($_POST['comment'])) : '';
- $url = htmlspecialchars($this->reportData['url'], ENT_COMPAT | ENT_HTML401);
-
- if (isset($_POST['submit'])) {
- if ($this->_validate()) {
- $msg = "URL: {$url}\n"
- . "IP Address: {$this->_getClientIp()}\n"
- . "First Name: {$this->postData['firstName']}\n"
- . "Last Name: {$this->postData['lastName']}\n"
- . "E-mail Address: {$this->postData['email']}\n";
- if ($this->postData['telephone']) {
- $msg .= "Telephone: {$this->postData['telephone']}\n";
- }
- if ($this->postData['comment']) {
- $msg .= "Comment: {$this->postData['comment']}\n";
- }
-
- $subject = sprintf('%s [%s]', $this->_config->subject, $this->reportId);
- @mail($this->_config->email_address, $subject, $msg);
-
- $this->showSendForm = false;
- $this->showSentMsg = true;
- } else {
- $this->showErrorMsg = true;
- }
- } else {
- $time = gmdate('Y-m-d H:i:s \G\M\T');
-
- $msg = "URL: {$url}\n"
- . "IP Address: {$this->_getClientIp()}\n"
- . "Time: {$time}\n"
- . "Error:\n{$this->reportData[0]}\n\n"
- . "Trace:\n{$this->reportData[1]}";
-
- $subject = sprintf('%s [%s]', $this->_config->subject, $this->reportId);
- @mail($this->_config->email_address, $subject, $msg);
-
- if ($this->_config->trash === 'delete') {
- @unlink($this->_reportFile);
- }
- }
- }
-
/**
* Validate submitted post data
*/
diff --git a/lib/Mage/Archive.php b/lib/Mage/Archive.php
index 68643cd627a..c27a3de1402 100644
--- a/lib/Mage/Archive.php
+++ b/lib/Mage/Archive.php
@@ -59,43 +59,6 @@ class Mage_Archive
'tbz2' => 'tar.bz',
'tbzip2' => 'tar.bz'];
- /**
- * Create object of current archiver by $extension.
- *
- * @param string $extension
- * @return Mage_Archive_Tar|Mage_Archive_Gz|Mage_Archive_Bz
- */
- protected function _getArchiver($extension)
- {
- if (array_key_exists(strtolower($extension), $this->_formats)) {
- $format = $this->_formats[$extension];
- } else {
- $format = self::DEFAULT_ARCHIVER;
- }
- $class = 'Mage_Archive_' . ucfirst($format);
- $this->_archiver = new $class();
- return $this->_archiver;
- }
-
- /**
- * Split current format to list of archivers.
- *
- * @param string $source
- * @return array
- */
- protected function _getArchivers($source)
- {
- $ext = pathinfo($source, PATHINFO_EXTENSION);
- if (!isset($this->_formats[$ext])) {
- return [];
- }
- $format = $this->_formats[$ext];
- if ($format) {
- return explode('.', $format);
- }
- return [];
- }
-
/**
* Pack file or directory to archivers are parsed from extension.
*
@@ -204,4 +167,41 @@ public function isTar($file)
}
return false;
}
+
+ /**
+ * Create object of current archiver by $extension.
+ *
+ * @param string $extension
+ * @return Mage_Archive_Tar|Mage_Archive_Gz|Mage_Archive_Bz
+ */
+ protected function _getArchiver($extension)
+ {
+ if (array_key_exists(strtolower($extension), $this->_formats)) {
+ $format = $this->_formats[$extension];
+ } else {
+ $format = self::DEFAULT_ARCHIVER;
+ }
+ $class = 'Mage_Archive_' . ucfirst($format);
+ $this->_archiver = new $class();
+ return $this->_archiver;
+ }
+
+ /**
+ * Split current format to list of archivers.
+ *
+ * @param string $source
+ * @return array
+ */
+ protected function _getArchivers($source)
+ {
+ $ext = pathinfo($source, PATHINFO_EXTENSION);
+ if (!isset($this->_formats[$ext])) {
+ return [];
+ }
+ $format = $this->_formats[$ext];
+ if ($format) {
+ return explode('.', $format);
+ }
+ return [];
+ }
}
diff --git a/lib/Mage/Archive/Abstract.php b/lib/Mage/Archive/Abstract.php
index 8ad6365cbfc..f6e63bb7674 100644
--- a/lib/Mage/Archive/Abstract.php
+++ b/lib/Mage/Archive/Abstract.php
@@ -22,6 +22,21 @@
*/
class Mage_Archive_Abstract
{
+ /**
+ * Get file name from source (URI) without last extension.
+ *
+ * @param string $source
+ * @param bool $withExtension
+ * @return mixed|string
+ */
+ public function getFilename($source, $withExtension = false)
+ {
+ $file = str_replace(dirname($source) . DS, '', $source);
+ if (!$withExtension) {
+ $file = substr($file, 0, strrpos($file, '.'));
+ }
+ return $file;
+ }
/**
* Write data to file. If file can't be opened - throw exception
*
@@ -59,20 +74,4 @@ protected function _readFile($source)
}
return $data;
}
-
- /**
- * Get file name from source (URI) without last extension.
- *
- * @param string $source
- * @param bool $withExtension
- * @return mixed|string
- */
- public function getFilename($source, $withExtension = false)
- {
- $file = str_replace(dirname($source) . DS, '', $source);
- if (!$withExtension) {
- $file = substr($file, 0, strrpos($file, '.'));
- }
- return $file;
- }
}
diff --git a/lib/Mage/Archive/Tar.php b/lib/Mage/Archive/Tar.php
index 8b5218c7ed2..e4f213f6ff5 100644
--- a/lib/Mage/Archive/Tar.php
+++ b/lib/Mage/Archive/Tar.php
@@ -72,6 +72,83 @@ class Mage_Archive_Tar extends Mage_Archive_Abstract implements Mage_Archive_Int
*/
protected $_destinationFilePath;
+ /**
+ * Pack file to TAR (Tape Archiver).
+ *
+ * @param string $source
+ * @param string $destination
+ * @param boolean $skipRoot
+ * @return string
+ */
+ public function pack($source, $destination, $skipRoot = false)
+ {
+ $this->_setSkipRoot($skipRoot);
+ $source = realpath($source);
+ $tarData = $this->_setCurrentPath($source)
+ ->_setDestinationFilePath($destination)
+ ->_setCurrentFile($source);
+
+ $this->_initWriter();
+ $this->_createTar($skipRoot, true);
+ $this->_destroyWriter();
+
+ return $destination;
+ }
+
+ /**
+ * Unpack file from TAR (Tape Archiver).
+ *
+ * @param string $source
+ * @param string $destination
+ * @return string
+ */
+ public function unpack($source, $destination)
+ {
+ $this->_setCurrentFile($source)
+ ->_setCurrentPath($source);
+
+ $this->_initReader();
+ $this->_unpackCurrentTar($destination);
+ $this->_destroyReader();
+
+ return $destination;
+ }
+
+ /**
+ * Extract one file from TAR (Tape Archiver).
+ *
+ * @param string $file
+ * @param string $source
+ * @param string $destination
+ * @return string
+ */
+ public function extract($file, $source, $destination)
+ {
+ $this->_setCurrentFile($source);
+ $this->_initReader();
+
+ $archiveReader = $this->_getReader();
+ $extractedFile = '';
+
+ while (!$archiveReader->eof()) {
+ $header = $this->_extractFileHeader();
+ if ($header['name'] == $file) {
+ $extractedFile = $destination . basename($header['name']);
+ $this->_extractAndWriteFile($header, $extractedFile);
+ break;
+ }
+
+ if ($header['type'] != 5) {
+ $skipBytes = (int) (($header['size'] + self::TAR_BLOCK_SIZE - 1) / self::TAR_BLOCK_SIZE)
+ * self::TAR_BLOCK_SIZE;
+ $archiveReader->read($skipBytes);
+ }
+ }
+
+ $this->_destroyReader();
+ return $extractedFile;
+ }
+
/**
* Initialize tarball writer
*
@@ -589,81 +666,4 @@ protected function _extractAndWriteFile($fileHeader, $destination)
$bytesExtracted += strlen($block);
}
}
-
- /**
- * Pack file to TAR (Tape Archiver).
- *
- * @param string $source
- * @param string $destination
- * @param boolean $skipRoot
- * @return string
- */
- public function pack($source, $destination, $skipRoot = false)
- {
- $this->_setSkipRoot($skipRoot);
- $source = realpath($source);
- $tarData = $this->_setCurrentPath($source)
- ->_setDestinationFilePath($destination)
- ->_setCurrentFile($source);
-
- $this->_initWriter();
- $this->_createTar($skipRoot, true);
- $this->_destroyWriter();
-
- return $destination;
- }
-
- /**
- * Unpack file from TAR (Tape Archiver).
- *
- * @param string $source
- * @param string $destination
- * @return string
- */
- public function unpack($source, $destination)
- {
- $this->_setCurrentFile($source)
- ->_setCurrentPath($source);
-
- $this->_initReader();
- $this->_unpackCurrentTar($destination);
- $this->_destroyReader();
-
- return $destination;
- }
-
- /**
- * Extract one file from TAR (Tape Archiver).
- *
- * @param string $file
- * @param string $source
- * @param string $destination
- * @return string
- */
- public function extract($file, $source, $destination)
- {
- $this->_setCurrentFile($source);
- $this->_initReader();
-
- $archiveReader = $this->_getReader();
- $extractedFile = '';
-
- while (!$archiveReader->eof()) {
- $header = $this->_extractFileHeader();
- if ($header['name'] == $file) {
- $extractedFile = $destination . basename($header['name']);
- $this->_extractAndWriteFile($header, $extractedFile);
- break;
- }
-
- if ($header['type'] != 5) {
- $skipBytes = (int) (($header['size'] + self::TAR_BLOCK_SIZE - 1) / self::TAR_BLOCK_SIZE)
- * self::TAR_BLOCK_SIZE;
- $archiveReader->read($skipBytes);
- }
- }
-
- $this->_destroyReader();
- return $extractedFile;
- }
}
diff --git a/lib/Mage/Cache/Backend/File.php b/lib/Mage/Cache/Backend/File.php
index 379580a38a5..14566126979 100644
--- a/lib/Mage/Cache/Backend/File.php
+++ b/lib/Mage/Cache/Backend/File.php
@@ -119,6 +119,17 @@ public function __construct(array $options = [])
$this->_options['cache_file_umask'] = $this->_options['file_mode'];
}
+ /**
+ * For unit testing only
+ *
+ * @param $id
+ */
+ public function ___expire($id)
+ {
+ $metadata = $this->_getMetadatas($id);
+ $this->touch($id, 1 - $metadata['expire']);
+ }
+
/**
* Trying to load cached value by id, in case of failure will return false, in other case will return cached string
*
@@ -780,15 +791,4 @@ protected function _recursiveMkdirAndChmod($id)
}
return true;
}
-
- /**
- * For unit testing only
- *
- * @param $id
- */
- public function ___expire($id)
- {
- $metadata = $this->_getMetadatas($id);
- $this->touch($id, 1 - $metadata['expire']);
- }
}
diff --git a/lib/Mage/DB/Mysqli.php b/lib/Mage/DB/Mysqli.php
index 4bcf146306f..85e7390ff6a 100644
--- a/lib/Mage/DB/Mysqli.php
+++ b/lib/Mage/DB/Mysqli.php
@@ -293,16 +293,6 @@ public function escapeFieldValues(array $arrNames)
return $out;
}
- /**
- * Throw connect exception
- * @throws Mage_DB_Exception
- * @return never
- */
- protected function throwConnectException()
- {
- throw new Mage_DB_Exception($this->conn->connect_error);
- }
-
/**
* Query - perform with throwing exception on error
* @param string $sql query
@@ -506,4 +496,14 @@ public function lastInsertId()
$data = $this->fetchOne($sql);
return $data['id'];
}
+
+ /**
+ * Throw connect exception
+ * @throws Mage_DB_Exception
+ * @return never
+ */
+ protected function throwConnectException()
+ {
+ throw new Mage_DB_Exception($this->conn->connect_error);
+ }
}
diff --git a/lib/Mage/HTTP/Client/Curl.php b/lib/Mage/HTTP/Client/Curl.php
index fbcf2238a53..191e75865bc 100644
--- a/lib/Mage/HTTP/Client/Curl.php
+++ b/lib/Mage/HTTP/Client/Curl.php
@@ -109,6 +109,11 @@ class Mage_HTTP_Client_Curl implements Mage_HTTP_IClient
*/
protected $_headerCount = 0;
+ /**
+ * Constructor
+ */
+ public function __construct() {}
+
/**
* Set request timeout in seconds
*
@@ -119,11 +124,6 @@ public function setTimeout($value)
$this->_timeout = (int) $value;
}
- /**
- * Constructor
- */
- public function __construct() {}
-
/**
* Set headers from hash
@@ -316,6 +316,33 @@ public function getStatus()
return $this->_responseStatus;
}
+ /**
+ * Throw error exception
+ * @param $string
+ * @throws Exception
+ * @return never
+ */
+ public function doError($string)
+ {
+ throw new Exception($string);
+ }
+
+ /**
+ * Set CURL options ovverides array *
+ */
+ public function setOptions($arr)
+ {
+ $this->_curlUserOptions = $arr;
+ }
+
+ /**
+ * Set curl option
+ */
+ public function setOption($name, $value)
+ {
+ $this->_curlUserOptions[$name] = $value;
+ }
+
/**
* Make request
* @param string $method
@@ -379,17 +406,6 @@ protected function makeRequest($method, $uri, $params = [])
curl_close($this->_ch);
}
- /**
- * Throw error exception
- * @param $string
- * @throws Exception
- * @return never
- */
- public function doError($string)
- {
- throw new Exception($string);
- }
-
/**
* Parse headers - CURL callback function
*
@@ -461,20 +477,4 @@ protected function curlOptions($array)
{
curl_setopt_array($this->_ch, $array);
}
-
- /**
- * Set CURL options ovverides array *
- */
- public function setOptions($arr)
- {
- $this->_curlUserOptions = $arr;
- }
-
- /**
- * Set curl option
- */
- public function setOption($name, $value)
- {
- $this->_curlUserOptions[$name] = $value;
- }
}
diff --git a/lib/Mage/HTTP/Client/Socket.php b/lib/Mage/HTTP/Client/Socket.php
index f8f99428acf..60bd8eb1f43 100644
--- a/lib/Mage/HTTP/Client/Socket.php
+++ b/lib/Mage/HTTP/Client/Socket.php
@@ -88,16 +88,6 @@ class Mage_HTTP_Client_Socket implements Mage_HTTP_IClient
*/
private $_redirectCount = 0;
- /**
- * Set request timeout, msec
- *
- * @param int $value
- */
- public function setTimeout($value)
- {
- $this->_timeout = (int) $value;
- }
-
/**
* Constructor
* @param string $host
@@ -110,6 +100,16 @@ public function __construct($host = null, $port = 80)
}
}
+ /**
+ * Set request timeout, msec
+ *
+ * @param int $value
+ */
+ public function setTimeout($value)
+ {
+ $this->_timeout = (int) $value;
+ }
+
/**
* Set connection params
*
@@ -225,40 +225,6 @@ public function get($uri)
$this->makeRequest('GET', $this->parseUrl($uri));
}
- /**
- * Set host, port from full url
- * and return relative url
- *
- * @param string $uri ex. http://google.com/index.php?a=b
- * @return string ex. /index.php?a=b
- */
- protected function parseUrl($uri)
- {
- $parts = parse_url($uri);
- if (!empty($parts['user']) && !empty($parts['pass'])) {
- $this->setCredentials($parts['user'], $parts['pass']);
- }
- if (!empty($parts['port'])) {
- $this->_port = (int) $parts['port'];
- }
-
- if (!empty($parts['host'])) {
- $this->_host = $parts['host'];
- } else {
- throw new InvalidArgumentException("Uri doesn't contain host part");
- }
-
- if (!empty($parts['path'])) {
- $requestUri = $parts['path'];
- } else {
- throw new InvalidArgumentException("Uri doesn't contain path part");
- }
- if (!empty($parts['query'])) {
- $requestUri .= '?' . $parts['query'];
- }
- return $requestUri;
- }
-
/**
* Make POST request
*/
@@ -348,6 +314,76 @@ public function getCookiesFull()
return $out;
}
+ /**
+ * Get response status code
+ * @see Mage_HTTP_Client::getStatus()
+ */
+ public function getStatus()
+ {
+ return $this->_responseStatus;
+ }
+
+ /**
+ * Throw error exception
+ * @param $string
+ * @throws Exception
+ * @return never
+ */
+ public function doError($string)
+ {
+ throw new Exception($string);
+ }
+
+ /**
+ * TODO
+ */
+ public function setOptions($arr)
+ {
+ // Stub
+ }
+
+ /**
+ * TODO
+ */
+ public function setOption($name, $value)
+ {
+ // Stub
+ }
+
+ /**
+ * Set host, port from full url
+ * and return relative url
+ *
+ * @param string $uri ex. http://google.com/index.php?a=b
+ * @return string ex. /index.php?a=b
+ */
+ protected function parseUrl($uri)
+ {
+ $parts = parse_url($uri);
+ if (!empty($parts['user']) && !empty($parts['pass'])) {
+ $this->setCredentials($parts['user'], $parts['pass']);
+ }
+ if (!empty($parts['port'])) {
+ $this->_port = (int) $parts['port'];
+ }
+
+ if (!empty($parts['host'])) {
+ $this->_host = $parts['host'];
+ } else {
+ throw new InvalidArgumentException("Uri doesn't contain host part");
+ }
+
+ if (!empty($parts['path'])) {
+ $requestUri = $parts['path'];
+ } else {
+ throw new InvalidArgumentException("Uri doesn't contain path part");
+ }
+ if (!empty($parts['query'])) {
+ $requestUri .= '?' . $parts['query'];
+ }
+ return $requestUri;
+ }
+
/**
* Process response headers
*/
@@ -421,15 +457,6 @@ protected function processRedirect()
// TODO: implement redircets support
}
- /**
- * Get response status code
- * @see Mage_HTTP_Client::getStatus()
- */
- public function getStatus()
- {
- return $this->_responseStatus;
- }
-
/**
* Make request
* @param string $method
@@ -468,17 +495,6 @@ protected function makeRequest($method, $uri, $params = [])
$this->processResponse();
}
- /**
- * Throw error exception
- * @param $string
- * @throws Exception
- * @return never
- */
- public function doError($string)
- {
- throw new Exception($string);
- }
-
/**
* Convert headers hash to string
* @param $delimiter
@@ -497,20 +513,4 @@ protected function headersToString($append = [])
}
return implode($str);
}
-
- /**
- * TODO
- */
- public function setOptions($arr)
- {
- // Stub
- }
-
- /**
- * TODO
- */
- public function setOption($name, $value)
- {
- // Stub
- }
}
diff --git a/lib/Mage/System/Args.php b/lib/Mage/System/Args.php
index 90e1c3436fd..09dfd6e3841 100644
--- a/lib/Mage/System/Args.php
+++ b/lib/Mage/System/Args.php
@@ -22,24 +22,6 @@ class Mage_System_Args
public $flags;
public $filtered;
- /**
- * Get flags/named options
- * @return array
- */
- public function getFlags()
- {
- return $this->flags;
- }
-
- /**
- * Get filtered args
- * @return array
- */
- public function getFiltered()
- {
- return $this->filtered;
- }
-
/**
* Constructor
* @param array|false $argv, if false $GLOBALS['argv'] is taken
@@ -82,4 +64,22 @@ public function __construct($argv = false)
}
}
}
+
+ /**
+ * Get flags/named options
+ * @return array
+ */
+ public function getFlags()
+ {
+ return $this->flags;
+ }
+
+ /**
+ * Get filtered args
+ * @return array
+ */
+ public function getFiltered()
+ {
+ return $this->filtered;
+ }
}
diff --git a/lib/Mage/System/Ftp.php b/lib/Mage/System/Ftp.php
index e3c51dc21fb..5dccac1d3f0 100644
--- a/lib/Mage/System/Ftp.php
+++ b/lib/Mage/System/Ftp.php
@@ -29,19 +29,6 @@ class Mage_System_Ftp
*/
protected $_conn = false;
- /**
- * Check connected, throw exception if not
- *
- * @throws Exception
- * @return void
- */
- protected function checkConnected()
- {
- if (!$this->_conn) {
- throw new Exception(__CLASS__ . ' - no connection established with server');
- }
- }
-
/**
* ftp_mkdir wrapper
*
@@ -526,4 +513,17 @@ public function delete($file)
$file = $this->correctFilePath($file);
return @ftp_delete($this->_conn, $file);
}
+
+ /**
+ * Check connected, throw exception if not
+ *
+ * @throws Exception
+ * @return void
+ */
+ protected function checkConnected()
+ {
+ if (!$this->_conn) {
+ throw new Exception(__CLASS__ . ' - no connection established with server');
+ }
+ }
}
diff --git a/lib/Mage/Xml/Generator.php b/lib/Mage/Xml/Generator.php
index 9cf2da77696..32d518c86cc 100644
--- a/lib/Mage/Xml/Generator.php
+++ b/lib/Mage/Xml/Generator.php
@@ -26,29 +26,19 @@ public function __construct()
}
/**
- * @return DOMDocument|null
- */
- public function getDom()
- {
- return $this->_dom;
- }
-
- /**
- * @return DOMDocument
+ * @return string
*/
- protected function _getCurrentDom()
+ public function __toString()
{
- return $this->_currentDom;
+ return $this->getDom()->saveXML();
}
/**
- * @param DOMElement $node
- * @return $this
+ * @return DOMDocument|null
*/
- protected function _setCurrentDom($node)
+ public function getDom()
{
- $this->_currentDom = $node;
- return $this;
+ return $this->_dom;
}
/**
@@ -100,20 +90,30 @@ public function arrayToXml($content)
}
/**
- * @return string
+ * @param string $file
+ * @return $this
*/
- public function __toString()
+ public function save($file)
{
- return $this->getDom()->saveXML();
+ $this->getDom()->save($file);
+ return $this;
}
/**
- * @param string $file
+ * @return DOMDocument
+ */
+ protected function _getCurrentDom()
+ {
+ return $this->_currentDom;
+ }
+
+ /**
+ * @param DOMElement $node
* @return $this
*/
- public function save($file)
+ protected function _setCurrentDom($node)
{
- $this->getDom()->save($file);
+ $this->_currentDom = $node;
return $this;
}
}
diff --git a/lib/Mage/Xml/Parser.php b/lib/Mage/Xml/Parser.php
index 09fae8bc206..f38021312d9 100644
--- a/lib/Mage/Xml/Parser.php
+++ b/lib/Mage/Xml/Parser.php
@@ -30,6 +30,24 @@ public function getDom()
return $this->_dom;
}
+ public function xmlToArray()
+ {
+ $this->_content = $this->_xmlToArray();
+ return $this->_content;
+ }
+
+ public function load($file)
+ {
+ $this->getDom()->load($file);
+ return $this;
+ }
+
+ public function loadXML($string)
+ {
+ $this->getDom()->loadXML($string);
+ return $this;
+ }
+
protected function _getCurrentDom()
{
return $this->_currentDom;
@@ -41,12 +59,6 @@ protected function _setCurrentDom($node)
return $this;
}
- public function xmlToArray()
- {
- $this->_content = $this->_xmlToArray();
- return $this->_content;
- }
-
protected function _xmlToArray($currentNode = false)
{
if (!$currentNode) {
@@ -87,16 +99,4 @@ protected function _xmlToArray($currentNode = false)
}
return $content;
}
-
- public function load($file)
- {
- $this->getDom()->load($file);
- return $this;
- }
-
- public function loadXML($string)
- {
- $this->getDom()->loadXML($string);
- return $this;
- }
}
diff --git a/lib/Magento/Db/Adapter/Pdo/Mysql.php b/lib/Magento/Db/Adapter/Pdo/Mysql.php
index f933c3fc8e7..9e7caf266c0 100644
--- a/lib/Magento/Db/Adapter/Pdo/Mysql.php
+++ b/lib/Magento/Db/Adapter/Pdo/Mysql.php
@@ -92,24 +92,6 @@ public function splitSelect(Varien_Db_Select $select, $entityIdField = '*', $ste
return $bunches;
}
- /**
- * Quote a raw string.
- *
- * @param string|float $value Raw string
- * @return string|float Quoted string
- */
- protected function _quote($value)
- {
- if (is_float($value)) {
- return $this->_convertFloat($value);
- }
- // Fix for null-byte injection
- if (is_string($value)) {
- $value = addcslashes($value, "\000\032");
- }
- return parent::_quote($value);
- }
-
/**
* Safely quotes a value for an SQL statement.
*
@@ -137,6 +119,24 @@ public function quote($value, $type = null)
return parent::quote($value, $type);
}
+ /**
+ * Quote a raw string.
+ *
+ * @param string|float $value Raw string
+ * @return string|float Quoted string
+ */
+ protected function _quote($value)
+ {
+ if (is_float($value)) {
+ return $this->_convertFloat($value);
+ }
+ // Fix for null-byte injection
+ if (is_string($value)) {
+ $value = addcslashes($value, "\000\032");
+ }
+ return parent::_quote($value);
+ }
+
/**
* Convert float values that are not supported by MySQL to alternative representation value.
* Value 99999999.9999 is a maximum value that may be stored in Magento decimal columns in DB.
diff --git a/lib/Magento/Db/Object.php b/lib/Magento/Db/Object.php
index d4117419d29..9b80cabf74d 100644
--- a/lib/Magento/Db/Object.php
+++ b/lib/Magento/Db/Object.php
@@ -64,16 +64,6 @@ public function getDbType()
return $this->_dbType;
}
- /**
- * Returns current schema name
- *
- * @return string
- */
- protected function _getCurrentSchema()
- {
- return $this->_adapter->fetchOne('SELECT SCHEMA()');
- }
-
/**
* Returns schema name
*
@@ -121,4 +111,14 @@ public function getObjectName()
{
return $this->_objectName;
}
+
+ /**
+ * Returns current schema name
+ *
+ * @return string
+ */
+ protected function _getCurrentSchema()
+ {
+ return $this->_adapter->fetchOne('SELECT SCHEMA()');
+ }
}
diff --git a/lib/Magento/Db/Sql/Trigger.php b/lib/Magento/Db/Sql/Trigger.php
index 5366ff085dd..02383dd6a91 100644
--- a/lib/Magento/Db/Sql/Trigger.php
+++ b/lib/Magento/Db/Sql/Trigger.php
@@ -90,53 +90,13 @@ public function __construct()
}
/**
- * Validate where all trigger parts set?
- *
- * @return Magento_Db_Sql_Trigger
- * @throws Exception
- */
- protected function _validateIsComplete()
- {
- foreach (array_keys(self::$_partsInit) as $part) {
- if (empty($this->_parts[$part])) {
- throw new Exception('Part [' . $part . '] should be set');
- }
- }
- return $this;
- }
-
- /**
- * Set trigger part
- *
- * @param $part
- * @param $value
- * @return Magento_Db_Sql_Trigger
- * @throws InvalidArgumentException
- */
- protected function _setPart($part, $value)
- {
- if ($value != null) {
- $this->_parts[$part] = $value;
- } else {
- throw new InvalidArgumentException('Part [' . $part . '] can not be empty');
- }
- return $this;
- }
-
- /**
- * Set trigger part
+ * Implement magic method
*
- * @param $part
- * @return string|array
- * @throws Exception
+ * @return string
*/
- protected function _getPart($part)
+ public function __toString()
{
- if (isset($this->_parts[$part])) {
- return $this->_parts[$part];
- }
-
- throw new Exception('Part [' . $part . '] does\'t exists');
+ return $this->assemble();
}
/**
@@ -173,18 +133,6 @@ public function getBodyPart($part)
throw new Exception('Part [' . $part . '] does\'t exists');
}
- /**
- * Generate trigger name
- *
- * @return string
- */
- protected function _generateTriggerName()
- {
- return strtolower('trg_' . $this->_parts[self::TARGET]
- . '_' . $this->_parts[self::TIME]
- . '_' . $this->_parts[self::EVENT]);
- }
-
/**
* Set trigger time {BEFORE/AFTER}
* @param $time
@@ -298,16 +246,6 @@ public function assemble()
. "END;\n";
}
- /**
- * Implement magic method
- *
- * @return string
- */
- public function __toString()
- {
- return $this->assemble();
- }
-
/**
* Retrieve list of allowed events
*
@@ -338,4 +276,66 @@ public function reset()
$this->_parts = self::$_partsInit;
return $this;
}
+
+ /**
+ * Validate where all trigger parts set?
+ *
+ * @return Magento_Db_Sql_Trigger
+ * @throws Exception
+ */
+ protected function _validateIsComplete()
+ {
+ foreach (array_keys(self::$_partsInit) as $part) {
+ if (empty($this->_parts[$part])) {
+ throw new Exception('Part [' . $part . '] should be set');
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * Set trigger part
+ *
+ * @param $part
+ * @param $value
+ * @return Magento_Db_Sql_Trigger
+ * @throws InvalidArgumentException
+ */
+ protected function _setPart($part, $value)
+ {
+ if ($value != null) {
+ $this->_parts[$part] = $value;
+ } else {
+ throw new InvalidArgumentException('Part [' . $part . '] can not be empty');
+ }
+ return $this;
+ }
+
+ /**
+ * Set trigger part
+ *
+ * @param $part
+ * @return string|array
+ * @throws Exception
+ */
+ protected function _getPart($part)
+ {
+ if (isset($this->_parts[$part])) {
+ return $this->_parts[$part];
+ }
+
+ throw new Exception('Part [' . $part . '] does\'t exists');
+ }
+
+ /**
+ * Generate trigger name
+ *
+ * @return string
+ */
+ protected function _generateTriggerName()
+ {
+ return strtolower('trg_' . $this->_parts[self::TARGET]
+ . '_' . $this->_parts[self::TIME]
+ . '_' . $this->_parts[self::EVENT]);
+ }
}
diff --git a/lib/Magento/Profiler.php b/lib/Magento/Profiler.php
index 075dcbe04b3..2981f4d2b84 100644
--- a/lib/Magento/Profiler.php
+++ b/lib/Magento/Profiler.php
@@ -81,21 +81,6 @@ class Magento_Profiler
self::FETCH_REALMEM,
];
- /**
- * Retrieve unique identifier among all timers
- *
- * @param string|null $timerName Timer name
- * @return string
- */
- private static function _getTimerId($timerName = null)
- {
- $currentPath = self::$_currentPath;
- if ($timerName) {
- $currentPath[] = $timerName;
- }
- return implode(self::NESTING_SEPARATOR, $currentPath);
- }
-
/**
* Enable profiling.
* Any call to profiler does nothing until profiler is enabled.
@@ -274,4 +259,19 @@ public static function display()
$output->display();
}
}
+
+ /**
+ * Retrieve unique identifier among all timers
+ *
+ * @param string|null $timerName Timer name
+ * @return string
+ */
+ private static function _getTimerId($timerName = null)
+ {
+ $currentPath = self::$_currentPath;
+ if ($timerName) {
+ $currentPath[] = $timerName;
+ }
+ return implode(self::NESTING_SEPARATOR, $currentPath);
+ }
}
diff --git a/lib/Magento/Profiler/OutputAbstract.php b/lib/Magento/Profiler/OutputAbstract.php
index 4c88db733d0..2405eb655e1 100644
--- a/lib/Magento/Profiler/OutputAbstract.php
+++ b/lib/Magento/Profiler/OutputAbstract.php
@@ -55,6 +55,22 @@ public function __construct($filter = null)
*/
abstract public function display();
+ /**
+ * Set threshold (minimal allowed) value for timer column.
+ * Timer is being rendered if at least one of its columns is not less than the minimal allowed value.
+ *
+ * @param string $fetchKey
+ * @param int|float|null $minAllowedValue
+ */
+ public function setThreshold($fetchKey, $minAllowedValue)
+ {
+ if ($minAllowedValue === null) {
+ unset($this->_thresholds[$fetchKey]);
+ } else {
+ $this->_thresholds[$fetchKey] = $minAllowedValue;
+ }
+ }
+
/**
* Retrieve the list of (column_label; column_id) pairs
*
@@ -103,6 +119,48 @@ protected function _renderTimerId($timerId)
return $timerId;
}
+ /**
+ * Retrieve the list of timer Ids
+ *
+ * @return array
+ */
+ protected function _getTimers()
+ {
+ $pattern = $this->_filter;
+ $timerIds = $this->_getSortedTimers();
+ $result = [];
+ foreach ($timerIds as $timerId) {
+ /* Filter by timer id pattern */
+ if ($pattern && !preg_match($pattern, $timerId)) {
+ continue;
+ }
+ /* Filter by column value thresholds */
+ $skip = false;
+ foreach ($this->_thresholds as $fetchKey => $minAllowedValue) {
+ $skip = (Magento_Profiler::fetch($timerId, $fetchKey) < $minAllowedValue);
+ /* First value not less than the allowed one forces to include timer to the result */
+ if (!$skip) {
+ break;
+ }
+ }
+ if (!$skip) {
+ $result[] = $timerId;
+ }
+ }
+ return $result;
+ }
+
+ /**
+ * Render a caption for the profiling results
+ *
+ * @return string
+ */
+ protected function _renderCaption()
+ {
+ $result = 'Code Profiler (Memory usage: real - %s, emalloc - %s)';
+ return sprintf($result, memory_get_usage(true), memory_get_usage());
+ }
+
/**
* Retrieve timer ids sorted to correspond the nesting
*
@@ -153,62 +211,4 @@ private function _getSortedTimers()
}
return $result;
}
-
- /**
- * Retrieve the list of timer Ids
- *
- * @return array
- */
- protected function _getTimers()
- {
- $pattern = $this->_filter;
- $timerIds = $this->_getSortedTimers();
- $result = [];
- foreach ($timerIds as $timerId) {
- /* Filter by timer id pattern */
- if ($pattern && !preg_match($pattern, $timerId)) {
- continue;
- }
- /* Filter by column value thresholds */
- $skip = false;
- foreach ($this->_thresholds as $fetchKey => $minAllowedValue) {
- $skip = (Magento_Profiler::fetch($timerId, $fetchKey) < $minAllowedValue);
- /* First value not less than the allowed one forces to include timer to the result */
- if (!$skip) {
- break;
- }
- }
- if (!$skip) {
- $result[] = $timerId;
- }
- }
- return $result;
- }
-
- /**
- * Render a caption for the profiling results
- *
- * @return string
- */
- protected function _renderCaption()
- {
- $result = 'Code Profiler (Memory usage: real - %s, emalloc - %s)';
- return sprintf($result, memory_get_usage(true), memory_get_usage());
- }
-
- /**
- * Set threshold (minimal allowed) value for timer column.
- * Timer is being rendered if at least one of its columns is not less than the minimal allowed value.
- *
- * @param string $fetchKey
- * @param int|float|null $minAllowedValue
- */
- public function setThreshold($fetchKey, $minAllowedValue)
- {
- if ($minAllowedValue === null) {
- unset($this->_thresholds[$fetchKey]);
- } else {
- $this->_thresholds[$fetchKey] = $minAllowedValue;
- }
- }
}
diff --git a/lib/Varien/Cache/Backend/Database.php b/lib/Varien/Cache/Backend/Database.php
index 5e18cdb0b05..fbcdda104a1 100644
--- a/lib/Varien/Cache/Backend/Database.php
+++ b/lib/Varien/Cache/Backend/Database.php
@@ -75,48 +75,6 @@ public function __construct($options = [])
}
}
- /**
- * Get DB adapter
- *
- * @return Zend_Db_Adapter_Abstract
- */
- protected function _getAdapter()
- {
- if (!$this->_adapter) {
- if (!empty($this->_options['adapter_callback'])) {
- $adapter = call_user_func($this->_options['adapter_callback']);
- } else {
- $adapter = $this->_options['adapter'];
- }
- if (!($adapter instanceof Zend_Db_Adapter_Abstract)) {
- Zend_Cache::throwException('DB Adapter should be declared and extend Zend_Db_Adapter_Abstract');
- } else {
- $this->_adapter = $adapter;
- }
- }
- return $this->_adapter;
- }
-
- /**
- * Get table name where data is stored
- *
- * @return string
- */
- protected function _getDataTable()
- {
- return $this->_options['data_table'];
- }
-
- /**
- * Get table name where tags are stored
- *
- * @return string
- */
- protected function _getTagsTable()
- {
- return $this->_options['tags_table'];
- }
-
/**
* Test if a cache is available for the given id and (if yes) return it (false else)
*
@@ -222,28 +180,6 @@ public function remove($id)
return $result && $adapter->delete($this->_getTagsTable(), ['cache_id = ?' => $id]);
}
- /**
- * Delete cache rows from Data table
- *
- * @param $cacheIdsToRemove
- * @return int
- */
- protected function _deleteCachesFromDataTable($cacheIdsToRemove)
- {
- return $this->_getAdapter()->delete($this->_getDataTable(), ['id IN (?)' => $cacheIdsToRemove]);
- }
-
- /**
- * Delete cache rows from Tags table
- *
- * @param $cacheIdsToRemove
- * @return int
- */
- protected function _deleteCachesFromTagsTable($cacheIdsToRemove)
- {
- return $this->_getAdapter()->delete($this->_getTagsTable(), ['cache_id IN (?)' => $cacheIdsToRemove]);
- }
-
/**
* Clean some cache records
*
@@ -291,47 +227,6 @@ public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = [])
return $result;
}
- /**
- * Clean old cache data and related cache tag data
- *
- * @return bool
- */
- protected function _cleanOldCache()
- {
- $time = time();
- $counter = 0;
- $result = true;
- $adapter = $this->_getAdapter();
- $cacheIdsToRemove = [];
-
- $select = $adapter->select()
- ->from($this->_getDataTable(), 'id')
- ->where('expire_time > ?', 0)
- ->where('expire_time <= ?', $time)
- ;
-
- $statement = $adapter->query($select);
- while ($row = $statement->fetch()) {
- if (!$result) {
- break;
- }
- $cacheIdsToRemove[] = $row['id'];
- $counter++;
- if ($counter > 100) {
- $result = $result && $this->_deleteCachesFromDataTable($cacheIdsToRemove);
- $result = $result && $this->_deleteCachesFromTagsTable($cacheIdsToRemove);
- $cacheIdsToRemove = [];
- $counter = 0;
- }
- }
- if (!empty($cacheIdsToRemove)) {
- $result = $result && $this->_deleteCachesFromDataTable($cacheIdsToRemove);
- $result = $result && $this->_deleteCachesFromTagsTable($cacheIdsToRemove);
- }
-
- return $result;
- }
-
/**
* Return an array of stored cache ids
*
@@ -499,6 +394,111 @@ public function getCapabilities()
];
}
+ /**
+ * Get DB adapter
+ *
+ * @return Zend_Db_Adapter_Abstract
+ */
+ protected function _getAdapter()
+ {
+ if (!$this->_adapter) {
+ if (!empty($this->_options['adapter_callback'])) {
+ $adapter = call_user_func($this->_options['adapter_callback']);
+ } else {
+ $adapter = $this->_options['adapter'];
+ }
+ if (!($adapter instanceof Zend_Db_Adapter_Abstract)) {
+ Zend_Cache::throwException('DB Adapter should be declared and extend Zend_Db_Adapter_Abstract');
+ } else {
+ $this->_adapter = $adapter;
+ }
+ }
+ return $this->_adapter;
+ }
+
+ /**
+ * Get table name where data is stored
+ *
+ * @return string
+ */
+ protected function _getDataTable()
+ {
+ return $this->_options['data_table'];
+ }
+
+ /**
+ * Get table name where tags are stored
+ *
+ * @return string
+ */
+ protected function _getTagsTable()
+ {
+ return $this->_options['tags_table'];
+ }
+
+ /**
+ * Delete cache rows from Data table
+ *
+ * @param $cacheIdsToRemove
+ * @return int
+ */
+ protected function _deleteCachesFromDataTable($cacheIdsToRemove)
+ {
+ return $this->_getAdapter()->delete($this->_getDataTable(), ['id IN (?)' => $cacheIdsToRemove]);
+ }
+
+ /**
+ * Delete cache rows from Tags table
+ *
+ * @param $cacheIdsToRemove
+ * @return int
+ */
+ protected function _deleteCachesFromTagsTable($cacheIdsToRemove)
+ {
+ return $this->_getAdapter()->delete($this->_getTagsTable(), ['cache_id IN (?)' => $cacheIdsToRemove]);
+ }
+
+ /**
+ * Clean old cache data and related cache tag data
+ *
+ * @return bool
+ */
+ protected function _cleanOldCache()
+ {
+ $time = time();
+ $counter = 0;
+ $result = true;
+ $adapter = $this->_getAdapter();
+ $cacheIdsToRemove = [];
+
+ $select = $adapter->select()
+ ->from($this->_getDataTable(), 'id')
+ ->where('expire_time > ?', 0)
+ ->where('expire_time <= ?', $time)
+ ;
+
+ $statement = $adapter->query($select);
+ while ($row = $statement->fetch()) {
+ if (!$result) {
+ break;
+ }
+ $cacheIdsToRemove[] = $row['id'];
+ $counter++;
+ if ($counter > 100) {
+ $result = $result && $this->_deleteCachesFromDataTable($cacheIdsToRemove);
+ $result = $result && $this->_deleteCachesFromTagsTable($cacheIdsToRemove);
+ $cacheIdsToRemove = [];
+ $counter = 0;
+ }
+ }
+ if (!empty($cacheIdsToRemove)) {
+ $result = $result && $this->_deleteCachesFromDataTable($cacheIdsToRemove);
+ $result = $result && $this->_deleteCachesFromTagsTable($cacheIdsToRemove);
+ }
+
+ return $result;
+ }
+
/**
* Save tags related to specific id
*
diff --git a/lib/Varien/Cache/Backend/Memcached.php b/lib/Varien/Cache/Backend/Memcached.php
index d95cde414f6..724b8f55f99 100644
--- a/lib/Varien/Cache/Backend/Memcached.php
+++ b/lib/Varien/Cache/Backend/Memcached.php
@@ -52,33 +52,6 @@ public function __construct(array $options = [])
}
}
- /**
- * Returns ID of a specific chunk on the basis of data's ID
- *
- * @param string $id Main data's ID
- * @param int $index Particular chunk number to return ID for
- * @return string
- */
- protected function _getChunkId($id, $index)
- {
- return "{$id}[{$index}]";
- }
-
- /**
- * Remove saved chunks in case something gone wrong (e.g. some chunk from the chain can not be found)
- *
- * @param string $id ID of data's info cell
- * @param int $chunks Number of chunks to remove (basically, the number after '{splitted}|')
- */
- protected function _cleanTheMess($id, $chunks)
- {
- for ($i = 0; $i < $chunks; $i++) {
- $this->remove($this->_getChunkId($id, $i));
- }
-
- $this->remove($id);
- }
-
/**
* Save data to memcached, split it into chunks if data size is bigger than memcached slab size.
*
@@ -148,4 +121,31 @@ public function load($id, $doNotTestCacheValidity = false)
// Data has not been split to chunks on save
return $data;
}
+
+ /**
+ * Returns ID of a specific chunk on the basis of data's ID
+ *
+ * @param string $id Main data's ID
+ * @param int $index Particular chunk number to return ID for
+ * @return string
+ */
+ protected function _getChunkId($id, $index)
+ {
+ return "{$id}[{$index}]";
+ }
+
+ /**
+ * Remove saved chunks in case something gone wrong (e.g. some chunk from the chain can not be found)
+ *
+ * @param string $id ID of data's info cell
+ * @param int $chunks Number of chunks to remove (basically, the number after '{splitted}|')
+ */
+ protected function _cleanTheMess($id, $chunks)
+ {
+ for ($i = 0; $i < $chunks; $i++) {
+ $this->remove($this->_getChunkId($id, $i));
+ }
+
+ $this->remove($id);
+ }
}
diff --git a/lib/Varien/Cache/Core.php b/lib/Varien/Cache/Core.php
index 7c3e23986ea..a39b290c0d5 100644
--- a/lib/Varien/Cache/Core.php
+++ b/lib/Varien/Cache/Core.php
@@ -16,6 +16,10 @@
class Varien_Cache_Core extends Zend_Cache_Core
{
+ /**
+ * Used to tell chunked data from ordinary
+ */
+ public const CODE_WORD = '{splitted}';
/**
* Specific slab size = 1Mb minus overhead
*
@@ -23,11 +27,6 @@ class Varien_Cache_Core extends Zend_Cache_Core
*/
protected $_specificOptions = ['slab_size' => 0];
- /**
- * Used to tell chunked data from ordinary
- */
- public const CODE_WORD = '{splitted}';
-
/**
* Constructor
*
@@ -42,66 +41,6 @@ public function __construct($options = [])
}
}
- /**
- * Returns ID of a specific chunk on the basis of data's ID
- *
- * @param string $id Main data's ID
- * @param int $index Particular chunk number to return ID for
- * @return string
- */
- protected function _getChunkId($id, $index)
- {
- return "{$id}[{$index}]";
- }
-
- /**
- * Remove saved chunks in case something gone wrong (e.g. some chunk from the chain can not be found)
- *
- * @param string $id ID of data's info cell
- * @param int $chunks Number of chunks to remove (basically, the number after '{splitted}|')
- */
- protected function _cleanTheMess($id, $chunks)
- {
- for ($i = 0; $i < $chunks; $i++) {
- $this->remove($this->_getChunkId($id, $i));
- }
-
- $this->remove($id);
- }
-
- /**
- * Make and return a cache id
- *
- * Checks 'cache_id_prefix' and returns new id with prefix or simply the id if null
- *
- * @param string $id Cache id
- * @return string Cache id (with or without prefix)
- */
- protected function _id($id)
- {
- if ($id !== null) {
- $id = preg_replace('/([^a-zA-Z0-9_]{1,1})/', '_', $id);
- if (isset($this->_options['cache_id_prefix'])) {
- $id = $this->_options['cache_id_prefix'] . $id;
- }
- }
- return $id;
- }
-
- /**
- * Prepare tags
- *
- * @param array $tags
- * @return array
- */
- protected function _tags($tags)
- {
- foreach ($tags as $key => $tag) {
- $tags[$key] = $this->_id($tag);
- }
- return $tags;
- }
-
/**
* Save some data in a cache
*
@@ -227,4 +166,64 @@ public function getIdsNotMatchingTags($tags = [])
$tags = $this->_tags($tags);
return parent::getIdsNotMatchingTags($tags);
}
+
+ /**
+ * Returns ID of a specific chunk on the basis of data's ID
+ *
+ * @param string $id Main data's ID
+ * @param int $index Particular chunk number to return ID for
+ * @return string
+ */
+ protected function _getChunkId($id, $index)
+ {
+ return "{$id}[{$index}]";
+ }
+
+ /**
+ * Remove saved chunks in case something gone wrong (e.g. some chunk from the chain can not be found)
+ *
+ * @param string $id ID of data's info cell
+ * @param int $chunks Number of chunks to remove (basically, the number after '{splitted}|')
+ */
+ protected function _cleanTheMess($id, $chunks)
+ {
+ for ($i = 0; $i < $chunks; $i++) {
+ $this->remove($this->_getChunkId($id, $i));
+ }
+
+ $this->remove($id);
+ }
+
+ /**
+ * Make and return a cache id
+ *
+ * Checks 'cache_id_prefix' and returns new id with prefix or simply the id if null
+ *
+ * @param string $id Cache id
+ * @return string Cache id (with or without prefix)
+ */
+ protected function _id($id)
+ {
+ if ($id !== null) {
+ $id = preg_replace('/([^a-zA-Z0-9_]{1,1})/', '_', $id);
+ if (isset($this->_options['cache_id_prefix'])) {
+ $id = $this->_options['cache_id_prefix'] . $id;
+ }
+ }
+ return $id;
+ }
+
+ /**
+ * Prepare tags
+ *
+ * @param array $tags
+ * @return array
+ */
+ protected function _tags($tags)
+ {
+ foreach ($tags as $key => $tag) {
+ $tags[$key] = $this->_id($tag);
+ }
+ return $tags;
+ }
}
diff --git a/lib/Varien/Data/Collection.php b/lib/Varien/Data/Collection.php
index eccb00c78db..fd2c41571c8 100644
--- a/lib/Varien/Data/Collection.php
+++ b/lib/Varien/Data/Collection.php
@@ -172,18 +172,6 @@ public function isLoaded()
return $this->_isCollectionLoaded;
}
- /**
- * Set collection loading status flag
- *
- * @param bool $flag
- * @return $this
- */
- protected function _setIsLoaded($flag = true)
- {
- $this->_isCollectionLoaded = $flag;
- return $this;
- }
-
/**
* Get current collection page
*
@@ -362,28 +350,6 @@ public function addItem(Varien_Object $item)
return $this;
}
- /**
- * Add item that has no id to collection
- *
- * @param Varien_Object $item
- * @return $this
- */
- protected function _addItem($item)
- {
- $this->_items[] = $item;
- return $this;
- }
-
- /**
- * Retrieve item id
- *
- * @return mixed
- */
- protected function _getItemId(Varien_Object $item)
- {
- return $item->getId();
- }
-
/**
* Retrieve ids of all tems
*
@@ -547,36 +513,6 @@ public function getNewEmptyItem()
return new $this->_itemObjectClass();
}
- /**
- * Render sql select conditions
- *
- * @return Varien_Data_Collection
- */
- protected function _renderFilters()
- {
- return $this;
- }
-
- /**
- * Render sql select orders
- *
- * @return Varien_Data_Collection
- */
- protected function _renderOrders()
- {
- return $this;
- }
-
- /**
- * Render sql select limit
- *
- * @return Varien_Data_Collection
- */
- protected function _renderLimit()
- {
- return $this;
- }
-
/**
* Set select distinct
*
@@ -649,38 +585,6 @@ public function toArray($arrRequiredFields = [])
return $arrItems;
}
- /**
- * Convert items array to array for select options
- *
- * return items array
- * array(
- * $index => array(
- * 'value' => mixed
- * 'label' => mixed
- * )
- * )
- *
- * @param string $valueField
- * @param string $labelField
- * @param array $additional
- * @return array
- */
- protected function _toOptionArray($valueField = 'id', $labelField = 'name', $additional = [])
- {
- $data = [];
- $res = [];
- $additional['value'] = $valueField;
- $additional['label'] = $labelField;
-
- foreach ($this as $item) {
- foreach ($additional as $code => $field) {
- $data[$code] = $item->getData($field);
- }
- $res[] = $data;
- }
- return $res;
- }
-
/**
* @return array
*/
@@ -697,25 +601,6 @@ public function toOptionHash()
return $this->_toOptionHash();
}
- /**
- * Convert items array to hash for select options
- *
- * return items hash
- * array($value => $label)
- *
- * @param string $valueField
- * @param string $labelField
- * @return array
- */
- protected function _toOptionHash($valueField = 'id', $labelField = 'name')
- {
- $res = [];
- foreach ($this as $item) {
- $res[$item->getData($valueField)] = $item->getData($labelField);
- }
- return $res;
- }
-
/**
* Retrieve item by id
*
@@ -831,4 +716,119 @@ public function hasFlag($flag)
{
return array_key_exists($flag, $this->_flags);
}
+
+ /**
+ * Set collection loading status flag
+ *
+ * @param bool $flag
+ * @return $this
+ */
+ protected function _setIsLoaded($flag = true)
+ {
+ $this->_isCollectionLoaded = $flag;
+ return $this;
+ }
+
+ /**
+ * Add item that has no id to collection
+ *
+ * @param Varien_Object $item
+ * @return $this
+ */
+ protected function _addItem($item)
+ {
+ $this->_items[] = $item;
+ return $this;
+ }
+
+ /**
+ * Retrieve item id
+ *
+ * @return mixed
+ */
+ protected function _getItemId(Varien_Object $item)
+ {
+ return $item->getId();
+ }
+
+ /**
+ * Render sql select conditions
+ *
+ * @return Varien_Data_Collection
+ */
+ protected function _renderFilters()
+ {
+ return $this;
+ }
+
+ /**
+ * Render sql select orders
+ *
+ * @return Varien_Data_Collection
+ */
+ protected function _renderOrders()
+ {
+ return $this;
+ }
+
+ /**
+ * Render sql select limit
+ *
+ * @return Varien_Data_Collection
+ */
+ protected function _renderLimit()
+ {
+ return $this;
+ }
+
+ /**
+ * Convert items array to array for select options
+ *
+ * return items array
+ * array(
+ * $index => array(
+ * 'value' => mixed
+ * 'label' => mixed
+ * )
+ * )
+ *
+ * @param string $valueField
+ * @param string $labelField
+ * @param array $additional
+ * @return array
+ */
+ protected function _toOptionArray($valueField = 'id', $labelField = 'name', $additional = [])
+ {
+ $data = [];
+ $res = [];
+ $additional['value'] = $valueField;
+ $additional['label'] = $labelField;
+
+ foreach ($this as $item) {
+ foreach ($additional as $code => $field) {
+ $data[$code] = $item->getData($field);
+ }
+ $res[] = $data;
+ }
+ return $res;
+ }
+
+ /**
+ * Convert items array to hash for select options
+ *
+ * return items hash
+ * array($value => $label)
+ *
+ * @param string $valueField
+ * @param string $labelField
+ * @return array
+ */
+ protected function _toOptionHash($valueField = 'id', $labelField = 'name')
+ {
+ $res = [];
+ foreach ($this as $item) {
+ $res[$item->getData($valueField)] = $item->getData($labelField);
+ }
+ return $res;
+ }
}
diff --git a/lib/Varien/Data/Collection/Db.php b/lib/Varien/Data/Collection/Db.php
index 59e720e6615..e7602f19f73 100644
--- a/lib/Varien/Data/Collection/Db.php
+++ b/lib/Varien/Data/Collection/Db.php
@@ -96,6 +96,18 @@ public function __construct($conn = null)
}
}
+ /**
+ * Magic clone function
+ *
+ * Clone also Zend_Db_Select
+ *
+ * @return void
+ */
+ public function __clone()
+ {
+ $this->_select = clone $this->_select;
+ }
+
/**
* Add variable to bind list
*
@@ -127,18 +139,6 @@ public function initCache($object, $idPrefix, $tags)
return $this;
}
- /**
- * Specify collection objects id field name
- *
- * @param string $fieldName
- * @return $this
- */
- protected function _setIdFieldName($fieldName)
- {
- $this->_idFieldName = $fieldName;
- return $this;
- }
-
/**
* Id field name getter
*
@@ -149,19 +149,6 @@ public function getIdFieldName()
return $this->_idFieldName;
}
- /**
- * Get collection item identifier
- *
- * @return mixed
- */
- protected function _getItemId(Varien_Object $item)
- {
- if ($field = $this->getIdFieldName()) {
- return $item->getData($field);
- }
- return parent::_getItemId($item);
- }
-
/**
* Set database connection adapter
*
@@ -331,32 +318,219 @@ public function unshiftOrder($field, $direction = self::SORT_ORDER_DESC)
}
/**
- * Add ORDERBY to the end or to the beginning
+ * Add field filter to collection
*
- * @param string $field
- * @param string $direction
- * @param bool $unshift
- * @return $this
+ * @see self::_getConditionSql for $condition
+ *
+ * @param string|array $field
+ * @param int|string|array|null $condition
+ * @return $this
*/
- private function _setOrder($field, $direction, $unshift = false)
+ public function addFieldToFilter($field, $condition = null)
{
- $this->_isOrdersRendered = false;
- $field = (string) $this->_getMappedField($field);
- $direction = (strtoupper($direction) == self::SORT_ORDER_ASC) ? self::SORT_ORDER_ASC : self::SORT_ORDER_DESC;
+ if (!is_array($field)) {
+ $resultCondition = $this->_translateCondition($field, $condition);
+ } else {
+ $conditions = [];
+ foreach ($field as $key => $currField) {
+ $conditions[] = $this->_translateCondition(
+ $currField,
+ isset($condition[$key]) ? $condition[$key] : null,
+ );
+ }
- unset($this->_orders[$field]); // avoid ordering by the same field twice
- if ($unshift) {
- $orders = [$field => $direction];
- foreach ($this->_orders as $key => $dir) {
- $orders[$key] = $dir;
+ $resultCondition = '(' . implode(') ' . Zend_Db_Select::SQL_OR . ' (', $conditions) . ')';
+ }
+
+ $this->_select->where($resultCondition);
+
+ return $this;
+ }
+
+ /**
+ * Set select distinct
+ *
+ * @param bool $flag
+ *
+ * @return $this
+ */
+ public function distinct($flag)
+ {
+ $this->_select->distinct($flag);
+ return $this;
+ }
+
+ /**
+ * Load data
+ *
+ * @param bool $printQuery
+ * @param bool $logQuery
+ *
+ * @return $this
+ */
+ public function load($printQuery = false, $logQuery = false)
+ {
+ if ($this->isLoaded()) {
+ return $this;
+ }
+
+ $this->_beforeLoad();
+
+ $this->_renderFilters()
+ ->_renderOrders()
+ ->_renderLimit();
+
+ $this->printLogQuery($printQuery, $logQuery);
+ $data = $this->getData();
+ $this->resetData();
+
+ if (is_array($data)) {
+ foreach ($data as $row) {
+ $item = $this->getNewEmptyItem();
+ if ($this->getIdFieldName()) {
+ $item->setIdFieldName($this->getIdFieldName());
+ }
+ $item->addData($row);
+ $item->setDataChanges(false);
+ $this->addItem($item);
}
- $this->_orders = $orders;
- } else {
- $this->_orders[$field] = $direction;
}
+
+ $this->_setIsLoaded();
+ $this->_afterLoad();
+ return $this;
+ }
+
+ /**
+ * Returns a collection item that corresponds to the fetched row
+ * and moves the internal data pointer ahead
+ *
+ * @return Varien_Object|bool
+ */
+ public function fetchItem()
+ {
+ if (null === $this->_fetchStmt) {
+ $this->_fetchStmt = $this->getConnection()
+ ->query($this->getSelect());
+ }
+ $data = $this->_fetchStmt->fetch();
+ if (!empty($data) && is_array($data)) {
+ $item = $this->getNewEmptyItem();
+ if ($this->getIdFieldName()) {
+ $item->setIdFieldName($this->getIdFieldName());
+ }
+ $item->setData($data);
+
+ return $item;
+ }
+ return false;
+ }
+
+ /**
+ * Get all data array for collection
+ *
+ * @return array
+ */
+ public function getData()
+ {
+ if ($this->_data === null) {
+ $this->_renderFilters()
+ ->_renderOrders()
+ ->_renderLimit();
+ $this->_data = $this->_fetchAll($this->_select);
+ $this->_afterLoadData();
+ }
+ return $this->_data;
+ }
+
+ /**
+ * Reset loaded for collection data array
+ *
+ * @return $this
+ */
+ public function resetData()
+ {
+ $this->_data = null;
+ return $this;
+ }
+
+ /**
+ * @param bool $printQuery
+ * @param bool $logQuery
+ * @return Varien_Data_Collection|Varien_Data_Collection_Db
+ */
+ public function loadData($printQuery = false, $logQuery = false)
+ {
+ return $this->load($printQuery, $logQuery);
+ }
+
+ /**
+ * Print and/or log query
+ *
+ * @param bool $printQuery
+ * @param bool $logQuery
+ * @param string $sql
+ *
+ * @return $this
+ */
+ public function printLogQuery($printQuery = false, $logQuery = false, $sql = null)
+ {
+ if ($printQuery) {
+ echo is_null($sql) ? $this->getSelect()->__toString() : $sql;
+ }
+
+ if ($logQuery) {
+ Mage::log(is_null($sql) ? $this->getSelect()->__toString() : $sql);
+ }
+ return $this;
+ }
+
+ /**
+ * Add filter to Map
+ *
+ * @param string $filter
+ * @param string $alias
+ * @param string $group default 'fields'
+ *
+ * @return $this
+ */
+ public function addFilterToMap($filter, $alias, $group = 'fields')
+ {
+ if (is_null($this->_map)) {
+ $this->_map = [$group => []];
+ } elseif (is_null($this->_map[$group])) {
+ $this->_map[$group] = [];
+ }
+ $this->_map[$group][$filter] = $alias;
+
+ return $this;
+ }
+
+ /**
+ * Specify collection objects id field name
+ *
+ * @param string $fieldName
+ * @return $this
+ */
+ protected function _setIdFieldName($fieldName)
+ {
+ $this->_idFieldName = $fieldName;
return $this;
}
+ /**
+ * Get collection item identifier
+ *
+ * @return mixed
+ */
+ protected function _getItemId(Varien_Object $item)
+ {
+ if ($field = $this->getIdFieldName()) {
+ return $item->getData($field);
+ }
+ return parent::_getItemId($item);
+ }
+
/**
* Render sql select conditions
*
@@ -404,36 +578,6 @@ protected function _renderFilters()
*/
protected function _renderFiltersBefore() {}
- /**
- * Add field filter to collection
- *
- * @see self::_getConditionSql for $condition
- *
- * @param string|array $field
- * @param int|string|array|null $condition
- * @return $this
- */
- public function addFieldToFilter($field, $condition = null)
- {
- if (!is_array($field)) {
- $resultCondition = $this->_translateCondition($field, $condition);
- } else {
- $conditions = [];
- foreach ($field as $key => $currField) {
- $conditions[] = $this->_translateCondition(
- $currField,
- isset($condition[$key]) ? $condition[$key] : null,
- );
- }
-
- $resultCondition = '(' . implode(') ' . Zend_Db_Select::SQL_OR . ' (', $conditions) . ')';
- }
-
- $this->_select->where($resultCondition);
-
- return $this;
- }
-
/**
* Build sql where condition part
*
@@ -563,19 +707,6 @@ protected function _renderLimit()
return $this;
}
- /**
- * Set select distinct
- *
- * @param bool $flag
- *
- * @return $this
- */
- public function distinct($flag)
- {
- $this->_select->distinct($flag);
- return $this;
- }
-
/**
* Before load action
*
@@ -586,72 +717,6 @@ protected function _beforeLoad()
return $this;
}
- /**
- * Load data
- *
- * @param bool $printQuery
- * @param bool $logQuery
- *
- * @return $this
- */
- public function load($printQuery = false, $logQuery = false)
- {
- if ($this->isLoaded()) {
- return $this;
- }
-
- $this->_beforeLoad();
-
- $this->_renderFilters()
- ->_renderOrders()
- ->_renderLimit();
-
- $this->printLogQuery($printQuery, $logQuery);
- $data = $this->getData();
- $this->resetData();
-
- if (is_array($data)) {
- foreach ($data as $row) {
- $item = $this->getNewEmptyItem();
- if ($this->getIdFieldName()) {
- $item->setIdFieldName($this->getIdFieldName());
- }
- $item->addData($row);
- $item->setDataChanges(false);
- $this->addItem($item);
- }
- }
-
- $this->_setIsLoaded();
- $this->_afterLoad();
- return $this;
- }
-
- /**
- * Returns a collection item that corresponds to the fetched row
- * and moves the internal data pointer ahead
- *
- * @return Varien_Object|bool
- */
- public function fetchItem()
- {
- if (null === $this->_fetchStmt) {
- $this->_fetchStmt = $this->getConnection()
- ->query($this->getSelect());
- }
- $data = $this->_fetchStmt->fetch();
- if (!empty($data) && is_array($data)) {
- $item = $this->getNewEmptyItem();
- if ($this->getIdFieldName()) {
- $item->setIdFieldName($this->getIdFieldName());
- }
- $item->setData($data);
-
- return $item;
- }
- return false;
- }
-
/**
* Convert items array to hash for select options
* unsing fetchItem method
@@ -676,23 +741,6 @@ protected function _toOptionHashOptimized($valueField = 'id', $labelField = 'nam
return $result;
}
- /**
- * Get all data array for collection
- *
- * @return array
- */
- public function getData()
- {
- if ($this->_data === null) {
- $this->_renderFilters()
- ->_renderOrders()
- ->_renderLimit();
- $this->_data = $this->_fetchAll($this->_select);
- $this->_afterLoadData();
- }
- return $this->_data;
- }
-
/**
* Process loaded collection data
*
@@ -703,17 +751,6 @@ protected function _afterLoadData()
return $this;
}
- /**
- * Reset loaded for collection data array
- *
- * @return $this
- */
- public function resetData()
- {
- $this->_data = null;
- return $this;
- }
-
/**
* @return $this
*/
@@ -722,37 +759,6 @@ protected function _afterLoad()
return $this;
}
- /**
- * @param bool $printQuery
- * @param bool $logQuery
- * @return Varien_Data_Collection|Varien_Data_Collection_Db
- */
- public function loadData($printQuery = false, $logQuery = false)
- {
- return $this->load($printQuery, $logQuery);
- }
-
- /**
- * Print and/or log query
- *
- * @param bool $printQuery
- * @param bool $logQuery
- * @param string $sql
- *
- * @return $this
- */
- public function printLogQuery($printQuery = false, $logQuery = false, $sql = null)
- {
- if ($printQuery) {
- echo is_null($sql) ? $this->getSelect()->__toString() : $sql;
- }
-
- if ($logQuery) {
- Mage::log(is_null($sql) ? $this->getSelect()->__toString() : $sql);
- }
- return $this;
- }
-
/**
* Reset collection
*
@@ -872,35 +878,29 @@ protected function _getCacheTags()
}
/**
- * Add filter to Map
- *
- * @param string $filter
- * @param string $alias
- * @param string $group default 'fields'
+ * Add ORDERBY to the end or to the beginning
*
+ * @param string $field
+ * @param string $direction
+ * @param bool $unshift
* @return $this
*/
- public function addFilterToMap($filter, $alias, $group = 'fields')
+ private function _setOrder($field, $direction, $unshift = false)
{
- if (is_null($this->_map)) {
- $this->_map = [$group => []];
- } elseif (is_null($this->_map[$group])) {
- $this->_map[$group] = [];
- }
- $this->_map[$group][$filter] = $alias;
+ $this->_isOrdersRendered = false;
+ $field = (string) $this->_getMappedField($field);
+ $direction = (strtoupper($direction) == self::SORT_ORDER_ASC) ? self::SORT_ORDER_ASC : self::SORT_ORDER_DESC;
+ unset($this->_orders[$field]); // avoid ordering by the same field twice
+ if ($unshift) {
+ $orders = [$field => $direction];
+ foreach ($this->_orders as $key => $dir) {
+ $orders[$key] = $dir;
+ }
+ $this->_orders = $orders;
+ } else {
+ $this->_orders[$field] = $direction;
+ }
return $this;
}
-
- /**
- * Magic clone function
- *
- * Clone also Zend_Db_Select
- *
- * @return void
- */
- public function __clone()
- {
- $this->_select = clone $this->_select;
- }
}
diff --git a/lib/Varien/Data/Collection/Filesystem.php b/lib/Varien/Data/Collection/Filesystem.php
index f202e3d1c77..9e75c487f9b 100644
--- a/lib/Varien/Data/Collection/Filesystem.php
+++ b/lib/Varien/Data/Collection/Filesystem.php
@@ -87,6 +87,14 @@ class Varien_Data_Collection_Filesystem extends Varien_Data_Collection
*/
protected $_disallowedFilesMask = '';
+ /**
+ * Collecting items helper variables
+ *
+ * @var array
+ */
+ protected $_collectedDirs = [];
+ protected $_collectedFiles = [];
+
/**
* Filter rendering helper variables
*
@@ -97,14 +105,6 @@ class Varien_Data_Collection_Filesystem extends Varien_Data_Collection
private $_filterBrackets = [];
private $_filterEvalRendered = '';
- /**
- * Collecting items helper variables
- *
- * @var array
- */
- protected $_collectedDirs = [];
- protected $_collectedFiles = [];
-
/**
* Allowed dirs mask setter
* Set empty to not filter
@@ -209,49 +209,6 @@ public function setDirsFirst($value)
return $this;
}
- /**
- * Get files from specified directory recursively (if needed)
- *
- * @param string|array $dir
- */
- protected function _collectRecursive($dir)
- {
- $collectedResult = [];
- if (!is_array($dir)) {
- $dir = [$dir];
- }
- foreach ($dir as $folder) {
- if ($nodes = glob($folder . DIRECTORY_SEPARATOR . '*')) {
- foreach ($nodes as $node) {
- $collectedResult[] = $node;
- }
- }
- }
- if (empty($collectedResult)) {
- return;
- }
-
- foreach ($collectedResult as $item) {
- if (is_dir($item) && (!$this->_allowedDirsMask || preg_match($this->_allowedDirsMask, basename($item)))) {
- if ($this->_collectDirs) {
- if ($this->_dirsFirst) {
- $this->_collectedDirs[] = $item;
- } else {
- $this->_collectedFiles[] = $item;
- }
- }
- if ($this->_collectRecursively) {
- $this->_collectRecursive($item);
- }
- } elseif ($this->_collectFiles && is_file($item)
- && (!$this->_allowedFilesMask || preg_match($this->_allowedFilesMask, basename($item)))
- && (!$this->_disallowedFilesMask || !preg_match($this->_disallowedFilesMask, basename($item)))
- ) {
- $this->_collectedFiles[] = $item;
- }
- }
- }
-
/**
* Launch data collecting
*
@@ -302,52 +259,6 @@ public function loadData($printQuery = false, $logQuery = false)
return $this;
}
- /**
- * With specified collected items:
- * - generate data
- * - apply filters
- * - sort
- *
- * @param string $attributeName '_collectedFiles' | '_collectedDirs'
- */
- private function _generateAndFilterAndSort($attributeName)
- {
- // generate custom data (as rows with columns) basing on the filenames
- foreach ($this->$attributeName as $key => $filename) {
- $this->{$attributeName}[$key] = $this->_generateRow($filename);
- }
-
- // apply filters on generated data
- if (!empty($this->_filters)) {
- foreach ($this->$attributeName as $key => $row) {
- if (!$this->_filterRow($row)) {
- unset($this->{$attributeName}[$key]);
- }
- }
- }
-
- // sort (keys are lost!)
- if (!empty($this->_orders)) {
- usort($this->$attributeName, [$this, '_usort']);
- }
- }
-
- /**
- * Callback for sorting items
- * Currently supports only sorting by one column
- *
- * @param array $a
- * @param array $b
- * @return int|void
- */
- protected function _usort($a, $b)
- {
- foreach ($this->_orders as $key => $direction) {
- $result = $a[$key] > $b[$key] ? 1 : ($a[$key] < $b[$key] ? -1 : 0);
- return (self::SORT_ORDER_ASC === strtoupper($direction) ? $result : -$result);
- }
- }
-
/**
* Set select order
* Currently supports only sorting by one column
@@ -362,20 +273,6 @@ public function setOrder($field, $direction = self::SORT_ORDER_DESC)
return $this;
}
- /**
- * Generate item row basing on the filename
- *
- * @param string $filename
- * @return array
- */
- protected function _generateRow($filename)
- {
- return [
- 'filename' => $filename,
- 'basename' => basename($filename),
- ];
- }
-
/**
* Set a custom filter with callback
* The callback must take 3 params:
@@ -403,56 +300,6 @@ public function addCallbackFilter($field, $value, $type, $callback, $isInverted
return $this;
}
- /**
- * The filters renderer and caller
- * Aplies to each row, renders once.
- *
- * @param array $row
- * @return bool
- */
- protected function _filterRow($row)
- {
- // render filters once
- if (!$this->_isFiltersRendered) {
- $eval = '';
- for ($i = 0; $i < $this->_filterIncrement; $i++) {
- if (isset($this->_filterBrackets[$i])) {
- $eval .= $this->_renderConditionBeforeFilterElement($i, $this->_filterBrackets[$i]['is_and'])
- . $this->_filterBrackets[$i]['value'];
- } else {
- $f = '$this->_filters[' . $i . ']';
- $eval .= $this->_renderConditionBeforeFilterElement($i, $this->_filters[$i]['is_and'])
- . ($this->_filters[$i]['is_inverted'] ? '!' : '')
- . '$this->_invokeFilter(' . "{$f}['callback'], array({$f}['field'], {$f}['value'], " . '$row))';
- }
- }
- $this->_filterEvalRendered = $eval;
- $this->_isFiltersRendered = true;
- }
- $result = false;
- if ($this->_filterEvalRendered) {
- eval('$result = ' . $this->_filterEvalRendered . ';');
- }
- return $result;
- }
-
- /**
- * Invokes specified callback
- * Skips, if there is no filtered key in the row
- *
- * @param callback $callback
- * @param array $callbackParams
- * @return bool
- */
- protected function _invokeFilter($callback, $callbackParams)
- {
- list($field, $value, $row) = $callbackParams;
- if (!array_key_exists($field, $row)) {
- return false;
- }
- return call_user_func_array($callback, $callbackParams);
- }
-
/**
* Fancy field filter
*
@@ -535,46 +382,6 @@ public function addFieldToFilter($field, $cond, $type = 'and')
return $this;
}
- /**
- * Prepare a bracket into filters
- *
- * @param string $bracket
- * @param bool $isAnd
- * @return $this
- */
- protected function _addFilterBracket($bracket = '(', $isAnd = true)
- {
- $this->_filterBrackets[$this->_filterIncrement] = [
- 'value' => $bracket === ')' ? ')' : '(',
- 'is_and' => $isAnd,
- ];
- $this->_filterIncrement++;
- return $this;
- }
-
- /**
- * Render condition sign before element, if required
- *
- * @param int $increment
- * @param bool $isAnd
- * @return string
- */
- protected function _renderConditionBeforeFilterElement($increment, $isAnd)
- {
- if (isset($this->_filterBrackets[$increment]) && ')' === $this->_filterBrackets[$increment]['value']) {
- return '';
- }
- $prevIncrement = $increment - 1;
- $prevBracket = false;
- if (isset($this->_filterBrackets[$prevIncrement])) {
- $prevBracket = $this->_filterBrackets[$prevIncrement]['value'];
- }
- if ($prevIncrement < 0 || $prevBracket === '(') {
- return '';
- }
- return ($isAnd ? ' && ' : ' || ');
- }
-
/**
* Does nothing. Intentionally disabled parent method
*
@@ -688,4 +495,197 @@ public function filterCallbackIsLessThan($field, $filterValue, $row)
{
return $row[$field] < $filterValue;
}
+
+ /**
+ * Get files from specified directory recursively (if needed)
+ *
+ * @param string|array $dir
+ */
+ protected function _collectRecursive($dir)
+ {
+ $collectedResult = [];
+ if (!is_array($dir)) {
+ $dir = [$dir];
+ }
+ foreach ($dir as $folder) {
+ if ($nodes = glob($folder . DIRECTORY_SEPARATOR . '*')) {
+ foreach ($nodes as $node) {
+ $collectedResult[] = $node;
+ }
+ }
+ }
+ if (empty($collectedResult)) {
+ return;
+ }
+
+ foreach ($collectedResult as $item) {
+ if (is_dir($item) && (!$this->_allowedDirsMask || preg_match($this->_allowedDirsMask, basename($item)))) {
+ if ($this->_collectDirs) {
+ if ($this->_dirsFirst) {
+ $this->_collectedDirs[] = $item;
+ } else {
+ $this->_collectedFiles[] = $item;
+ }
+ }
+ if ($this->_collectRecursively) {
+ $this->_collectRecursive($item);
+ }
+ } elseif ($this->_collectFiles && is_file($item)
+ && (!$this->_allowedFilesMask || preg_match($this->_allowedFilesMask, basename($item)))
+ && (!$this->_disallowedFilesMask || !preg_match($this->_disallowedFilesMask, basename($item)))
+ ) {
+ $this->_collectedFiles[] = $item;
+ }
+ }
+ }
+
+ /**
+ * Callback for sorting items
+ * Currently supports only sorting by one column
+ *
+ * @param array $a
+ * @param array $b
+ * @return int|void
+ */
+ protected function _usort($a, $b)
+ {
+ foreach ($this->_orders as $key => $direction) {
+ $result = $a[$key] > $b[$key] ? 1 : ($a[$key] < $b[$key] ? -1 : 0);
+ return (self::SORT_ORDER_ASC === strtoupper($direction) ? $result : -$result);
+ }
+ }
+
+ /**
+ * Generate item row basing on the filename
+ *
+ * @param string $filename
+ * @return array
+ */
+ protected function _generateRow($filename)
+ {
+ return [
+ 'filename' => $filename,
+ 'basename' => basename($filename),
+ ];
+ }
+
+ /**
+ * The filters renderer and caller
+ * Aplies to each row, renders once.
+ *
+ * @param array $row
+ * @return bool
+ */
+ protected function _filterRow($row)
+ {
+ // render filters once
+ if (!$this->_isFiltersRendered) {
+ $eval = '';
+ for ($i = 0; $i < $this->_filterIncrement; $i++) {
+ if (isset($this->_filterBrackets[$i])) {
+ $eval .= $this->_renderConditionBeforeFilterElement($i, $this->_filterBrackets[$i]['is_and'])
+ . $this->_filterBrackets[$i]['value'];
+ } else {
+ $f = '$this->_filters[' . $i . ']';
+ $eval .= $this->_renderConditionBeforeFilterElement($i, $this->_filters[$i]['is_and'])
+ . ($this->_filters[$i]['is_inverted'] ? '!' : '')
+ . '$this->_invokeFilter(' . "{$f}['callback'], array({$f}['field'], {$f}['value'], " . '$row))';
+ }
+ }
+ $this->_filterEvalRendered = $eval;
+ $this->_isFiltersRendered = true;
+ }
+ $result = false;
+ if ($this->_filterEvalRendered) {
+ eval('$result = ' . $this->_filterEvalRendered . ';');
+ }
+ return $result;
+ }
+
+ /**
+ * Invokes specified callback
+ * Skips, if there is no filtered key in the row
+ *
+ * @param callback $callback
+ * @param array $callbackParams
+ * @return bool
+ */
+ protected function _invokeFilter($callback, $callbackParams)
+ {
+ list($field, $value, $row) = $callbackParams;
+ if (!array_key_exists($field, $row)) {
+ return false;
+ }
+ return call_user_func_array($callback, $callbackParams);
+ }
+
+ /**
+ * Prepare a bracket into filters
+ *
+ * @param string $bracket
+ * @param bool $isAnd
+ * @return $this
+ */
+ protected function _addFilterBracket($bracket = '(', $isAnd = true)
+ {
+ $this->_filterBrackets[$this->_filterIncrement] = [
+ 'value' => $bracket === ')' ? ')' : '(',
+ 'is_and' => $isAnd,
+ ];
+ $this->_filterIncrement++;
+ return $this;
+ }
+
+ /**
+ * Render condition sign before element, if required
+ *
+ * @param int $increment
+ * @param bool $isAnd
+ * @return string
+ */
+ protected function _renderConditionBeforeFilterElement($increment, $isAnd)
+ {
+ if (isset($this->_filterBrackets[$increment]) && ')' === $this->_filterBrackets[$increment]['value']) {
+ return '';
+ }
+ $prevIncrement = $increment - 1;
+ $prevBracket = false;
+ if (isset($this->_filterBrackets[$prevIncrement])) {
+ $prevBracket = $this->_filterBrackets[$prevIncrement]['value'];
+ }
+ if ($prevIncrement < 0 || $prevBracket === '(') {
+ return '';
+ }
+ return ($isAnd ? ' && ' : ' || ');
+ }
+
+ /**
+ * With specified collected items:
+ * - generate data
+ * - apply filters
+ * - sort
+ *
+ * @param string $attributeName '_collectedFiles' | '_collectedDirs'
+ */
+ private function _generateAndFilterAndSort($attributeName)
+ {
+ // generate custom data (as rows with columns) basing on the filenames
+ foreach ($this->$attributeName as $key => $filename) {
+ $this->{$attributeName}[$key] = $this->_generateRow($filename);
+ }
+
+ // apply filters on generated data
+ if (!empty($this->_filters)) {
+ foreach ($this->$attributeName as $key => $row) {
+ if (!$this->_filterRow($row)) {
+ unset($this->{$attributeName}[$key]);
+ }
+ }
+ }
+
+ // sort (keys are lost!)
+ if (!empty($this->_orders)) {
+ usort($this->$attributeName, [$this, '_usort']);
+ }
+ }
}
diff --git a/lib/Varien/Data/Form.php b/lib/Varien/Data/Form.php
index 52fc4fd6aa2..092c5071bf5 100644
--- a/lib/Varien/Data/Form.php
+++ b/lib/Varien/Data/Form.php
@@ -119,17 +119,6 @@ public function addElement(Varien_Data_Form_Element_Abstract $element, $after =
return $this;
}
- /**
- * Check existing element
- *
- * @param string $elementId
- * @return bool
- */
- protected function _elementIdExists($elementId)
- {
- return isset($this->_elementsIndex[$elementId]);
- }
-
/**
* @param Varien_Data_Form_Element_Abstract $element
* @return $this
@@ -309,4 +298,15 @@ public function getHtml()
{
return $this->toHtml();
}
+
+ /**
+ * Check existing element
+ *
+ * @param string $elementId
+ * @return bool
+ */
+ protected function _elementIdExists($elementId)
+ {
+ return isset($this->_elementsIndex[$elementId]);
+ }
}
diff --git a/lib/Varien/Data/Form/Abstract.php b/lib/Varien/Data/Form/Abstract.php
index 0e1243eb59d..8c2697fa51a 100644
--- a/lib/Varien/Data/Form/Abstract.php
+++ b/lib/Varien/Data/Form/Abstract.php
@@ -54,6 +54,20 @@ public function __construct($attributes = [])
parent::__construct($attributes);
}
+ /**
+ * @return array
+ */
+ public function __toArray(array $arrAttributes = [])
+ {
+ $res = [];
+ $res['config'] = $this->getData();
+ $res['formElements'] = [];
+ foreach ($this->getElements() as $element) {
+ $res['formElements'][] = $element->toArray();
+ }
+ return $res;
+ }
+
/**
* @param string $type
* @param string $className
@@ -181,18 +195,4 @@ public function addColumn($elementId, $config)
$this->addElement($element);
return $element;
}
-
- /**
- * @return array
- */
- public function __toArray(array $arrAttributes = [])
- {
- $res = [];
- $res['config'] = $this->getData();
- $res['formElements'] = [];
- foreach ($this->getElements() as $element) {
- $res['formElements'][] = $element->toArray();
- }
- return $res;
- }
}
diff --git a/lib/Varien/Data/Form/Element/Abstract.php b/lib/Varien/Data/Form/Element/Abstract.php
index 8c8bc0fa05f..79687648eb5 100644
--- a/lib/Varien/Data/Form/Element/Abstract.php
+++ b/lib/Varien/Data/Form/Element/Abstract.php
@@ -196,15 +196,6 @@ public function removeClass($class)
return $this;
}
- /**
- * @param string $string
- * @return string
- */
- protected function _escape($string)
- {
- return htmlspecialchars((string) $string, ENT_COMPAT);
- }
-
/**
* @param string|null $index
* @return string
@@ -382,4 +373,13 @@ public function addElementValues($values, $overwrite = false)
return $this;
}
+
+ /**
+ * @param string $string
+ * @return string
+ */
+ protected function _escape($string)
+ {
+ return htmlspecialchars((string) $string, ENT_COMPAT);
+ }
}
diff --git a/lib/Varien/Data/Form/Element/Checkboxes.php b/lib/Varien/Data/Form/Element/Checkboxes.php
index 722f0ae836a..a9e9b8a4f98 100644
--- a/lib/Varien/Data/Form/Element/Checkboxes.php
+++ b/lib/Varien/Data/Form/Element/Checkboxes.php
@@ -46,45 +46,6 @@ public function getHtmlAttributes()
return ['type', 'name', 'class', 'style', 'checked', 'onclick', 'onchange', 'disabled'];
}
- /**
- * Prepare value list
- *
- * @return array
- */
- protected function _prepareValues()
- {
- $options = [];
- $values = [];
-
- if ($this->getValues()) {
- if (!is_array($this->getValues())) {
- $options = [$this->getValues()];
- } else {
- $options = $this->getValues();
- }
- } elseif ($this->getOptions() && is_array($this->getOptions())) {
- $options = $this->getOptions();
- }
- foreach ($options as $k => $v) {
- if (is_string($v)) {
- $values[] = [
- 'label' => $v,
- 'value' => $k,
- ];
- } elseif (isset($v['value'])) {
- if (!isset($v['label'])) {
- $v['label'] = $v['value'];
- }
- $values[] = [
- 'label' => $v['label'],
- 'value' => $v['value'],
- ];
- }
- }
-
- return $values;
- }
-
/**
* Retrieve HTML
*
@@ -176,6 +137,45 @@ public function getOnchange($value)
return;
}
+ /**
+ * Prepare value list
+ *
+ * @return array
+ */
+ protected function _prepareValues()
+ {
+ $options = [];
+ $values = [];
+
+ if ($this->getValues()) {
+ if (!is_array($this->getValues())) {
+ $options = [$this->getValues()];
+ } else {
+ $options = $this->getValues();
+ }
+ } elseif ($this->getOptions() && is_array($this->getOptions())) {
+ $options = $this->getOptions();
+ }
+ foreach ($options as $k => $v) {
+ if (is_string($v)) {
+ $values[] = [
+ 'label' => $v,
+ 'value' => $k,
+ ];
+ } elseif (isset($v['value'])) {
+ if (!isset($v['label'])) {
+ $v['label'] = $v['value'];
+ }
+ $values[] = [
+ 'label' => $v['label'],
+ 'value' => $v['value'],
+ ];
+ }
+ }
+
+ return $values;
+ }
+
// public function getName($value)
// {
// if ($name = $this->getData('name')) {
diff --git a/lib/Varien/Data/Form/Element/Date.php b/lib/Varien/Data/Form/Element/Date.php
index b1a35f88169..f5f1a2e5681 100644
--- a/lib/Varien/Data/Form/Element/Date.php
+++ b/lib/Varien/Data/Form/Element/Date.php
@@ -48,23 +48,6 @@ public function __construct($attributes = [])
}
}
- /**
- * If script executes on x64 system, converts large
- * numeric values to timestamp limit
- *
- * @param string $value
- * @return int
- */
- protected function _toTimestamp($value)
- {
- $value = (int) $value;
- if ($value > 3155760000) {
- $value = 0;
- }
-
- return $value;
- }
-
/**
* Set date value
* If Zend_Date instance is provided instead of value, other params will be ignored.
@@ -194,4 +177,21 @@ public function getElementHtml()
return $html . $this->getAfterElementHtml();
}
+
+ /**
+ * If script executes on x64 system, converts large
+ * numeric values to timestamp limit
+ *
+ * @param string $value
+ * @return int
+ */
+ protected function _toTimestamp($value)
+ {
+ $value = (int) $value;
+ if ($value > 3155760000) {
+ $value = 0;
+ }
+
+ return $value;
+ }
}
diff --git a/lib/Varien/Data/Form/Element/Editor.php b/lib/Varien/Data/Form/Element/Editor.php
index 23415889c5f..7a71f3664e1 100644
--- a/lib/Varien/Data/Form/Element/Editor.php
+++ b/lib/Varien/Data/Form/Element/Editor.php
@@ -144,6 +144,66 @@ public function getTheme()
return $this->_getData('theme');
}
+ /**
+ * Editor config retriever
+ *
+ * @param string $key Config var key
+ * @return mixed
+ */
+ public function getConfig($key = null)
+ {
+ if (!($this->_getData('config') instanceof Varien_Object)) {
+ $config = new Varien_Object();
+ $this->setConfig($config);
+ }
+ if ($key !== null) {
+ return $this->_getData('config')->getData($key);
+ }
+ return $this->_getData('config');
+ }
+
+ /**
+ * Translate string using defined helper
+ *
+ * @param string $string String to be translated
+ * @return string
+ */
+ public function translate($string)
+ {
+ $translator = $this->getConfig('translator');
+ if ($translator && method_exists($translator, '__')) {
+ $result = $translator->__($string);
+ if (is_string($result)) {
+ return $result;
+ }
+ }
+
+ return $string;
+ }
+
+ /**
+ * Check whether Wysiwyg is enabled or not
+ *
+ * @return bool
+ */
+ public function isEnabled()
+ {
+ if ($this->hasData('wysiwyg')) {
+ return $this->getWysiwyg();
+ }
+ return $this->getConfig('enabled');
+ }
+
+ /**
+ * Check whether Wysiwyg is loaded on demand or not
+ *
+ * @return bool
+ */
+ public function isHidden()
+ {
+ return $this->getConfig('hidden');
+ }
+
/**
* Return Editor top Buttons HTML
*
@@ -324,64 +384,4 @@ protected function _wrapIntoContainer($html)
. $html
. '';
}
-
- /**
- * Editor config retriever
- *
- * @param string $key Config var key
- * @return mixed
- */
- public function getConfig($key = null)
- {
- if (!($this->_getData('config') instanceof Varien_Object)) {
- $config = new Varien_Object();
- $this->setConfig($config);
- }
- if ($key !== null) {
- return $this->_getData('config')->getData($key);
- }
- return $this->_getData('config');
- }
-
- /**
- * Translate string using defined helper
- *
- * @param string $string String to be translated
- * @return string
- */
- public function translate($string)
- {
- $translator = $this->getConfig('translator');
- if ($translator && method_exists($translator, '__')) {
- $result = $translator->__($string);
- if (is_string($result)) {
- return $result;
- }
- }
-
- return $string;
- }
-
- /**
- * Check whether Wysiwyg is enabled or not
- *
- * @return bool
- */
- public function isEnabled()
- {
- if ($this->hasData('wysiwyg')) {
- return $this->getWysiwyg();
- }
- return $this->getConfig('enabled');
- }
-
- /**
- * Check whether Wysiwyg is loaded on demand or not
- *
- * @return bool
- */
- public function isHidden()
- {
- return $this->getConfig('hidden');
- }
}
diff --git a/lib/Varien/Data/Form/Element/Image.php b/lib/Varien/Data/Form/Element/Image.php
index 7407144d215..e726a0b5a8b 100644
--- a/lib/Varien/Data/Form/Element/Image.php
+++ b/lib/Varien/Data/Form/Element/Image.php
@@ -63,6 +63,16 @@ public function getElementHtml()
return $html . $this->_getDeleteCheckbox();
}
+ /**
+ * Return name
+ *
+ * @return string
+ */
+ public function getName()
+ {
+ return $this->getData('name');
+ }
+
/**
* Return html code of delete checkbox element
*
@@ -106,14 +116,4 @@ protected function _getUrl()
{
return $this->getValue();
}
-
- /**
- * Return name
- *
- * @return string
- */
- public function getName()
- {
- return $this->getData('name');
- }
}
diff --git a/lib/Varien/Data/Form/Element/Select.php b/lib/Varien/Data/Form/Element/Select.php
index b54264ceca8..73e6e24c4b5 100644
--- a/lib/Varien/Data/Form/Element/Select.php
+++ b/lib/Varien/Data/Form/Element/Select.php
@@ -75,6 +75,14 @@ public function getElementHtml()
return $html . $this->getAfterElementHtml();
}
+ /**
+ * @return array
+ */
+ public function getHtmlAttributes()
+ {
+ return ['title', 'class', 'style', 'onclick', 'onchange', 'disabled', 'readonly', 'tabindex'];
+ }
+
/**
* @param array $option
* @param string|array $selected
@@ -116,12 +124,4 @@ protected function _prepareOptions()
$this->setValues($values);
}
}
-
- /**
- * @return array
- */
- public function getHtmlAttributes()
- {
- return ['title', 'class', 'style', 'onclick', 'onchange', 'disabled', 'readonly', 'tabindex'];
- }
}
diff --git a/lib/Varien/Data/Tree/Db.php b/lib/Varien/Data/Tree/Db.php
index a28cf2dac4b..2ba43ae3092 100644
--- a/lib/Varien/Data/Tree/Db.php
+++ b/lib/Varien/Data/Tree/Db.php
@@ -244,6 +244,35 @@ public function moveNodeTo($node, $parentNode, $prevNode = null)
}
}
+ /**
+ * @param Varien_Data_Tree_Node $node
+ * @return $this|Varien_Data_Tree
+ * @throws Exception
+ */
+ public function removeNode($node)
+ {
+ // For reorder old node branch
+ $dataReorderOld = [
+ $this->_orderField => new Zend_Db_Expr($this->_conn->quoteIdentifier($this->_orderField) . '-1'),
+ ];
+ $conditionReorderOld = $this->_conn->quoteIdentifier($this->_parentField) . '=' . $node->getData($this->_parentField) .
+ ' AND ' . $this->_conn->quoteIdentifier($this->_orderField) . '>' . $node->getData($this->_orderField);
+
+ $this->_conn->beginTransaction();
+ try {
+ $condition = $this->_conn->quoteInto("$this->_idField=?", $node->getId());
+ $this->_conn->delete($this->_table, $condition);
+ // Update old node branch
+ $this->_conn->update($this->_table, $dataReorderOld, $conditionReorderOld);
+ $this->_conn->commit();
+ } catch (Exception $e) {
+ $this->_conn->rollBack();
+ throw new Exception('Can\'t remove tree node');
+ }
+ parent::removeNode($node);
+ return $this;
+ }
+
/**
* @param int $parentId
* @param int $parentLevel
@@ -289,33 +318,4 @@ protected function _loadFullTree()
return $this;
}
-
- /**
- * @param Varien_Data_Tree_Node $node
- * @return $this|Varien_Data_Tree
- * @throws Exception
- */
- public function removeNode($node)
- {
- // For reorder old node branch
- $dataReorderOld = [
- $this->_orderField => new Zend_Db_Expr($this->_conn->quoteIdentifier($this->_orderField) . '-1'),
- ];
- $conditionReorderOld = $this->_conn->quoteIdentifier($this->_parentField) . '=' . $node->getData($this->_parentField) .
- ' AND ' . $this->_conn->quoteIdentifier($this->_orderField) . '>' . $node->getData($this->_orderField);
-
- $this->_conn->beginTransaction();
- try {
- $condition = $this->_conn->quoteInto("$this->_idField=?", $node->getId());
- $this->_conn->delete($this->_table, $condition);
- // Update old node branch
- $this->_conn->update($this->_table, $dataReorderOld, $conditionReorderOld);
- $this->_conn->commit();
- } catch (Exception $e) {
- $this->_conn->rollBack();
- throw new Exception('Can\'t remove tree node');
- }
- parent::removeNode($node);
- return $this;
- }
}
diff --git a/lib/Varien/Date.php b/lib/Varien/Date.php
index 4bd4378304e..30b58aae1c1 100644
--- a/lib/Varien/Date.php
+++ b/lib/Varien/Date.php
@@ -88,21 +88,6 @@ public static function convertZendToStrftime($value, $convertDate = true, $conve
}
return $value;
}
-
- /**
- * Convert value by dictionary
- *
- * @param string $value
- * @param array $dictionary
- * @return string
- */
- protected static function _convert($value, $dictionary)
- {
- foreach ($dictionary as $search => $replace) {
- $value = preg_replace('/(^|[^%])' . $search . '/', '$1' . $replace, $value);
- }
- return $value;
- }
/**
* Convert date to UNIX timestamp
* Returns current UNIX timestamp if date is true
@@ -167,4 +152,19 @@ public static function formatDate($date, $includeTime = true)
$format = $includeTime ? self::DATETIME_PHP_FORMAT : self::DATE_PHP_FORMAT;
return date($format, $date);
}
+
+ /**
+ * Convert value by dictionary
+ *
+ * @param string $value
+ * @param array $dictionary
+ * @return string
+ */
+ protected static function _convert($value, $dictionary)
+ {
+ foreach ($dictionary as $search => $replace) {
+ $value = preg_replace('/(^|[^%])' . $search . '/', '$1' . $replace, $value);
+ }
+ return $value;
+ }
}
diff --git a/lib/Varien/Db/Adapter/Mysqli.php b/lib/Varien/Db/Adapter/Mysqli.php
index 3cf02e2515a..a839340ccfa 100644
--- a/lib/Varien/Db/Adapter/Mysqli.php
+++ b/lib/Varien/Db/Adapter/Mysqli.php
@@ -19,61 +19,6 @@ class Varien_Db_Adapter_Mysqli extends Zend_Db_Adapter_Mysqli
public const ISO_DATE_FORMAT = 'yyyy-MM-dd';
public const ISO_DATETIME_FORMAT = 'yyyy-MM-dd HH-mm-ss';
- /**
- * Creates a real connection to the database with multi-query capability.
- *
- * @return void
- * @throws Zend_Db_Adapter_Mysqli_Exception
- *
- * @SuppressWarnings("PHPMD.ErrorControlOperator")
- */
- protected function _connect()
- {
- if ($this->_connection) {
- return;
- }
- if (!extension_loaded('mysqli')) {
- throw new Zend_Db_Adapter_Exception('mysqli extension is not installed');
- }
- // Suppress connection warnings here.
- // Throw an exception instead.
- @$conn = new mysqli();
- if (mysqli_connect_errno()) {
- throw new Zend_Db_Adapter_Mysqli_Exception(mysqli_connect_errno());
- }
-
- $conn->init();
- $conn->options(MYSQLI_OPT_LOCAL_INFILE, true);
- #$conn->options(MYSQLI_CLIENT_MULTI_QUERIES, true);
-
- $port = !empty($this->_config['port']) ? $this->_config['port'] : null;
- $socket = !empty($this->_config['unix_socket']) ? $this->_config['unix_socket'] : null;
- // socket specified in host config
- if (strpos($this->_config['host'], '/') !== false) {
- $socket = $this->_config['host'];
- $this->_config['host'] = null;
- } elseif (strpos($this->_config['host'], ':') !== false) {
- list($this->_config['host'], $port) = explode(':', $this->_config['host']);
- }
-
- $connectionSuccessful = @$conn->real_connect(
- $this->_config['host'],
- $this->_config['username'],
- $this->_config['password'],
- $this->_config['dbname'],
- $port,
- $socket,
- );
- if (!$connectionSuccessful) {
- throw new Zend_Db_Adapter_Mysqli_Exception(mysqli_connect_error());
- }
-
- $this->_connection = $conn;
-
- /** @link http://bugs.mysql.com/bug.php?id=18551 */
- $this->_connection->query("SET SQL_MODE=''");
- }
-
/**
* Run RAW Query
*
@@ -281,4 +226,59 @@ public function select()
{
return new Varien_Db_Select($this);
}
+
+ /**
+ * Creates a real connection to the database with multi-query capability.
+ *
+ * @return void
+ * @throws Zend_Db_Adapter_Mysqli_Exception
+ *
+ * @SuppressWarnings("PHPMD.ErrorControlOperator")
+ */
+ protected function _connect()
+ {
+ if ($this->_connection) {
+ return;
+ }
+ if (!extension_loaded('mysqli')) {
+ throw new Zend_Db_Adapter_Exception('mysqli extension is not installed');
+ }
+ // Suppress connection warnings here.
+ // Throw an exception instead.
+ @$conn = new mysqli();
+ if (mysqli_connect_errno()) {
+ throw new Zend_Db_Adapter_Mysqli_Exception(mysqli_connect_errno());
+ }
+
+ $conn->init();
+ $conn->options(MYSQLI_OPT_LOCAL_INFILE, true);
+ #$conn->options(MYSQLI_CLIENT_MULTI_QUERIES, true);
+
+ $port = !empty($this->_config['port']) ? $this->_config['port'] : null;
+ $socket = !empty($this->_config['unix_socket']) ? $this->_config['unix_socket'] : null;
+ // socket specified in host config
+ if (strpos($this->_config['host'], '/') !== false) {
+ $socket = $this->_config['host'];
+ $this->_config['host'] = null;
+ } elseif (strpos($this->_config['host'], ':') !== false) {
+ list($this->_config['host'], $port) = explode(':', $this->_config['host']);
+ }
+
+ $connectionSuccessful = @$conn->real_connect(
+ $this->_config['host'],
+ $this->_config['username'],
+ $this->_config['password'],
+ $this->_config['dbname'],
+ $port,
+ $socket,
+ );
+ if (!$connectionSuccessful) {
+ throw new Zend_Db_Adapter_Mysqli_Exception(mysqli_connect_error());
+ }
+
+ $this->_connection = $conn;
+
+ /** @link http://bugs.mysql.com/bug.php?id=18551 */
+ $this->_connection->query("SET SQL_MODE=''");
+ }
}
diff --git a/lib/Varien/Db/Adapter/Pdo/Mysql.php b/lib/Varien/Db/Adapter/Pdo/Mysql.php
index 01bbad0d727..c96d2759341 100644
--- a/lib/Varien/Db/Adapter/Pdo/Mysql.php
+++ b/lib/Varien/Db/Adapter/Pdo/Mysql.php
@@ -212,6 +212,16 @@ class Varien_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Mysql implements V
*/
protected $_queryHook = null;
+ /**
+ * Check if all transactions have been committed
+ */
+ public function __destruct()
+ {
+ if ($this->_transactionLevel > 0) {
+ trigger_error('Some transactions have not been committed or rolled back', E_USER_ERROR);
+ }
+ }
+
/**
* Begin new DB transaction for connection
*
@@ -296,97 +306,6 @@ public function convertDateTime($datetime)
return $this->formatDate($datetime);
}
- /**
- * Parse a source hostname and generate a host info
- * @param $hostName
- *
- * @return Varien_Object
- */
- protected function _getHostInfo($hostName)
- {
- $hostInfo = new Varien_Object();
- $matches = [];
- if (str_contains($hostName, '/')) {
- $hostInfo->setAddressType(self::ADDRESS_TYPE_UNIX_SOCKET)
- ->setUnixSocket($hostName);
- } elseif (preg_match('/^\[(([0-9a-f]{1,4})?(:([0-9a-f]{1,4})?){1,}:([0-9a-f]{1,4}))(%[0-9a-z]+)?\](:([0-9]+))?$/i', $hostName, $matches)) {
- $hostName = $matches[1];
- $hostName .= $matches[6] ?? '';
- $hostInfo->setAddressType(self::ADDRESS_TYPE_IPV6_ADDRESS)
- ->setHostName($hostName)
- ->setPort($matches[8] ?? null);
- } elseif (preg_match('/^(([0-9a-f]{1,4})?(:([0-9a-f]{1,4})?){1,}:([0-9a-f]{1,4}))(%[0-9a-z]+)?$/i', $hostName, $matches)) {
- $hostName = $matches[1];
- $hostName .= $matches[6] ?? '';
- $hostInfo->setAddressType(self::ADDRESS_TYPE_IPV6_ADDRESS)
- ->setHostName($hostName);
- } elseif (str_contains($hostName, ':')) {
- list($hostAddress, $hostPort) = explode(':', $hostName);
- $hostInfo->setAddressType(
- filter_var($hostAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)
- ? self::ADDRESS_TYPE_IPV4_ADDRESS
- : self::ADDRESS_TYPE_HOSTNAME,
- )->setHostName($hostAddress)
- ->setPort($hostPort);
- } else {
- $hostInfo->setAddressType(
- filter_var($hostName, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)
- ? self::ADDRESS_TYPE_IPV4_ADDRESS
- : self::ADDRESS_TYPE_HOSTNAME,
- )->setHostName($hostName);
- }
-
- return $hostInfo;
- }
-
- /**
- * Creates a PDO object and connects to the database.
- *
- * @throws Zend_Db_Adapter_Exception
- */
- protected function _connect()
- {
- if ($this->_connection) {
- return;
- }
-
- if (!extension_loaded('pdo_mysql')) {
- throw new Zend_Db_Adapter_Exception('pdo_mysql extension is not installed');
- }
-
- $hostInfo = $this->_getHostInfo($this->_config['host'] ?? $this->_config['unix_socket'] ?? null);
-
- switch ($hostInfo->getAddressType()) {
- case self::ADDRESS_TYPE_UNIX_SOCKET:
- $this->_config['unix_socket'] = $hostInfo->getUnixSocket();
- unset($this->_config['host']);
- break;
- case self::ADDRESS_TYPE_IPV6_ADDRESS: // break intentionally omitted
- case self::ADDRESS_TYPE_IPV4_ADDRESS: // break intentionally omitted
- case self::ADDRESS_TYPE_HOSTNAME:
- $this->_config['host'] = $hostInfo->getHostName();
- if ($hostInfo->getPort()) {
- $this->_config['port'] = $hostInfo->getPort();
- }
- break;
- default:
- break;
- }
-
- $this->_debugTimer();
- parent::_connect();
- $this->_debugStat(self::DEBUG_CONNECT, '');
-
- /** @link http://bugs.mysql.com/bug.php?id=18551 */
- $this->_connection->query("SET SQL_MODE=''");
-
- if (!$this->_connectionFlagsSet) {
- $this->_connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
- $this->_connection->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
- $this->_connectionFlagsSet = true;
- }
- }
-
/**
* Run RAW Query
*
@@ -451,24 +370,6 @@ public function raw_fetchRow($sql, $field = null)
}
}
- /**
- * Check transaction level in case of DDL query
- *
- * @param string|Zend_Db_Select $sql
- * @throws Zend_Db_Adapter_Exception
- */
- protected function _checkDdlTransaction($sql)
- {
- if (is_string($sql) && $this->getTransactionLevel() > 0) {
- $startSql = strtolower(substr(ltrim($sql), 0, 3));
- if (in_array($startSql, $this->_ddlRoutines)
- && (preg_match($this->_tempRoutines, $sql) !== 1)
- ) {
- trigger_error(Varien_Db_Adapter_Interface::ERROR_DDL_MESSAGE, E_USER_ERROR);
- }
- }
- }
-
/**
* Special handling for PDO query().
* All bind parameter names must begin with ':'.
@@ -506,47 +407,6 @@ public function query($sql, $bind = [])
return $result;
}
- /**
- * Prepares SQL query by moving to bind all special parameters that can be confused with bind placeholders
- * (e.g. "foo:bar"). And also changes named bind to positional one, because underlying library has problems
- * with named binds.
- *
- * @param Zend_Db_Select|string $sql
- * @param-out string $sql
- * @param mixed $bind
- * @return $this
- */
- protected function _prepareQuery(&$sql, &$bind = [])
- {
- $sql = (string) $sql;
- if (!is_array($bind)) {
- $bind = [$bind];
- }
-
- // Mixed bind is not supported - so remember whether it is named bind, to normalize later if required
- $isNamedBind = false;
- if ($bind) {
- foreach ($bind as $k => $v) {
- if (!is_int($k)) {
- $isNamedBind = true;
- if ($k[0] != ':') {
- $bind[":{$k}"] = $v;
- unset($bind[$k]);
- }
- }
- }
- }
-
- // Special query hook
- if ($this->_queryHook) {
- $object = $this->_queryHook['object'];
- $method = $this->_queryHook['method'];
- $object->$method($sql, $bind);
- }
-
- return $this;
- }
-
/**
* Callback function for preparation of query and bind by regexp.
* Checks query parameters for special symbols and moves such parameters to bind array as named ones.
@@ -572,80 +432,6 @@ public function proccessBindCallback($matches)
return $matches[0];
}
- /**
- * Unquote raw string (use for auto-bind)
- *
- * @param string $string
- * @return string
- */
- protected function _unQuote($string)
- {
- $translate = [
- '\\000' => "\000",
- '\\n' => "\n",
- '\\r' => "\r",
- '\\\\' => '\\',
- "\'" => "'",
- '\\"' => '"',
- '\\032' => "\032",
- ];
- return strtr($string, $translate);
- }
-
- /**
- * Normalizes mixed positional-named bind to positional bind, and replaces named placeholders in query to
- * '?' placeholders.
- *
- * @param string $sql
- * @param array $bind
- * @return $this
- */
- protected function _convertMixedBind(&$sql, &$bind)
- {
- $positions = [];
- $offset = 0;
- // get positions
- while (true) {
- $pos = strpos($sql, '?', $offset);
- if ($pos !== false) {
- $positions[] = $pos;
- $offset = ++$pos;
- } else {
- break;
- }
- }
-
- $bindResult = [];
- $map = [];
- foreach ($bind as $k => $v) {
- // positional
- if (is_int($k)) {
- if (!isset($positions[$k])) {
- continue;
- }
- $bindResult[$positions[$k]] = $v;
- } else {
- $offset = 0;
- while (true) {
- $pos = strpos($sql, $k, $offset);
- if ($pos === false) {
- break;
- } else {
- $offset = $pos + strlen($k);
- $bindResult[$pos] = $v;
- }
- }
- $map[$k] = '?';
- }
- }
-
- ksort($bindResult);
- $bind = array_values($bindResult);
- $sql = strtr($sql, $map);
-
- return $this;
- }
-
/**
* Sets (removes) query hook.
*
@@ -704,75 +490,14 @@ public function multi_query($sql)
}
/**
- * Split multi statement query
+ * Drop the Foreign Key from table
*
- * @param string $sql
- * @return array
+ * @param string $tableName
+ * @param string $fkName
+ * @param string $schemaName
+ * @return $this
*/
- protected function _splitMultiQuery($sql)
- {
- $parts = preg_split(
- '#(;|\'|"|\\\\|//|--|\n|/\*|\*/)#',
- $sql,
- -1,
- PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE,
- );
-
- $q = false;
- $c = false;
- $stmts = [];
- $s = '';
-
- foreach ($parts as $i => $part) {
- // strings
- if (($part === "'" || $part === '"') && ($i === 0 || $parts[$i - 1] !== '\\')) {
- if ($q === false) {
- $q = $part;
- } elseif ($q === $part) {
- $q = false;
- }
- }
-
- // single line comments
- if (($part === '//' || $part === '--') && ($i === 0 || $parts[$i - 1] === "\n")) {
- $c = $part;
- } elseif ($part === "\n" && ($c === '//' || $c === '--')) {
- $c = false;
- }
-
- // multi line comments
- if ($part === '/*' && $c === false) {
- $c = '/*';
- } elseif ($part === '*/' && $c === '/*') {
- $c = false;
- }
-
- // statements
- if ($part === ';' && $q === false && $c === false) {
- if (trim($s) !== '') {
- $stmts[] = trim($s);
- $s = '';
- }
- } else {
- $s .= $part;
- }
- }
- if (trim($s) !== '') {
- $stmts[] = trim($s);
- }
-
- return $stmts;
- }
-
- /**
- * Drop the Foreign Key from table
- *
- * @param string $tableName
- * @param string $fkName
- * @param string $schemaName
- * @return $this
- */
- public function dropForeignKey($tableName, $fkName, $schemaName = null)
+ public function dropForeignKey($tableName, $fkName, $schemaName = null)
{
$foreignKeys = $this->getForeignKeys($tableName, $schemaName);
$fkName = strtoupper($fkName);
@@ -1370,42 +1095,6 @@ public function addKey($tableName, $indexName, $fields, $indexType = 'index', $s
return $this->addIndex($tableName, $indexName, $fields, $indexType, $schemaName);
}
- /**
- * Remove duplicate entry for create key
- *
- * @param string $table
- * @param array $fields
- * @param array $ids
- * @return $this
- */
- protected function _removeDuplicateEntry($table, $fields, $ids)
- {
- $where = [];
- $i = 0;
- foreach ($fields as $field) {
- $where[] = $this->quoteInto($field . '=?', $ids[$i++]);
- }
-
- if (!$where) {
- return $this;
- }
- $whereCond = implode(' AND ', $where);
- $sql = sprintf('SELECT COUNT(*) as `cnt` FROM `%s` WHERE %s', $table, $whereCond);
-
- $cnt = $this->raw_fetchRow($sql, 'cnt');
- if ($cnt > 1) {
- $sql = sprintf(
- 'DELETE FROM `%s` WHERE %s LIMIT %d',
- $table,
- $whereCond,
- $cnt - 1,
- );
- $this->raw_query($sql);
- }
-
- return $this;
- }
-
/**
* Creates and returns a new Zend_Db_Select object for this adapter.
*
@@ -1416,114 +1105,6 @@ public function select()
return new Varien_Db_Select($this);
}
- /**
- * Start debug timer
- *
- * @return $this
- */
- protected function _debugTimer()
- {
- if ($this->_debug) {
- $this->_debugTimer = microtime(true);
- }
-
- return $this;
- }
-
- /**
- * Logging debug information
- *
- * @param int $type
- * @param string $sql
- * @param array $bind
- * @param Zend_Db_Statement_Pdo $result
- * @return $this
- */
- protected function _debugStat($type, $sql, $bind = [], $result = null)
- {
- if (!$this->_debug) {
- return $this;
- }
-
- $code = '## ' . getmypid() . ' ## ';
- $nl = "\n";
- $time = sprintf('%.4f', microtime(true) - $this->_debugTimer);
-
- if (!$this->_logAllQueries && $time < $this->_logQueryTime) {
- return $this;
- }
- switch ($type) {
- case self::DEBUG_CONNECT:
- $code .= 'CONNECT' . $nl;
- break;
- case self::DEBUG_TRANSACTION:
- $code .= 'TRANSACTION ' . $sql . $nl;
- break;
- case self::DEBUG_QUERY:
- $code .= 'QUERY' . $nl;
- $code .= 'SQL: ' . $sql . $nl;
- if ($bind) {
- $code .= 'BIND: ' . var_export($bind, true) . $nl;
- }
- if ($result instanceof Zend_Db_Statement_Pdo) {
- $code .= 'AFF: ' . $result->rowCount() . $nl;
- }
- break;
- }
- $code .= 'TIME: ' . $time . $nl;
-
- if ($this->_logCallStack) {
- $code .= 'TRACE: ' . Varien_Debug::backtrace(true, false) . $nl;
- }
-
- $code .= $nl;
-
- $this->_debugWriteToFile($code);
-
- return $this;
- }
-
- /**
- * Write exception and throw
- *
- * @throws Exception
- */
- protected function _debugException(Exception $e)
- {
- if (!$this->_debug) {
- throw $e;
- }
-
- $nl = "\n";
- $code = 'EXCEPTION ' . $nl . $e . $nl . $nl;
- $this->_debugWriteToFile($code);
-
- throw $e;
- }
-
- /**
- * Debug write to file process
- *
- * @param string $str
- */
- protected function _debugWriteToFile($str)
- {
- $str = '## ' . date(self::TIMESTAMP_FORMAT) . "\r\n" . $str;
- if (!$this->_debugIoAdapter) {
- $this->_debugIoAdapter = new Varien_Io_File();
- $dir = Mage::getBaseDir() . DS . $this->_debugIoAdapter->dirname($this->_debugFile);
- $this->_debugIoAdapter->checkAndCreateFolder($dir);
- $this->_debugIoAdapter->open(['path' => $dir]);
- $this->_debugFile = basename($this->_debugFile);
- }
-
- $this->_debugIoAdapter->streamOpen($this->_debugFile, 'a');
- $this->_debugIoAdapter->streamLock();
- $this->_debugIoAdapter->streamWrite($str);
- $this->_debugIoAdapter->streamUnlock();
- $this->_debugIoAdapter->streamClose();
- }
-
/**
* Quotes a value and places into a piece of text at a placeholder.
*
@@ -1544,29 +1125,6 @@ public function quoteInto($text, $value, $type = null, $count = null)
return parent::quoteInto($text, $value, $type, $count);
}
- /**
- * Retrieve ddl cache name
- *
- * @param string $tableName
- * @param string $schemaName
- */
- protected function _getTableName($tableName, $schemaName = null)
- {
- return ($schemaName ? $schemaName . '.' : '') . $tableName;
- }
-
- /**
- * Retrieve Id for cache
- *
- * @param string $tableKey
- * @param int $ddlType
- * @return string
- */
- protected function _getCacheId($tableKey, $ddlType)
- {
- return sprintf('%s_%s_%s', self::DDL_CACHE_PREFIX, $tableKey, $ddlType);
- }
-
/**
* Load DDL data from cache
* Return false if cache does not exists
@@ -1891,64 +1449,14 @@ public function modifyColumnByDdl($tableName, $columnName, $definition, $flushDa
}
/**
- * Retrieve column data type by data from describe table
+ * Truncate table
*
- * @param array $column
- * @return string|void
+ * @deprecated since 1.4.0.1
+ * @param string $tableName
+ * @param string $schemaName
+ * @return $this
*/
- protected function _getColumnTypeByDdl($column)
- {
- switch ($column['DATA_TYPE']) {
- case 'bool':
- return Varien_Db_Ddl_Table::TYPE_BOOLEAN;
- case 'tinytext':
- case 'char':
- case 'varchar':
- case 'text':
- case 'mediumtext':
- case 'longtext':
- return Varien_Db_Ddl_Table::TYPE_TEXT;
- case 'blob':
- case 'mediumblob':
- case 'longblob':
- return Varien_Db_Ddl_Table::TYPE_BLOB;
- case 'tinyint':
- case 'tinyint unsigned':
- case 'smallint':
- case 'smallint unsigned':
- return Varien_Db_Ddl_Table::TYPE_SMALLINT;
- case 'mediumint':
- case 'int':
- case 'int unsigned':
- return Varien_Db_Ddl_Table::TYPE_INTEGER;
- case 'bigint':
- case 'bigint unsigned':
- return Varien_Db_Ddl_Table::TYPE_BIGINT;
- case 'datetime':
- return Varien_Db_Ddl_Table::TYPE_DATETIME;
- case 'timestamp':
- return Varien_Db_Ddl_Table::TYPE_TIMESTAMP;
- case 'date':
- return Varien_Db_Ddl_Table::TYPE_DATE;
- case 'float':
- return Varien_Db_Ddl_Table::TYPE_FLOAT;
- case 'decimal':
- case 'numeric':
- return Varien_Db_Ddl_Table::TYPE_DECIMAL;
- case 'varbinary':
- return Varien_Db_Ddl_Table::TYPE_VARBINARY;
- }
- }
-
- /**
- * Truncate table
- *
- * @deprecated since 1.4.0.1
- * @param string $tableName
- * @param string $schemaName
- * @return $this
- */
- public function truncate($tableName, $schemaName = null)
+ public function truncate($tableName, $schemaName = null)
{
return $this->truncateTable($tableName, $schemaName);
}
@@ -2288,432 +1796,143 @@ public function createTemporaryTable(Varien_Db_Ddl_Table $table)
}
/**
- * Retrieve columns and primary keys definition array for create table
+ * Get column definition from description
*
- * @return array
- * @throws Zend_Db_Exception
+ * @param array $options
+ * @param null|string $ddlType
+ * @return string
*/
- protected function _getColumnsDefinition(Varien_Db_Ddl_Table $table)
+ public function getColumnDefinitionFromDescribe($options, $ddlType = null)
{
- $definition = [];
- $primary = [];
- $columns = $table->getColumns();
- if (empty($columns)) {
- throw new Zend_Db_Exception('Table columns are not defined');
- }
-
- foreach ($columns as $columnData) {
- $columnDefinition = $this->_getColumnDefinition($columnData);
- if ($columnData['PRIMARY']) {
- $primary[$columnData['COLUMN_NAME']] = $columnData['PRIMARY_POSITION'];
- }
-
- $definition[] = sprintf(
- ' %s %s',
- $this->quoteIdentifier($columnData['COLUMN_NAME']),
- $columnDefinition,
- );
- }
-
- // PRIMARY KEY
- if (!empty($primary)) {
- asort($primary, SORT_NUMERIC);
- $primary = array_map([$this, 'quoteIdentifier'], array_keys($primary));
- $definition[] = sprintf(' PRIMARY KEY (%s)', implode(', ', $primary));
+ $columnInfo = $this->getColumnCreateByDescribe($options);
+ foreach ($columnInfo['options'] as $key => $value) {
+ $columnInfo[$key] = $value;
}
-
- return $definition;
+ return $this->_getColumnDefinition($columnInfo, $ddlType);
}
/**
- * Retrieve table indexes definition array for create table
+ * Drop table from database
*
- * @return array
+ * @param string $tableName
+ * @param string $schemaName
+ * @return boolean
*/
- protected function _getIndexesDefinition(Varien_Db_Ddl_Table $table)
+ public function dropTable($tableName, $schemaName = null)
{
- $definition = [];
- $indexes = $table->getIndexes();
- if (!empty($indexes)) {
- foreach ($indexes as $indexData) {
- if (!empty($indexData['TYPE'])) {
- switch ($indexData['TYPE']) {
- case 'primary':
- $indexType = 'PRIMARY KEY';
- unset($indexData['INDEX_NAME']);
- break;
- default:
- $indexType = strtoupper($indexData['TYPE']);
- break;
- }
- } else {
- $indexType = 'KEY';
- }
-
- $columns = [];
- foreach ($indexData['COLUMNS'] as $columnData) {
- $column = $this->quoteIdentifier($columnData['NAME']);
- if (!empty($columnData['SIZE'])) {
- $column .= sprintf('(%d)', $columnData['SIZE']);
- }
- $columns[] = $column;
- }
- $indexName = isset($indexData['INDEX_NAME']) ? $this->quoteIdentifier($indexData['INDEX_NAME']) : '';
- $definition[] = sprintf(
- ' %s %s (%s)',
- $indexType,
- $indexName,
- implode(', ', $columns),
- );
- }
- }
+ $table = $this->quoteIdentifier($this->_getTableName($tableName, $schemaName));
+ $query = 'DROP TABLE IF EXISTS ' . $table;
+ $this->query($query);
- return $definition;
+ return true;
}
/**
- * Retrieve table foreign keys definition array for create table
+ * Drop temporary table from database
*
- * @return array
+ * @param string $tableName
+ * @param string $schemaName
+ * @return $this
*/
- protected function _getForeignKeysDefinition(Varien_Db_Ddl_Table $table)
+ public function dropTemporaryTable($tableName, $schemaName = null)
{
- $definition = [];
- $relations = $table->getForeignKeys();
+ $table = $this->quoteIdentifier($this->_getTableName($tableName, $schemaName));
+ $query = 'DROP TEMPORARY TABLE IF EXISTS ' . $table;
+ $this->query($query);
- if (!empty($relations)) {
- foreach ($relations as $fkData) {
- $onDelete = $this->_getDdlAction($fkData['ON_DELETE']);
- $onUpdate = $this->_getDdlAction($fkData['ON_UPDATE']);
+ return $this;
+ }
- $definition[] = sprintf(
- ' CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s) ON DELETE %s ON UPDATE %s',
- $this->quoteIdentifier($fkData['FK_NAME']),
- $this->quoteIdentifier($fkData['COLUMN_NAME']),
- $this->quoteIdentifier($fkData['REF_TABLE_NAME']),
- $this->quoteIdentifier($fkData['REF_COLUMN_NAME']),
- $onDelete,
- $onUpdate,
- );
- }
+ /**
+ * Truncate a table
+ *
+ * @param string $tableName
+ * @param string $schemaName
+ * @return $this
+ * @throws Zend_Db_Exception
+ */
+ public function truncateTable($tableName, $schemaName = null)
+ {
+ if (!$this->isTableExists($tableName, $schemaName)) {
+ throw new Zend_Db_Exception(sprintf('Table "%s" is not exists', $tableName));
}
- return $definition;
+ $table = $this->quoteIdentifier($this->_getTableName($tableName, $schemaName));
+ $query = 'TRUNCATE TABLE ' . $table;
+ $this->query($query);
+
+ return $this;
}
/**
- * Retrieve table options definition array for create table
+ * Check is a table exists
*
- * @return array
- * @throws Zend_Db_Exception
+ * @param string $tableName
+ * @param string $schemaName
+ * @return boolean
*/
- protected function _getOptionsDefinition(Varien_Db_Ddl_Table $table)
+ public function isTableExists($tableName, $schemaName = null)
{
- $definition = [];
- $comment = $table->getComment();
- if (empty($comment)) {
- throw new Zend_Db_Exception('Comment for table is required and must be defined');
+ $fromDbName = 'DATABASE()';
+ if ($schemaName !== null) {
+ $fromDbName = $this->quote($schemaName);
}
- $definition[] = $this->quoteInto('COMMENT=?', $comment);
- $tableProps = [
- 'type' => 'ENGINE=%s',
- 'checksum' => 'CHECKSUM=%d',
- 'auto_increment' => 'AUTO_INCREMENT=%d',
- 'avg_row_length' => 'AVG_ROW_LENGTH=%d',
- 'max_rows' => 'MAX_ROWS=%d',
- 'min_rows' => 'MIN_ROWS=%d',
- 'delay_key_write' => 'DELAY_KEY_WRITE=%d',
- 'row_format' => 'row_format=%s',
- 'charset' => 'charset=%s',
- 'collate' => 'COLLATE=%s',
- ];
- foreach ($tableProps as $key => $mask) {
- $v = $table->getOption($key);
- if ($v !== null) {
- $definition[] = sprintf($mask, $v);
- }
+ $sql = sprintf(
+ 'SELECT COUNT(1) AS tbl_exists FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = %s AND TABLE_SCHEMA = %s',
+ $this->quote($tableName),
+ $fromDbName,
+ );
+ $ddl = $this->raw_fetchRow($sql, 'tbl_exists');
+ if ($ddl) {
+ return true;
}
- return $definition;
+ return false;
}
/**
- * Get column definition from description
+ * Rename table
*
- * @param array $options
- * @param null|string $ddlType
- * @return string
+ * @param string $oldTableName
+ * @param string $newTableName
+ * @param string $schemaName
+ * @return boolean
+ * @throws Zend_Db_Exception
*/
- public function getColumnDefinitionFromDescribe($options, $ddlType = null)
+ public function renameTable($oldTableName, $newTableName, $schemaName = null)
{
- $columnInfo = $this->getColumnCreateByDescribe($options);
- foreach ($columnInfo['options'] as $key => $value) {
- $columnInfo[$key] = $value;
+ if (!$this->isTableExists($oldTableName, $schemaName)) {
+ throw new Zend_Db_Exception(sprintf('Table "%s" is not exists', $oldTableName));
}
- return $this->_getColumnDefinition($columnInfo, $ddlType);
+ if ($this->isTableExists($newTableName, $schemaName)) {
+ throw new Zend_Db_Exception(sprintf('Table "%s" already exists', $newTableName));
+ }
+
+ $oldTable = $this->_getTableName($oldTableName, $schemaName);
+ $newTable = $this->_getTableName($newTableName, $schemaName);
+
+ $query = sprintf('ALTER TABLE %s RENAME TO %s', $oldTable, $newTable);
+ $this->query($query);
+
+ $this->resetDdlCache($oldTableName, $schemaName);
+
+ return true;
}
/**
- * Retrieve column definition fragment
+ * Rename several tables
*
- * @param array $options
- * @param string $ddlType Table DDL Column type constant
- * @throws Varien_Exception
- * @return string
+ * @param array $tablePairs array('oldName' => 'Name1', 'newName' => 'Name2')
+ *
+ * @return boolean
* @throws Zend_Db_Exception
*/
- protected function _getColumnDefinition($options, $ddlType = null)
+ public function renameTablesBatch(array $tablePairs)
{
- // convert keys to uppercase
- $options = array_change_key_case($options, CASE_UPPER);
- $cType = null;
- $cUnsigned = false;
- $cNullable = true;
- $cDefault = false;
- $cIdentity = false;
-
- // detect and validate column type
- if ($ddlType === null) {
- $ddlType = $this->_getDdlType($options);
- }
-
- if (empty($ddlType) || !isset($this->_ddlColumnTypes[$ddlType])) {
- throw new Zend_Db_Exception('Invalid column definition data');
- }
-
- // column size
- $cType = $this->_ddlColumnTypes[$ddlType];
- switch ($ddlType) {
- case Varien_Db_Ddl_Table::TYPE_SMALLINT:
- case Varien_Db_Ddl_Table::TYPE_INTEGER:
- case Varien_Db_Ddl_Table::TYPE_BIGINT:
- if (!empty($options['UNSIGNED'])) {
- $cUnsigned = true;
- }
- break;
- case Varien_Db_Ddl_Table::TYPE_DECIMAL:
- case Varien_Db_Ddl_Table::TYPE_NUMERIC:
- $precision = 10;
- $scale = 0;
- $match = [];
- if (!empty($options['LENGTH']) && preg_match('#^\(?(\d+),(\d+)\)?$#', $options['LENGTH'], $match)) {
- $precision = $match[1];
- $scale = $match[2];
- } else {
- if (isset($options['SCALE']) && is_numeric($options['SCALE'])) {
- $scale = $options['SCALE'];
- }
- if (isset($options['PRECISION']) && is_numeric($options['PRECISION'])) {
- $precision = $options['PRECISION'];
- }
- }
- $cType .= sprintf('(%d,%d)', $precision, $scale);
- break;
- case Varien_Db_Ddl_Table::TYPE_TEXT:
- case Varien_Db_Ddl_Table::TYPE_BLOB:
- case Varien_Db_Ddl_Table::TYPE_VARBINARY:
- if (empty($options['LENGTH'])) {
- $length = Varien_Db_Ddl_Table::DEFAULT_TEXT_SIZE;
- } else {
- $length = $this->_parseTextSize($options['LENGTH']);
- }
- if ($length <= 255) {
- $cType = $ddlType == Varien_Db_Ddl_Table::TYPE_TEXT ? 'varchar' : 'varbinary';
- $cType = sprintf('%s(%d)', $cType, $length);
- } elseif ($length > 255 && $length <= 65536) {
- $cType = $ddlType == Varien_Db_Ddl_Table::TYPE_TEXT ? 'text' : 'blob';
- } elseif ($length > 65536 && $length <= 16777216) {
- $cType = $ddlType == Varien_Db_Ddl_Table::TYPE_TEXT ? 'mediumtext' : 'mediumblob';
- } else {
- $cType = $ddlType == Varien_Db_Ddl_Table::TYPE_TEXT ? 'longtext' : 'longblob';
- }
- break;
- }
-
- if (array_key_exists('DEFAULT', $options)) {
- $cDefault = $options['DEFAULT'];
- }
- if (array_key_exists('NULLABLE', $options)) {
- $cNullable = (bool) $options['NULLABLE'];
- }
- if (!empty($options['IDENTITY']) || !empty($options['AUTO_INCREMENT'])) {
- $cIdentity = true;
- }
-
- /* For cases when tables created from createTableByDdl()
- * where default value can be quoted already.
- * We need to avoid "double-quoting" here
- */
- if ($cDefault !== null && strlen($cDefault)) {
- $cDefault = str_replace("'", '', $cDefault);
- }
-
- // prepare default value string
- if ($ddlType == Varien_Db_Ddl_Table::TYPE_TIMESTAMP) {
- if ($cDefault === null) {
- $cDefault = new Zend_Db_Expr('NULL');
- } elseif ($cDefault == Varien_Db_Ddl_Table::TIMESTAMP_INIT) {
- $cDefault = new Zend_Db_Expr('CURRENT_TIMESTAMP');
- } elseif ($cDefault == Varien_Db_Ddl_Table::TIMESTAMP_UPDATE) {
- $cDefault = new Zend_Db_Expr('0 ON UPDATE CURRENT_TIMESTAMP');
- } elseif ($cDefault == Varien_Db_Ddl_Table::TIMESTAMP_INIT_UPDATE) {
- $cDefault = new Zend_Db_Expr('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP');
- } elseif ($cNullable && !$cDefault) {
- $cDefault = new Zend_Db_Expr('NULL');
- } else {
- $cDefault = new Zend_Db_Expr('0');
- }
- } elseif (is_null($cDefault) && $cNullable) {
- $cDefault = new Zend_Db_Expr('NULL');
- }
-
- if (empty($options['COMMENT'])) {
- $comment = '';
- } else {
- $comment = $options['COMMENT'];
- }
-
- //set column position
- $after = null;
- if (!empty($options['AFTER'])) {
- $after = $options['AFTER'];
- }
-
- return sprintf(
- '%s%s%s%s%s COMMENT %s %s',
- $cType,
- $cUnsigned ? ' UNSIGNED' : '',
- $cNullable ? ' NULL' : ' NOT NULL',
- $cDefault !== false ? $this->quoteInto(' default ?', $cDefault) : '',
- $cIdentity ? ' auto_increment' : '',
- $this->quote($comment),
- $after ? 'AFTER ' . $this->quoteIdentifier($after) : '',
- );
- }
-
- /**
- * Drop table from database
- *
- * @param string $tableName
- * @param string $schemaName
- * @return boolean
- */
- public function dropTable($tableName, $schemaName = null)
- {
- $table = $this->quoteIdentifier($this->_getTableName($tableName, $schemaName));
- $query = 'DROP TABLE IF EXISTS ' . $table;
- $this->query($query);
-
- return true;
- }
-
- /**
- * Drop temporary table from database
- *
- * @param string $tableName
- * @param string $schemaName
- * @return $this
- */
- public function dropTemporaryTable($tableName, $schemaName = null)
- {
- $table = $this->quoteIdentifier($this->_getTableName($tableName, $schemaName));
- $query = 'DROP TEMPORARY TABLE IF EXISTS ' . $table;
- $this->query($query);
-
- return $this;
- }
-
- /**
- * Truncate a table
- *
- * @param string $tableName
- * @param string $schemaName
- * @return $this
- * @throws Zend_Db_Exception
- */
- public function truncateTable($tableName, $schemaName = null)
- {
- if (!$this->isTableExists($tableName, $schemaName)) {
- throw new Zend_Db_Exception(sprintf('Table "%s" is not exists', $tableName));
- }
-
- $table = $this->quoteIdentifier($this->_getTableName($tableName, $schemaName));
- $query = 'TRUNCATE TABLE ' . $table;
- $this->query($query);
-
- return $this;
- }
-
- /**
- * Check is a table exists
- *
- * @param string $tableName
- * @param string $schemaName
- * @return boolean
- */
- public function isTableExists($tableName, $schemaName = null)
- {
- $fromDbName = 'DATABASE()';
- if ($schemaName !== null) {
- $fromDbName = $this->quote($schemaName);
- }
-
- $sql = sprintf(
- 'SELECT COUNT(1) AS tbl_exists FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = %s AND TABLE_SCHEMA = %s',
- $this->quote($tableName),
- $fromDbName,
- );
- $ddl = $this->raw_fetchRow($sql, 'tbl_exists');
- if ($ddl) {
- return true;
- }
-
- return false;
- }
-
- /**
- * Rename table
- *
- * @param string $oldTableName
- * @param string $newTableName
- * @param string $schemaName
- * @return boolean
- * @throws Zend_Db_Exception
- */
- public function renameTable($oldTableName, $newTableName, $schemaName = null)
- {
- if (!$this->isTableExists($oldTableName, $schemaName)) {
- throw new Zend_Db_Exception(sprintf('Table "%s" is not exists', $oldTableName));
- }
- if ($this->isTableExists($newTableName, $schemaName)) {
- throw new Zend_Db_Exception(sprintf('Table "%s" already exists', $newTableName));
- }
-
- $oldTable = $this->_getTableName($oldTableName, $schemaName);
- $newTable = $this->_getTableName($newTableName, $schemaName);
-
- $query = sprintf('ALTER TABLE %s RENAME TO %s', $oldTable, $newTable);
- $this->query($query);
-
- $this->resetDdlCache($oldTableName, $schemaName);
-
- return true;
- }
-
- /**
- * Rename several tables
- *
- * @param array $tablePairs array('oldName' => 'Name1', 'newName' => 'Name2')
- *
- * @return boolean
- * @throws Zend_Db_Exception
- */
- public function renameTablesBatch(array $tablePairs)
- {
- if (count($tablePairs) == 0) {
- throw new Zend_Db_Exception('Please provide tables for rename');
- }
+ if (count($tablePairs) == 0) {
+ throw new Zend_Db_Exception('Please provide tables for rename');
+ }
$renamesList = [];
$tablesList = [];
@@ -3047,48 +2266,14 @@ public function prepareSqlCondition($fieldName, $condition)
}
/**
- * Prepare Sql condition
+ * Prepare value for save in column
+ * Return converted to column data type value
*
- * @param string $text Condition value
- * @param mixed $value
- * @param string $fieldName
- * @return string
+ * @param array $column the column describe array
+ * @param mixed $value
+ * @return mixed
*/
- protected function _prepareQuotedSqlCondition($text, $value, $fieldName)
- {
- $value = is_string($value) ? str_replace("\0", '', $value) : $value;
- $sql = $this->quoteInto($text, $value);
- return str_replace('{{fieldName}}', (string) $fieldName, $sql);
- }
-
- /**
- * Transforms sql condition key 'seq' / 'sneq' that is used for comparing string values to its analog:
- * - 'null' / 'notnull' for empty strings
- * - 'eq' / 'neq' for non-empty strings
- *
- * @param string $conditionKey
- * @param mixed $value
- * @return string
- */
- protected function _transformStringSqlCondition($conditionKey, $value)
- {
- $value = str_replace("\0", '', (string) $value);
- if ($value == '') {
- return ($conditionKey == 'seq') ? 'null' : 'notnull';
- } else {
- return ($conditionKey == 'seq') ? 'eq' : 'neq';
- }
- }
-
- /**
- * Prepare value for save in column
- * Return converted to column data type value
- *
- * @param array $column the column describe array
- * @param mixed $value
- * @return mixed
- */
- public function prepareColumnValue(array $column, $value)
+ public function prepareColumnValue(array $column, $value)
{
if ($value instanceof Zend_Db_Expr) {
return $value;
@@ -3274,23 +2459,6 @@ public function getGreatestSql(array $data)
return new Zend_Db_Expr(sprintf('GREATEST(%s)', implode(', ', $data)));
}
- /**
- * Get Interval Unit SQL fragment
- *
- * @param int $interval
- * @param string $unit
- * @return string
- * @throws Zend_Db_Exception
- */
- protected function _getIntervalUnitSql($interval, $unit)
- {
- if (!isset($this->_intervalUnits[$unit])) {
- throw new Zend_Db_Exception(sprintf('Undefined interval unit "%s" specified', $unit));
- }
-
- return sprintf('INTERVAL %d %s', $interval, $this->_intervalUnits[$unit]);
- }
-
/**
* Add time values (intervals) to a date value
*
@@ -3403,22 +2571,6 @@ public function getDateExtractSql($date, $unit)
return new Zend_Db_Expr($expr);
}
- /**
- * Minus superfluous characters from hash.
- *
- * @param $hash
- * @param $prefix
- * @param $maxCharacters
- * @return string
- */
- protected function _minusSuperfluous($hash, $prefix, $maxCharacters)
- {
- $diff = strlen($hash) + strlen($prefix) - $maxCharacters;
- $superfluous = $diff / 2;
- $odd = $diff % 2;
- return substr($hash, $superfluous, - ($superfluous + $odd));
- }
-
/**
* Retrieve valid table name
* Check table name length and allowed symbols
@@ -3854,112 +3006,6 @@ public function forUpdate($sql)
return sprintf('%s FOR UPDATE', $sql);
}
- /**
- * Prepare insert data
- *
- * @param mixed $row
- * @param array $bind
- * @return string
- */
- protected function _prepareInsertData($row, &$bind)
- {
- if (is_array($row)) {
- $line = [];
- foreach ($row as $value) {
- if ($value instanceof Zend_Db_Expr) {
- $line[] = $value->__toString();
- } else {
- $line[] = '?';
- $bind[] = $value;
- }
- }
- $line = implode(', ', $line);
- } elseif ($row instanceof Zend_Db_Expr) {
- $line = $row->__toString();
- } else {
- $line = '?';
- $bind[] = $row;
- }
-
- return sprintf('(%s)', $line);
- }
-
- /**
- * Return insert sql query
- *
- * @param string $tableName
- * @return string
- */
- protected function _getInsertSqlQuery($tableName, array $columns, array $values)
- {
- $tableName = $this->quoteIdentifier($tableName, true);
- $columns = array_map([$this, 'quoteIdentifier'], $columns);
- $columns = implode(',', $columns);
- $values = implode(', ', $values);
-
- return sprintf('INSERT INTO %s (%s) VALUES %s', $tableName, $columns, $values);
- }
-
- /**
- * Return ddl type
- *
- * @param array $options
- * @return string
- */
- protected function _getDdlType($options)
- {
- $ddlType = null;
- if (isset($options['TYPE'])) {
- $ddlType = $options['TYPE'];
- } elseif (isset($options['COLUMN_TYPE'])) {
- $ddlType = $options['COLUMN_TYPE'];
- }
-
- return $ddlType;
- }
-
- /**
- * Return DDL action
- *
- * @param string $action
- * @return string
- */
- protected function _getDdlAction($action)
- {
- switch ($action) {
- case Varien_Db_Adapter_Interface::FK_ACTION_CASCADE:
- return Varien_Db_Ddl_Table::ACTION_CASCADE;
- case Varien_Db_Adapter_Interface::FK_ACTION_SET_NULL:
- return Varien_Db_Ddl_Table::ACTION_SET_NULL;
- case Varien_Db_Adapter_Interface::FK_ACTION_RESTRICT:
- return Varien_Db_Ddl_Table::ACTION_RESTRICT;
- default:
- return Varien_Db_Ddl_Table::ACTION_NO_ACTION;
- }
- }
-
- /**
- * Prepare sql date condition
- *
- * @param array $condition
- * @param string $key
- * @return string
- */
- protected function _prepareSqlDateCondition($condition, $key)
- {
- if (empty($condition['date'])) {
- if (empty($condition['datetime'])) {
- $result = $condition[$key];
- } else {
- $result = $this->formatDate($condition[$key]);
- }
- } else {
- $result = $this->formatDate($condition[$key]);
- }
-
- return $result;
- }
-
/**
* Try to find installed primary key name, if not - format new one.
*
@@ -3977,40 +3023,6 @@ public function getPrimaryKeyName($tableName, $schemaName = null)
}
}
- /**
- * Parse text size
- * Returns max allowed size if value great it
- *
- * @param string|int $size
- * @return int
- */
- protected function _parseTextSize($size)
- {
- $size = trim($size);
- $last = strtolower(substr($size, -1));
-
- switch ($last) {
- case 'k':
- $size = (int) $size * 1024;
- break;
- case 'm':
- $size = (int) $size * 1024 * 1024;
- break;
- case 'g':
- $size = (int) $size * 1024 * 1024 * 1024;
- break;
- }
-
- if (empty($size)) {
- return Varien_Db_Ddl_Table::DEFAULT_TEXT_SIZE;
- }
- if ($size >= Varien_Db_Ddl_Table::MAX_TEXT_SIZE) {
- return Varien_Db_Ddl_Table::MAX_TEXT_SIZE;
- }
-
- return (int) $size;
- }
-
/**
* Converts fetched blob into raw binary PHP data.
* The MySQL drivers do it nice, no processing required.
@@ -4038,23 +3050,6 @@ public function getSuggestedZeroDate()
return '0000-00-00 00:00:00';
}
- /**
- * Retrieve Foreign Key name
- *
- * @deprecated after 1.6.0.0
- *
- * @param string $fkName
- * @return string
- */
- protected function _getForeignKeyName($fkName)
- {
- if (substr($fkName, 0, 3) != 'FK_') {
- $fkName = 'FK_' . $fkName;
- }
-
- return $fkName;
- }
-
/**
* Drop trigger
*
@@ -4089,12 +3084,1017 @@ public function createTableFromSelect($tableName, Zend_Db_Select $select, $tempo
}
/**
- * Check if all transactions have been committed
+ * Parse a source hostname and generate a host info
+ * @param $hostName
+ *
+ * @return Varien_Object
*/
- public function __destruct()
+ protected function _getHostInfo($hostName)
{
- if ($this->_transactionLevel > 0) {
- trigger_error('Some transactions have not been committed or rolled back', E_USER_ERROR);
- }
+ $hostInfo = new Varien_Object();
+ $matches = [];
+ if (str_contains($hostName, '/')) {
+ $hostInfo->setAddressType(self::ADDRESS_TYPE_UNIX_SOCKET)
+ ->setUnixSocket($hostName);
+ } elseif (preg_match('/^\[(([0-9a-f]{1,4})?(:([0-9a-f]{1,4})?){1,}:([0-9a-f]{1,4}))(%[0-9a-z]+)?\](:([0-9]+))?$/i', $hostName, $matches)) {
+ $hostName = $matches[1];
+ $hostName .= $matches[6] ?? '';
+ $hostInfo->setAddressType(self::ADDRESS_TYPE_IPV6_ADDRESS)
+ ->setHostName($hostName)
+ ->setPort($matches[8] ?? null);
+ } elseif (preg_match('/^(([0-9a-f]{1,4})?(:([0-9a-f]{1,4})?){1,}:([0-9a-f]{1,4}))(%[0-9a-z]+)?$/i', $hostName, $matches)) {
+ $hostName = $matches[1];
+ $hostName .= $matches[6] ?? '';
+ $hostInfo->setAddressType(self::ADDRESS_TYPE_IPV6_ADDRESS)
+ ->setHostName($hostName);
+ } elseif (str_contains($hostName, ':')) {
+ list($hostAddress, $hostPort) = explode(':', $hostName);
+ $hostInfo->setAddressType(
+ filter_var($hostAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)
+ ? self::ADDRESS_TYPE_IPV4_ADDRESS
+ : self::ADDRESS_TYPE_HOSTNAME,
+ )->setHostName($hostAddress)
+ ->setPort($hostPort);
+ } else {
+ $hostInfo->setAddressType(
+ filter_var($hostName, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)
+ ? self::ADDRESS_TYPE_IPV4_ADDRESS
+ : self::ADDRESS_TYPE_HOSTNAME,
+ )->setHostName($hostName);
+ }
+
+ return $hostInfo;
+ }
+
+ /**
+ * Creates a PDO object and connects to the database.
+ *
+ * @throws Zend_Db_Adapter_Exception
+ */
+ protected function _connect()
+ {
+ if ($this->_connection) {
+ return;
+ }
+
+ if (!extension_loaded('pdo_mysql')) {
+ throw new Zend_Db_Adapter_Exception('pdo_mysql extension is not installed');
+ }
+
+ $hostInfo = $this->_getHostInfo($this->_config['host'] ?? $this->_config['unix_socket'] ?? null);
+
+ switch ($hostInfo->getAddressType()) {
+ case self::ADDRESS_TYPE_UNIX_SOCKET:
+ $this->_config['unix_socket'] = $hostInfo->getUnixSocket();
+ unset($this->_config['host']);
+ break;
+ case self::ADDRESS_TYPE_IPV6_ADDRESS: // break intentionally omitted
+ case self::ADDRESS_TYPE_IPV4_ADDRESS: // break intentionally omitted
+ case self::ADDRESS_TYPE_HOSTNAME:
+ $this->_config['host'] = $hostInfo->getHostName();
+ if ($hostInfo->getPort()) {
+ $this->_config['port'] = $hostInfo->getPort();
+ }
+ break;
+ default:
+ break;
+ }
+
+ $this->_debugTimer();
+ parent::_connect();
+ $this->_debugStat(self::DEBUG_CONNECT, '');
+
+ /** @link http://bugs.mysql.com/bug.php?id=18551 */
+ $this->_connection->query("SET SQL_MODE=''");
+
+ if (!$this->_connectionFlagsSet) {
+ $this->_connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
+ $this->_connection->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
+ $this->_connectionFlagsSet = true;
+ }
+ }
+
+ /**
+ * Check transaction level in case of DDL query
+ *
+ * @param string|Zend_Db_Select $sql
+ * @throws Zend_Db_Adapter_Exception
+ */
+ protected function _checkDdlTransaction($sql)
+ {
+ if (is_string($sql) && $this->getTransactionLevel() > 0) {
+ $startSql = strtolower(substr(ltrim($sql), 0, 3));
+ if (in_array($startSql, $this->_ddlRoutines)
+ && (preg_match($this->_tempRoutines, $sql) !== 1)
+ ) {
+ trigger_error(Varien_Db_Adapter_Interface::ERROR_DDL_MESSAGE, E_USER_ERROR);
+ }
+ }
+ }
+
+ /**
+ * Prepares SQL query by moving to bind all special parameters that can be confused with bind placeholders
+ * (e.g. "foo:bar"). And also changes named bind to positional one, because underlying library has problems
+ * with named binds.
+ *
+ * @param Zend_Db_Select|string $sql
+ * @param-out string $sql
+ * @param mixed $bind
+ * @return $this
+ */
+ protected function _prepareQuery(&$sql, &$bind = [])
+ {
+ $sql = (string) $sql;
+ if (!is_array($bind)) {
+ $bind = [$bind];
+ }
+
+ // Mixed bind is not supported - so remember whether it is named bind, to normalize later if required
+ $isNamedBind = false;
+ if ($bind) {
+ foreach ($bind as $k => $v) {
+ if (!is_int($k)) {
+ $isNamedBind = true;
+ if ($k[0] != ':') {
+ $bind[":{$k}"] = $v;
+ unset($bind[$k]);
+ }
+ }
+ }
+ }
+
+ // Special query hook
+ if ($this->_queryHook) {
+ $object = $this->_queryHook['object'];
+ $method = $this->_queryHook['method'];
+ $object->$method($sql, $bind);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Unquote raw string (use for auto-bind)
+ *
+ * @param string $string
+ * @return string
+ */
+ protected function _unQuote($string)
+ {
+ $translate = [
+ '\\000' => "\000",
+ '\\n' => "\n",
+ '\\r' => "\r",
+ '\\\\' => '\\',
+ "\'" => "'",
+ '\\"' => '"',
+ '\\032' => "\032",
+ ];
+ return strtr($string, $translate);
+ }
+
+ /**
+ * Normalizes mixed positional-named bind to positional bind, and replaces named placeholders in query to
+ * '?' placeholders.
+ *
+ * @param string $sql
+ * @param array $bind
+ * @return $this
+ */
+ protected function _convertMixedBind(&$sql, &$bind)
+ {
+ $positions = [];
+ $offset = 0;
+ // get positions
+ while (true) {
+ $pos = strpos($sql, '?', $offset);
+ if ($pos !== false) {
+ $positions[] = $pos;
+ $offset = ++$pos;
+ } else {
+ break;
+ }
+ }
+
+ $bindResult = [];
+ $map = [];
+ foreach ($bind as $k => $v) {
+ // positional
+ if (is_int($k)) {
+ if (!isset($positions[$k])) {
+ continue;
+ }
+ $bindResult[$positions[$k]] = $v;
+ } else {
+ $offset = 0;
+ while (true) {
+ $pos = strpos($sql, $k, $offset);
+ if ($pos === false) {
+ break;
+ } else {
+ $offset = $pos + strlen($k);
+ $bindResult[$pos] = $v;
+ }
+ }
+ $map[$k] = '?';
+ }
+ }
+
+ ksort($bindResult);
+ $bind = array_values($bindResult);
+ $sql = strtr($sql, $map);
+
+ return $this;
+ }
+
+ /**
+ * Split multi statement query
+ *
+ * @param string $sql
+ * @return array
+ */
+ protected function _splitMultiQuery($sql)
+ {
+ $parts = preg_split(
+ '#(;|\'|"|\\\\|//|--|\n|/\*|\*/)#',
+ $sql,
+ -1,
+ PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE,
+ );
+
+ $q = false;
+ $c = false;
+ $stmts = [];
+ $s = '';
+
+ foreach ($parts as $i => $part) {
+ // strings
+ if (($part === "'" || $part === '"') && ($i === 0 || $parts[$i - 1] !== '\\')) {
+ if ($q === false) {
+ $q = $part;
+ } elseif ($q === $part) {
+ $q = false;
+ }
+ }
+
+ // single line comments
+ if (($part === '//' || $part === '--') && ($i === 0 || $parts[$i - 1] === "\n")) {
+ $c = $part;
+ } elseif ($part === "\n" && ($c === '//' || $c === '--')) {
+ $c = false;
+ }
+
+ // multi line comments
+ if ($part === '/*' && $c === false) {
+ $c = '/*';
+ } elseif ($part === '*/' && $c === '/*') {
+ $c = false;
+ }
+
+ // statements
+ if ($part === ';' && $q === false && $c === false) {
+ if (trim($s) !== '') {
+ $stmts[] = trim($s);
+ $s = '';
+ }
+ } else {
+ $s .= $part;
+ }
+ }
+ if (trim($s) !== '') {
+ $stmts[] = trim($s);
+ }
+
+ return $stmts;
+ }
+
+ /**
+ * Remove duplicate entry for create key
+ *
+ * @param string $table
+ * @param array $fields
+ * @param array $ids
+ * @return $this
+ */
+ protected function _removeDuplicateEntry($table, $fields, $ids)
+ {
+ $where = [];
+ $i = 0;
+ foreach ($fields as $field) {
+ $where[] = $this->quoteInto($field . '=?', $ids[$i++]);
+ }
+
+ if (!$where) {
+ return $this;
+ }
+ $whereCond = implode(' AND ', $where);
+ $sql = sprintf('SELECT COUNT(*) as `cnt` FROM `%s` WHERE %s', $table, $whereCond);
+
+ $cnt = $this->raw_fetchRow($sql, 'cnt');
+ if ($cnt > 1) {
+ $sql = sprintf(
+ 'DELETE FROM `%s` WHERE %s LIMIT %d',
+ $table,
+ $whereCond,
+ $cnt - 1,
+ );
+ $this->raw_query($sql);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Start debug timer
+ *
+ * @return $this
+ */
+ protected function _debugTimer()
+ {
+ if ($this->_debug) {
+ $this->_debugTimer = microtime(true);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Logging debug information
+ *
+ * @param int $type
+ * @param string $sql
+ * @param array $bind
+ * @param Zend_Db_Statement_Pdo $result
+ * @return $this
+ */
+ protected function _debugStat($type, $sql, $bind = [], $result = null)
+ {
+ if (!$this->_debug) {
+ return $this;
+ }
+
+ $code = '## ' . getmypid() . ' ## ';
+ $nl = "\n";
+ $time = sprintf('%.4f', microtime(true) - $this->_debugTimer);
+
+ if (!$this->_logAllQueries && $time < $this->_logQueryTime) {
+ return $this;
+ }
+ switch ($type) {
+ case self::DEBUG_CONNECT:
+ $code .= 'CONNECT' . $nl;
+ break;
+ case self::DEBUG_TRANSACTION:
+ $code .= 'TRANSACTION ' . $sql . $nl;
+ break;
+ case self::DEBUG_QUERY:
+ $code .= 'QUERY' . $nl;
+ $code .= 'SQL: ' . $sql . $nl;
+ if ($bind) {
+ $code .= 'BIND: ' . var_export($bind, true) . $nl;
+ }
+ if ($result instanceof Zend_Db_Statement_Pdo) {
+ $code .= 'AFF: ' . $result->rowCount() . $nl;
+ }
+ break;
+ }
+ $code .= 'TIME: ' . $time . $nl;
+
+ if ($this->_logCallStack) {
+ $code .= 'TRACE: ' . Varien_Debug::backtrace(true, false) . $nl;
+ }
+
+ $code .= $nl;
+
+ $this->_debugWriteToFile($code);
+
+ return $this;
+ }
+
+ /**
+ * Write exception and throw
+ *
+ * @throws Exception
+ */
+ protected function _debugException(Exception $e)
+ {
+ if (!$this->_debug) {
+ throw $e;
+ }
+
+ $nl = "\n";
+ $code = 'EXCEPTION ' . $nl . $e . $nl . $nl;
+ $this->_debugWriteToFile($code);
+
+ throw $e;
+ }
+
+ /**
+ * Debug write to file process
+ *
+ * @param string $str
+ */
+ protected function _debugWriteToFile($str)
+ {
+ $str = '## ' . date(self::TIMESTAMP_FORMAT) . "\r\n" . $str;
+ if (!$this->_debugIoAdapter) {
+ $this->_debugIoAdapter = new Varien_Io_File();
+ $dir = Mage::getBaseDir() . DS . $this->_debugIoAdapter->dirname($this->_debugFile);
+ $this->_debugIoAdapter->checkAndCreateFolder($dir);
+ $this->_debugIoAdapter->open(['path' => $dir]);
+ $this->_debugFile = basename($this->_debugFile);
+ }
+
+ $this->_debugIoAdapter->streamOpen($this->_debugFile, 'a');
+ $this->_debugIoAdapter->streamLock();
+ $this->_debugIoAdapter->streamWrite($str);
+ $this->_debugIoAdapter->streamUnlock();
+ $this->_debugIoAdapter->streamClose();
+ }
+
+ /**
+ * Retrieve ddl cache name
+ *
+ * @param string $tableName
+ * @param string $schemaName
+ */
+ protected function _getTableName($tableName, $schemaName = null)
+ {
+ return ($schemaName ? $schemaName . '.' : '') . $tableName;
+ }
+
+ /**
+ * Retrieve Id for cache
+ *
+ * @param string $tableKey
+ * @param int $ddlType
+ * @return string
+ */
+ protected function _getCacheId($tableKey, $ddlType)
+ {
+ return sprintf('%s_%s_%s', self::DDL_CACHE_PREFIX, $tableKey, $ddlType);
+ }
+
+ /**
+ * Retrieve column data type by data from describe table
+ *
+ * @param array $column
+ * @return string|void
+ */
+ protected function _getColumnTypeByDdl($column)
+ {
+ switch ($column['DATA_TYPE']) {
+ case 'bool':
+ return Varien_Db_Ddl_Table::TYPE_BOOLEAN;
+ case 'tinytext':
+ case 'char':
+ case 'varchar':
+ case 'text':
+ case 'mediumtext':
+ case 'longtext':
+ return Varien_Db_Ddl_Table::TYPE_TEXT;
+ case 'blob':
+ case 'mediumblob':
+ case 'longblob':
+ return Varien_Db_Ddl_Table::TYPE_BLOB;
+ case 'tinyint':
+ case 'tinyint unsigned':
+ case 'smallint':
+ case 'smallint unsigned':
+ return Varien_Db_Ddl_Table::TYPE_SMALLINT;
+ case 'mediumint':
+ case 'int':
+ case 'int unsigned':
+ return Varien_Db_Ddl_Table::TYPE_INTEGER;
+ case 'bigint':
+ case 'bigint unsigned':
+ return Varien_Db_Ddl_Table::TYPE_BIGINT;
+ case 'datetime':
+ return Varien_Db_Ddl_Table::TYPE_DATETIME;
+ case 'timestamp':
+ return Varien_Db_Ddl_Table::TYPE_TIMESTAMP;
+ case 'date':
+ return Varien_Db_Ddl_Table::TYPE_DATE;
+ case 'float':
+ return Varien_Db_Ddl_Table::TYPE_FLOAT;
+ case 'decimal':
+ case 'numeric':
+ return Varien_Db_Ddl_Table::TYPE_DECIMAL;
+ case 'varbinary':
+ return Varien_Db_Ddl_Table::TYPE_VARBINARY;
+ }
+ }
+
+ /**
+ * Retrieve columns and primary keys definition array for create table
+ *
+ * @return array
+ * @throws Zend_Db_Exception
+ */
+ protected function _getColumnsDefinition(Varien_Db_Ddl_Table $table)
+ {
+ $definition = [];
+ $primary = [];
+ $columns = $table->getColumns();
+ if (empty($columns)) {
+ throw new Zend_Db_Exception('Table columns are not defined');
+ }
+
+ foreach ($columns as $columnData) {
+ $columnDefinition = $this->_getColumnDefinition($columnData);
+ if ($columnData['PRIMARY']) {
+ $primary[$columnData['COLUMN_NAME']] = $columnData['PRIMARY_POSITION'];
+ }
+
+ $definition[] = sprintf(
+ ' %s %s',
+ $this->quoteIdentifier($columnData['COLUMN_NAME']),
+ $columnDefinition,
+ );
+ }
+
+ // PRIMARY KEY
+ if (!empty($primary)) {
+ asort($primary, SORT_NUMERIC);
+ $primary = array_map([$this, 'quoteIdentifier'], array_keys($primary));
+ $definition[] = sprintf(' PRIMARY KEY (%s)', implode(', ', $primary));
+ }
+
+ return $definition;
+ }
+
+ /**
+ * Retrieve table indexes definition array for create table
+ *
+ * @return array
+ */
+ protected function _getIndexesDefinition(Varien_Db_Ddl_Table $table)
+ {
+ $definition = [];
+ $indexes = $table->getIndexes();
+ if (!empty($indexes)) {
+ foreach ($indexes as $indexData) {
+ if (!empty($indexData['TYPE'])) {
+ switch ($indexData['TYPE']) {
+ case 'primary':
+ $indexType = 'PRIMARY KEY';
+ unset($indexData['INDEX_NAME']);
+ break;
+ default:
+ $indexType = strtoupper($indexData['TYPE']);
+ break;
+ }
+ } else {
+ $indexType = 'KEY';
+ }
+
+ $columns = [];
+ foreach ($indexData['COLUMNS'] as $columnData) {
+ $column = $this->quoteIdentifier($columnData['NAME']);
+ if (!empty($columnData['SIZE'])) {
+ $column .= sprintf('(%d)', $columnData['SIZE']);
+ }
+ $columns[] = $column;
+ }
+ $indexName = isset($indexData['INDEX_NAME']) ? $this->quoteIdentifier($indexData['INDEX_NAME']) : '';
+ $definition[] = sprintf(
+ ' %s %s (%s)',
+ $indexType,
+ $indexName,
+ implode(', ', $columns),
+ );
+ }
+ }
+
+ return $definition;
+ }
+
+ /**
+ * Retrieve table foreign keys definition array for create table
+ *
+ * @return array
+ */
+ protected function _getForeignKeysDefinition(Varien_Db_Ddl_Table $table)
+ {
+ $definition = [];
+ $relations = $table->getForeignKeys();
+
+ if (!empty($relations)) {
+ foreach ($relations as $fkData) {
+ $onDelete = $this->_getDdlAction($fkData['ON_DELETE']);
+ $onUpdate = $this->_getDdlAction($fkData['ON_UPDATE']);
+
+ $definition[] = sprintf(
+ ' CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s) ON DELETE %s ON UPDATE %s',
+ $this->quoteIdentifier($fkData['FK_NAME']),
+ $this->quoteIdentifier($fkData['COLUMN_NAME']),
+ $this->quoteIdentifier($fkData['REF_TABLE_NAME']),
+ $this->quoteIdentifier($fkData['REF_COLUMN_NAME']),
+ $onDelete,
+ $onUpdate,
+ );
+ }
+ }
+
+ return $definition;
+ }
+
+ /**
+ * Retrieve table options definition array for create table
+ *
+ * @return array
+ * @throws Zend_Db_Exception
+ */
+ protected function _getOptionsDefinition(Varien_Db_Ddl_Table $table)
+ {
+ $definition = [];
+ $comment = $table->getComment();
+ if (empty($comment)) {
+ throw new Zend_Db_Exception('Comment for table is required and must be defined');
+ }
+ $definition[] = $this->quoteInto('COMMENT=?', $comment);
+
+ $tableProps = [
+ 'type' => 'ENGINE=%s',
+ 'checksum' => 'CHECKSUM=%d',
+ 'auto_increment' => 'AUTO_INCREMENT=%d',
+ 'avg_row_length' => 'AVG_ROW_LENGTH=%d',
+ 'max_rows' => 'MAX_ROWS=%d',
+ 'min_rows' => 'MIN_ROWS=%d',
+ 'delay_key_write' => 'DELAY_KEY_WRITE=%d',
+ 'row_format' => 'row_format=%s',
+ 'charset' => 'charset=%s',
+ 'collate' => 'COLLATE=%s',
+ ];
+ foreach ($tableProps as $key => $mask) {
+ $v = $table->getOption($key);
+ if ($v !== null) {
+ $definition[] = sprintf($mask, $v);
+ }
+ }
+
+ return $definition;
+ }
+
+ /**
+ * Retrieve column definition fragment
+ *
+ * @param array $options
+ * @param string $ddlType Table DDL Column type constant
+ * @throws Varien_Exception
+ * @return string
+ * @throws Zend_Db_Exception
+ */
+ protected function _getColumnDefinition($options, $ddlType = null)
+ {
+ // convert keys to uppercase
+ $options = array_change_key_case($options, CASE_UPPER);
+ $cType = null;
+ $cUnsigned = false;
+ $cNullable = true;
+ $cDefault = false;
+ $cIdentity = false;
+
+ // detect and validate column type
+ if ($ddlType === null) {
+ $ddlType = $this->_getDdlType($options);
+ }
+
+ if (empty($ddlType) || !isset($this->_ddlColumnTypes[$ddlType])) {
+ throw new Zend_Db_Exception('Invalid column definition data');
+ }
+
+ // column size
+ $cType = $this->_ddlColumnTypes[$ddlType];
+ switch ($ddlType) {
+ case Varien_Db_Ddl_Table::TYPE_SMALLINT:
+ case Varien_Db_Ddl_Table::TYPE_INTEGER:
+ case Varien_Db_Ddl_Table::TYPE_BIGINT:
+ if (!empty($options['UNSIGNED'])) {
+ $cUnsigned = true;
+ }
+ break;
+ case Varien_Db_Ddl_Table::TYPE_DECIMAL:
+ case Varien_Db_Ddl_Table::TYPE_NUMERIC:
+ $precision = 10;
+ $scale = 0;
+ $match = [];
+ if (!empty($options['LENGTH']) && preg_match('#^\(?(\d+),(\d+)\)?$#', $options['LENGTH'], $match)) {
+ $precision = $match[1];
+ $scale = $match[2];
+ } else {
+ if (isset($options['SCALE']) && is_numeric($options['SCALE'])) {
+ $scale = $options['SCALE'];
+ }
+ if (isset($options['PRECISION']) && is_numeric($options['PRECISION'])) {
+ $precision = $options['PRECISION'];
+ }
+ }
+ $cType .= sprintf('(%d,%d)', $precision, $scale);
+ break;
+ case Varien_Db_Ddl_Table::TYPE_TEXT:
+ case Varien_Db_Ddl_Table::TYPE_BLOB:
+ case Varien_Db_Ddl_Table::TYPE_VARBINARY:
+ if (empty($options['LENGTH'])) {
+ $length = Varien_Db_Ddl_Table::DEFAULT_TEXT_SIZE;
+ } else {
+ $length = $this->_parseTextSize($options['LENGTH']);
+ }
+ if ($length <= 255) {
+ $cType = $ddlType == Varien_Db_Ddl_Table::TYPE_TEXT ? 'varchar' : 'varbinary';
+ $cType = sprintf('%s(%d)', $cType, $length);
+ } elseif ($length > 255 && $length <= 65536) {
+ $cType = $ddlType == Varien_Db_Ddl_Table::TYPE_TEXT ? 'text' : 'blob';
+ } elseif ($length > 65536 && $length <= 16777216) {
+ $cType = $ddlType == Varien_Db_Ddl_Table::TYPE_TEXT ? 'mediumtext' : 'mediumblob';
+ } else {
+ $cType = $ddlType == Varien_Db_Ddl_Table::TYPE_TEXT ? 'longtext' : 'longblob';
+ }
+ break;
+ }
+
+ if (array_key_exists('DEFAULT', $options)) {
+ $cDefault = $options['DEFAULT'];
+ }
+ if (array_key_exists('NULLABLE', $options)) {
+ $cNullable = (bool) $options['NULLABLE'];
+ }
+ if (!empty($options['IDENTITY']) || !empty($options['AUTO_INCREMENT'])) {
+ $cIdentity = true;
+ }
+
+ /* For cases when tables created from createTableByDdl()
+ * where default value can be quoted already.
+ * We need to avoid "double-quoting" here
+ */
+ if ($cDefault !== null && strlen($cDefault)) {
+ $cDefault = str_replace("'", '', $cDefault);
+ }
+
+ // prepare default value string
+ if ($ddlType == Varien_Db_Ddl_Table::TYPE_TIMESTAMP) {
+ if ($cDefault === null) {
+ $cDefault = new Zend_Db_Expr('NULL');
+ } elseif ($cDefault == Varien_Db_Ddl_Table::TIMESTAMP_INIT) {
+ $cDefault = new Zend_Db_Expr('CURRENT_TIMESTAMP');
+ } elseif ($cDefault == Varien_Db_Ddl_Table::TIMESTAMP_UPDATE) {
+ $cDefault = new Zend_Db_Expr('0 ON UPDATE CURRENT_TIMESTAMP');
+ } elseif ($cDefault == Varien_Db_Ddl_Table::TIMESTAMP_INIT_UPDATE) {
+ $cDefault = new Zend_Db_Expr('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP');
+ } elseif ($cNullable && !$cDefault) {
+ $cDefault = new Zend_Db_Expr('NULL');
+ } else {
+ $cDefault = new Zend_Db_Expr('0');
+ }
+ } elseif (is_null($cDefault) && $cNullable) {
+ $cDefault = new Zend_Db_Expr('NULL');
+ }
+
+ if (empty($options['COMMENT'])) {
+ $comment = '';
+ } else {
+ $comment = $options['COMMENT'];
+ }
+
+ //set column position
+ $after = null;
+ if (!empty($options['AFTER'])) {
+ $after = $options['AFTER'];
+ }
+
+ return sprintf(
+ '%s%s%s%s%s COMMENT %s %s',
+ $cType,
+ $cUnsigned ? ' UNSIGNED' : '',
+ $cNullable ? ' NULL' : ' NOT NULL',
+ $cDefault !== false ? $this->quoteInto(' default ?', $cDefault) : '',
+ $cIdentity ? ' auto_increment' : '',
+ $this->quote($comment),
+ $after ? 'AFTER ' . $this->quoteIdentifier($after) : '',
+ );
+ }
+
+ /**
+ * Prepare Sql condition
+ *
+ * @param string $text Condition value
+ * @param mixed $value
+ * @param string $fieldName
+ * @return string
+ */
+ protected function _prepareQuotedSqlCondition($text, $value, $fieldName)
+ {
+ $value = is_string($value) ? str_replace("\0", '', $value) : $value;
+ $sql = $this->quoteInto($text, $value);
+ return str_replace('{{fieldName}}', (string) $fieldName, $sql);
+ }
+
+ /**
+ * Transforms sql condition key 'seq' / 'sneq' that is used for comparing string values to its analog:
+ * - 'null' / 'notnull' for empty strings
+ * - 'eq' / 'neq' for non-empty strings
+ *
+ * @param string $conditionKey
+ * @param mixed $value
+ * @return string
+ */
+ protected function _transformStringSqlCondition($conditionKey, $value)
+ {
+ $value = str_replace("\0", '', (string) $value);
+ if ($value == '') {
+ return ($conditionKey == 'seq') ? 'null' : 'notnull';
+ } else {
+ return ($conditionKey == 'seq') ? 'eq' : 'neq';
+ }
+ }
+
+ /**
+ * Get Interval Unit SQL fragment
+ *
+ * @param int $interval
+ * @param string $unit
+ * @return string
+ * @throws Zend_Db_Exception
+ */
+ protected function _getIntervalUnitSql($interval, $unit)
+ {
+ if (!isset($this->_intervalUnits[$unit])) {
+ throw new Zend_Db_Exception(sprintf('Undefined interval unit "%s" specified', $unit));
+ }
+
+ return sprintf('INTERVAL %d %s', $interval, $this->_intervalUnits[$unit]);
+ }
+
+ /**
+ * Minus superfluous characters from hash.
+ *
+ * @param $hash
+ * @param $prefix
+ * @param $maxCharacters
+ * @return string
+ */
+ protected function _minusSuperfluous($hash, $prefix, $maxCharacters)
+ {
+ $diff = strlen($hash) + strlen($prefix) - $maxCharacters;
+ $superfluous = $diff / 2;
+ $odd = $diff % 2;
+ return substr($hash, $superfluous, - ($superfluous + $odd));
+ }
+
+ /**
+ * Prepare insert data
+ *
+ * @param mixed $row
+ * @param array $bind
+ * @return string
+ */
+ protected function _prepareInsertData($row, &$bind)
+ {
+ if (is_array($row)) {
+ $line = [];
+ foreach ($row as $value) {
+ if ($value instanceof Zend_Db_Expr) {
+ $line[] = $value->__toString();
+ } else {
+ $line[] = '?';
+ $bind[] = $value;
+ }
+ }
+ $line = implode(', ', $line);
+ } elseif ($row instanceof Zend_Db_Expr) {
+ $line = $row->__toString();
+ } else {
+ $line = '?';
+ $bind[] = $row;
+ }
+
+ return sprintf('(%s)', $line);
+ }
+
+ /**
+ * Return insert sql query
+ *
+ * @param string $tableName
+ * @return string
+ */
+ protected function _getInsertSqlQuery($tableName, array $columns, array $values)
+ {
+ $tableName = $this->quoteIdentifier($tableName, true);
+ $columns = array_map([$this, 'quoteIdentifier'], $columns);
+ $columns = implode(',', $columns);
+ $values = implode(', ', $values);
+
+ return sprintf('INSERT INTO %s (%s) VALUES %s', $tableName, $columns, $values);
+ }
+
+ /**
+ * Return ddl type
+ *
+ * @param array $options
+ * @return string
+ */
+ protected function _getDdlType($options)
+ {
+ $ddlType = null;
+ if (isset($options['TYPE'])) {
+ $ddlType = $options['TYPE'];
+ } elseif (isset($options['COLUMN_TYPE'])) {
+ $ddlType = $options['COLUMN_TYPE'];
+ }
+
+ return $ddlType;
+ }
+
+ /**
+ * Return DDL action
+ *
+ * @param string $action
+ * @return string
+ */
+ protected function _getDdlAction($action)
+ {
+ switch ($action) {
+ case Varien_Db_Adapter_Interface::FK_ACTION_CASCADE:
+ return Varien_Db_Ddl_Table::ACTION_CASCADE;
+ case Varien_Db_Adapter_Interface::FK_ACTION_SET_NULL:
+ return Varien_Db_Ddl_Table::ACTION_SET_NULL;
+ case Varien_Db_Adapter_Interface::FK_ACTION_RESTRICT:
+ return Varien_Db_Ddl_Table::ACTION_RESTRICT;
+ default:
+ return Varien_Db_Ddl_Table::ACTION_NO_ACTION;
+ }
+ }
+
+ /**
+ * Prepare sql date condition
+ *
+ * @param array $condition
+ * @param string $key
+ * @return string
+ */
+ protected function _prepareSqlDateCondition($condition, $key)
+ {
+ if (empty($condition['date'])) {
+ if (empty($condition['datetime'])) {
+ $result = $condition[$key];
+ } else {
+ $result = $this->formatDate($condition[$key]);
+ }
+ } else {
+ $result = $this->formatDate($condition[$key]);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Parse text size
+ * Returns max allowed size if value great it
+ *
+ * @param string|int $size
+ * @return int
+ */
+ protected function _parseTextSize($size)
+ {
+ $size = trim($size);
+ $last = strtolower(substr($size, -1));
+
+ switch ($last) {
+ case 'k':
+ $size = (int) $size * 1024;
+ break;
+ case 'm':
+ $size = (int) $size * 1024 * 1024;
+ break;
+ case 'g':
+ $size = (int) $size * 1024 * 1024 * 1024;
+ break;
+ }
+
+ if (empty($size)) {
+ return Varien_Db_Ddl_Table::DEFAULT_TEXT_SIZE;
+ }
+ if ($size >= Varien_Db_Ddl_Table::MAX_TEXT_SIZE) {
+ return Varien_Db_Ddl_Table::MAX_TEXT_SIZE;
+ }
+
+ return (int) $size;
+ }
+
+ /**
+ * Retrieve Foreign Key name
+ *
+ * @deprecated after 1.6.0.0
+ *
+ * @param string $fkName
+ * @return string
+ */
+ protected function _getForeignKeyName($fkName)
+ {
+ if (substr($fkName, 0, 3) != 'FK_') {
+ $fkName = 'FK_' . $fkName;
+ }
+
+ return $fkName;
}
}
diff --git a/lib/Varien/Db/Select.php b/lib/Varien/Db/Select.php
index feaf5a4e399..5a18f12efab 100644
--- a/lib/Varien/Db/Select.php
+++ b/lib/Varien/Db/Select.php
@@ -174,104 +174,6 @@ public function resetJoinLeft()
return $this;
}
- /**
- * Validate LEFT joins, and remove it if not exists
- *
- * @return $this
- */
- protected function _resetJoinLeft()
- {
- foreach ($this->_parts[self::FROM] as $tableId => $tableProp) {
- if ($tableProp['joinType'] == self::LEFT_JOIN) {
- if ($tableProp['useInCond']) {
- continue;
- }
-
- $used = false;
- foreach ($tableProp['joinInTables'] as $table) {
- if (isset($this->_parts[self::FROM][$table])) {
- $used = true;
- break;
- }
- }
-
- if (!$used) {
- unset($this->_parts[self::FROM][$tableId]);
- return $this->_resetJoinLeft();
- }
- }
- }
-
- return $this;
- }
-
- /**
- * Find table name in condition (where, column)
- *
- * @param string $table
- * @param string $cond
- * @return bool
- */
- protected function _findTableInCond($table, $cond)
- {
- $cond = (string) $cond;
- $quote = $this->_adapter->getQuoteIdentifierSymbol();
-
- if (strpos($cond, $quote . $table . $quote . '.') !== false) {
- return true;
- }
-
- $position = 0;
- $result = 0;
- $needle = [];
- while (is_integer($result)) {
- $result = strpos($cond, $table . '.', $position);
- if (is_integer($result)) {
- $needle[] = $result;
- $position = ($result + strlen($table) + 1);
- }
- }
-
- if (!$needle) {
- return false;
- }
-
- foreach ($needle as $position) {
- if ($position == 0) {
- return true;
- }
- if (!preg_match('#[a-z0-9_]#is', substr($cond, $position - 1, 1))) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Populate the {@link $_parts} 'join' key
- *
- * Does the dirty work of populating the join key.
- *
- * The $name and $cols parameters follow the same logic
- * as described in the from() method.
- *
- * @param null|string $type Type of join; inner, left, and null are currently supported
- * @param array|string|Zend_Db_Expr $name Table name
- * @param string $cond Join on this condition
- * @param array|string $cols The columns to select from the joined table
- * @param string $schema The database name to specify, if any.
- * @return Zend_Db_Select This Zend_Db_Select object
- * @throws Zend_Db_Select_Exception
- */
- protected function _join($type, $name, $cond, $cols, $schema = null)
- {
- if ($type == self::INNER_JOIN && empty($cond)) {
- $type = self::CROSS_JOIN;
- }
- return parent::_join($type, $name, $cond, $cols, $schema);
- }
-
/**
* Sets a limit count and offset to the query.
*
@@ -373,6 +275,140 @@ public function useStraightJoin($flag = true)
return $this;
}
+ /**
+ * Adds the random order to query
+ *
+ * @param string $field integer field name
+ * @return $this
+ */
+ public function orderRand($field = null)
+ {
+ $this->_adapter->orderRand($this, $field);
+ return $this;
+ }
+ /**
+ * Add EXISTS clause
+ *
+ * @param Varien_Db_Select $select
+ * @param string $joinCondition
+ * @param bool $isExists
+ * @return $this
+ */
+ public function exists($select, $joinCondition, $isExists = true)
+ {
+ if ($isExists) {
+ $exists = 'EXISTS (%s)';
+ } else {
+ $exists = 'NOT EXISTS (%s)';
+ }
+ $select->reset(self::COLUMNS)
+ ->columns([new Zend_Db_Expr('1')])
+ ->where($joinCondition);
+
+ $exists = sprintf($exists, $select->assemble());
+
+ $this->where($exists);
+ return $this;
+ }
+
+ /**
+ * Validate LEFT joins, and remove it if not exists
+ *
+ * @return $this
+ */
+ protected function _resetJoinLeft()
+ {
+ foreach ($this->_parts[self::FROM] as $tableId => $tableProp) {
+ if ($tableProp['joinType'] == self::LEFT_JOIN) {
+ if ($tableProp['useInCond']) {
+ continue;
+ }
+
+ $used = false;
+ foreach ($tableProp['joinInTables'] as $table) {
+ if (isset($this->_parts[self::FROM][$table])) {
+ $used = true;
+ break;
+ }
+ }
+
+ if (!$used) {
+ unset($this->_parts[self::FROM][$tableId]);
+ return $this->_resetJoinLeft();
+ }
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Find table name in condition (where, column)
+ *
+ * @param string $table
+ * @param string $cond
+ * @return bool
+ */
+ protected function _findTableInCond($table, $cond)
+ {
+ $cond = (string) $cond;
+ $quote = $this->_adapter->getQuoteIdentifierSymbol();
+
+ if (strpos($cond, $quote . $table . $quote . '.') !== false) {
+ return true;
+ }
+
+ $position = 0;
+ $result = 0;
+ $needle = [];
+ while (is_integer($result)) {
+ $result = strpos($cond, $table . '.', $position);
+ if (is_integer($result)) {
+ $needle[] = $result;
+ $position = ($result + strlen($table) + 1);
+ }
+ }
+
+ if (!$needle) {
+ return false;
+ }
+
+ foreach ($needle as $position) {
+ if ($position == 0) {
+ return true;
+ }
+ if (!preg_match('#[a-z0-9_]#is', substr($cond, $position - 1, 1))) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Populate the {@link $_parts} 'join' key
+ *
+ * Does the dirty work of populating the join key.
+ *
+ * The $name and $cols parameters follow the same logic
+ * as described in the from() method.
+ *
+ * @param null|string $type Type of join; inner, left, and null are currently supported
+ * @param array|string|Zend_Db_Expr $name Table name
+ * @param string $cond Join on this condition
+ * @param array|string $cols The columns to select from the joined table
+ * @param string $schema The database name to specify, if any.
+ * @return Zend_Db_Select This Zend_Db_Select object
+ * @throws Zend_Db_Select_Exception
+ */
+ protected function _join($type, $name, $cond, $cols, $schema = null)
+ {
+ if ($type == self::INNER_JOIN && empty($cond)) {
+ $type = self::CROSS_JOIN;
+ }
+ return parent::_join($type, $name, $cond, $cols, $schema);
+ }
+
/**
* Render STRAIGHT_JOIN clause
*
@@ -406,18 +442,6 @@ protected function _tableCols($correlationName, $cols, $afterCorrelationName = n
parent::_tableCols($correlationName, $cols, $afterCorrelationName);
}
- /**
- * Adds the random order to query
- *
- * @param string $field integer field name
- * @return $this
- */
- public function orderRand($field = null)
- {
- $this->_adapter->orderRand($this, $field);
- return $this;
- }
-
/**
* Render FOR UPDATE clause
*
@@ -432,28 +456,4 @@ protected function _renderForupdate($sql)
return $sql;
}
- /**
- * Add EXISTS clause
- *
- * @param Varien_Db_Select $select
- * @param string $joinCondition
- * @param bool $isExists
- * @return $this
- */
- public function exists($select, $joinCondition, $isExists = true)
- {
- if ($isExists) {
- $exists = 'EXISTS (%s)';
- } else {
- $exists = 'NOT EXISTS (%s)';
- }
- $select->reset(self::COLUMNS)
- ->columns([new Zend_Db_Expr('1')])
- ->where($joinCondition);
-
- $exists = sprintf($exists, $select->assemble());
-
- $this->where($exists);
- return $this;
- }
}
diff --git a/lib/Varien/Db/Statement/Parameter.php b/lib/Varien/Db/Statement/Parameter.php
index 13c2834bbd5..d868b2e8f29 100644
--- a/lib/Varien/Db/Statement/Parameter.php
+++ b/lib/Varien/Db/Statement/Parameter.php
@@ -72,6 +72,16 @@ public function __construct($value)
$this->_additional = new Varien_Object();
}
+ /**
+ * Returns representation of a object to be used in string contexts
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return (string) $this->_value;
+ }
+
/**
* Sets parameter value.
*
@@ -212,16 +222,6 @@ public function getAdditional()
return $this->_additional;
}
- /**
- * Returns representation of a object to be used in string contexts
- *
- * @return string
- */
- public function __toString()
- {
- return (string) $this->_value;
- }
-
/**
* Returns representation of a object to be used in string contexts
*
diff --git a/lib/Varien/Db/Tree.php b/lib/Varien/Db/Tree.php
index 1838aa0f05e..db898fe00b7 100644
--- a/lib/Varien/Db/Tree.php
+++ b/lib/Varien/Db/Tree.php
@@ -121,6 +121,78 @@ public function __construct($config = [])
}
}
+ public function __moveNode($eId, $pId, $aId = 0)
+ {
+ $eInfo = $this->getNodeInfo($eId);
+ $level = $eInfo[$this->_level];
+ $left_key = $eInfo[$this->_left];
+ $right_key = $eInfo[$this->_right];
+ $right_key_near = 0;
+ $left_key_near = 0;
+ $skew_level = 0;
+
+ if ($pId != 0) {
+ $pInfo = $this->getNodeInfo($pId);
+ $skew_level = $pInfo[$this->_level] - $eInfo[$this->_level] + 1;
+ }
+ if ($aId != 0) {
+ $aInfo = $this->getNodeInfo($aId);
+ }
+
+ if ($pId == 0) { //move to root
+ $right_key_near = $this->_db->fetchOne('SELECT MAX(' . $this->_right . ') FROM ' . $this->_table);
+ } elseif (isset($aInfo) && $aId != 0 && $pId == $eInfo[$this->_pid]) { // if we have after ID
+ $right_key_near = $aInfo[$this->_right];
+ $left_key_near = $aInfo[$this->_left];
+ } elseif (isset($pInfo) && $aId == 0 && $pId == $eInfo[$this->_pid]) { // if we do not have after ID
+ $right_key_near = $pInfo[$this->_left];
+ } elseif (isset($pInfo) && $pId != $eInfo[$this->_pid]) {
+ $right_key_near = $pInfo[$this->_right] - 1;
+ }
+
+ $skew_tree = $eInfo[$this->_right] - $eInfo[$this->_left] + 1;
+ echo "alert('" . $right_key_near . "');";
+
+ if ($right_key_near > $right_key) { // up
+ echo "alert('move up');";
+ $skew_edit = $right_key_near - $left_key + 1;
+ $sql = 'UPDATE ' . $this->_table . '
+ SET
+ ' . $this->_right . ' = IF(' . $this->_left . ' >= ' . $eInfo[$this->_left] . ', ' . $this->_right . ' + ' . $skew_edit . ', IF(' . $this->_right . ' < ' . $eInfo[$this->_left] . ', ' . $this->_right . ' + ' . $skew_tree . ', ' . $this->_right . ')),
+ ' . $this->_level . ' = IF(' . $this->_left . ' >= ' . $eInfo[$this->_left] . ', ' . $this->_level . ' + ' . $skew_level . ', ' . $this->_level . '),
+ ' . $this->_left . ' = IF(' . $this->_left . ' >= ' . $eInfo[$this->_left] . ', ' . $this->_left . ' + ' . $skew_edit . ', IF(' . $this->_left . ' > ' . $right_key_near . ', ' . $this->_left . ' + ' . $skew_tree . ', ' . $this->_left . '))
+ WHERE ' . $this->_right . ' > ' . $right_key_near . ' AND ' . $this->_left . ' < ' . $eInfo[$this->_right];
+ } elseif ($right_key_near < $right_key) { // down
+ echo "alert('move down');";
+ $skew_edit = $right_key_near - $left_key + 1 - $skew_tree;
+ $sql = 'UPDATE ' . $this->_table . '
+ SET
+ ' . $this->_left . ' = IF(' . $this->_right . ' <= ' . $right_key . ', ' . $this->_left . ' + ' . $skew_edit . ', IF(' . $this->_left . ' > ' . $right_key . ', ' . $this->_left . ' - ' . $skew_tree . ', ' . $this->_left . ')),
+ ' . $this->_level . ' = IF(' . $this->_right . ' <= ' . $right_key . ', ' . $this->_level . ' + ' . $skew_level . ', ' . $this->_level . '),
+ ' . $this->_right . ' = IF(' . $this->_right . ' <= ' . $right_key . ', ' . $this->_right . ' + ' . $skew_edit . ', IF(' . $this->_right . ' <= ' . $right_key_near . ', ' . $this->_right . ' - ' . $skew_tree . ', ' . $this->_right . '))
+ WHERE
+ ' . $this->_right . ' > ' . $left_key . ' AND ' . $this->_left . ' <= ' . $right_key_near;
+ }
+
+ if (isset($sql)) {
+ $this->_db->beginTransaction();
+ try {
+ $this->_db->query($sql);
+ //$afrows = $this->_db->get
+ $this->_db->commit();
+ } catch (Exception $e) {
+ $this->_db->rollBack();
+ echo $e->getMessage();
+ echo "
\r\n";
+ echo $sql;
+ echo "
\r\n";
+ exit();
+ }
+ }
+
+ echo "alert('node added')";
+ }
+
/**
* set name of id field
*
@@ -397,78 +469,6 @@ public function moveNode($eId, $pId, $aId = 0)
}
}
- public function __moveNode($eId, $pId, $aId = 0)
- {
- $eInfo = $this->getNodeInfo($eId);
- $level = $eInfo[$this->_level];
- $left_key = $eInfo[$this->_left];
- $right_key = $eInfo[$this->_right];
- $right_key_near = 0;
- $left_key_near = 0;
- $skew_level = 0;
-
- if ($pId != 0) {
- $pInfo = $this->getNodeInfo($pId);
- $skew_level = $pInfo[$this->_level] - $eInfo[$this->_level] + 1;
- }
- if ($aId != 0) {
- $aInfo = $this->getNodeInfo($aId);
- }
-
- if ($pId == 0) { //move to root
- $right_key_near = $this->_db->fetchOne('SELECT MAX(' . $this->_right . ') FROM ' . $this->_table);
- } elseif (isset($aInfo) && $aId != 0 && $pId == $eInfo[$this->_pid]) { // if we have after ID
- $right_key_near = $aInfo[$this->_right];
- $left_key_near = $aInfo[$this->_left];
- } elseif (isset($pInfo) && $aId == 0 && $pId == $eInfo[$this->_pid]) { // if we do not have after ID
- $right_key_near = $pInfo[$this->_left];
- } elseif (isset($pInfo) && $pId != $eInfo[$this->_pid]) {
- $right_key_near = $pInfo[$this->_right] - 1;
- }
-
- $skew_tree = $eInfo[$this->_right] - $eInfo[$this->_left] + 1;
- echo "alert('" . $right_key_near . "');";
-
- if ($right_key_near > $right_key) { // up
- echo "alert('move up');";
- $skew_edit = $right_key_near - $left_key + 1;
- $sql = 'UPDATE ' . $this->_table . '
- SET
- ' . $this->_right . ' = IF(' . $this->_left . ' >= ' . $eInfo[$this->_left] . ', ' . $this->_right . ' + ' . $skew_edit . ', IF(' . $this->_right . ' < ' . $eInfo[$this->_left] . ', ' . $this->_right . ' + ' . $skew_tree . ', ' . $this->_right . ')),
- ' . $this->_level . ' = IF(' . $this->_left . ' >= ' . $eInfo[$this->_left] . ', ' . $this->_level . ' + ' . $skew_level . ', ' . $this->_level . '),
- ' . $this->_left . ' = IF(' . $this->_left . ' >= ' . $eInfo[$this->_left] . ', ' . $this->_left . ' + ' . $skew_edit . ', IF(' . $this->_left . ' > ' . $right_key_near . ', ' . $this->_left . ' + ' . $skew_tree . ', ' . $this->_left . '))
- WHERE ' . $this->_right . ' > ' . $right_key_near . ' AND ' . $this->_left . ' < ' . $eInfo[$this->_right];
- } elseif ($right_key_near < $right_key) { // down
- echo "alert('move down');";
- $skew_edit = $right_key_near - $left_key + 1 - $skew_tree;
- $sql = 'UPDATE ' . $this->_table . '
- SET
- ' . $this->_left . ' = IF(' . $this->_right . ' <= ' . $right_key . ', ' . $this->_left . ' + ' . $skew_edit . ', IF(' . $this->_left . ' > ' . $right_key . ', ' . $this->_left . ' - ' . $skew_tree . ', ' . $this->_left . ')),
- ' . $this->_level . ' = IF(' . $this->_right . ' <= ' . $right_key . ', ' . $this->_level . ' + ' . $skew_level . ', ' . $this->_level . '),
- ' . $this->_right . ' = IF(' . $this->_right . ' <= ' . $right_key . ', ' . $this->_right . ' + ' . $skew_edit . ', IF(' . $this->_right . ' <= ' . $right_key_near . ', ' . $this->_right . ' - ' . $skew_tree . ', ' . $this->_right . '))
- WHERE
- ' . $this->_right . ' > ' . $left_key . ' AND ' . $this->_left . ' <= ' . $right_key_near;
- }
-
- if (isset($sql)) {
- $this->_db->beginTransaction();
- try {
- $this->_db->query($sql);
- //$afrows = $this->_db->get
- $this->_db->commit();
- } catch (Exception $e) {
- $this->_db->rollBack();
- echo $e->getMessage();
- echo "
\r\n";
- echo $sql;
- echo "
\r\n";
- exit();
- }
- }
-
- echo "alert('node added')";
- }
-
public function addTable($tableName, $joinCondition, $fields = '*')
{
$this->_extTables[$tableName] = [
@@ -477,13 +477,6 @@ public function addTable($tableName, $joinCondition, $fields = '*')
];
}
- protected function _addExtTablesToSelect(Zend_Db_Select &$select)
- {
- foreach ($this->_extTables as $tableName => $info) {
- $select->joinInner($tableName, $info['joinCondition'], $info['fields']);
- }
- }
-
public function getChildren($ID, $start_level = 0, $end_level = 0)
{
try {
@@ -534,4 +527,11 @@ public function getNode($nodeId)
return new Varien_Db_Tree_Node($data, $this->getKeys());
}
+
+ protected function _addExtTablesToSelect(Zend_Db_Select &$select)
+ {
+ foreach ($this->_extTables as $tableName => $info) {
+ $select->joinInner($tableName, $info['joinCondition'], $info['fields']);
+ }
+ }
}
diff --git a/lib/Varien/Db/Tree/Node.php b/lib/Varien/Db/Tree/Node.php
index b124567c743..0c638a73306 100644
--- a/lib/Varien/Db/Tree/Node.php
+++ b/lib/Varien/Db/Tree/Node.php
@@ -18,6 +18,8 @@
class Varien_Db_Tree_Node
{
+ public $hasChild = false;
+ public $numChild = 0;
private $left;
private $right;
private $id;
@@ -25,9 +27,6 @@ class Varien_Db_Tree_Node
private $level;
private $data;
- public $hasChild = false;
- public $numChild = 0;
-
/**
* Varien_Db_Tree_Node constructor.
* @param array $nodeData
diff --git a/lib/Varien/Directory/Collection.php b/lib/Varien/Directory/Collection.php
index 7fff91e61ad..95e7c5d905d 100644
--- a/lib/Varien/Directory/Collection.php
+++ b/lib/Varien/Directory/Collection.php
@@ -50,6 +50,29 @@ public function __construct($path, $isRecursion = true, $recursionLevel = 0)
$this->parseDir();
}
}
+ /**
+ * display this collection as array
+ *
+ * @return array
+ */
+ public function __toArray()
+ {
+ $arr = [];
+ $this->toArray($arr);
+ return $arr;
+ }
+ /**
+ * get this collection as xml
+ * @param bool $addOpenTag - add or not header of xml
+ * @param string $rootName - root element name
+ * @return none
+ */
+ public function __toXml($addOpenTag = true, $rootName = 'Struct')
+ {
+ $xml = '';
+ $this->toXml($xml, $addOpenTag, $rootName);
+ return $xml;
+ }
/**
* Get name of this directory
*
@@ -159,23 +182,6 @@ public function addItem(IFactory $item)
{
$this->_items[] = $item;
}
- /**
- * parse this directory
- *
- * @return none
- */
- protected function parseDir()
- {
- $this->clear();
- $iter = new RecursiveDirectoryIterator($this->getPath());
- while ($iter->valid()) {
- $curr = (string) $iter->getSubPathname();
- if (!$iter->isDot() && $curr[0] != '.') {
- $this->addItem(Varien_Directory_Factory::getFactory($iter->current(), $this->getRecursion(), $this->getRecursionLevel()));
- }
- $iter->next();
- }
- }
/**
* set filter using
*
@@ -274,27 +280,6 @@ public function getDirsName(&$dirs)
$dirs[] = $this->getDirName();
}
}
- /**
- * set filters for files
- *
- * @param array $filter - array of filters
- * @return none
- */
- protected function setFilesFilter($filter)
- {
- $this->walk('setFilesFilter', [$filter]);
- }
- /**
- * display this collection as array
- *
- * @return array
- */
- public function __toArray()
- {
- $arr = [];
- $this->toArray($arr);
- return $arr;
- }
/**
* display this collection as array
* @param array &$arr - this collection array
@@ -309,18 +294,6 @@ public function toArray(&$arr)
$this->walk('toArray', [&$arr]);
}
}
- /**
- * get this collection as xml
- * @param bool $addOpenTag - add or not header of xml
- * @param string $rootName - root element name
- * @return none
- */
- public function __toXml($addOpenTag = true, $rootName = 'Struct')
- {
- $xml = '';
- $this->toXml($xml, $addOpenTag, $rootName);
- return $xml;
- }
/**
* get this collection as xml
* @param string &$xml - xml
@@ -345,6 +318,47 @@ public function toXml(&$xml, $recursionLevel = 0, $addOpenTag = true, $rootName
$xml .= '' . "\n";
}
}
+ /**
+ * add filter
+ * @return none
+ */
+ public function addFilter($field, $value)
+ {
+ $filter = [];
+ $filter['field'] = $field;
+ $filter['value'] = $value;
+ $this->_filters[] = $filter;
+ $this->_isFiltersRendered = false;
+ $this->walk('addFilter', [$field, $value]);
+ return $this;
+ }
+ /**
+ * parse this directory
+ *
+ * @return none
+ */
+ protected function parseDir()
+ {
+ $this->clear();
+ $iter = new RecursiveDirectoryIterator($this->getPath());
+ while ($iter->valid()) {
+ $curr = (string) $iter->getSubPathname();
+ if (!$iter->isDot() && $curr[0] != '.') {
+ $this->addItem(Varien_Directory_Factory::getFactory($iter->current(), $this->getRecursion(), $this->getRecursionLevel()));
+ }
+ $iter->next();
+ }
+ }
+ /**
+ * set filters for files
+ *
+ * @param array $filter - array of filters
+ * @return none
+ */
+ protected function setFilesFilter($filter)
+ {
+ $this->walk('setFilesFilter', [$filter]);
+ }
/**
* apply filters
* @return none
@@ -403,20 +417,6 @@ protected function _renderFilters()
}
$this->setFilesFilter($filter);
}
- /**
- * add filter
- * @return none
- */
- public function addFilter($field, $value)
- {
- $filter = [];
- $filter['field'] = $field;
- $filter['value'] = $value;
- $this->_filters[] = $filter;
- $this->_isFiltersRendered = false;
- $this->walk('addFilter', [$field, $value]);
- return $this;
- }
}
/* Example */
diff --git a/lib/Varien/File/Uploader.php b/lib/Varien/File/Uploader.php
index cca0c7ccd7f..6180390191e 100644
--- a/lib/Varien/File/Uploader.php
+++ b/lib/Varien/File/Uploader.php
@@ -36,6 +36,14 @@ class Varien_File_Uploader
UPLOAD_ERR_EXTENSION => 'A PHP extension stopped the file upload',
];
+ public const SINGLE_STYLE = 0;
+ public const MULTIPLE_STYLE = 1;
+
+ /**
+ * @deprecated Use UPLOAD_ERR_NO_FILE instead
+ */
+ public const TMP_NAME_EMPTY = UPLOAD_ERR_NO_FILE;
+
/**
* Uploaded file handle (copy of $_FILES[] element)
*
@@ -138,14 +146,6 @@ class Varien_File_Uploader
*/
protected $_validateCallbacks = [];
- public const SINGLE_STYLE = 0;
- public const MULTIPLE_STYLE = 1;
-
- /**
- * @deprecated Use UPLOAD_ERR_NO_FILE instead
- */
- public const TMP_NAME_EMPTY = UPLOAD_ERR_NO_FILE;
-
/**
* Resulting of uploaded file
*
@@ -167,17 +167,6 @@ public function __construct($fileId)
}
}
- /**
- * After save logic
- *
- * @param array $result
- * @return Varien_File_Uploader
- */
- protected function _afterSave($result)
- {
- return $this;
- }
-
/**
* Used to save uploaded file into destination folder with
* original or new file name (if specified)
@@ -241,49 +230,6 @@ public function save($destinationFolder, $newFileName = null)
return $this->_result;
}
- /**
- * Move files from TMP folder into destination folder
- *
- * @param string $tmpPath
- * @param string $destPath
- * @return bool
- */
- protected function _moveFile($tmpPath, $destPath)
- {
- return move_uploaded_file($tmpPath, $destPath);
- }
-
- /**
- * Validate file before save
- *
- * @access public
- */
- protected function _validateFile()
- {
- if ($this->_fileExists === false) {
- return;
- }
-
- //is file extension allowed
- if (!$this->checkAllowedExtension($this->getFileExtension())) {
- throw new Exception('Disallowed file type.');
- }
-
- /*
- * Validate MIME-Types.
- */
- if (!$this->checkMimeType($this->_validMimeTypes)) {
- throw new Exception('Invalid MIME type.');
- }
-
- //run validate callbacks
- foreach ($this->_validateCallbacks as $params) {
- if (is_object($params['object']) && method_exists($params['object'], $params['method'])) {
- $params['object']->{$params['method']}($this->_file['tmp_name']);
- }
- }
- }
-
/**
* Returns extension of the uploaded file
*
@@ -358,14 +304,6 @@ public function correctFileNameCase($fileName)
return $fileName;
}
- protected static function _addDirSeparator($dir)
- {
- if (substr($dir, -1) != DIRECTORY_SEPARATOR) {
- $dir .= DIRECTORY_SEPARATOR;
- }
- return $dir;
- }
-
/**
* Used to check if uploaded file mime type is valid or not
*
@@ -497,6 +435,103 @@ public function chechAllowedExtension($extension)
return $this->checkAllowedExtension($extension);
}
+ public static function getNewFileName($destFile)
+ {
+ $fileInfo = pathinfo($destFile);
+ if (file_exists($destFile)) {
+ $index = 1;
+ $baseName = $fileInfo['filename'] . '.' . $fileInfo['extension'];
+ while (file_exists($fileInfo['dirname'] . DIRECTORY_SEPARATOR . $baseName)) {
+ $baseName = $fileInfo['filename'] . '_' . $index . '.' . $fileInfo['extension'];
+ $index++;
+ }
+ $destFileName = $baseName;
+ } else {
+ return $fileInfo['basename'];
+ }
+
+ return $destFileName;
+ }
+
+ public static function getDispretionPath($fileName)
+ {
+ $char = 0;
+ $dispretionPath = '';
+ while (($char < 2) && ($char < strlen($fileName))) {
+ if (empty($dispretionPath)) {
+ $dispretionPath = DIRECTORY_SEPARATOR
+ . ('.' == $fileName[$char] ? '_' : $fileName[$char]);
+ } else {
+ $dispretionPath = self::_addDirSeparator($dispretionPath)
+ . ('.' == $fileName[$char] ? '_' : $fileName[$char]);
+ }
+ $char++;
+ }
+ return $dispretionPath;
+ }
+
+ /**
+ * After save logic
+ *
+ * @param array $result
+ * @return Varien_File_Uploader
+ */
+ protected function _afterSave($result)
+ {
+ return $this;
+ }
+
+ /**
+ * Move files from TMP folder into destination folder
+ *
+ * @param string $tmpPath
+ * @param string $destPath
+ * @return bool
+ */
+ protected function _moveFile($tmpPath, $destPath)
+ {
+ return move_uploaded_file($tmpPath, $destPath);
+ }
+
+ /**
+ * Validate file before save
+ *
+ * @access public
+ */
+ protected function _validateFile()
+ {
+ if ($this->_fileExists === false) {
+ return;
+ }
+
+ //is file extension allowed
+ if (!$this->checkAllowedExtension($this->getFileExtension())) {
+ throw new Exception('Disallowed file type.');
+ }
+
+ /*
+ * Validate MIME-Types.
+ */
+ if (!$this->checkMimeType($this->_validMimeTypes)) {
+ throw new Exception('Invalid MIME type.');
+ }
+
+ //run validate callbacks
+ foreach ($this->_validateCallbacks as $params) {
+ if (is_object($params['object']) && method_exists($params['object'], $params['method'])) {
+ $params['object']->{$params['method']}($this->_file['tmp_name']);
+ }
+ }
+ }
+
+ protected static function _addDirSeparator($dir)
+ {
+ if (substr($dir, -1) != DIRECTORY_SEPARATOR) {
+ $dir .= DIRECTORY_SEPARATOR;
+ }
+ return $dir;
+ }
+
private function _getMimeType()
{
return $this->_file['type'];
@@ -552,39 +587,4 @@ private function _createDestinationFolder($destinationFolder)
}
return $this;
}
-
- public static function getNewFileName($destFile)
- {
- $fileInfo = pathinfo($destFile);
- if (file_exists($destFile)) {
- $index = 1;
- $baseName = $fileInfo['filename'] . '.' . $fileInfo['extension'];
- while (file_exists($fileInfo['dirname'] . DIRECTORY_SEPARATOR . $baseName)) {
- $baseName = $fileInfo['filename'] . '_' . $index . '.' . $fileInfo['extension'];
- $index++;
- }
- $destFileName = $baseName;
- } else {
- return $fileInfo['basename'];
- }
-
- return $destFileName;
- }
-
- public static function getDispretionPath($fileName)
- {
- $char = 0;
- $dispretionPath = '';
- while (($char < 2) && ($char < strlen($fileName))) {
- if (empty($dispretionPath)) {
- $dispretionPath = DIRECTORY_SEPARATOR
- . ('.' == $fileName[$char] ? '_' : $fileName[$char]);
- } else {
- $dispretionPath = self::_addDirSeparator($dispretionPath)
- . ('.' == $fileName[$char] ? '_' : $fileName[$char]);
- }
- $char++;
- }
- return $dispretionPath;
- }
}
diff --git a/lib/Varien/Filter/Template/Simple.php b/lib/Varien/Filter/Template/Simple.php
index 218e67ebc23..7ca4621f320 100644
--- a/lib/Varien/Filter/Template/Simple.php
+++ b/lib/Varien/Filter/Template/Simple.php
@@ -47,17 +47,6 @@ public function setTags($start, $end)
return $this;
}
- /**
- * Return result of getData method for matched variables
- *
- * @param array $matches
- * @return mixed
- */
- protected function _filterDataItem($matches)
- {
- return $this->getData($matches[1]);
- }
-
/**
* Insert data to template
*
@@ -72,4 +61,15 @@ public function filter($value)
$value,
);
}
+
+ /**
+ * Return result of getData method for matched variables
+ *
+ * @param array $matches
+ * @return mixed
+ */
+ protected function _filterDataItem($matches)
+ {
+ return $this->getData($matches[1]);
+ }
}
diff --git a/lib/Varien/Http/Adapter/Curl.php b/lib/Varien/Http/Adapter/Curl.php
index e5518fdd6c7..1b0d1d14acc 100644
--- a/lib/Varien/Http/Adapter/Curl.php
+++ b/lib/Varien/Http/Adapter/Curl.php
@@ -57,33 +57,6 @@ class Varien_Http_Adapter_Curl implements Zend_Http_Client_Adapter_Interface
*/
protected $_options = [];
- /**
- * Apply current configuration array to transport resource
- *
- * @return Varien_Http_Adapter_Curl
- */
- protected function _applyConfig()
- {
- curl_setopt_array($this->_getResource(), $this->_options);
-
- if (empty($this->_config)) {
- return $this;
- }
-
- $verifyPeer = isset($this->_config['verifypeer']) ? $this->_config['verifypeer'] : 0;
- curl_setopt($this->_getResource(), CURLOPT_SSL_VERIFYPEER, $verifyPeer);
-
- $verifyHost = isset($this->_config['verifyhost']) ? $this->_config['verifyhost'] : 0;
- curl_setopt($this->_getResource(), CURLOPT_SSL_VERIFYHOST, $verifyHost);
-
- foreach (array_keys($this->_config) as $param) {
- if (array_key_exists($param, $this->_allowedParams)) {
- curl_setopt($this->_getResource(), $this->_allowedParams[$param], $this->_config[$param]);
- }
- }
- return $this;
- }
-
/**
* Set array of additional cURL options
*
@@ -219,19 +192,6 @@ public function close()
return $this;
}
- /**
- * Returns a cURL handle on success
- *
- * @return resource|CurlHandle
- */
- protected function _getResource()
- {
- if (is_null($this->_resource)) {
- $this->_resource = curl_init();
- }
- return $this->_resource;
- }
-
/**
* Get last error number
*
@@ -304,4 +264,44 @@ public function multiRequest($urls, $options = [])
curl_multi_close($multihandle);
return $result;
}
+
+ /**
+ * Apply current configuration array to transport resource
+ *
+ * @return Varien_Http_Adapter_Curl
+ */
+ protected function _applyConfig()
+ {
+ curl_setopt_array($this->_getResource(), $this->_options);
+
+ if (empty($this->_config)) {
+ return $this;
+ }
+
+ $verifyPeer = isset($this->_config['verifypeer']) ? $this->_config['verifypeer'] : 0;
+ curl_setopt($this->_getResource(), CURLOPT_SSL_VERIFYPEER, $verifyPeer);
+
+ $verifyHost = isset($this->_config['verifyhost']) ? $this->_config['verifyhost'] : 0;
+ curl_setopt($this->_getResource(), CURLOPT_SSL_VERIFYHOST, $verifyHost);
+
+ foreach (array_keys($this->_config) as $param) {
+ if (array_key_exists($param, $this->_allowedParams)) {
+ curl_setopt($this->_getResource(), $this->_allowedParams[$param], $this->_config[$param]);
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * Returns a cURL handle on success
+ *
+ * @return resource|CurlHandle
+ */
+ protected function _getResource()
+ {
+ if (is_null($this->_resource)) {
+ $this->_resource = curl_init();
+ }
+ return $this->_resource;
+ }
}
diff --git a/lib/Varien/Http/Client.php b/lib/Varien/Http/Client.php
index 6e40e251ca3..356d277f88c 100644
--- a/lib/Varien/Http/Client.php
+++ b/lib/Varien/Http/Client.php
@@ -36,14 +36,6 @@ public function __construct($uri = null, $config = null)
parent::__construct($uri, $config);
}
- protected function _trySetCurlAdapter()
- {
- if (extension_loaded('curl')) {
- $this->setAdapter(new Varien_Http_Adapter_Curl());
- }
- return $this;
- }
-
public function request($method = null)
{
$this->_trySetCurlAdapter();
@@ -62,6 +54,14 @@ public function setUrlEncodeBody($flag)
return $this;
}
+ protected function _trySetCurlAdapter()
+ {
+ if (extension_loaded('curl')) {
+ $this->setAdapter(new Varien_Http_Adapter_Curl());
+ }
+ return $this;
+ }
+
/**
* Adding custom functionality to decode data after
* standard prepare functionality
diff --git a/lib/Varien/Image.php b/lib/Varien/Image.php
index a620a9b9059..f760f9e8fc5 100644
--- a/lib/Varien/Image.php
+++ b/lib/Varien/Image.php
@@ -285,20 +285,6 @@ public function setWatermarkHeigth($heigth)
return $this;
}
- /**
- * Retrieve image adapter object
- *
- * @param string $adapter
- * @return Varien_Image_Adapter_Abstract
- */
- protected function _getAdapter($adapter = null)
- {
- if (!isset($this->_adapter)) {
- $this->_adapter = Varien_Image_Adapter::factory($adapter);
- }
- return $this->_adapter;
- }
-
/**
* Retrieve original image width
*
@@ -318,4 +304,18 @@ public function getOriginalHeight()
{
return $this->_getAdapter()->getOriginalHeight();
}
+
+ /**
+ * Retrieve image adapter object
+ *
+ * @param string $adapter
+ * @return Varien_Image_Adapter_Abstract
+ */
+ protected function _getAdapter($adapter = null)
+ {
+ if (!isset($this->_adapter)) {
+ $this->_adapter = Varien_Image_Adapter::factory($adapter);
+ }
+ return $this->_adapter;
+ }
}
diff --git a/lib/Varien/Image/Adapter/Abstract.php b/lib/Varien/Image/Adapter/Abstract.php
index 938df7a322e..276a99343a2 100644
--- a/lib/Varien/Image/Adapter/Abstract.php
+++ b/lib/Varien/Image/Adapter/Abstract.php
@@ -20,13 +20,6 @@
abstract class Varien_Image_Adapter_Abstract
{
- public $fileName = null;
-
- /**
- * @var int Color used to fill space when rotating image, do not confuse it with $_backgroundColor
- */
- public $imageBackgroundColor = 0;
-
public const POSITION_TOP_LEFT = 'top-left';
public const POSITION_TOP_RIGHT = 'top-right';
public const POSITION_BOTTOM_LEFT = 'bottom-left';
@@ -34,6 +27,12 @@ abstract class Varien_Image_Adapter_Abstract
public const POSITION_STRETCH = 'stretch';
public const POSITION_TILE = 'tile';
public const POSITION_CENTER = 'center';
+ public $fileName = null;
+
+ /**
+ * @var int Color used to fill space when rotating image, do not confuse it with $_backgroundColor
+ */
+ public $imageBackgroundColor = 0;
/**
* Image file type of the image $this->_fileName
diff --git a/lib/Varien/Image/Adapter/Gd2.php b/lib/Varien/Image/Adapter/Gd2.php
index 0be4facefa8..7abf2b23d9a 100644
--- a/lib/Varien/Image/Adapter/Gd2.php
+++ b/lib/Varien/Image/Adapter/Gd2.php
@@ -17,6 +17,13 @@
class Varien_Image_Adapter_Gd2 extends Varien_Image_Adapter_Abstract
{
protected $_requiredExtensions = ['gd'];
+
+ /**
+ * Whether image was resized or not
+ *
+ * @var bool
+ */
+ protected $_resized = false;
private static $_callbacks = [
IMAGETYPE_WEBP => ['output' => 'imagewebp', 'create' => 'imagecreatefromwebp'],
IMAGETYPE_GIF => ['output' => 'imagegif', 'create' => 'imagecreatefromgif'],
@@ -26,13 +33,6 @@ class Varien_Image_Adapter_Gd2 extends Varien_Image_Adapter_Abstract
IMAGETYPE_WBMP => ['output' => 'imagewbmp', 'create' => 'imagecreatefromwbmp'],
];
- /**
- * Whether image was resized or not
- *
- * @var bool
- */
- protected $_resized = false;
-
public function __construct()
{
// Initialize shutdown function
@@ -65,66 +65,6 @@ public function open($filename)
$this->_imageHandler = call_user_func($this->_getCallback('create'), $this->_fileName);
}
- /**
- * Checks whether memory limit is reached.
- *
- * @deprecated
- * @return bool
- */
- protected function _isMemoryLimitReached()
- {
- $limit = $this->_convertToByte(ini_get('memory_limit'));
- /**
- * In case if memory limit was converted to 0, treat it as unlimited
- */
- if ($limit === 0) {
- return false;
- }
- $size = getimagesize($this->_fileName);
- $requiredMemory = $size[0] * $size[1] * 3;
-
- return (memory_get_usage(true) + $requiredMemory) > $limit;
- }
-
- /**
- * Convert PHP memory limit value into bytes
- * Notation in value is supported only for PHP
- * Shorthand byte options are case insensitive
- *
- * @deprecated
- * @param string $memoryValue
- * @throws Varien_Exception
- * @see http://php.net/manual/en/faq.using.php#faq.using.shorthandbytes
- * @return int
- */
- protected function _convertToByte($memoryValue)
- {
- $memoryValue = trim($memoryValue);
- if (empty($memoryValue)) {
- return 0;
- }
- if (preg_match('~^([1-9][0-9]*)[\s]*(k|m|g)b?$~i', $memoryValue, $matches)) {
- $option = strtolower($matches[2]);
- $memoryValue = (int) $matches[1];
- switch ($option) {
- case 'g':
- $memoryValue *= 1024;
- // no break
- case 'm':
- $memoryValue *= 1024;
- // no break
- case 'k':
- $memoryValue *= 1024;
- break;
- default:
- break;
- }
- }
- $memoryValue = (int) $memoryValue;
-
- return $memoryValue > 0 ? $memoryValue : 0;
- }
-
public function save($destination = null, $newName = null)
{
$fileName = (!isset($destination)) ? $this->_fileName : $destination;
@@ -214,80 +154,6 @@ public function display()
call_user_func($this->_getCallback('output'), $this->_imageHandler);
}
- /**
- * Obtain function name, basing on image type and callback type
- *
- * @param string $callbackType
- * @param int $fileType
- * @return string
- * @throws Exception
- */
- private function _getCallback($callbackType, $fileType = null, $unsupportedText = 'Unsupported image format.')
- {
- if (null === $fileType) {
- $fileType = $this->_fileType;
- }
- if (empty(self::$_callbacks[$fileType])) {
- throw new Exception("{$unsupportedText}. Type: {$fileType}. File: {$this->_fileName}");
- }
- if (empty(self::$_callbacks[$fileType][$callbackType])) {
- throw new Exception("Callback not found. Callbacktype: {$callbackType}. File: {$this->_fileName}");
- }
- return self::$_callbacks[$fileType][$callbackType];
- }
-
- private function _fillBackgroundColor(&$imageResourceTo)
- {
- // try to keep transparency, if any
- if ($this->_keepTransparency) {
- $isAlpha = false;
- $transparentIndex = $this->_getTransparency($this->_imageHandler, $this->_fileType, $isAlpha);
- try {
- // fill truecolor png with alpha transparency
- if ($isAlpha) {
- if (!imagealphablending($imageResourceTo, false)) {
- throw new Exception('Failed to set alpha blending for PNG image. File: {$this->_fileName}');
- }
- $transparentAlphaColor = imagecolorallocatealpha($imageResourceTo, 0, 0, 0, 127);
- if (false === $transparentAlphaColor) {
- throw new Exception('Failed to allocate alpha transparency for PNG image. File: {$this->_fileName}');
- }
- if (!imagefill($imageResourceTo, 0, 0, $transparentAlphaColor)) {
- throw new Exception('Failed to fill PNG image with alpha transparency. File: {$this->_fileName}');
- }
- if (!imagesavealpha($imageResourceTo, true)) {
- throw new Exception('Failed to save alpha transparency into PNG image. File: {$this->_fileName}');
- }
-
- return $transparentAlphaColor;
- } elseif (false !== $transparentIndex) { // fill image with indexed non-alpha transparency
- $transparentColor = false;
- if ($transparentIndex >= 0 && $transparentIndex < imagecolorstotal($this->_imageHandler)) {
- list($r, $g, $b) = array_values(imagecolorsforindex($this->_imageHandler, $transparentIndex));
- $transparentColor = imagecolorallocate($imageResourceTo, (int) $r, (int) $g, (int) $b);
- }
- if (false === $transparentColor) {
- throw new Exception('Failed to allocate transparent color for image.');
- }
- if (!imagefill($imageResourceTo, 0, 0, $transparentColor)) {
- throw new Exception('Failed to fill image with transparency.');
- }
- imagecolortransparent($imageResourceTo, $transparentColor);
- return $transparentColor;
- }
- } catch (Exception $e) {
- // fallback to default background color
- }
- }
- list($r, $g, $b) = $this->_backgroundColor;
- $color = imagecolorallocate($imageResourceTo, (int) $r, (int) $g, (int) $b);
- if (!imagefill($imageResourceTo, 0, 0, $color)) {
- throw new Exception("Failed to fill image background with color {$r} {$g} {$b}. File: {$this->_fileName}");
- }
-
- return $color;
- }
-
/**
* Gives true for a PNG with alpha, false otherwise
*
@@ -299,28 +165,6 @@ public function checkAlpha($fileName)
return ((ord(file_get_contents($fileName, false, null, 25, 1)) & 6) & 4) == 4;
}
- private function _getTransparency($imageResource, $fileType, &$isAlpha = false, &$isTrueColor = false)
- {
- $isAlpha = false;
- $isTrueColor = false;
- // assume that transparency is supported by gif/png/webp only
- if (($fileType === IMAGETYPE_GIF) || ($fileType === IMAGETYPE_PNG) || ($fileType === IMAGETYPE_WEBP)) {
- // check for specific transparent color
- $transparentIndex = imagecolortransparent($imageResource);
- if ($transparentIndex >= 0) {
- return $transparentIndex;
- } elseif ($fileType === IMAGETYPE_PNG || $fileType === IMAGETYPE_WEBP) {
- $isAlpha = $this->checkAlpha($this->_fileName);
- $isTrueColor = true;
- return $transparentIndex; // -1
- }
- }
- if ($fileType === IMAGETYPE_JPEG) {
- $isTrueColor = true;
- }
- return false;
- }
-
/**
* Change the image size
*
@@ -638,6 +482,172 @@ public function checkDependencies()
}
}
+ /**
+ * Gives real mime-type with not considering file type field
+ *
+ * @return string
+ */
+ public function getMimeTypeWithOutFileType()
+ {
+ return $this->_fileMimeType;
+ }
+
+ /**
+ * Checks whether memory limit is reached.
+ *
+ * @deprecated
+ * @return bool
+ */
+ protected function _isMemoryLimitReached()
+ {
+ $limit = $this->_convertToByte(ini_get('memory_limit'));
+ /**
+ * In case if memory limit was converted to 0, treat it as unlimited
+ */
+ if ($limit === 0) {
+ return false;
+ }
+ $size = getimagesize($this->_fileName);
+ $requiredMemory = $size[0] * $size[1] * 3;
+
+ return (memory_get_usage(true) + $requiredMemory) > $limit;
+ }
+
+ /**
+ * Convert PHP memory limit value into bytes
+ * Notation in value is supported only for PHP
+ * Shorthand byte options are case insensitive
+ *
+ * @deprecated
+ * @param string $memoryValue
+ * @throws Varien_Exception
+ * @see http://php.net/manual/en/faq.using.php#faq.using.shorthandbytes
+ * @return int
+ */
+ protected function _convertToByte($memoryValue)
+ {
+ $memoryValue = trim($memoryValue);
+ if (empty($memoryValue)) {
+ return 0;
+ }
+ if (preg_match('~^([1-9][0-9]*)[\s]*(k|m|g)b?$~i', $memoryValue, $matches)) {
+ $option = strtolower($matches[2]);
+ $memoryValue = (int) $matches[1];
+ switch ($option) {
+ case 'g':
+ $memoryValue *= 1024;
+ // no break
+ case 'm':
+ $memoryValue *= 1024;
+ // no break
+ case 'k':
+ $memoryValue *= 1024;
+ break;
+ default:
+ break;
+ }
+ }
+ $memoryValue = (int) $memoryValue;
+
+ return $memoryValue > 0 ? $memoryValue : 0;
+ }
+
+ /**
+ * Obtain function name, basing on image type and callback type
+ *
+ * @param string $callbackType
+ * @param int $fileType
+ * @return string
+ * @throws Exception
+ */
+ private function _getCallback($callbackType, $fileType = null, $unsupportedText = 'Unsupported image format.')
+ {
+ if (null === $fileType) {
+ $fileType = $this->_fileType;
+ }
+ if (empty(self::$_callbacks[$fileType])) {
+ throw new Exception("{$unsupportedText}. Type: {$fileType}. File: {$this->_fileName}");
+ }
+ if (empty(self::$_callbacks[$fileType][$callbackType])) {
+ throw new Exception("Callback not found. Callbacktype: {$callbackType}. File: {$this->_fileName}");
+ }
+ return self::$_callbacks[$fileType][$callbackType];
+ }
+
+ private function _fillBackgroundColor(&$imageResourceTo)
+ {
+ // try to keep transparency, if any
+ if ($this->_keepTransparency) {
+ $isAlpha = false;
+ $transparentIndex = $this->_getTransparency($this->_imageHandler, $this->_fileType, $isAlpha);
+ try {
+ // fill truecolor png with alpha transparency
+ if ($isAlpha) {
+ if (!imagealphablending($imageResourceTo, false)) {
+ throw new Exception('Failed to set alpha blending for PNG image. File: {$this->_fileName}');
+ }
+ $transparentAlphaColor = imagecolorallocatealpha($imageResourceTo, 0, 0, 0, 127);
+ if (false === $transparentAlphaColor) {
+ throw new Exception('Failed to allocate alpha transparency for PNG image. File: {$this->_fileName}');
+ }
+ if (!imagefill($imageResourceTo, 0, 0, $transparentAlphaColor)) {
+ throw new Exception('Failed to fill PNG image with alpha transparency. File: {$this->_fileName}');
+ }
+ if (!imagesavealpha($imageResourceTo, true)) {
+ throw new Exception('Failed to save alpha transparency into PNG image. File: {$this->_fileName}');
+ }
+
+ return $transparentAlphaColor;
+ } elseif (false !== $transparentIndex) { // fill image with indexed non-alpha transparency
+ $transparentColor = false;
+ if ($transparentIndex >= 0 && $transparentIndex < imagecolorstotal($this->_imageHandler)) {
+ list($r, $g, $b) = array_values(imagecolorsforindex($this->_imageHandler, $transparentIndex));
+ $transparentColor = imagecolorallocate($imageResourceTo, (int) $r, (int) $g, (int) $b);
+ }
+ if (false === $transparentColor) {
+ throw new Exception('Failed to allocate transparent color for image.');
+ }
+ if (!imagefill($imageResourceTo, 0, 0, $transparentColor)) {
+ throw new Exception('Failed to fill image with transparency.');
+ }
+ imagecolortransparent($imageResourceTo, $transparentColor);
+ return $transparentColor;
+ }
+ } catch (Exception $e) {
+ // fallback to default background color
+ }
+ }
+ list($r, $g, $b) = $this->_backgroundColor;
+ $color = imagecolorallocate($imageResourceTo, (int) $r, (int) $g, (int) $b);
+ if (!imagefill($imageResourceTo, 0, 0, $color)) {
+ throw new Exception("Failed to fill image background with color {$r} {$g} {$b}. File: {$this->_fileName}");
+ }
+
+ return $color;
+ }
+
+ private function _getTransparency($imageResource, $fileType, &$isAlpha = false, &$isTrueColor = false)
+ {
+ $isAlpha = false;
+ $isTrueColor = false;
+ // assume that transparency is supported by gif/png/webp only
+ if (($fileType === IMAGETYPE_GIF) || ($fileType === IMAGETYPE_PNG) || ($fileType === IMAGETYPE_WEBP)) {
+ // check for specific transparent color
+ $transparentIndex = imagecolortransparent($imageResource);
+ if ($transparentIndex >= 0) {
+ return $transparentIndex;
+ } elseif ($fileType === IMAGETYPE_PNG || $fileType === IMAGETYPE_WEBP) {
+ $isAlpha = $this->checkAlpha($this->_fileName);
+ $isTrueColor = true;
+ return $transparentIndex; // -1
+ }
+ }
+ if ($fileType === IMAGETYPE_JPEG) {
+ $isTrueColor = true;
+ }
+ return false;
+ }
+
private function refreshImageDimensions()
{
$this->_imageSrcWidth = imagesx($this->_imageHandler);
@@ -654,14 +664,4 @@ private function _saveAlpha($imageHandler)
imagealphablending($imageHandler, false);
imagesavealpha($imageHandler, true);
}
-
- /**
- * Gives real mime-type with not considering file type field
- *
- * @return string
- */
- public function getMimeTypeWithOutFileType()
- {
- return $this->_fileMimeType;
- }
}
diff --git a/lib/Varien/Io/File.php b/lib/Varien/Io/File.php
index b431461c29a..b7edab4a509 100644
--- a/lib/Varien/Io/File.php
+++ b/lib/Varien/Io/File.php
@@ -23,32 +23,36 @@
class Varien_Io_File extends Varien_Io_Abstract
{
/**
- * Save initial working directory
+ * Used to grep ls() output
*
- * @var string
+ * @const
*/
- protected $_iwd;
+ public const GREP_FILES = 'files_only';
/**
- * Use virtual current working directory for application integrity
+ * Used to grep ls() output
*
- * @var string
+ * @const
*/
- protected $_cwd;
+ public const GREP_DIRS = 'dirs_only';
/**
- * Used to grep ls() output
+ * @var string[]
+ */
+ public const ALLOWED_IMAGES_EXTENSIONS = ['webp', 'jpg', 'jpeg', 'png', 'gif', 'bmp'];
+ /**
+ * Save initial working directory
*
- * @const
+ * @var string
*/
- public const GREP_FILES = 'files_only';
+ protected $_iwd;
/**
- * Used to grep ls() output
+ * Use virtual current working directory for application integrity
*
- * @const
+ * @var string
*/
- public const GREP_DIRS = 'dirs_only';
+ protected $_cwd;
/**
* If this variable is set to TRUE, our library will be able to automatically create
@@ -92,11 +96,6 @@ class Varien_Io_File extends Varien_Io_Abstract
*/
protected $_streamException;
- /**
- * @var string[]
- */
- public const ALLOWED_IMAGES_EXTENSIONS = ['webp', 'jpg', 'jpeg', 'png', 'gif', 'bmp'];
-
public function __construct()
{
// Initialize shutdown function
@@ -514,82 +513,6 @@ public function write($filename, $src, $mode = null)
return $result;
}
- /**
- * Check source is valid
- *
- * @param string|resource $src
- * @return bool
- *
- * @SuppressWarnings("PHPMD.ErrorControlOperator")
- */
- protected function _isValidSource($src)
- {
- // In case of a string
- if (is_string($src)) {
- // If its a file we check for null byte
- // If it's not a valid path, file_exists() will return a falsey value, and the @ will keep it from complaining about the bad string.
- return !(@file_exists($src) && str_contains($src, chr(0)));
- } elseif (is_resource($src)) {
- return true;
- }
-
- return false;
- }
-
- /**
- * Check filename is writeable
- * If filename not exist check dirname writeable
- *
- * @param string $filename
- * @throws Varien_Io_Exception
- * @return bool
- *
- * @SuppressWarnings("PHPMD.ErrorControlOperator")
- */
- protected function _isFilenameWriteable($filename)
- {
- $error = false;
- if ($this->_cwd) {
- @chdir($this->_cwd);
- }
- if (file_exists($filename)) {
- if (!is_writeable($filename)) {
- $error = "File '{$this->getFilteredPath($filename)}' isn't writeable";
- }
- } else {
- $folder = dirname($filename);
- if (!is_writable($folder)) {
- $error = "Folder '{$this->getFilteredPath($folder)}' isn't writeable";
- }
- }
- if ($this->_iwd) {
- @chdir($this->_iwd);
- }
-
- if ($error) {
- throw new Varien_Io_Exception($error);
- }
- return true;
- }
-
- /**
- * Check source is file
- *
- * @param string $src
- * @return bool
- *
- * @SuppressWarnings("PHPMD.ErrorControlOperator")
- */
- protected function _checkSrcIsFile($src)
- {
- $result = false;
- if (is_string($src) && @is_readable($src) && is_file($src)) {
- $result = true;
- }
-
- return $result;
- }
-
/**
* File put content wrapper
*
@@ -856,6 +779,97 @@ public function ls($grep = null)
return $list;
}
+ public function dirsep()
+ {
+ return DIRECTORY_SEPARATOR;
+ }
+
+ public function dirname($file)
+ {
+ return $this->getCleanPath(dirname($file));
+ }
+
+ public function getStreamHandler()
+ {
+ return $this->_streamHandler;
+ }
+
+ /**
+ * Check source is valid
+ *
+ * @param string|resource $src
+ * @return bool
+ *
+ * @SuppressWarnings("PHPMD.ErrorControlOperator")
+ */
+ protected function _isValidSource($src)
+ {
+ // In case of a string
+ if (is_string($src)) {
+ // If its a file we check for null byte
+ // If it's not a valid path, file_exists() will return a falsey value, and the @ will keep it from complaining about the bad string.
+ return !(@file_exists($src) && str_contains($src, chr(0)));
+ } elseif (is_resource($src)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Check filename is writeable
+ * If filename not exist check dirname writeable
+ *
+ * @param string $filename
+ * @throws Varien_Io_Exception
+ * @return bool
+ *
+ * @SuppressWarnings("PHPMD.ErrorControlOperator")
+ */
+ protected function _isFilenameWriteable($filename)
+ {
+ $error = false;
+ if ($this->_cwd) {
+ @chdir($this->_cwd);
+ }
+ if (file_exists($filename)) {
+ if (!is_writeable($filename)) {
+ $error = "File '{$this->getFilteredPath($filename)}' isn't writeable";
+ }
+ } else {
+ $folder = dirname($filename);
+ if (!is_writable($folder)) {
+ $error = "Folder '{$this->getFilteredPath($folder)}' isn't writeable";
+ }
+ }
+ if ($this->_iwd) {
+ @chdir($this->_iwd);
+ }
+
+ if ($error) {
+ throw new Varien_Io_Exception($error);
+ }
+ return true;
+ }
+
+ /**
+ * Check source is file
+ *
+ * @param string $src
+ * @return bool
+ *
+ * @SuppressWarnings("PHPMD.ErrorControlOperator")
+ */
+ protected function _checkSrcIsFile($src)
+ {
+ $result = false;
+ if (is_string($src) && @is_readable($src) && is_file($src)) {
+ $result = true;
+ }
+
+ return $result;
+ }
+
/**
* Convert integer permissions format into human readable
*
@@ -930,19 +944,4 @@ protected function _getFileOwner($filename)
return $owner['name'] . ' / ' . $groupinfo;
}
-
- public function dirsep()
- {
- return DIRECTORY_SEPARATOR;
- }
-
- public function dirname($file)
- {
- return $this->getCleanPath(dirname($file));
- }
-
- public function getStreamHandler()
- {
- return $this->_streamHandler;
- }
}
diff --git a/lib/Varien/Object.php b/lib/Varien/Object.php
index 7f5452bce72..234bc04cc54 100644
--- a/lib/Varien/Object.php
+++ b/lib/Varien/Object.php
@@ -96,44 +96,129 @@ public function __construct()
$this->_construct();
}
- protected function _addFullNames()
+ /**
+ * Convert object attributes to array
+ *
+ * @param array $arrAttributes array of required attributes
+ * @return array
+ */
+ public function __toArray(array $arrAttributes = [])
{
- if (empty($this->_syncFieldsMap)) {
- return;
+ if (empty($arrAttributes)) {
+ return $this->_data;
}
- $existedShortKeys = array_intersect_key(array_flip($this->_syncFieldsMap), $this->_data);
- foreach ($existedShortKeys as $key => $fullFieldName) {
- $this->_data[$fullFieldName] = $this->_data[$key];
+ $arrRes = [];
+ foreach ($arrAttributes as $attribute) {
+ if (isset($this->_data[$attribute])) {
+ $arrRes[$attribute] = $this->_data[$attribute];
+ } else {
+ $arrRes[$attribute] = null;
+ }
}
+ return $arrRes;
}
/**
- * Inits mapping array of object's previously used fields to new fields.
- * Must be overloaded by descendants to set concrete fields map.
+ * Convert object attributes to XML
+ *
+ * @param array $arrAttributes array of required attributes
+ * @param string $rootName name of the root element
+ * @param bool $addOpenTag
+ * @param bool $addCdata
+ * @return string
*/
- protected function _initOldFieldsMap() {}
+ protected function __toXml(array $arrAttributes = [], $rootName = 'item', $addOpenTag = false, $addCdata = true)
+ {
+ $xml = '';
+ if ($addOpenTag) {
+ $xml .= '' . "\n";
+ }
+ if (!empty($rootName)) {
+ $xml .= '<' . $rootName . '>' . "\n";
+ }
+ $xmlModel = new Varien_Simplexml_Element('');
+ $arrData = $this->toArray($arrAttributes);
+ foreach ($arrData as $fieldName => $fieldValue) {
+ if ($addCdata === true) {
+ $fieldValue = "";
+ } else {
+ $fieldValue = $xmlModel->xmlentities($fieldValue);
+ }
+ $xml .= "<$fieldName>$fieldValue" . "\n";
+ }
+ if (!empty($rootName)) {
+ $xml .= '' . "\n";
+ }
+ return $xml;
+ }
/**
- * Called after old fields are inited. Forms synchronization map to sync old fields and new fields
- * between each other.
+ * Convert object attributes to JSON
*
- * @return $this
+ * @param array $arrAttributes array of required attributes
+ * @return string
*/
- protected function _prepareSyncFieldsMap()
+ protected function __toJson(array $arrAttributes = [])
{
- $old2New = $this->_oldFieldsMap;
- $new2Old = array_flip($this->_oldFieldsMap);
- $this->_syncFieldsMap = array_merge($old2New, $new2Old);
- return $this;
+ $arrData = $this->toArray($arrAttributes);
+ return Zend_Json::encode($arrData);
}
/**
- * Internal constructor not depended on params. Can be used for object initialization
+ * Set/Get attribute wrapper
*
- * @return void
+ * @param string $method
+ * @param array $args
+ * @return mixed
*/
- protected function _construct() {}
+ public function __call($method, $args)
+ {
+ switch (substr($method, 0, 3)) {
+ case 'get':
+ $key = $this->_underscore(substr($method, 3));
+ return $this->getData($key, $args[0] ?? null);
+
+ case 'set':
+ $key = $this->_underscore(substr($method, 3));
+ return $this->setData($key, $args[0] ?? null);
+
+ case 'uns':
+ $key = $this->_underscore(substr($method, 3));
+ return $this->unsetData($key);
+
+ case 'has':
+ $key = $this->_underscore(substr($method, 3));
+ return isset($this->_data[$key]);
+ }
+ throw new Varien_Exception(
+ 'Invalid method ' . get_class($this) . '::' . $method . '(' . print_r($args, true) . ')',
+ );
+ }
+
+ /**
+ * Attribute getter (deprecated)
+ *
+ * @param string $var
+ * @return mixed
+ */
+ public function __get($var)
+ {
+ $var = $this->_underscore($var);
+ return $this->getData($var);
+ }
+
+ /**
+ * Attribute setter (deprecated)
+ *
+ * @param string $var
+ * @param mixed $value
+ */
+ public function __set($var, $value)
+ {
+ $var = $this->_underscore($var);
+ $this->setData($var, $value);
+ }
/**
* Set _isDeleted flag value (if $isDeleted param is defined) and return current flag value
@@ -375,17 +460,6 @@ public function getDataByKey($key)
return $this->_getData($key);
}
- /**
- * Get value from _data array without parse key
- *
- * @param string $key
- * @return mixed
- */
- protected function _getData($key)
- {
- return $this->_data[$key] ?? null;
- }
-
/**
* Set object data with calling setter method
*
@@ -443,29 +517,6 @@ public function hasData($key = '')
return array_key_exists($key, $this->_data);
}
- /**
- * Convert object attributes to array
- *
- * @param array $arrAttributes array of required attributes
- * @return array
- */
- public function __toArray(array $arrAttributes = [])
- {
- if (empty($arrAttributes)) {
- return $this->_data;
- }
-
- $arrRes = [];
- foreach ($arrAttributes as $attribute) {
- if (isset($this->_data[$attribute])) {
- $arrRes[$attribute] = $this->_data[$attribute];
- } else {
- $arrRes[$attribute] = null;
- }
- }
- return $arrRes;
- }
-
/**
* Public wrapper for __toArray
*
@@ -476,56 +527,6 @@ public function toArray(array $arrAttributes = [])
return $this->__toArray($arrAttributes);
}
- /**
- * Set required array elements
- *
- * @param array $arr
- * @return array
- */
- protected function _prepareArray(&$arr, array $elements = [])
- {
- foreach ($elements as $element) {
- if (!isset($arr[$element])) {
- $arr[$element] = null;
- }
- }
- return $arr;
- }
-
- /**
- * Convert object attributes to XML
- *
- * @param array $arrAttributes array of required attributes
- * @param string $rootName name of the root element
- * @param bool $addOpenTag
- * @param bool $addCdata
- * @return string
- */
- protected function __toXml(array $arrAttributes = [], $rootName = 'item', $addOpenTag = false, $addCdata = true)
- {
- $xml = '';
- if ($addOpenTag) {
- $xml .= '' . "\n";
- }
- if (!empty($rootName)) {
- $xml .= '<' . $rootName . '>' . "\n";
- }
- $xmlModel = new Varien_Simplexml_Element('');
- $arrData = $this->toArray($arrAttributes);
- foreach ($arrData as $fieldName => $fieldValue) {
- if ($addCdata === true) {
- $fieldValue = "";
- } else {
- $fieldValue = $xmlModel->xmlentities($fieldValue);
- }
- $xml .= "<$fieldName>$fieldValue" . "\n";
- }
- if (!empty($rootName)) {
- $xml .= '' . "\n";
- }
- return $xml;
- }
-
/**
* Public wrapper for __toXml
*
@@ -539,18 +540,6 @@ public function toXml(array $arrAttributes = [], $rootName = 'item', $addOpenTag
return $this->__toXml($arrAttributes, $rootName, $addOpenTag, $addCdata);
}
- /**
- * Convert object attributes to JSON
- *
- * @param array $arrAttributes array of required attributes
- * @return string
- */
- protected function __toJson(array $arrAttributes = [])
- {
- $arrData = $this->toArray($arrAttributes);
- return Zend_Json::encode($arrData);
- }
-
/**
* Public wrapper for __toJson
*
@@ -596,61 +585,6 @@ public function toString($format = '')
return $str;
}
- /**
- * Set/Get attribute wrapper
- *
- * @param string $method
- * @param array $args
- * @return mixed
- */
- public function __call($method, $args)
- {
- switch (substr($method, 0, 3)) {
- case 'get':
- $key = $this->_underscore(substr($method, 3));
- return $this->getData($key, $args[0] ?? null);
-
- case 'set':
- $key = $this->_underscore(substr($method, 3));
- return $this->setData($key, $args[0] ?? null);
-
- case 'uns':
- $key = $this->_underscore(substr($method, 3));
- return $this->unsetData($key);
-
- case 'has':
- $key = $this->_underscore(substr($method, 3));
- return isset($this->_data[$key]);
- }
- throw new Varien_Exception(
- 'Invalid method ' . get_class($this) . '::' . $method . '(' . print_r($args, true) . ')',
- );
- }
-
- /**
- * Attribute getter (deprecated)
- *
- * @param string $var
- * @return mixed
- */
- public function __get($var)
- {
- $var = $this->_underscore($var);
- return $this->getData($var);
- }
-
- /**
- * Attribute setter (deprecated)
- *
- * @param string $var
- * @param mixed $value
- */
- public function __set($var, $value)
- {
- $var = $this->_underscore($var);
- $this->setData($var, $value);
- }
-
/**
* checks whether the object is empty
*
@@ -664,36 +598,6 @@ public function isEmpty()
return false;
}
- /**
- * Converts field names for setters and getters
- *
- * $this->setMyField($value) === $this->setData('my_field', $value)
- * Uses cache to eliminate unnecessary preg_replace
- *
- * @param string $name
- * @return string
- */
- protected function _underscore($name)
- {
- if (isset(self::$_underscoreCache[$name])) {
- return self::$_underscoreCache[$name];
- }
- #Varien_Profiler::start('underscore');
- $result = strtolower(preg_replace('/([A-Z])/', '_$1', lcfirst($name)));
- #Varien_Profiler::stop('underscore');
- self::$_underscoreCache[$name] = $result;
- return $result;
- }
-
- /**
- * @param string $name
- * @return string
- */
- protected function _camelize($name)
- {
- return uc_words($name, '');
- }
-
/**
* serialize object attributes
*
@@ -842,4 +746,100 @@ public function flagDirty($field, $flag = true)
}
return $this;
}
+
+ protected function _addFullNames()
+ {
+ if (empty($this->_syncFieldsMap)) {
+ return;
+ }
+
+ $existedShortKeys = array_intersect_key(array_flip($this->_syncFieldsMap), $this->_data);
+ foreach ($existedShortKeys as $key => $fullFieldName) {
+ $this->_data[$fullFieldName] = $this->_data[$key];
+ }
+ }
+
+ /**
+ * Inits mapping array of object's previously used fields to new fields.
+ * Must be overloaded by descendants to set concrete fields map.
+ */
+ protected function _initOldFieldsMap() {}
+
+ /**
+ * Called after old fields are inited. Forms synchronization map to sync old fields and new fields
+ * between each other.
+ *
+ * @return $this
+ */
+ protected function _prepareSyncFieldsMap()
+ {
+ $old2New = $this->_oldFieldsMap;
+ $new2Old = array_flip($this->_oldFieldsMap);
+ $this->_syncFieldsMap = array_merge($old2New, $new2Old);
+ return $this;
+ }
+
+ /**
+ * Internal constructor not depended on params. Can be used for object initialization
+ *
+ * @return void
+ */
+ protected function _construct() {}
+
+ /**
+ * Get value from _data array without parse key
+ *
+ * @param string $key
+ * @return mixed
+ */
+ protected function _getData($key)
+ {
+ return $this->_data[$key] ?? null;
+ }
+
+ /**
+ * Set required array elements
+ *
+ * @param array $arr
+ * @return array
+ */
+ protected function _prepareArray(&$arr, array $elements = [])
+ {
+ foreach ($elements as $element) {
+ if (!isset($arr[$element])) {
+ $arr[$element] = null;
+ }
+ }
+ return $arr;
+ }
+
+ /**
+ * Converts field names for setters and getters
+ *
+ * $this->setMyField($value) === $this->setData('my_field', $value)
+ * Uses cache to eliminate unnecessary preg_replace
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function _underscore($name)
+ {
+ if (isset(self::$_underscoreCache[$name])) {
+ return self::$_underscoreCache[$name];
+ }
+ #Varien_Profiler::start('underscore');
+ $result = strtolower(preg_replace('/([A-Z])/', '_$1', lcfirst($name)));
+ #Varien_Profiler::stop('underscore');
+ self::$_underscoreCache[$name] = $result;
+ return $result;
+ }
+
+ /**
+ * @param string $name
+ * @return string
+ */
+ protected function _camelize($name)
+ {
+ return uc_words($name, '');
+ }
}
diff --git a/lib/Varien/Simplexml/Config.php b/lib/Varien/Simplexml/Config.php
index 626e5e9d8f8..1864c7919ed 100644
--- a/lib/Varien/Simplexml/Config.php
+++ b/lib/Varien/Simplexml/Config.php
@@ -383,37 +383,6 @@ public function removeCache()
return $this;
}
- /**
- * @param string $id
- * @return bool
- */
- protected function _loadCache($id)
- {
- return $this->getCache()->load($id);
- }
-
- /**
- * @param string $data
- * @param string $id
- * @param array $tags
- * @param int|boolean $lifetime
- * @return bool
- */
- protected function _saveCache($data, $id, $tags = [], $lifetime = false)
- {
- return $this->getCache()->save($data, $id, $tags, $lifetime);
- }
-
- /**
- * @todo check this, as there are no caches that implement remove() method
- * @param string $id
- * @return mixed
- */
- protected function _removeCache($id)
- {
- return $this->getCache()->remove($id);
- }
-
/**
* Imports XML file
*
@@ -533,4 +502,35 @@ public function extend(Varien_Simplexml_Config $config, $overwrite = true)
$this->getNode()->extend($config->getNode(), $overwrite);
return $this;
}
+
+ /**
+ * @param string $id
+ * @return bool
+ */
+ protected function _loadCache($id)
+ {
+ return $this->getCache()->load($id);
+ }
+
+ /**
+ * @param string $data
+ * @param string $id
+ * @param array $tags
+ * @param int|boolean $lifetime
+ * @return bool
+ */
+ protected function _saveCache($data, $id, $tags = [], $lifetime = false)
+ {
+ return $this->getCache()->save($data, $id, $tags, $lifetime);
+ }
+
+ /**
+ * @todo check this, as there are no caches that implement remove() method
+ * @param string $id
+ * @return mixed
+ */
+ protected function _removeCache($id)
+ {
+ return $this->getCache()->remove($id);
+ }
}
diff --git a/lib/Varien/Simplexml/Element.php b/lib/Varien/Simplexml/Element.php
index 7eaedcc1392..3be094d8ac3 100644
--- a/lib/Varien/Simplexml/Element.php
+++ b/lib/Varien/Simplexml/Element.php
@@ -204,40 +204,6 @@ public function asCanonicalArray()
return $this->_asArray(true);
}
- /**
- * Returns the node and children as an array
- *
- * @param bool $isCanonical - whether to ignore attributes
- * @return array|string
- */
- protected function _asArray($isCanonical = false)
- {
- $result = [];
- if (!$isCanonical) {
- // add attributes
- foreach ($this->attributes() as $attributeName => $attribute) {
- if ($attribute) {
- $result['@'][$attributeName] = (string) $attribute;
- }
- }
- }
- // add children values
- if ($this->hasChildren()) {
- foreach ($this->children() as $childName => $child) {
- $result[$childName] = $child->_asArray($isCanonical);
- }
- } else {
- if (empty($result)) {
- // return as string, if nothing was found
- $result = (string) $this;
- } else {
- // value has zero key element
- $result[0] = (string) $this;
- }
- }
- return $result;
- }
-
/**
* Makes nicely formatted XML from the node
*
@@ -455,4 +421,38 @@ public function setNode($path, $value, $overwrite = true)
}
return $this;
}
+
+ /**
+ * Returns the node and children as an array
+ *
+ * @param bool $isCanonical - whether to ignore attributes
+ * @return array|string
+ */
+ protected function _asArray($isCanonical = false)
+ {
+ $result = [];
+ if (!$isCanonical) {
+ // add attributes
+ foreach ($this->attributes() as $attributeName => $attribute) {
+ if ($attribute) {
+ $result['@'][$attributeName] = (string) $attribute;
+ }
+ }
+ }
+ // add children values
+ if ($this->hasChildren()) {
+ foreach ($this->children() as $childName => $child) {
+ $result[$childName] = $child->_asArray($isCanonical);
+ }
+ } else {
+ if (empty($result)) {
+ // return as string, if nothing was found
+ $result = (string) $this;
+ } else {
+ // value has zero key element
+ $result[0] = (string) $this;
+ }
+ }
+ return $result;
+ }
}
diff --git a/shell/abstract.php b/shell/abstract.php
index 983d82db4e0..ab26da615f7 100644
--- a/shell/abstract.php
+++ b/shell/abstract.php
@@ -83,6 +83,40 @@ public function __construct()
$this->_showHelp();
}
+ /**
+ * Run script
+ *
+ */
+ abstract public function run();
+
+ /**
+ * Retrieve Usage Help Message
+ *
+ */
+ public function usageHelp()
+ {
+ return <<_args[$name])) {
+ return $this->_args[$name];
+ }
+ return false;
+ }
+
/**
* Get Magento Root path (with last directory separator)
*
@@ -171,12 +205,6 @@ protected function _validate()
}
}
- /**
- * Run script
- *
- */
- abstract public function run();
-
/**
* Check is show usage help
*
@@ -187,32 +215,4 @@ protected function _showHelp()
die($this->usageHelp());
}
}
-
- /**
- * Retrieve Usage Help Message
- *
- */
- public function usageHelp()
- {
- return <<_args[$name])) {
- return $this->_args[$name];
- }
- return false;
- }
}
diff --git a/shell/indexer.php b/shell/indexer.php
index 48560754b37..866aad2a0fe 100644
--- a/shell/indexer.php
+++ b/shell/indexer.php
@@ -24,49 +24,6 @@
*/
class Mage_Shell_Indexer extends Mage_Shell_Abstract
{
- /**
- * Get Indexer instance
- *
- * @return Mage_Core_Model_Abstract|Mage_Index_Model_Indexer
- */
- protected function _getIndexer()
- {
- return $this->_factory->getSingleton($this->_factory->getIndexClassAlias());
- }
-
- /**
- * Parse string with indexers and return array of indexer instances
- *
- * @param string $string
- * @return array
- */
- protected function _parseIndexerString($string)
- {
- $processes = [];
- if ($string == 'all') {
- $collection = $this->_getIndexer()->getProcessesCollection();
- foreach ($collection as $process) {
- if ($process->getIndexer()->isVisible() === false) {
- continue;
- }
- $processes[] = $process;
- }
- } elseif (!empty($string)) {
- $codes = explode(',', $string);
- $codes = array_map('trim', $codes);
- $processes = $this->_getIndexer()->getProcessesCollectionByCodes($codes);
- foreach ($processes as $key => $process) {
- if ($process->getIndexer()->getVisibility() === false) {
- unset($processes[$key]);
- }
- }
- if ($this->_getIndexer()->hasErrors()) {
- echo implode(PHP_EOL, $this->_getIndexer()->getErrors()), PHP_EOL;
- }
- }
- return $processes;
- }
-
/**
* Run script
*
@@ -202,6 +159,48 @@ public function usageHelp()
USAGE;
}
+ /**
+ * Get Indexer instance
+ *
+ * @return Mage_Core_Model_Abstract|Mage_Index_Model_Indexer
+ */
+ protected function _getIndexer()
+ {
+ return $this->_factory->getSingleton($this->_factory->getIndexClassAlias());
+ }
+
+ /**
+ * Parse string with indexers and return array of indexer instances
+ *
+ * @param string $string
+ * @return array
+ */
+ protected function _parseIndexerString($string)
+ {
+ $processes = [];
+ if ($string == 'all') {
+ $collection = $this->_getIndexer()->getProcessesCollection();
+ foreach ($collection as $process) {
+ if ($process->getIndexer()->isVisible() === false) {
+ continue;
+ }
+ $processes[] = $process;
+ }
+ } elseif (!empty($string)) {
+ $codes = explode(',', $string);
+ $codes = array_map('trim', $codes);
+ $processes = $this->_getIndexer()->getProcessesCollectionByCodes($codes);
+ foreach ($processes as $key => $process) {
+ if ($process->getIndexer()->getVisibility() === false) {
+ unset($processes[$key]);
+ }
+ }
+ if ($this->_getIndexer()->hasErrors()) {
+ echo implode(PHP_EOL, $this->_getIndexer()->getErrors()), PHP_EOL;
+ }
+ }
+ return $processes;
+ }
}
$shell = new Mage_Shell_Indexer();
diff --git a/shell/log.php b/shell/log.php
index 60c7a24a805..0159e337db5 100644
--- a/shell/log.php
+++ b/shell/log.php
@@ -31,64 +31,6 @@ class Mage_Shell_Log extends Mage_Shell_Abstract
*/
protected $_log;
- /**
- * Retrieve Log instance
- *
- * @return Mage_Log_Model_Log
- */
- protected function _getLog()
- {
- if (is_null($this->_log)) {
- $this->_log = Mage::getModel('log/log');
- }
- return $this->_log;
- }
-
- /**
- * Convert count to human view
- *
- * @param int $number
- * @return string
- */
- protected function _humanCount($number)
- {
- if ($number < 1000) {
- return (string) $number;
- }
- if ($number < 1000000) {
- return sprintf('%.2fK', $number / 1000);
- }
-
- if ($number < 1000000000) {
- return sprintf('%.2fM', $number / 1000000);
- }
-
- return sprintf('%.2fB', $number / 1000000000);
- }
-
- /**
- * Convert size to human view
- *
- * @param int $number
- * @return string
- */
- protected function _humanSize($number)
- {
- if ($number < 1000) {
- return sprintf('%d b', $number);
- }
-
- if ($number < 1000000) {
- return sprintf('%.2fKb', $number / 1000);
- }
-
- if ($number < 1000000000) {
- return sprintf('%.2fMb', $number / 1000000);
- }
-
- return sprintf('%.2fGb', $number / 1000000000);
- }
-
/**
* Run script
*
@@ -181,6 +123,64 @@ public function usageHelp()
USAGE;
}
+
+ /**
+ * Retrieve Log instance
+ *
+ * @return Mage_Log_Model_Log
+ */
+ protected function _getLog()
+ {
+ if (is_null($this->_log)) {
+ $this->_log = Mage::getModel('log/log');
+ }
+ return $this->_log;
+ }
+
+ /**
+ * Convert count to human view
+ *
+ * @param int $number
+ * @return string
+ */
+ protected function _humanCount($number)
+ {
+ if ($number < 1000) {
+ return (string) $number;
+ }
+ if ($number < 1000000) {
+ return sprintf('%.2fK', $number / 1000);
+ }
+
+ if ($number < 1000000000) {
+ return sprintf('%.2fM', $number / 1000000);
+ }
+
+ return sprintf('%.2fB', $number / 1000000000);
+ }
+
+ /**
+ * Convert size to human view
+ *
+ * @param int $number
+ * @return string
+ */
+ protected function _humanSize($number)
+ {
+ if ($number < 1000) {
+ return sprintf('%d b', $number);
+ }
+
+ if ($number < 1000000) {
+ return sprintf('%.2fKb', $number / 1000);
+ }
+
+ if ($number < 1000000000) {
+ return sprintf('%.2fMb', $number / 1000000);
+ }
+
+ return sprintf('%.2fGb', $number / 1000000000);
+ }
}
$shell = new Mage_Shell_Log();
 . ' "' . $this->__('This attribute shares the same value in all the stores') . '")
';
}
+
+ protected function _addBreadcrumb($label, $title = null, $link = null)
+ {
+ /** @var Mage_Adminhtml_Block_Widget_Breadcrumbs $block */
+ $block = $this->getLayout()->getBlock('breadcrumbs');
+ $block->addLink($label, $title, $link);
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index a8fbc946cc1..e9a7d657336 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -48,31 +48,6 @@ class Mage_Adminhtml_Block_Widget_Container extends Mage_Adminhtml_Block_Templat
*/
protected $_headerText = 'Container Widget Header';
- /**
- * Add a button
- *
- * @param string $id
- * @param array $data
- * @param int $level
- * @param int $sortOrder
- * @param string|null $area area, that button should be displayed in ('header', 'footer', null)
- * @return $this
- */
- protected function _addButton($id, $data, $level = 0, $sortOrder = 0, $area = 'header')
- {
- if (!isset($this->_buttons[$level])) {
- $this->_buttons[$level] = [];
- }
- $this->_buttons[$level][$id] = $data;
- $this->_buttons[$level][$id]['area'] = $area;
- if ($sortOrder) {
- $this->_buttons[$level][$id]['sort_order'] = $sortOrder;
- } else {
- $this->_buttons[$level][$id]['sort_order'] = count($this->_buttons[$level]) * 10;
- }
- return $this;
- }
-
/**
* Public wrapper for protected _addButton method
*
@@ -88,22 +63,6 @@ public function addButton($id, $data, $level = 0, $sortOrder = 0, $area = 'heade
return $this->_addButton($id, $data, $level, $sortOrder, $area);
}
- /**
- * Remove existing button
- *
- * @param string $id
- * @return $this
- */
- protected function _removeButton($id)
- {
- foreach ($this->_buttons as $level => $buttons) {
- if (isset($buttons[$id])) {
- unset($this->_buttons[$level][$id]);
- }
- }
- return $this;
- }
-
/**
* Public wrapper for the _removeButton() method
*
@@ -115,37 +74,6 @@ public function removeButton($id)
return $this->_removeButton($id);
}
- /**
- * Update specified button property
- *
- * @param string $id
- * @param string $key
- * @param mixed $data
- * @return $this
- */
- protected function _updateButton($id, $key, $data)
- {
- foreach ($this->_buttons as $level => $buttons) {
- if (isset($buttons[$id])) {
- if (!empty($key)) {
- if ($child = $this->getChild($id . '_button')) {
- $child->setData($key, $data);
- }
- if ($key == 'level') {
- $this->_buttons[$data][$id] = $this->_buttons[$level][$id];
- unset($this->_buttons[$level][$id]);
- } else {
- $this->_buttons[$level][$id][$key] = $data;
- }
- } else {
- $this->_buttons[$level][$id] = $data;
- }
- break;
- }
- }
- return $this;
- }
-
/**
* Public wrapper for protected _updateButton method
*
@@ -159,44 +87,6 @@ public function updateButton($id, $key, $data)
return $this->_updateButton($id, $key, $data);
}
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- foreach ($this->_buttons as $level => $buttons) {
- foreach ($buttons as $id => $data) {
- $childId = $this->_prepareButtonBlockId($id);
- $this->_addButtonChildBlock($childId);
- }
- }
- return parent::_prepareLayout();
- }
-
- /**
- * Prepare block id for button's id
- *
- * @param string $id
- * @return string
- */
- protected function _prepareButtonBlockId($id)
- {
- return $id . '_button';
- }
-
- /**
- * Adding child block with specified child's id.
- *
- * @param string $childId
- * @return Mage_Adminhtml_Block_Widget_Button
- */
- protected function _addButtonChildBlock($childId)
- {
- $block = $this->getLayout()->createBlock('adminhtml/widget_button');
- $this->setChild($childId, $block);
- return $block;
- }
-
/**
* Produce buttons HTML
*
@@ -283,6 +173,116 @@ public function hasFooterButtons()
return false;
}
+ /**
+ * Add a button
+ *
+ * @param string $id
+ * @param array $data
+ * @param int $level
+ * @param int $sortOrder
+ * @param string|null $area area, that button should be displayed in ('header', 'footer', null)
+ * @return $this
+ */
+ protected function _addButton($id, $data, $level = 0, $sortOrder = 0, $area = 'header')
+ {
+ if (!isset($this->_buttons[$level])) {
+ $this->_buttons[$level] = [];
+ }
+ $this->_buttons[$level][$id] = $data;
+ $this->_buttons[$level][$id]['area'] = $area;
+ if ($sortOrder) {
+ $this->_buttons[$level][$id]['sort_order'] = $sortOrder;
+ } else {
+ $this->_buttons[$level][$id]['sort_order'] = count($this->_buttons[$level]) * 10;
+ }
+ return $this;
+ }
+
+ /**
+ * Remove existing button
+ *
+ * @param string $id
+ * @return $this
+ */
+ protected function _removeButton($id)
+ {
+ foreach ($this->_buttons as $level => $buttons) {
+ if (isset($buttons[$id])) {
+ unset($this->_buttons[$level][$id]);
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * Update specified button property
+ *
+ * @param string $id
+ * @param string $key
+ * @param mixed $data
+ * @return $this
+ */
+ protected function _updateButton($id, $key, $data)
+ {
+ foreach ($this->_buttons as $level => $buttons) {
+ if (isset($buttons[$id])) {
+ if (!empty($key)) {
+ if ($child = $this->getChild($id . '_button')) {
+ $child->setData($key, $data);
+ }
+ if ($key == 'level') {
+ $this->_buttons[$data][$id] = $this->_buttons[$level][$id];
+ unset($this->_buttons[$level][$id]);
+ } else {
+ $this->_buttons[$level][$id][$key] = $data;
+ }
+ } else {
+ $this->_buttons[$level][$id] = $data;
+ }
+ break;
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ foreach ($this->_buttons as $level => $buttons) {
+ foreach ($buttons as $id => $data) {
+ $childId = $this->_prepareButtonBlockId($id);
+ $this->_addButtonChildBlock($childId);
+ }
+ }
+ return parent::_prepareLayout();
+ }
+
+ /**
+ * Prepare block id for button's id
+ *
+ * @param string $id
+ * @return string
+ */
+ protected function _prepareButtonBlockId($id)
+ {
+ return $id . '_button';
+ }
+
+ /**
+ * Adding child block with specified child's id.
+ *
+ * @param string $childId
+ * @return Mage_Adminhtml_Block_Widget_Button
+ */
+ protected function _addButtonChildBlock($childId)
+ {
+ $block = $this->getLayout()->createBlock('adminhtml/widget_button');
+ $this->setChild($childId, $block);
+ return $block;
+ }
+
/**
* Prepare html output
*
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php
index a4910e18e85..bbf7abef5ba 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php
@@ -29,45 +29,6 @@ class Mage_Adminhtml_Block_Widget_Form extends Mage_Adminhtml_Block_Widget
*/
protected $_form;
- /**
- * Class constructor
- *
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('widget/form.phtml');
- $this->setDestElementId('edit_form');
- $this->setShowGlobalIcon(false);
- }
-
- /**
- * Preparing global layout
- *
- * You can redefine this method in child classes for changin layout
- *
- * @return Mage_Core_Block_Abstract
- */
- protected function _prepareLayout()
- {
- $renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_element');
- if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
- Varien_Data_Form::setElementRenderer($renderer);
- }
-
- $renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_fieldset');
- if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
- Varien_Data_Form::setFieldsetRenderer($renderer);
- }
-
- $renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_fieldset_element');
- if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
- Varien_Data_Form::setFieldsetElementRenderer($renderer);
- }
-
- return parent::_prepareLayout();
- }
-
/**
* Get form object
*
@@ -116,6 +77,45 @@ public function setForm(Varien_Data_Form $form)
return $this;
}
+ /**
+ * Class constructor
+ *
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('widget/form.phtml');
+ $this->setDestElementId('edit_form');
+ $this->setShowGlobalIcon(false);
+ }
+
+ /**
+ * Preparing global layout
+ *
+ * You can redefine this method in child classes for changin layout
+ *
+ * @return Mage_Core_Block_Abstract
+ */
+ protected function _prepareLayout()
+ {
+ $renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_element');
+ if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
+ Varien_Data_Form::setElementRenderer($renderer);
+ }
+
+ $renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_fieldset');
+ if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
+ Varien_Data_Form::setFieldsetRenderer($renderer);
+ }
+
+ $renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_fieldset_element');
+ if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
+ Varien_Data_Form::setFieldsetElementRenderer($renderer);
+ }
+
+ return parent::_prepareLayout();
+ }
+
/**
* Prepare form before rendering HTML
*
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
index 4c4bcc1f1e1..a0c81d88d7b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
@@ -64,22 +64,6 @@ public function __construct()
], 1);
}
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- if ($this->_blockGroup && $this->_controller && $this->_mode) {
- $this->setChild('form', $this->getLayout()->createBlock($this->_blockGroup
- . '/'
- . $this->_controller
- . '_'
- . $this->_mode
- . '_form'));
- }
- return parent::_prepareLayout();
- }
-
/**
* Get URL for back (reset) button
*
@@ -193,4 +177,20 @@ public function setDataObject($object)
$this->getChild('form')->setDataObject($object);
return $this->setData('data_object', $object);
}
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ if ($this->_blockGroup && $this->_controller && $this->_mode) {
+ $this->setChild('form', $this->getLayout()->createBlock($this->_blockGroup
+ . '/'
+ . $this->_controller
+ . '_'
+ . $this->_mode
+ . '_form'));
+ }
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
index 67a6cff6c9c..770b18b358c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
@@ -51,6 +51,16 @@ public function getValues()
return $this->getElement()->getValue();
}
+ public function getAddButtonHtml()
+ {
+ return $this->getChildHtml('add_button');
+ }
+
+ public function getDeleteButtonHtml($image)
+ {
+ return str_replace('#image#', $image, $this->getChildHtml('delete_button'));
+ }
+
protected function _prepareLayout()
{
$this->setChild(
@@ -74,14 +84,4 @@ protected function _prepareLayout()
);
return parent::_prepareLayout();
}
-
- public function getAddButtonHtml()
- {
- return $this->getChildHtml('add_button');
- }
-
- public function getDeleteButtonHtml($image)
- {
- return str_replace('#image#', $image, $this->getChildHtml('delete_button'));
- }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php
index 74faa985055..ceeaecc8939 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php
@@ -24,11 +24,6 @@ class Mage_Adminhtml_Block_Widget_Form_Renderer_Element extends Mage_Adminhtml_B
{
protected $_element;
- protected function _construct()
- {
- $this->setTemplate('widget/form/renderer/element.phtml');
- }
-
public function getElement()
{
return $this->_element;
@@ -39,4 +34,9 @@ public function render(Varien_Data_Form_Element_Abstract $element)
$this->_element = $element;
return $this->toHtml();
}
+
+ protected function _construct()
+ {
+ $this->setTemplate('widget/form/renderer/element.phtml');
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php
index 64c280935ff..b90b91dd48c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php
@@ -24,11 +24,6 @@ class Mage_Adminhtml_Block_Widget_Form_Renderer_Fieldset extends Mage_Adminhtml_
{
protected $_element;
- protected function _construct()
- {
- $this->setTemplate('widget/form/renderer/fieldset.phtml');
- }
-
public function getElement()
{
return $this->_element;
@@ -39,4 +34,9 @@ public function render(Varien_Data_Form_Element_Abstract $element)
$this->_element = $element;
return $this->toHtml();
}
+
+ protected function _construct()
+ {
+ $this->setTemplate('widget/form/renderer/fieldset.phtml');
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php
index 17538a325c0..bff33a9dc35 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php
@@ -24,11 +24,6 @@ class Mage_Adminhtml_Block_Widget_Form_Renderer_Fieldset_Element extends Mage_Ad
{
protected $_element;
- protected function _construct()
- {
- $this->setTemplate('widget/form/renderer/fieldset/element.phtml');
- }
-
public function getElement()
{
return $this->_element;
@@ -39,4 +34,9 @@ public function render(Varien_Data_Form_Element_Abstract $element)
$this->_element = $element;
return $this->toHtml();
}
+
+ protected function _construct()
+ {
+ $this->setTemplate('widget/form/renderer/fieldset/element.phtml');
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
index ccdafd1d1d1..9c2e143d525 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
@@ -226,40 +226,6 @@ public function __construct($attributes = [])
$this->_emptyText = Mage::helper('adminhtml')->__('No records found.');
}
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- $this->setChild(
- 'export_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData([
- 'label' => Mage::helper('adminhtml')->__('Export'),
- 'onclick' => $this->getJsObjectName() . '.doExport()',
- 'class' => 'task',
- ]),
- );
- $this->setChild(
- 'reset_filter_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData([
- 'label' => Mage::helper('adminhtml')->__('Reset Filter'),
- 'onclick' => $this->getJsObjectName() . '.resetFilter()',
- ]),
- );
- $this->setChild(
- 'search_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData([
- 'label' => Mage::helper('adminhtml')->__('Search'),
- 'onclick' => $this->getJsObjectName() . '.doFilter()',
- 'class' => 'task',
- ]),
- );
- return parent::_prepareLayout();
- }
-
/**
* @return string
*/
@@ -523,376 +489,116 @@ public function getColumns()
}
/**
- * @param array $data
- *
- * @return $this
+ * @return string
*/
- protected function _setFilterValues($data)
+ public function getVarNameLimit()
{
- foreach (array_keys($data) as $columnId) {
- $column = $this->getColumn($columnId);
- if ($column instanceof Mage_Adminhtml_Block_Widget_Grid_Column
- && (!empty($data[$columnId]) || strlen($data[$columnId]) > 0)
- && $column->getFilter()
- ) {
- $column->getFilter()->setValue($data[$columnId]);
- $this->_addColumnFilterToCollection($column);
- }
- }
-
- return $this;
+ return $this->_varNameLimit;
}
/**
- * Add filter
- *
- * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
- * @return $this
+ * @return string
*/
- protected function _addColumnFilterToCollection($column)
+ public function getVarNamePage()
{
- if ($this->getCollection()) {
- $field = $column->getFilterIndex() ?: $column->getIndex();
- if ($column->getFilterConditionCallback() && $column->getFilterConditionCallback()[0] instanceof self) {
- call_user_func($column->getFilterConditionCallback(), $this->getCollection(), $column);
- } else {
- $cond = $column->getFilter()->getCondition();
- if ($field && $cond !== null) {
- $filtered = array_map(static function ($value) {
- return is_object($value) ? $value->__toString() : $value;
- }, is_array($cond) ? array_values($cond) : [$cond]);
- if (in_array('\'%NULL%\'', $filtered, true) || in_array('NULL', $filtered, true)) {
- $this->getCollection()->addFieldToFilter($field, ['null' => true]);
- } else {
- $this->getCollection()->addFieldToFilter($field, $cond);
- }
- }
- }
- }
- return $this;
+ return $this->_varNamePage;
}
/**
- * Add link model filter from grid column to collection
- *
- * @param Mage_Catalog_Model_Resource_Product_Link_Product_Collection $collection
- * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
- *
- * @return $this
+ * @return string
*/
- protected function _addLinkModelFilterCallback($collection, $column)
+ public function getVarNameSort()
{
- $field = $column->getFilterIndex() ?: $column->getIndex();
- $condition = $column->getFilter()->getCondition();
- $collection->addLinkModelFieldToFilter($field, $condition);
-
- return $this;
+ return $this->_varNameSort;
}
/**
- * Sets sorting order by some column
- *
- * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
- * @return $this
+ * @return string
*/
- protected function _setCollectionOrder($column)
+ public function getVarNameDir()
{
- $collection = $this->getCollection();
- if ($collection) {
- $columnIndex = $column->getFilterIndex() ?: $column->getIndex();
- $collection->setOrder($columnIndex, strtoupper($column->getDir()));
- }
- return $this;
+ return $this->_varNameDir;
}
/**
- * Prepare grid collection object
- *
- * @return $this
- * @throws Exception
+ * @return string
*/
- protected function _prepareCollection()
+ public function getVarNameFilter()
{
- if ($this->getCollection()) {
- $this->_preparePage();
-
- $columnId = $this->getParam($this->getVarNameSort(), $this->_defaultSort);
- $dir = $this->getParam($this->getVarNameDir(), $this->_defaultDir);
- $filter = $this->getParam($this->getVarNameFilter(), null);
-
- if (is_null($filter)) {
- $filter = $this->_defaultFilter;
- }
-
- if (is_string($filter)) {
- /** @var Mage_Adminhtml_Helper_Data $helper */
- $helper = $this->helper('adminhtml');
- $data = $helper->prepareFilterString($filter);
- $this->_setFilterValues($data);
- } elseif ($filter && is_array($filter)) {
- $this->_setFilterValues($filter);
- } elseif (count($this->_defaultFilter)) {
- $this->_setFilterValues($this->_defaultFilter);
- }
-
- if (isset($this->_columns[$columnId]) && $this->_columns[$columnId]->getIndex()) {
- $dir = (strtolower($dir) === 'desc') ? 'desc' : 'asc';
- $this->_columns[$columnId]->setDir($dir);
- $this->_setCollectionOrder($this->_columns[$columnId]);
- }
-
- if (!$this->_isExport) {
- $this->_beforeLoadCollection();
- $this->getCollection()->load();
- $this->_afterLoadCollection();
- }
- }
-
- return $this;
+ return $this->_varNameFilter;
}
/**
- * Decode URL encoded filter value recursive callback method
- *
- * @param string $value
+ * @param string $name
+ * @return string
*/
- protected function _decodeFilter(&$value)
+ public function setVarNameLimit($name)
{
- /** @var Mage_Adminhtml_Helper_Data $helper */
- $helper = $this->helper('adminhtml');
- $value = $helper->decodeFilter($value);
+ return $this->_varNameLimit = $name;
}
- protected function _preparePage()
+ /**
+ * @param string $name
+ * @return string
+ */
+ public function setVarNamePage($name)
{
- $this->getCollection()->setPageSize((int) $this->getParam($this->getVarNameLimit(), $this->_defaultLimit));
- $this->getCollection()->setCurPage((int) $this->getParam($this->getVarNamePage(), $this->_defaultPage));
+ return $this->_varNamePage = $name;
}
/**
- * Prepare columns for grid
- *
- * @return $this
+ * @param string $name
+ * @return string
*/
- protected function _prepareColumns()
+ public function setVarNameSort($name)
{
- $this->sortColumnsByOrder();
- return $this;
+ return $this->_varNameSort = $name;
}
/**
- * Prepare grid massaction block
- *
- * @return $this
+ * @param string $name
+ * @return string
*/
- protected function _prepareMassactionBlock()
+ public function setVarNameDir($name)
{
- $this->setChild('massaction', $this->getLayout()->createBlock($this->getMassactionBlockName()));
- $this->_prepareMassaction();
- if ($this->getMassactionBlock()->isAvailable()) {
- $this->_prepareMassactionColumn();
- }
- return $this;
+ return $this->_varNameDir = $name;
}
/**
- * Prepare grid massaction actions
- *
- * @return $this
+ * @param string $name
+ * @return string
*/
- protected function _prepareMassaction()
+ public function setVarNameFilter($name)
{
- return $this;
+ return $this->_varNameFilter = $name;
}
/**
- * Prepare grid massaction column
+ * Set visibility of column headers
*
- * @return $this
+ * @param bool $visible
*/
- protected function _prepareMassactionColumn()
+ public function setHeadersVisibility($visible = true)
{
- $columnId = 'massaction';
- $massactionColumn = $this->getLayout()->createBlock('adminhtml/widget_grid_column')
- ->setData([
- 'index' => $this->getMassactionIdField(),
- 'filter_index' => $this->getMassactionIdFilter(),
- 'type' => 'massaction',
- 'name' => $this->getMassactionBlock()->getFormFieldName(),
- 'align' => 'center',
- 'is_system' => true,
- ]);
-
- if ($this->getNoFilterMassactionColumn()) {
- $massactionColumn->setData('filter', false);
- }
-
- $massactionColumn->setSelected($this->getMassactionBlock()->getSelected())
- ->setGrid($this)
- ->setId($columnId);
-
- $oldColumns = $this->_columns;
- $this->_columns = [];
- $this->_columns[$columnId] = $massactionColumn;
- $this->_columns = array_merge($this->_columns, $oldColumns);
- return $this;
+ $this->_headersVisibility = $visible;
}
/**
- * @return $this
- * @throws Exception
+ * Return visibility of column headers
+ *
+ * @return bool
*/
- protected function _prepareGrid()
+ public function getHeadersVisibility()
{
- $this->_prepareColumns();
- $this->_prepareMassactionBlock();
- $this->_prepareCollection();
- return $this;
+ return $this->_headersVisibility;
}
/**
- * @inheritDoc
- * @throws Exception
+ * Set visibility of pager
+ *
+ * @param bool $visible
*/
- protected function _beforeToHtml()
- {
- try {
- $this->_prepareGrid();
- } catch (Exception $e) {
- $this->resetSavedParametersInSession();
- throw $e;
- }
-
- return parent::_beforeToHtml();
- }
-
- /**
- * @return $this
- */
- protected function _afterLoadCollection()
- {
- return $this;
- }
-
- /**
- * @return $this
- */
- protected function _beforeLoadCollection()
- {
- return $this;
- }
-
- /**
- * @return string
- */
- public function getVarNameLimit()
- {
- return $this->_varNameLimit;
- }
-
- /**
- * @return string
- */
- public function getVarNamePage()
- {
- return $this->_varNamePage;
- }
-
- /**
- * @return string
- */
- public function getVarNameSort()
- {
- return $this->_varNameSort;
- }
-
- /**
- * @return string
- */
- public function getVarNameDir()
- {
- return $this->_varNameDir;
- }
-
- /**
- * @return string
- */
- public function getVarNameFilter()
- {
- return $this->_varNameFilter;
- }
-
- /**
- * @param string $name
- * @return string
- */
- public function setVarNameLimit($name)
- {
- return $this->_varNameLimit = $name;
- }
-
- /**
- * @param string $name
- * @return string
- */
- public function setVarNamePage($name)
- {
- return $this->_varNamePage = $name;
- }
-
- /**
- * @param string $name
- * @return string
- */
- public function setVarNameSort($name)
- {
- return $this->_varNameSort = $name;
- }
-
- /**
- * @param string $name
- * @return string
- */
- public function setVarNameDir($name)
- {
- return $this->_varNameDir = $name;
- }
-
- /**
- * @param string $name
- * @return string
- */
- public function setVarNameFilter($name)
- {
- return $this->_varNameFilter = $name;
- }
-
- /**
- * Set visibility of column headers
- *
- * @param bool $visible
- */
- public function setHeadersVisibility($visible = true)
- {
- $this->_headersVisibility = $visible;
- }
-
- /**
- * Return visibility of column headers
- *
- * @return bool
- */
- public function getHeadersVisibility()
- {
- return $this->_headersVisibility;
- }
-
- /**
- * Set visibility of pager
- *
- * @param bool $visible
- */
- public function setPagerVisibility($visible = true)
+ public function setPagerVisibility($visible = true)
{
$this->_pagerVisibility = $visible;
}
@@ -1035,24 +741,6 @@ public function getRssLists()
return empty($this->_rssLists) ? false : $this->_rssLists;
}
- /**
- * Returns url for RSS
- * Can be overloaded in descendant classes to perform custom changes to url passed to addRssList()
- *
- * @param string $url
- * @return string
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _getRssUrl($url)
- {
- $urlModel = Mage::getModel('core/url');
- if (Mage::app()->getStore()->getStoreInUrl()) {
- // Url in 'admin' store view won't be accessible, so form it in default store view frontend
- $urlModel->setStore(Mage::app()->getDefaultStoreView());
- }
- return $urlModel->getUrl($url);
- }
-
/**
* Add new rss list to grid
*
@@ -1082,52 +770,6 @@ public function getHtml()
return $this->toHtml();
}
- /**
- * Retrieve file content from file container array
- *
- * @return string
- */
- protected function _getFileContainerContent(array $fileData)
- {
- $io = new Varien_Io_File();
- $path = $io->dirname($fileData['value']);
- $io->open(['path' => $path]);
- return $io->read($fileData['value']);
- }
-
- /**
- * Retrieve Headers row array for Export
- *
- * @return array
- */
- protected function _getExportHeaders()
- {
- $row = [];
- foreach ($this->_columns as $column) {
- if (!$column->getIsSystem()) {
- $row[] = $column->getExportHeader();
- }
- }
- return $row;
- }
-
- /**
- * Retrieve Totals row array for Export
- *
- * @return array
- */
- protected function _getExportTotals()
- {
- $totals = $this->getTotals();
- $row = [];
- foreach ($this->_columns as $column) {
- if (!$column->getIsSystem()) {
- $row[] = ($column->hasTotalsLabel()) ? $column->getTotalsLabel() : $column->getRowFieldExport($totals);
- }
- }
- return $row;
- }
-
/**
* Iterate collection and call callback method per item
* For callback method first argument always is item object
@@ -1166,23 +808,6 @@ public function _exportIterateCollection($callback, array $args)
}
}
- /**
- * Write item data to csv export file
- */
- protected function _exportCsvItem(Varien_Object $item, Varien_Io_File $adapter)
- {
- $row = [];
- foreach ($this->_columns as $column) {
- if (!$column->getIsSystem()) {
- $row[] = $column->getRowFieldExport($item);
- }
- }
-
- $adapter->streamWriteCsv(
- Mage::helper('core')->getEscapedCSVData($row),
- );
- }
-
/**
* Retrieve a file container array by grid data as CSV
*
@@ -1312,27 +937,6 @@ public function getXml()
return $xml . '';
}
- /**
- * Write item data to Excel 2003 XML export file
- *
- * @param Varien_Convert_Parser_Xml_Excel $parser
- */
- protected function _exportExcelItem(Varien_Object $item, Varien_Io_File $adapter, $parser = null)
- {
- if (is_null($parser)) {
- $parser = new Varien_Convert_Parser_Xml_Excel();
- }
-
- $row = [];
- foreach ($this->_columns as $column) {
- if (!$column->getIsSystem()) {
- $row[] = $column->getRowFieldExport($item);
- }
- }
- $data = $parser->getRowXml($row);
- $adapter->streamWrite($data);
- }
-
/**
* Retrieve a file container array by grid data as MS Excel 2003 XML Document
*
@@ -1925,4 +1529,400 @@ public function getLimitOptions(): array
{
return [20, 30, 50, 100, 200, 500, 1000];
}
+
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ $this->setChild(
+ 'export_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData([
+ 'label' => Mage::helper('adminhtml')->__('Export'),
+ 'onclick' => $this->getJsObjectName() . '.doExport()',
+ 'class' => 'task',
+ ]),
+ );
+ $this->setChild(
+ 'reset_filter_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData([
+ 'label' => Mage::helper('adminhtml')->__('Reset Filter'),
+ 'onclick' => $this->getJsObjectName() . '.resetFilter()',
+ ]),
+ );
+ $this->setChild(
+ 'search_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData([
+ 'label' => Mage::helper('adminhtml')->__('Search'),
+ 'onclick' => $this->getJsObjectName() . '.doFilter()',
+ 'class' => 'task',
+ ]),
+ );
+ return parent::_prepareLayout();
+ }
+
+ /**
+ * @param array $data
+ *
+ * @return $this
+ */
+ protected function _setFilterValues($data)
+ {
+ foreach (array_keys($data) as $columnId) {
+ $column = $this->getColumn($columnId);
+ if ($column instanceof Mage_Adminhtml_Block_Widget_Grid_Column
+ && (!empty($data[$columnId]) || strlen($data[$columnId]) > 0)
+ && $column->getFilter()
+ ) {
+ $column->getFilter()->setValue($data[$columnId]);
+ $this->_addColumnFilterToCollection($column);
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add filter
+ *
+ * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
+ * @return $this
+ */
+ protected function _addColumnFilterToCollection($column)
+ {
+ if ($this->getCollection()) {
+ $field = $column->getFilterIndex() ?: $column->getIndex();
+ if ($column->getFilterConditionCallback() && $column->getFilterConditionCallback()[0] instanceof self) {
+ call_user_func($column->getFilterConditionCallback(), $this->getCollection(), $column);
+ } else {
+ $cond = $column->getFilter()->getCondition();
+ if ($field && $cond !== null) {
+ $filtered = array_map(static function ($value) {
+ return is_object($value) ? $value->__toString() : $value;
+ }, is_array($cond) ? array_values($cond) : [$cond]);
+ if (in_array('\'%NULL%\'', $filtered, true) || in_array('NULL', $filtered, true)) {
+ $this->getCollection()->addFieldToFilter($field, ['null' => true]);
+ } else {
+ $this->getCollection()->addFieldToFilter($field, $cond);
+ }
+ }
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * Add link model filter from grid column to collection
+ *
+ * @param Mage_Catalog_Model_Resource_Product_Link_Product_Collection $collection
+ * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
+ *
+ * @return $this
+ */
+ protected function _addLinkModelFilterCallback($collection, $column)
+ {
+ $field = $column->getFilterIndex() ?: $column->getIndex();
+ $condition = $column->getFilter()->getCondition();
+ $collection->addLinkModelFieldToFilter($field, $condition);
+
+ return $this;
+ }
+
+ /**
+ * Sets sorting order by some column
+ *
+ * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
+ * @return $this
+ */
+ protected function _setCollectionOrder($column)
+ {
+ $collection = $this->getCollection();
+ if ($collection) {
+ $columnIndex = $column->getFilterIndex() ?: $column->getIndex();
+ $collection->setOrder($columnIndex, strtoupper($column->getDir()));
+ }
+ return $this;
+ }
+
+ /**
+ * Prepare grid collection object
+ *
+ * @return $this
+ * @throws Exception
+ */
+ protected function _prepareCollection()
+ {
+ if ($this->getCollection()) {
+ $this->_preparePage();
+
+ $columnId = $this->getParam($this->getVarNameSort(), $this->_defaultSort);
+ $dir = $this->getParam($this->getVarNameDir(), $this->_defaultDir);
+ $filter = $this->getParam($this->getVarNameFilter(), null);
+
+ if (is_null($filter)) {
+ $filter = $this->_defaultFilter;
+ }
+
+ if (is_string($filter)) {
+ /** @var Mage_Adminhtml_Helper_Data $helper */
+ $helper = $this->helper('adminhtml');
+ $data = $helper->prepareFilterString($filter);
+ $this->_setFilterValues($data);
+ } elseif ($filter && is_array($filter)) {
+ $this->_setFilterValues($filter);
+ } elseif (count($this->_defaultFilter)) {
+ $this->_setFilterValues($this->_defaultFilter);
+ }
+
+ if (isset($this->_columns[$columnId]) && $this->_columns[$columnId]->getIndex()) {
+ $dir = (strtolower($dir) === 'desc') ? 'desc' : 'asc';
+ $this->_columns[$columnId]->setDir($dir);
+ $this->_setCollectionOrder($this->_columns[$columnId]);
+ }
+
+ if (!$this->_isExport) {
+ $this->_beforeLoadCollection();
+ $this->getCollection()->load();
+ $this->_afterLoadCollection();
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Decode URL encoded filter value recursive callback method
+ *
+ * @param string $value
+ */
+ protected function _decodeFilter(&$value)
+ {
+ /** @var Mage_Adminhtml_Helper_Data $helper */
+ $helper = $this->helper('adminhtml');
+ $value = $helper->decodeFilter($value);
+ }
+
+ protected function _preparePage()
+ {
+ $this->getCollection()->setPageSize((int) $this->getParam($this->getVarNameLimit(), $this->_defaultLimit));
+ $this->getCollection()->setCurPage((int) $this->getParam($this->getVarNamePage(), $this->_defaultPage));
+ }
+
+ /**
+ * Prepare columns for grid
+ *
+ * @return $this
+ */
+ protected function _prepareColumns()
+ {
+ $this->sortColumnsByOrder();
+ return $this;
+ }
+
+ /**
+ * Prepare grid massaction block
+ *
+ * @return $this
+ */
+ protected function _prepareMassactionBlock()
+ {
+ $this->setChild('massaction', $this->getLayout()->createBlock($this->getMassactionBlockName()));
+ $this->_prepareMassaction();
+ if ($this->getMassactionBlock()->isAvailable()) {
+ $this->_prepareMassactionColumn();
+ }
+ return $this;
+ }
+
+ /**
+ * Prepare grid massaction actions
+ *
+ * @return $this
+ */
+ protected function _prepareMassaction()
+ {
+ return $this;
+ }
+
+ /**
+ * Prepare grid massaction column
+ *
+ * @return $this
+ */
+ protected function _prepareMassactionColumn()
+ {
+ $columnId = 'massaction';
+ $massactionColumn = $this->getLayout()->createBlock('adminhtml/widget_grid_column')
+ ->setData([
+ 'index' => $this->getMassactionIdField(),
+ 'filter_index' => $this->getMassactionIdFilter(),
+ 'type' => 'massaction',
+ 'name' => $this->getMassactionBlock()->getFormFieldName(),
+ 'align' => 'center',
+ 'is_system' => true,
+ ]);
+
+ if ($this->getNoFilterMassactionColumn()) {
+ $massactionColumn->setData('filter', false);
+ }
+
+ $massactionColumn->setSelected($this->getMassactionBlock()->getSelected())
+ ->setGrid($this)
+ ->setId($columnId);
+
+ $oldColumns = $this->_columns;
+ $this->_columns = [];
+ $this->_columns[$columnId] = $massactionColumn;
+ $this->_columns = array_merge($this->_columns, $oldColumns);
+ return $this;
+ }
+
+ /**
+ * @return $this
+ * @throws Exception
+ */
+ protected function _prepareGrid()
+ {
+ $this->_prepareColumns();
+ $this->_prepareMassactionBlock();
+ $this->_prepareCollection();
+ return $this;
+ }
+
+ /**
+ * @inheritDoc
+ * @throws Exception
+ */
+ protected function _beforeToHtml()
+ {
+ try {
+ $this->_prepareGrid();
+ } catch (Exception $e) {
+ $this->resetSavedParametersInSession();
+ throw $e;
+ }
+
+ return parent::_beforeToHtml();
+ }
+
+ /**
+ * @return $this
+ */
+ protected function _afterLoadCollection()
+ {
+ return $this;
+ }
+
+ /**
+ * @return $this
+ */
+ protected function _beforeLoadCollection()
+ {
+ return $this;
+ }
+
+ /**
+ * Returns url for RSS
+ * Can be overloaded in descendant classes to perform custom changes to url passed to addRssList()
+ *
+ * @param string $url
+ * @return string
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ protected function _getRssUrl($url)
+ {
+ $urlModel = Mage::getModel('core/url');
+ if (Mage::app()->getStore()->getStoreInUrl()) {
+ // Url in 'admin' store view won't be accessible, so form it in default store view frontend
+ $urlModel->setStore(Mage::app()->getDefaultStoreView());
+ }
+ return $urlModel->getUrl($url);
+ }
+
+ /**
+ * Retrieve file content from file container array
+ *
+ * @return string
+ */
+ protected function _getFileContainerContent(array $fileData)
+ {
+ $io = new Varien_Io_File();
+ $path = $io->dirname($fileData['value']);
+ $io->open(['path' => $path]);
+ return $io->read($fileData['value']);
+ }
+
+ /**
+ * Retrieve Headers row array for Export
+ *
+ * @return array
+ */
+ protected function _getExportHeaders()
+ {
+ $row = [];
+ foreach ($this->_columns as $column) {
+ if (!$column->getIsSystem()) {
+ $row[] = $column->getExportHeader();
+ }
+ }
+ return $row;
+ }
+
+ /**
+ * Retrieve Totals row array for Export
+ *
+ * @return array
+ */
+ protected function _getExportTotals()
+ {
+ $totals = $this->getTotals();
+ $row = [];
+ foreach ($this->_columns as $column) {
+ if (!$column->getIsSystem()) {
+ $row[] = ($column->hasTotalsLabel()) ? $column->getTotalsLabel() : $column->getRowFieldExport($totals);
+ }
+ }
+ return $row;
+ }
+
+ /**
+ * Write item data to csv export file
+ */
+ protected function _exportCsvItem(Varien_Object $item, Varien_Io_File $adapter)
+ {
+ $row = [];
+ foreach ($this->_columns as $column) {
+ if (!$column->getIsSystem()) {
+ $row[] = $column->getRowFieldExport($item);
+ }
+ }
+
+ $adapter->streamWriteCsv(
+ Mage::helper('core')->getEscapedCSVData($row),
+ );
+ }
+
+ /**
+ * Write item data to Excel 2003 XML export file
+ *
+ * @param Varien_Convert_Parser_Xml_Excel $parser
+ */
+ protected function _exportExcelItem(Varien_Object $item, Varien_Io_File $adapter, $parser = null)
+ {
+ if (is_null($parser)) {
+ $parser = new Varien_Convert_Parser_Xml_Excel();
+ }
+
+ $row = [];
+ foreach ($this->_columns as $column) {
+ if (!$column->getIsSystem()) {
+ $row[] = $column->getRowFieldExport($item);
+ }
+ }
+ $data = $parser->getRowXml($row);
+ $adapter->streamWrite($data);
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php
index 9e64aa1784c..96a64c0556a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php
@@ -204,6 +204,97 @@ public function getRowFieldExport(Varien_Object $row)
return $renderedValue;
}
+ /**
+ * @param string $renderer
+ * @return $this
+ */
+ public function setRenderer($renderer)
+ {
+ $this->_renderer = $renderer;
+ return $this;
+ }
+
+ /**
+ * Retrieve column renderer
+ *
+ * @return Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+ */
+ public function getRenderer()
+ {
+ if (!$this->_renderer) {
+ $rendererClass = $this->getData('renderer');
+ if (!$rendererClass) {
+ $rendererClass = $this->_getRendererByType();
+ }
+ $this->_renderer = $this->getLayout()->createBlock($rendererClass)
+ ->setColumn($this);
+ }
+ return $this->_renderer;
+ }
+
+ /**
+ * @param string $filterClass
+ * @return void
+ */
+ public function setFilter($filterClass)
+ {
+ $this->_filter = $this->getLayout()->createBlock($filterClass)
+ ->setColumn($this);
+ }
+
+ /**
+ * @return Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract|false
+ */
+ public function getFilter()
+ {
+ if (!$this->_filter) {
+ $filterClass = $this->getData('filter');
+ if ($filterClass === false) {
+ return false;
+ }
+ if (!$filterClass) {
+ $filterClass = $this->_getFilterByType();
+ if ($filterClass === false) {
+ return false;
+ }
+ }
+ $this->_filter = $this->getLayout()->createBlock($filterClass)
+ ->setColumn($this);
+ }
+
+ return $this->_filter;
+ }
+
+ /**
+ * @return string
+ */
+ public function getFilterHtml()
+ {
+ if ($this->getFilter()) {
+ return $this->getFilter()->getHtml();
+ }
+
+ return ' ';
+ }
+
+ /**
+ * Retrieve Header Name for Export
+ *
+ * @return string
+ */
+ public function getExportHeader()
+ {
+ if ($this->getHeaderExport()) {
+ return $this->getHeaderExport();
+ }
+ return $this->getHeader();
+ }
+
+ public function getType(): string
+ {
+ return (string) $this->_getData('type');
+ }
+
/**
* Decorate rendered cell value
*
@@ -232,16 +323,6 @@ protected function &_applyDecorators($value, $decorators)
return $value;
}
- /**
- * @param string $renderer
- * @return $this
- */
- public function setRenderer($renderer)
- {
- $this->_renderer = $renderer;
- return $this;
- }
-
/**
* @return string
*/
@@ -316,34 +397,6 @@ protected function _getRendererByType()
return $rendererClass;
}
- /**
- * Retrieve column renderer
- *
- * @return Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
- */
- public function getRenderer()
- {
- if (!$this->_renderer) {
- $rendererClass = $this->getData('renderer');
- if (!$rendererClass) {
- $rendererClass = $this->_getRendererByType();
- }
- $this->_renderer = $this->getLayout()->createBlock($rendererClass)
- ->setColumn($this);
- }
- return $this->_renderer;
- }
-
- /**
- * @param string $filterClass
- * @return void
- */
- public function setFilter($filterClass)
- {
- $this->_filter = $this->getLayout()->createBlock($filterClass)
- ->setColumn($this);
- }
-
/**
* @return string
*/
@@ -397,57 +450,4 @@ protected function _getFilterByType()
}
return $filterClass;
}
-
- /**
- * @return Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract|false
- */
- public function getFilter()
- {
- if (!$this->_filter) {
- $filterClass = $this->getData('filter');
- if ($filterClass === false) {
- return false;
- }
- if (!$filterClass) {
- $filterClass = $this->_getFilterByType();
- if ($filterClass === false) {
- return false;
- }
- }
- $this->_filter = $this->getLayout()->createBlock($filterClass)
- ->setColumn($this);
- }
-
- return $this->_filter;
- }
-
- /**
- * @return string
- */
- public function getFilterHtml()
- {
- if ($this->getFilter()) {
- return $this->getFilter()->getHtml();
- }
-
- return ' ';
- }
-
- /**
- * Retrieve Header Name for Export
- *
- * @return string
- */
- public function getExportHeader()
- {
- if ($this->getHeaderExport()) {
- return $this->getHeaderExport();
- }
- return $this->getHeader();
- }
-
- public function getType(): string
- {
- return (string) $this->_getData('type');
- }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php
index acfb4ec1764..182f4cfd35a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php
@@ -52,48 +52,58 @@ public function getColumn()
}
/**
- * Retrieve html name of filter
+ * Retrieve escaped value
*
+ * @param mixed $index
* @return string
*/
- protected function _getHtmlName()
+ public function getEscapedValue($index = null)
{
- return $this->getColumn()->getId();
+ return htmlspecialchars((string) $this->getValue($index));
}
/**
- * Retrieve html id of filter
+ * Retrieve condition
+ *
+ * @return array
+ */
+ public function getCondition()
+ {
+ $helper = Mage::getResourceHelper('core');
+ $likeExpression = $helper->addLikeEscape($this->getValue(), ['position' => 'any']);
+ return ['like' => $likeExpression];
+ }
+
+ /**
+ * Retrieve filter html
*
* @return string
*/
- protected function _getHtmlId()
+ public function getHtml()
{
- return $this->getColumn()->getGrid()->getId() . '_'
- . $this->getColumn()->getGrid()->getVarNameFilter() . '_'
- . $this->getColumn()->getId();
+ return '';
}
/**
- * Retrieve escaped value
+ * Retrieve html name of filter
*
- * @param mixed $index
* @return string
*/
- public function getEscapedValue($index = null)
+ protected function _getHtmlName()
{
- return htmlspecialchars((string) $this->getValue($index));
+ return $this->getColumn()->getId();
}
/**
- * Retrieve condition
+ * Retrieve html id of filter
*
- * @return array
+ * @return string
*/
- public function getCondition()
+ protected function _getHtmlId()
{
- $helper = Mage::getResourceHelper('core');
- $likeExpression = $helper->addLikeEscape($this->getValue(), ['position' => 'any']);
- return ['like' => $likeExpression];
+ return $this->getColumn()->getGrid()->getId() . '_'
+ . $this->getColumn()->getGrid()->getVarNameFilter() . '_'
+ . $this->getColumn()->getId();
}
/**
@@ -105,14 +115,4 @@ protected function _escapeValue($value)
{
return str_replace('_', '\_', str_replace('\\', '\\\\', $value));
}
-
- /**
- * Retrieve filter html
- *
- * @return string
- */
- public function getHtml()
- {
- return '';
- }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php
index c44e6c65724..53b0348e282 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php
@@ -30,6 +30,21 @@ public function getHtml()
return '' . parent::getHtml() . '';
}
+ /**
+ * @return array|null
+ */
+ public function getCondition()
+ {
+ if ($this->getValue()) {
+ return $this->getColumn()->getValue();
+ } else {
+ return [
+ ['neq' => $this->getColumn()->getValue()],
+ ['is' => new Zend_Db_Expr('NULL')],
+ ];
+ }
+ }
+
/**
* @return array[]
*/
@@ -50,19 +65,4 @@ protected function _getOptions()
],
];
}
-
- /**
- * @return array|null
- */
- public function getCondition()
- {
- if ($this->getValue()) {
- return $this->getColumn()->getValue();
- } else {
- return [
- ['neq' => $this->getColumn()->getValue()],
- ['is' => new Zend_Db_Expr('NULL')],
- ];
- }
- }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
index b72ae442923..deb46276078 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
@@ -25,17 +25,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date extends Mage_Adminhtml
{
protected $_locale;
- /**
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- if ($head = $this->getLayout()->getBlock('head')) {
- $head->setCanLoadCalendarJs(true);
- }
- return parent::_prepareLayout();
- }
-
/**
* @return string
* @throws Exception
@@ -171,6 +160,17 @@ public function getLocale()
return $this->_locale;
}
+ /**
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ if ($head = $this->getLayout()->getBlock('head')) {
+ $head->setCanLoadCalendarJs(true);
+ }
+ return parent::_prepareLayout();
+ }
+
/**
* Convert given date to default (UTC) timezone
*
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php
index 4878943f9e2..50588805226 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -51,43 +51,6 @@ public function getValue($index = null)
return $value;
}
- /**
- * Convert given date to default (UTC) timezone
- *
- * @param string $date
- * @param string $locale
- * @return Zend_Date|null
- */
- protected function _convertDate($date, $locale)
- {
- if ($this->getColumn()->getFilterTime()) {
- try {
- $dateObj = $this->getLocale()->date(null, null, $locale, false);
-
- //set default timezone for store (admin)
- $dateObj->setTimezone(
- Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE),
- );
-
- //set date with applying timezone of store
- $dateObj->set(
- $date,
- $this->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT),
- $locale,
- );
-
- //convert store date to default date in UTC timezone without DST
- $dateObj->setTimezone(Mage_Core_Model_Locale::DEFAULT_TIMEZONE);
-
- return $dateObj;
- } catch (Exception $e) {
- return null;
- }
- }
-
- return parent::_convertDate($date, $locale);
- }
-
/**
* Render filter html
*
@@ -165,4 +128,41 @@ public function getEscapedValue($index = null)
return $this->escapeHtml(parent::getEscapedValue($index));
}
+
+ /**
+ * Convert given date to default (UTC) timezone
+ *
+ * @param string $date
+ * @param string $locale
+ * @return Zend_Date|null
+ */
+ protected function _convertDate($date, $locale)
+ {
+ if ($this->getColumn()->getFilterTime()) {
+ try {
+ $dateObj = $this->getLocale()->date(null, null, $locale, false);
+
+ //set default timezone for store (admin)
+ $dateObj->setTimezone(
+ Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE),
+ );
+
+ //set date with applying timezone of store
+ $dateObj->set(
+ $date,
+ $this->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT),
+ $locale,
+ );
+
+ //convert store date to default date in UTC timezone without DST
+ $dateObj->setTimezone(Mage_Core_Model_Locale::DEFAULT_TIMEZONE);
+
+ return $dateObj;
+ } catch (Exception $e) {
+ return null;
+ }
+ }
+
+ return parent::_convertDate($date, $locale);
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php
index 477ffc0d669..a2177ddf8b6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php
@@ -58,39 +58,6 @@ public function getCurrencyAffect()
}
}
- protected function _getCurrencyModel()
- {
- if (is_null($this->_currencyModel)) {
- $this->_currencyModel = Mage::getModel('directory/currency');
- }
-
- return $this->_currencyModel;
- }
-
- protected function _getCurrencySelectHtml()
- {
- $value = $this->getEscapedValue('currency');
- if (!$value) {
- $value = $this->getColumn()->getCurrencyCode();
- }
-
- $html = '';
- $html .= '';
- }
-
- protected function _getCurrencyList()
- {
- if (is_null($this->_currencyList)) {
- $this->_currencyList = $this->_getCurrencyModel()->getConfigAllowCurrencies();
- }
- return $this->_currencyList;
- }
-
public function getValue($index = null)
{
if ($index) {
@@ -126,11 +93,6 @@ public function getCondition()
return $value;
}
- protected function _getRate($from, $to)
- {
- return Mage::getModel('directory/currency')->load($from)->getAnyRate($to);
- }
-
public function prepareRates($displayCurrency)
{
$storeCurrency = $this->getColumn()->getCurrencyCode();
@@ -141,4 +103,42 @@ public function prepareRates($displayCurrency)
$this->getColumn()->setCurrencyCode($displayCurrency);
}
}
+
+ protected function _getCurrencyModel()
+ {
+ if (is_null($this->_currencyModel)) {
+ $this->_currencyModel = Mage::getModel('directory/currency');
+ }
+
+ return $this->_currencyModel;
+ }
+
+ protected function _getCurrencySelectHtml()
+ {
+ $value = $this->getEscapedValue('currency');
+ if (!$value) {
+ $value = $this->getColumn()->getCurrencyCode();
+ }
+
+ $html = '';
+ $html .= '';
+ }
+
+ protected function _getCurrencyList()
+ {
+ if (is_null($this->_currencyList)) {
+ $this->_currencyList = $this->_getCurrencyModel()->getConfigAllowCurrencies();
+ }
+ return $this->_currencyList;
+ }
+
+ protected function _getRate($from, $to)
+ {
+ return Mage::getModel('directory/currency')->load($from)->getAnyRate($to);
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php
index dddce0188b5..7659b318192 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php
@@ -22,6 +22,17 @@
*/
class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Radio extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select
{
+ public function getCondition()
+ {
+ if ($this->getValue()) {
+ return $this->getColumn()->getValue();
+ } else {
+ return [
+ ['neq' => $this->getColumn()->getValue()],
+ ['is' => new Zend_Db_Expr('NULL')],
+ ];
+ }
+ }
protected function _getOptions()
{
return [
@@ -39,16 +50,4 @@ protected function _getOptions()
],
];
}
-
- public function getCondition()
- {
- if ($this->getValue()) {
- return $this->getColumn()->getValue();
- } else {
- return [
- ['neq' => $this->getColumn()->getValue()],
- ['is' => new Zend_Db_Expr('NULL')],
- ];
- }
- }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php
index a01e05560f9..2d8ff1d15c5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php
@@ -22,6 +22,37 @@
*/
class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract
{
+ /**
+ * @return string
+ */
+ public function getHtml()
+ {
+ $html = '';
+ }
+
+ /**
+ * @return array|null
+ */
+ public function getCondition()
+ {
+ if (is_null($this->getValue())) {
+ return null;
+ }
+ return ['eq' => $this->getValue()];
+ }
/**
* @return array[]
*/
@@ -58,36 +89,4 @@ protected function _renderOption($option, $value)
$selected = (($option['value'] == $value && (!is_null($value))) ? ' selected="selected"' : '');
return '';
}
-
- /**
- * @return string
- */
- public function getHtml()
- {
- $html = '';
- }
-
- /**
- * @return array|null
- */
- public function getCondition()
- {
- if (is_null($this->getValue())) {
- return null;
- }
- return ['eq' => $this->getValue()];
- }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php
index 710e1fe6bbc..e90d331ff6f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php
@@ -57,6 +57,23 @@ public function getOptions()
return $options;
}
+ /**
+ * Retrieve filter condition for collection
+ *
+ * @return mixed
+ */
+ public function getCondition()
+ {
+ if (is_null($this->getValue())) {
+ return null;
+ }
+ $value = $this->getValue();
+ if ($value == 'all') {
+ $value = '';
+ }
+ return ['eq' => $value];
+ }
+
/**
* Render SELECT options
*
@@ -88,21 +105,4 @@ protected function _drawOptions($options)
return $html;
}
-
- /**
- * Retrieve filter condition for collection
- *
- * @return mixed
- */
- public function getCondition()
- {
- if (is_null($this->getValue())) {
- return null;
- }
- $value = $this->getValue();
- if ($value == 'all') {
- $value = '';
- }
- return ['eq' => $value];
- }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php
index 72baf154573..1e32aa9b1c5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php
@@ -70,25 +70,6 @@ public function renderExport(Varien_Object $row)
return $this->render($row);
}
- /**
- * @return string|null
- */
- protected function _getValue(Varien_Object $row)
- {
- if ($getter = $this->getColumn()->getGetter()) {
- if (is_string($getter)) {
- return $row->$getter();
- } elseif (is_callable($getter)) {
- return call_user_func($getter, $row);
- }
- return '';
- }
- if ($index = $this->getColumn()->getIndex()) {
- return $row->getData($index);
- }
- return null;
- }
-
/**
* @return string
*/
@@ -100,14 +81,6 @@ public function _getInputValueElement(Varien_Object $row)
. '" value="' . $this->_getInputValue($row) . '"/>';
}
- /**
- * @return string|null
- */
- protected function _getInputValue(Varien_Object $row)
- {
- return $this->_getValue($row);
- }
-
/**
* @return string
*/
@@ -167,4 +140,31 @@ public function getCopyableText(Varien_Object $row)
{
return $this->_getValue($row);
}
+
+ /**
+ * @return string|null
+ */
+ protected function _getValue(Varien_Object $row)
+ {
+ if ($getter = $this->getColumn()->getGetter()) {
+ if (is_string($getter)) {
+ return $row->$getter();
+ } elseif (is_callable($getter)) {
+ return call_user_func($getter, $row);
+ }
+ return '';
+ }
+ if ($index = $this->getColumn()->getIndex()) {
+ return $row->getData($index);
+ }
+ return null;
+ }
+
+ /**
+ * @return string|null
+ */
+ protected function _getInputValue(Varien_Object $row)
+ {
+ return $this->_getValue($row);
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php
index f897745506f..c6bf39adabb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php
@@ -70,20 +70,6 @@ public function render(Varien_Object $row)
return $this->_getCheckboxHtml($v, $checked);
}
- /**
- * @param string $value Value of the element
- * @param bool $checked Whether it is checked
- * @return string
- */
- protected function _getCheckboxHtml($value, $checked)
- {
- $html = 'getColumn()->getFieldName() . '" ';
- $html .= 'value="' . $this->escapeHtml($value) . '" ';
- $html .= 'class="' . ($this->getColumn()->getInlineCss() ? $this->getColumn()->getInlineCss() : 'checkbox') . '"';
- return $html . ($checked . $this->getDisabled() . '/>');
- }
-
/**
* Renders header of the column
*
@@ -110,4 +96,18 @@ public function renderHeader()
$html .= 'class="checkbox"' . $checked . $disabled . ' ';
return $html . ('title="' . Mage::helper('adminhtml')->__('Select All') . '"/>');
}
+
+ /**
+ * @param string $value Value of the element
+ * @param bool $checked Whether it is checked
+ * @return string
+ */
+ protected function _getCheckboxHtml($value, $checked)
+ {
+ $html = 'getColumn()->getFieldName() . '" ';
+ $html .= 'value="' . $this->escapeHtml($value) . '" ';
+ $html .= 'class="' . ($this->getColumn()->getInlineCss() ? $this->getColumn()->getInlineCss() : 'checkbox') . '"';
+ return $html . ($checked . $this->getDisabled() . '/>');
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php
index b4734546385..73429ce762c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php
@@ -28,29 +28,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Date extends Mage_Adminht
*/
protected static $_format = null;
- /**
- * Retrieve date format
- *
- * @return string
- */
- protected function _getFormat()
- {
- $format = $this->getColumn()->getFormat();
- if (!$format) {
- if (is_null(self::$_format)) {
- try {
- self::$_format = Mage::app()->getLocale()->getDateFormat(
- Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM,
- );
- } catch (Exception $e) {
- Mage::logException($e);
- }
- }
- $format = self::$_format;
- }
- return $format;
- }
-
/**
* Renders grid column
*
@@ -80,4 +57,27 @@ public function render(Varien_Object $row)
}
return $this->getColumn()->getDefault();
}
+
+ /**
+ * Retrieve date format
+ *
+ * @return string
+ */
+ protected function _getFormat()
+ {
+ $format = $this->getColumn()->getFormat();
+ if (!$format) {
+ if (is_null(self::$_format)) {
+ try {
+ self::$_format = Mage::app()->getLocale()->getDateFormat(
+ Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM,
+ );
+ } catch (Exception $e) {
+ Mage::logException($e);
+ }
+ }
+ $format = self::$_format;
+ }
+ return $format;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php
index 950a18c3a27..8739358e5ee 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php
@@ -27,29 +27,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Datetime extends Mage_Adm
*/
protected static $_format = null;
- /**
- * Retrieve datetime format
- *
- * @return string
- */
- protected function _getFormat()
- {
- $format = $this->getColumn()->getFormat();
- if (!$format) {
- if (is_null(self::$_format)) {
- try {
- self::$_format = Mage::app()->getLocale()->getDateTimeFormat(
- Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM,
- );
- } catch (Exception $e) {
- Mage::logException($e);
- }
- }
- $format = self::$_format;
- }
- return $format;
- }
-
/**
* Renders grid column
*
@@ -73,4 +50,27 @@ public function render(Varien_Object $row)
}
return $this->getColumn()->getDefault();
}
+
+ /**
+ * Retrieve datetime format
+ *
+ * @return string
+ */
+ protected function _getFormat()
+ {
+ $format = $this->getColumn()->getFormat();
+ if (!$format) {
+ if (is_null(self::$_format)) {
+ try {
+ self::$_format = Mage::app()->getLocale()->getDateTimeFormat(
+ Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM,
+ );
+ } catch (Exception $e) {
+ Mage::logException($e);
+ }
+ }
+ $format = self::$_format;
+ }
+ return $format;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php
index 2f1ddf27e07..72b34dda876 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php
@@ -25,40 +25,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Store extends Mage_Adminh
protected $_skipAllStoresLabel = false;
protected $_skipEmptyStoresLabel = false;
- /**
- * Retrieve System Store model
- *
- * @return Mage_Adminhtml_Model_System_Store
- */
- protected function _getStoreModel()
- {
- return Mage::getSingleton('adminhtml/system_store');
- }
-
- /**
- * Retrieve 'show all stores label' flag
- *
- * @return bool
- */
- protected function _getShowAllStoresLabelFlag()
- {
- return $this->getColumn()->getData('skipAllStoresLabel')
- ? $this->getColumn()->getData('skipAllStoresLabel')
- : $this->_skipAllStoresLabel;
- }
-
- /**
- * Retrieve 'show empty stores label' flag
- *
- * @return bool
- */
- protected function _getShowEmptyStoresLabelFlag()
- {
- return $this->getColumn()->getData('skipEmptyStoresLabel')
- ? $this->getColumn()->getData('skipEmptyStoresLabel')
- : $this->_skipEmptyStoresLabel;
- }
-
/**
* Render row store views
*
@@ -148,4 +114,38 @@ public function renderExport(Varien_Object $row)
return $out;
}
+
+ /**
+ * Retrieve System Store model
+ *
+ * @return Mage_Adminhtml_Model_System_Store
+ */
+ protected function _getStoreModel()
+ {
+ return Mage::getSingleton('adminhtml/system_store');
+ }
+
+ /**
+ * Retrieve 'show all stores label' flag
+ *
+ * @return bool
+ */
+ protected function _getShowAllStoresLabelFlag()
+ {
+ return $this->getColumn()->getData('skipAllStoresLabel')
+ ? $this->getColumn()->getData('skipAllStoresLabel')
+ : $this->_skipAllStoresLabel;
+ }
+
+ /**
+ * Retrieve 'show empty stores label' flag
+ *
+ * @return bool
+ */
+ protected function _getShowEmptyStoresLabelFlag()
+ {
+ return $this->getColumn()->getData('skipEmptyStoresLabel')
+ ? $this->getColumn()->getData('skipEmptyStoresLabel')
+ : $this->_skipEmptyStoresLabel;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
index 126e373065a..443fbba6943 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
@@ -55,21 +55,6 @@ public function __construct()
]);
}
- /**
- * @inheritdoc
- */
- protected function _prepareLayout()
- {
- $this->setChild(
- 'grid',
- $this->getLayout()->createBlock(
- $this->_blockGroup . '/' . $this->_controller . '_grid',
- $this->_controller . '.grid',
- )->setSaveParametersInSession(true),
- );
- return parent::_prepareLayout();
- }
-
/**
* @return string
*/
@@ -89,41 +74,56 @@ public function getGridHtml()
/**
* @return string
*/
- protected function getAddButtonLabel()
+ public function getHeaderCssClass()
{
- return $this->_addButtonLabel;
+ return 'icon-head ' . parent::getHeaderCssClass();
}
/**
* @return string
*/
- protected function getBackButtonLabel()
+ public function getHeaderWidth()
{
- return $this->_backButtonLabel;
+ return 'width:50%;';
}
- protected function _addBackButton()
+ /**
+ * @inheritdoc
+ */
+ protected function _prepareLayout()
{
- $this->_addButton('back', [
- 'label' => $this->getBackButtonLabel(),
- 'onclick' => Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
- 'class' => 'back',
- ]);
+ $this->setChild(
+ 'grid',
+ $this->getLayout()->createBlock(
+ $this->_blockGroup . '/' . $this->_controller . '_grid',
+ $this->_controller . '.grid',
+ )->setSaveParametersInSession(true),
+ );
+ return parent::_prepareLayout();
}
/**
* @return string
*/
- public function getHeaderCssClass()
+ protected function getAddButtonLabel()
{
- return 'icon-head ' . parent::getHeaderCssClass();
+ return $this->_addButtonLabel;
}
/**
* @return string
*/
- public function getHeaderWidth()
+ protected function getBackButtonLabel()
{
- return 'width:50%;';
+ return $this->_backButtonLabel;
+ }
+
+ protected function _addBackButton()
+ {
+ $this->_addButton('back', [
+ 'label' => $this->getBackButtonLabel(),
+ 'onclick' => Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
+ 'class' => 'back',
+ ]);
}
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php
index 880241dc15d..017ecb49083 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php
@@ -67,17 +67,6 @@ public function setAdditionalActionBlock($block)
return $this;
}
- /**
- * @return Mage_Adminhtml_Block_Widget_Grid_Massaction_Item_Additional_Default
- */
- protected function _createFromConfig(array $config)
- {
- /** @var Mage_Adminhtml_Block_Widget_Grid_Massaction_Item_Additional_Default $block */
- $block = $this->getLayout()->createBlock('adminhtml/widget_grid_massaction_item_additional_default');
- $block->createFromConfiguration(isset($config['type']) ? $config['config'] : $config);
- return $block;
- }
-
/**
* Retrieve additional action block for this item
*
@@ -97,4 +86,15 @@ public function getAdditionalActionBlockHtml()
{
return $this->getChildHtml('additional_action');
}
+
+ /**
+ * @return Mage_Adminhtml_Block_Widget_Grid_Massaction_Item_Additional_Default
+ */
+ protected function _createFromConfig(array $config)
+ {
+ /** @var Mage_Adminhtml_Block_Widget_Grid_Massaction_Item_Additional_Default $block */
+ $block = $this->getLayout()->createBlock('adminhtml/widget_grid_massaction_item_additional_default');
+ $block->createFromConfiguration(isset($config['type']) ? $config['config'] : $config);
+ return $block;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
index cfa4e93ec5e..13a4be00de6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
@@ -60,11 +60,6 @@ class Mage_Adminhtml_Block_Widget_Tabs extends Mage_Adminhtml_Block_Widget
*/
protected $_destElementId = 'content';
- protected function _construct()
- {
- $this->setTemplate('widget/tabs.phtml');
- }
-
/**
* retrieve destination html element id
*
@@ -180,93 +175,6 @@ public function setActiveTab($tabId)
return $this;
}
- /**
- * Set Active Tab
- *
- * @param string $tabId
- * @return $this
- */
- protected function _setActiveTab($tabId)
- {
- foreach ($this->_tabs as $id => $tab) {
- if ($this->getTabId($tab) == $tabId) {
- $this->_activeTab = $id;
- $tab->setActive(true);
- return $this;
- }
- }
- return $this;
- }
-
- /**
- * @inheritDoc
- */
- protected function _beforeToHtml()
- {
- Mage::dispatchEvent('adminhtml_block_widget_tabs_html_before', ['block' => $this]);
- if ($activeTab = $this->getRequest()->getParam('active_tab')) {
- $this->setActiveTab($activeTab);
- } elseif ($activeTabId = Mage::getSingleton('admin/session')->getActiveTabId()) {
- $this->_setActiveTab($activeTabId);
- }
-
- if ($this->_activeTab === null && !empty($this->_tabs)) {
- $this->_activeTab = (reset($this->_tabs))->getId();
- }
-
- if (!empty($this->_afterTabIds)) {
- $this->_tabs = $this->_reorderTabs();
- }
-
- $this->assign('tabs', $this->_tabs);
- return parent::_beforeToHtml();
- }
-
- /**
- * Find the root parent Tab ID recursively.
- *
- * @param string $currentAfterTabId
- * @param int $degree Degrees of separation between child and root parent.
- * @return string The parent tab ID.
- */
- protected function _getRootParentTabId($currentAfterTabId, &$degree)
- {
- if (array_key_exists($currentAfterTabId, $this->_afterTabIds)) {
- $degree++;
- return $this->_getRootParentTabId($this->_afterTabIds[$currentAfterTabId], $degree);
- } else {
- return $currentAfterTabId;
- }
- }
-
- /**
- * @return array
- */
- protected function _reorderTabs()
- {
- // Set new position based on $afterTabId.
- foreach ($this->_afterTabIds as $tabId => $afterTabId) {
- if (array_key_exists($afterTabId, $this->_tabs)) {
- $degree = 1; // Initialize to 1 degree of separation.
- $parentAfterTabId = $this->_getRootParentTabId($afterTabId, $degree);
- $this->_tabPositions[$tabId] = $this->_tabPositions[$parentAfterTabId] + $degree;
- $degree++;
- }
- }
-
- asort($this->_tabPositions);
-
- $ordered = [];
- foreach (array_keys($this->_tabPositions) as $tabId) {
- if (isset($this->_tabs[$tabId])) {
- $tab = $this->_tabs[$tabId];
- $ordered[$tabId] = $tab;
- }
- }
-
- return $ordered;
- }
-
/**
* @return string
*/
@@ -486,4 +394,96 @@ public function removeTab($tabId)
}
return $this;
}
+
+ protected function _construct()
+ {
+ $this->setTemplate('widget/tabs.phtml');
+ }
+
+ /**
+ * Set Active Tab
+ *
+ * @param string $tabId
+ * @return $this
+ */
+ protected function _setActiveTab($tabId)
+ {
+ foreach ($this->_tabs as $id => $tab) {
+ if ($this->getTabId($tab) == $tabId) {
+ $this->_activeTab = $id;
+ $tab->setActive(true);
+ return $this;
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _beforeToHtml()
+ {
+ Mage::dispatchEvent('adminhtml_block_widget_tabs_html_before', ['block' => $this]);
+ if ($activeTab = $this->getRequest()->getParam('active_tab')) {
+ $this->setActiveTab($activeTab);
+ } elseif ($activeTabId = Mage::getSingleton('admin/session')->getActiveTabId()) {
+ $this->_setActiveTab($activeTabId);
+ }
+
+ if ($this->_activeTab === null && !empty($this->_tabs)) {
+ $this->_activeTab = (reset($this->_tabs))->getId();
+ }
+
+ if (!empty($this->_afterTabIds)) {
+ $this->_tabs = $this->_reorderTabs();
+ }
+
+ $this->assign('tabs', $this->_tabs);
+ return parent::_beforeToHtml();
+ }
+
+ /**
+ * Find the root parent Tab ID recursively.
+ *
+ * @param string $currentAfterTabId
+ * @param int $degree Degrees of separation between child and root parent.
+ * @return string The parent tab ID.
+ */
+ protected function _getRootParentTabId($currentAfterTabId, &$degree)
+ {
+ if (array_key_exists($currentAfterTabId, $this->_afterTabIds)) {
+ $degree++;
+ return $this->_getRootParentTabId($this->_afterTabIds[$currentAfterTabId], $degree);
+ } else {
+ return $currentAfterTabId;
+ }
+ }
+
+ /**
+ * @return array
+ */
+ protected function _reorderTabs()
+ {
+ // Set new position based on $afterTabId.
+ foreach ($this->_afterTabIds as $tabId => $afterTabId) {
+ if (array_key_exists($afterTabId, $this->_tabs)) {
+ $degree = 1; // Initialize to 1 degree of separation.
+ $parentAfterTabId = $this->_getRootParentTabId($afterTabId, $degree);
+ $this->_tabPositions[$tabId] = $this->_tabPositions[$parentAfterTabId] + $degree;
+ $degree++;
+ }
+ }
+
+ asort($this->_tabPositions);
+
+ $ordered = [];
+ foreach (array_keys($this->_tabPositions) as $tabId) {
+ if (isset($this->_tabs[$tabId])) {
+ $tab = $this->_tabs[$tabId];
+ $ordered[$tabId] = $tab;
+ }
+ }
+
+ return $ordered;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
index f9e426d59f1..d17668c1d75 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
@@ -43,12 +43,6 @@ public function __construct()
]);
}
- protected function _prepareLayout()
- {
- $this->setChild('plane', $this->getLayout()->createBlock('adminhtml/' . $this->_controller . '_view_plane'));
- return parent::_prepareLayout();
- }
-
public function getEditUrl()
{
return $this->getUrl('*/*/edit', [$this->_objectId => $this->getRequest()->getParam($this->_objectId)]);
@@ -58,4 +52,10 @@ public function getViewHtml()
{
return $this->getChildHtml('plane');
}
+
+ protected function _prepareLayout()
+ {
+ $this->setChild('plane', $this->getLayout()->createBlock('adminhtml/' . $this->_controller . '_view_plane'));
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php
index 2c84c954b55..672c3fbfa97 100644
--- a/app/code/core/Mage/Adminhtml/Controller/Action.php
+++ b/app/code/core/Mage/Adminhtml/Controller/Action.php
@@ -72,76 +72,18 @@ class Mage_Adminhtml_Controller_Action extends Mage_Core_Controller_Varien_Actio
protected $_sessionNamespace = self::SESSION_NAMESPACE;
/**
- * Check current user permission on resource and privilege
- *
- * @return bool
- */
- protected function _isAllowed()
- {
- return Mage::getSingleton('admin/session')->isAllowed(static::ADMIN_RESOURCE);
- }
-
- /**
- * Retrieve adminhtml session model object
- *
- * @return Mage_Adminhtml_Model_Session
- */
- protected function _getSession()
- {
- return Mage::getSingleton('adminhtml/session');
- }
-
- /**
- * Retrieve base admihtml helper
- *
- * @return Mage_Adminhtml_Helper_Data
- */
- protected function _getHelper()
- {
- return Mage::helper('adminhtml');
- }
-
- /**
- * Define active menu item in menu block
+ * Translate a phrase
*
- * @return $this
- */
- protected function _setActiveMenu($menuPath)
- {
- $this->getLayout()->getBlock('menu')->setActive($menuPath);
- return $this;
- }
-
- /**
- * @return $this
- */
- protected function _addBreadcrumb($label, $title, $link = null)
- {
- /** @var Mage_Adminhtml_Block_Widget_Breadcrumbs $block */
- $block = $this->getLayout()->getBlock('breadcrumbs');
- $block->addLink($label, $title, $link);
- return $this;
- }
-
- /**
- * @return $this
+ * @return string
+ * @SuppressWarnings("PHPMD.CamelCaseMethodName")
+ * @SuppressWarnings("PHPMD.ShortMethodName")
*/
- protected function _addContent(Mage_Core_Block_Abstract $block)
- {
- $this->getLayout()->getBlock('content')->append($block);
- return $this;
- }
-
- protected function _addLeft(Mage_Core_Block_Abstract $block)
- {
- $this->getLayout()->getBlock('left')->append($block);
- return $this;
- }
-
- protected function _addJs(Mage_Core_Block_Abstract $block)
+ public function __()
{
- $this->getLayout()->getBlock('js')->append($block);
- return $this;
+ $args = func_get_args();
+ $expr = new Mage_Core_Model_Translate_Expr(array_shift($args), $this->getUsedModuleName());
+ array_unshift($args, $expr);
+ return Mage::app()->getTranslator()->translate($args);
}
/**
@@ -225,59 +167,6 @@ public function preDispatch()
return $this;
}
- /**
- * @deprecated after 1.4.0.0 alpha, logic moved to Mage_Adminhtml_Block_Notification_Baseurl
- * @return $this
- */
- protected function _checkUrlSettings()
- {
- /**
- * Don't check for data saving actions
- */
- if ($this->getRequest()->getPost() || $this->getRequest()->getQuery('isAjax')) {
- return $this;
- }
-
- $configData = Mage::getModel('core/config_data');
-
- $defaultUnsecure = (string) Mage::getConfig()->getNode(
- 'default/' . Mage_Core_Model_Store::XML_PATH_UNSECURE_BASE_URL,
- );
- $defaultSecure = (string) Mage::getConfig()->getNode(
- 'default/' . Mage_Core_Model_Store::XML_PATH_SECURE_BASE_URL,
- );
-
- if ($defaultSecure == '{{base_url}}' || $defaultUnsecure == '{{base_url}}') {
- $this->_getSession()->addNotice(
- $this->__('{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento configuration.', $this->getUrl('adminhtml/system_config/edit', ['section' => 'web'])),
- );
- return $this;
- }
-
- $dataCollection = $configData->getCollection()
- ->addValueFilter('{{base_url}}');
-
- $url = false;
- foreach ($dataCollection as $data) {
- if ($data->getScope() == 'stores') {
- $code = Mage::app()->getStore($data->getScopeId())->getCode();
- $url = $this->getUrl('adminhtml/system_config/edit', ['section' => 'web', 'store' => $code]);
- }
- if ($data->getScope() == 'websites') {
- $code = Mage::app()->getWebsite($data->getScopeId())->getCode();
- $url = $this->getUrl('adminhtml/system_config/edit', ['section' => 'web', 'website' => $code]);
- }
-
- if ($url) {
- $this->_getSession()->addNotice(
- $this->__('{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento configuration.', $url),
- );
- return $this;
- }
- }
- return $this;
- }
-
public function deniedAction()
{
$this->getResponse()->setHeader('HTTP/1.1', '403 Forbidden');
@@ -327,18 +216,141 @@ public function setUsedModuleName($moduleName)
}
/**
- * Translate a phrase
+ * Generate url by route and parameters
*
- * @return string
- * @SuppressWarnings("PHPMD.CamelCaseMethodName")
- * @SuppressWarnings("PHPMD.ShortMethodName")
+ * @param string $route
+ * @param array $params
+ * @return string
*/
- public function __()
+ public function getUrl($route = '', $params = [])
{
- $args = func_get_args();
- $expr = new Mage_Core_Model_Translate_Expr(array_shift($args), $this->getUsedModuleName());
- array_unshift($args, $expr);
- return Mage::app()->getTranslator()->translate($args);
+ return Mage::helper('adminhtml')->getUrl($route, $params);
+ }
+
+ /**
+ * Check current user permission on resource and privilege
+ *
+ * @return bool
+ */
+ protected function _isAllowed()
+ {
+ return Mage::getSingleton('admin/session')->isAllowed(static::ADMIN_RESOURCE);
+ }
+
+ /**
+ * Retrieve adminhtml session model object
+ *
+ * @return Mage_Adminhtml_Model_Session
+ */
+ protected function _getSession()
+ {
+ return Mage::getSingleton('adminhtml/session');
+ }
+
+ /**
+ * Retrieve base admihtml helper
+ *
+ * @return Mage_Adminhtml_Helper_Data
+ */
+ protected function _getHelper()
+ {
+ return Mage::helper('adminhtml');
+ }
+
+ /**
+ * Define active menu item in menu block
+ *
+ * @return $this
+ */
+ protected function _setActiveMenu($menuPath)
+ {
+ $this->getLayout()->getBlock('menu')->setActive($menuPath);
+ return $this;
+ }
+
+ /**
+ * @return $this
+ */
+ protected function _addBreadcrumb($label, $title, $link = null)
+ {
+ /** @var Mage_Adminhtml_Block_Widget_Breadcrumbs $block */
+ $block = $this->getLayout()->getBlock('breadcrumbs');
+ $block->addLink($label, $title, $link);
+ return $this;
+ }
+
+ /**
+ * @return $this
+ */
+ protected function _addContent(Mage_Core_Block_Abstract $block)
+ {
+ $this->getLayout()->getBlock('content')->append($block);
+ return $this;
+ }
+
+ protected function _addLeft(Mage_Core_Block_Abstract $block)
+ {
+ $this->getLayout()->getBlock('left')->append($block);
+ return $this;
+ }
+
+ protected function _addJs(Mage_Core_Block_Abstract $block)
+ {
+ $this->getLayout()->getBlock('js')->append($block);
+ return $this;
+ }
+
+ /**
+ * @deprecated after 1.4.0.0 alpha, logic moved to Mage_Adminhtml_Block_Notification_Baseurl
+ * @return $this
+ */
+ protected function _checkUrlSettings()
+ {
+ /**
+ * Don't check for data saving actions
+ */
+ if ($this->getRequest()->getPost() || $this->getRequest()->getQuery('isAjax')) {
+ return $this;
+ }
+
+ $configData = Mage::getModel('core/config_data');
+
+ $defaultUnsecure = (string) Mage::getConfig()->getNode(
+ 'default/' . Mage_Core_Model_Store::XML_PATH_UNSECURE_BASE_URL,
+ );
+ $defaultSecure = (string) Mage::getConfig()->getNode(
+ 'default/' . Mage_Core_Model_Store::XML_PATH_SECURE_BASE_URL,
+ );
+
+ if ($defaultSecure == '{{base_url}}' || $defaultUnsecure == '{{base_url}}') {
+ $this->_getSession()->addNotice(
+ $this->__('{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento configuration.', $this->getUrl('adminhtml/system_config/edit', ['section' => 'web'])),
+ );
+ return $this;
+ }
+
+ $dataCollection = $configData->getCollection()
+ ->addValueFilter('{{base_url}}');
+
+ $url = false;
+ foreach ($dataCollection as $data) {
+ if ($data->getScope() == 'stores') {
+ $code = Mage::app()->getStore($data->getScopeId())->getCode();
+ $url = $this->getUrl('adminhtml/system_config/edit', ['section' => 'web', 'store' => $code]);
+ }
+ if ($data->getScope() == 'websites') {
+ $code = Mage::app()->getWebsite($data->getScopeId())->getCode();
+ $url = $this->getUrl('adminhtml/system_config/edit', ['section' => 'web', 'website' => $code]);
+ }
+
+ if ($url) {
+ $this->_getSession()->addNotice(
+ $this->__('{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento configuration.', $url),
+ );
+ return $this;
+ }
+ }
+ return $this;
}
/**
@@ -376,18 +388,6 @@ protected function _forward($action, $controller = null, $module = null, ?array
return parent::_forward($action, $controller, $module, $params);
}
- /**
- * Generate url by route and parameters
- *
- * @param string $route
- * @param array $params
- * @return string
- */
- public function getUrl($route = '', $params = [])
- {
- return Mage::helper('adminhtml')->getUrl($route, $params);
- }
-
/**
* Validate Secret Key
*
diff --git a/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php b/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php
index 754eecb0490..d98b36b1bc6 100644
--- a/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php
@@ -29,19 +29,6 @@ abstract class Mage_Adminhtml_Controller_Report_Abstract extends Mage_Adminhtml_
*/
protected $_adminSession = null;
- /**
- * Retrieve admin session model
- *
- * @return Mage_Admin_Model_Session
- */
- protected function _getSession()
- {
- if (is_null($this->_adminSession)) {
- $this->_adminSession = Mage::getSingleton('admin/session');
- }
- return $this->_adminSession;
- }
-
/**
* Add report breadcrumbs
*
@@ -87,6 +74,19 @@ public function _initReportAction($blocks)
return $this;
}
+ /**
+ * Retrieve admin session model
+ *
+ * @return Mage_Admin_Model_Session
+ */
+ protected function _getSession()
+ {
+ if (is_null($this->_adminSession)) {
+ $this->_adminSession = Mage::getSingleton('admin/session');
+ }
+ return $this->_adminSession;
+ }
+
/**
* Add refresh statistics links
*
diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php
index 8a42b617961..c8ffaad392c 100644
--- a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php
+++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php
@@ -28,29 +28,6 @@ class Mage_Adminhtml_Controller_Sales_Creditmemo extends Mage_Adminhtml_Controll
*/
public const ADMIN_RESOURCE = 'sales/creditmemo';
- /**
- * Additional initialization
- *
- */
- protected function _construct()
- {
- $this->setUsedModuleName('Mage_Sales');
- }
-
- /**
- * Init layout, menu and breadcrumb
- *
- * @return $this
- */
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('sales/creditmemo')
- ->_addBreadcrumb($this->__('Sales'), $this->__('Sales'))
- ->_addBreadcrumb($this->__('Credit Memos'), $this->__('Credit Memos'));
- return $this;
- }
-
/**
* Creditmemos grid
*/
@@ -125,4 +102,27 @@ public function printAction()
$this->_forward('noRoute');
}
}
+
+ /**
+ * Additional initialization
+ *
+ */
+ protected function _construct()
+ {
+ $this->setUsedModuleName('Mage_Sales');
+ }
+
+ /**
+ * Init layout, menu and breadcrumb
+ *
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('sales/creditmemo')
+ ->_addBreadcrumb($this->__('Sales'), $this->__('Sales'))
+ ->_addBreadcrumb($this->__('Credit Memos'), $this->__('Credit Memos'));
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php
index c265354e4bf..2ee4c38b720 100644
--- a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php
+++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php
@@ -28,28 +28,6 @@ class Mage_Adminhtml_Controller_Sales_Invoice extends Mage_Adminhtml_Controller_
*/
public const ADMIN_RESOURCE = 'sales/invoice';
- /**
- * Additional initialization
- */
- protected function _construct()
- {
- $this->setUsedModuleName('Mage_Sales');
- }
-
- /**
- * Init layout, menu and breadcrumb
- *
- * @return $this
- */
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('sales/invoice')
- ->_addBreadcrumb($this->__('Sales'), $this->__('Sales'))
- ->_addBreadcrumb($this->__('Invoices'), $this->__('Invoices'));
- return $this;
- }
-
/**
* Order grid
*/
@@ -136,4 +114,26 @@ public function pdfinvoicesAction()
}
$this->_redirect('*/*/');
}
+
+ /**
+ * Additional initialization
+ */
+ protected function _construct()
+ {
+ $this->setUsedModuleName('Mage_Sales');
+ }
+
+ /**
+ * Init layout, menu and breadcrumb
+ *
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('sales/invoice')
+ ->_addBreadcrumb($this->__('Sales'), $this->__('Sales'))
+ ->_addBreadcrumb($this->__('Invoices'), $this->__('Invoices'));
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php
index 2e63d910e7f..172eca5b6f1 100644
--- a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php
+++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php
@@ -28,28 +28,6 @@ class Mage_Adminhtml_Controller_Sales_Shipment extends Mage_Adminhtml_Controller
*/
public const ADMIN_RESOURCE = 'sales/shipment';
- /**
- * Additional initialization
- */
- protected function _construct()
- {
- $this->setUsedModuleName('Mage_Sales');
- }
-
- /**
- * Init layout, menu and breadcrumb
- *
- * @return $this
- */
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('sales/shipment')
- ->_addBreadcrumb($this->__('Sales'), $this->__('Sales'))
- ->_addBreadcrumb($this->__('Shipments'), $this->__('Shipments'));
- return $this;
- }
-
/**
* Shipments grid
*/
@@ -101,4 +79,26 @@ public function printAction()
$this->_forward('noRoute');
}
}
+
+ /**
+ * Additional initialization
+ */
+ protected function _construct()
+ {
+ $this->setUsedModuleName('Mage_Sales');
+ }
+
+ /**
+ * Init layout, menu and breadcrumb
+ *
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('sales/shipment')
+ ->_addBreadcrumb($this->__('Sales'), $this->__('Sales'))
+ ->_addBreadcrumb($this->__('Shipments'), $this->__('Shipments'));
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php
index 26b4e83abd0..70aa750e847 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php
@@ -24,20 +24,6 @@ class Mage_Adminhtml_Helper_Catalog_Product_Composite extends Mage_Core_Helper_A
{
protected $_moduleName = 'Mage_Adminhtml';
- /**
- * Init layout of product configuration update result
- *
- * @param Mage_Adminhtml_Controller_Action $controller
- * @return $this
- */
- protected function _initUpdateResultLayout($controller)
- {
- $controller->getLayout()->getUpdate()
- ->addHandle('ADMINHTML_CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT');
- $controller->loadLayoutUpdates()->generateLayoutXml()->generateLayoutBlocks();
- return $this;
- }
-
/**
* Prepares and render result of composite product configuration update for a case
* when single configuration submitted
@@ -54,30 +40,6 @@ public function renderUpdateResult($controller, Varien_Object $updateResult)
return $this;
}
- /**
- * Init composite product configuration layout
- *
- * $isOk - true or false, whether action was completed nicely or with some error
- * If $isOk is FALSE (some error during configuration), so $productType must be null
- *
- * @param Mage_Adminhtml_Controller_Action $controller
- * @param bool $isOk
- * @param string $productType
- * @return $this
- */
- protected function _initConfigureResultLayout($controller, $isOk, $productType)
- {
- $update = $controller->getLayout()->getUpdate();
- if ($isOk) {
- $update->addHandle('ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE')
- ->addHandle('PRODUCT_TYPE_' . $productType);
- } else {
- $update->addHandle('ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR');
- }
- $controller->loadLayoutUpdates()->generateLayoutXml()->generateLayoutBlocks();
- return $this;
- }
-
/**
* Prepares and render result of composite product configuration request
*
@@ -140,4 +102,42 @@ public function renderConfigureResult($controller, Varien_Object $configureResul
$controller->renderLayout();
return $this;
}
+
+ /**
+ * Init layout of product configuration update result
+ *
+ * @param Mage_Adminhtml_Controller_Action $controller
+ * @return $this
+ */
+ protected function _initUpdateResultLayout($controller)
+ {
+ $controller->getLayout()->getUpdate()
+ ->addHandle('ADMINHTML_CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT');
+ $controller->loadLayoutUpdates()->generateLayoutXml()->generateLayoutBlocks();
+ return $this;
+ }
+
+ /**
+ * Init composite product configuration layout
+ *
+ * $isOk - true or false, whether action was completed nicely or with some error
+ * If $isOk is FALSE (some error during configuration), so $productType must be null
+ *
+ * @param Mage_Adminhtml_Controller_Action $controller
+ * @param bool $isOk
+ * @param string $productType
+ * @return $this
+ */
+ protected function _initConfigureResultLayout($controller, $isOk, $productType)
+ {
+ $update = $controller->getLayout()->getUpdate();
+ if ($isOk) {
+ $update->addHandle('ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE')
+ ->addHandle('PRODUCT_TYPE_' . $productType);
+ } else {
+ $update->addHandle('ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR');
+ }
+ $controller->loadLayoutUpdates()->generateLayoutXml()->generateLayoutBlocks();
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php
index fb205cd97a4..5be2cad6b82 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php
@@ -44,8 +44,6 @@ public function getCollection()
return $this->_collection;
}
- abstract protected function _initCollection();
-
/**
* Returns collection items
*
@@ -99,4 +97,6 @@ public function getParams()
{
return $this->_params;
}
+
+ abstract protected function _initCollection();
}
diff --git a/app/code/core/Mage/Adminhtml/Model/Config.php b/app/code/core/Mage/Adminhtml/Model/Config.php
index d4dfdf68d16..2f964715330 100644
--- a/app/code/core/Mage/Adminhtml/Model/Config.php
+++ b/app/code/core/Mage/Adminhtml/Model/Config.php
@@ -44,6 +44,21 @@ class Mage_Adminhtml_Model_Config extends Varien_Simplexml_Config
*/
protected $_tabs;
+ public function __construct()
+ {
+ $this->_cacheChecksum = null;
+ $this->setCache(Mage::app()->getCache());
+ $this->setCacheTags([Mage_Core_Model_Config::CACHE_TAG]);
+ $usesCache = Mage::app()->useCache('config');
+ if (!$usesCache || !$this->loadCache()) {
+ $this->_config = Mage::getConfig()->loadModulesConfiguration('system.xml')
+ ->applyExtends();
+ if ($usesCache) {
+ $this->saveCache();
+ }
+ }
+ }
+
/**
* @param string $sectionCode
* @param string $websiteCode
@@ -73,21 +88,6 @@ public function getTabs()
return $this->_tabs;
}
- public function __construct()
- {
- $this->_cacheChecksum = null;
- $this->setCache(Mage::app()->getCache());
- $this->setCacheTags([Mage_Core_Model_Config::CACHE_TAG]);
- $usesCache = Mage::app()->useCache('config');
- if (!$usesCache || !$this->loadCache()) {
- $this->_config = Mage::getConfig()->loadModulesConfiguration('system.xml')
- ->applyExtends();
- if ($usesCache) {
- $this->saveCache();
- }
- }
- }
-
/**
* @param array|null $tags
* @return $this|Mage_Adminhtml_Model_Config
@@ -122,17 +122,6 @@ public function loadCache()
return false;
}
- /**
- * Init modules configuration
- */
- protected function _initSectionsAndTabs()
- {
- $config = $this->_config;
- Mage::dispatchEvent('adminhtml_init_system_config', ['config' => $config]);
- $this->_sections = $config->getNode('sections');
- $this->_tabs = $config->getNode('tabs');
- }
-
/**
* @param string $sectionCode
* @param string $websiteCode
@@ -283,4 +272,15 @@ public function getEncryptedNodeEntriesPaths($explodePathToEntities = false)
}
return $paths;
}
+
+ /**
+ * Init modules configuration
+ */
+ protected function _initSectionsAndTabs()
+ {
+ $config = $this->_config;
+ Mage::dispatchEvent('adminhtml_init_system_config', ['config' => $config]);
+ $this->_sections = $config->getNode('sections');
+ $this->_tabs = $config->getNode('tabs');
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Model/Config/Data.php b/app/code/core/Mage/Adminhtml/Model/Config/Data.php
index 0effd78b210..19eefe9f997 100644
--- a/app/code/core/Mage/Adminhtml/Model/Config/Data.php
+++ b/app/code/core/Mage/Adminhtml/Model/Config/Data.php
@@ -248,6 +248,116 @@ public function extendConfig($path, $full = true, $oldConfig = [])
return $extended;
}
+ /**
+ * Get config data value
+ *
+ * @param string $path
+ * @param null|bool $inherit
+ * @param null|array $configData
+ * @param-out bool $inherit
+ * @return Varien_Simplexml_Element
+ */
+ public function getConfigDataValue($path, &$inherit = null, $configData = null)
+ {
+ $this->load();
+ if (is_null($configData)) {
+ $configData = $this->_configData;
+ }
+ if (array_key_exists($path, $configData)) {
+ $data = $configData[$path];
+ $inherit = false;
+ } else {
+ $data = $this->getConfigRoot()->descend($path);
+ $inherit = true;
+ }
+
+ return $data;
+ }
+
+ /**
+ * Get config root node for current scope
+ *
+ * @return Mage_Core_Model_Config_Element
+ */
+ public function getConfigRoot()
+ {
+ if (is_null($this->_configRoot)) {
+ $this->load();
+ $this->_configRoot = Mage::getConfig()->getNode(null, $this->getScope(), $this->getScopeCode());
+ }
+ return $this->_configRoot;
+ }
+
+ /**
+ * Secure set groups
+ *
+ * @param array $groups
+ * @return Mage_Adminhtml_Model_Config_Data
+ * @throws Mage_Core_Exception
+ */
+ public function setGroupsSecure($groups)
+ {
+ $this->_validate();
+ $this->_getScope();
+
+ $groupsSecure = [];
+ $section = $this->getSection();
+ $sections = Mage::getModel('adminhtml/config')->getSections();
+
+ foreach ($groups as $group => $groupData) {
+ $groupConfig = $sections->descend($section . '/groups/' . $group);
+ foreach ($groupData['fields'] as $field => $fieldData) {
+ $fieldName = $field;
+ if ($groupConfig && $groupConfig->clone_fields) {
+ if ($groupConfig->clone_model) {
+ $cloneModel = Mage::getModel((string) $groupConfig->clone_model);
+ } else {
+ Mage::throwException(
+ $this->__('Config form fieldset clone model required to be able to clone fields'),
+ );
+ }
+ foreach ($cloneModel->getPrefixes() as $prefix) {
+ if (strpos($field, $prefix['field']) === 0) {
+ $field = substr($field, strlen($prefix['field']));
+ }
+ }
+ }
+ $fieldConfig = $sections->descend($section . '/groups/' . $group . '/fields/' . $field);
+ if (!$fieldConfig) {
+ $node = $sections->xpath($section . '//' . $group . '[@type="group"]/fields/' . $field);
+ if ($node) {
+ $fieldConfig = $node[0];
+ }
+ }
+ if (($groupConfig ? !$groupConfig->dynamic_group : true) && !$this->_isValidField($fieldConfig)) {
+ $message = Mage::helper('adminhtml')->__('Wrong field specified.') . ' ' . Mage::helper('adminhtml')->__('(%s/%s/%s)', $section, $group, $field);
+ Mage::throwException($message);
+ }
+ $groupsSecure[$group]['fields'][$fieldName] = $fieldData;
+ }
+ }
+
+ $this->setGroups($groupsSecure);
+
+ return $this;
+ }
+
+ /**
+ * Select group setter is secure or not based on the configuration
+ *
+ * @param array $groups
+ * @return Mage_Adminhtml_Model_Config_Data
+ * @throws Mage_Core_Exception
+ */
+ public function setGroupsSelector($groups)
+ {
+ if (Mage::getStoreConfigFlag('admin/security/secure_system_configuration_save_disabled')) {
+ return $this->setGroups($groups);
+ }
+
+ return $this->setGroupsSecure($groups);
+ }
+
/**
* Check if specified section allowed in ACL
*
@@ -352,100 +462,6 @@ protected function _getPathConfig($path, $full = true)
return $config;
}
- /**
- * Get config data value
- *
- * @param string $path
- * @param null|bool $inherit
- * @param null|array $configData
- * @param-out bool $inherit
- * @return Varien_Simplexml_Element
- */
- public function getConfigDataValue($path, &$inherit = null, $configData = null)
- {
- $this->load();
- if (is_null($configData)) {
- $configData = $this->_configData;
- }
- if (array_key_exists($path, $configData)) {
- $data = $configData[$path];
- $inherit = false;
- } else {
- $data = $this->getConfigRoot()->descend($path);
- $inherit = true;
- }
-
- return $data;
- }
-
- /**
- * Get config root node for current scope
- *
- * @return Mage_Core_Model_Config_Element
- */
- public function getConfigRoot()
- {
- if (is_null($this->_configRoot)) {
- $this->load();
- $this->_configRoot = Mage::getConfig()->getNode(null, $this->getScope(), $this->getScopeCode());
- }
- return $this->_configRoot;
- }
-
- /**
- * Secure set groups
- *
- * @param array $groups
- * @return Mage_Adminhtml_Model_Config_Data
- * @throws Mage_Core_Exception
- */
- public function setGroupsSecure($groups)
- {
- $this->_validate();
- $this->_getScope();
-
- $groupsSecure = [];
- $section = $this->getSection();
- $sections = Mage::getModel('adminhtml/config')->getSections();
-
- foreach ($groups as $group => $groupData) {
- $groupConfig = $sections->descend($section . '/groups/' . $group);
- foreach ($groupData['fields'] as $field => $fieldData) {
- $fieldName = $field;
- if ($groupConfig && $groupConfig->clone_fields) {
- if ($groupConfig->clone_model) {
- $cloneModel = Mage::getModel((string) $groupConfig->clone_model);
- } else {
- Mage::throwException(
- $this->__('Config form fieldset clone model required to be able to clone fields'),
- );
- }
- foreach ($cloneModel->getPrefixes() as $prefix) {
- if (strpos($field, $prefix['field']) === 0) {
- $field = substr($field, strlen($prefix['field']));
- }
- }
- }
- $fieldConfig = $sections->descend($section . '/groups/' . $group . '/fields/' . $field);
- if (!$fieldConfig) {
- $node = $sections->xpath($section . '//' . $group . '[@type="group"]/fields/' . $field);
- if ($node) {
- $fieldConfig = $node[0];
- }
- }
- if (($groupConfig ? !$groupConfig->dynamic_group : true) && !$this->_isValidField($fieldConfig)) {
- $message = Mage::helper('adminhtml')->__('Wrong field specified.') . ' ' . Mage::helper('adminhtml')->__('(%s/%s/%s)', $section, $group, $field);
- Mage::throwException($message);
- }
- $groupsSecure[$group]['fields'][$fieldName] = $fieldData;
- }
- }
-
- $this->setGroups($groupsSecure);
-
- return $this;
- }
-
/**
* Check field visibility by scope
*
@@ -469,20 +485,4 @@ protected function _isValidField($field)
return true;
}
-
- /**
- * Select group setter is secure or not based on the configuration
- *
- * @param array $groups
- * @return Mage_Adminhtml_Model_Config_Data
- * @throws Mage_Core_Exception
- */
- public function setGroupsSelector($groups)
- {
- if (Mage::getStoreConfigFlag('admin/security/secure_system_configuration_save_disabled')) {
- return $this->setGroups($groups);
- }
-
- return $this->setGroupsSecure($groups);
- }
}
diff --git a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php
index 35ff88033d9..8d10eff057a 100644
--- a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php
+++ b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php
@@ -74,81 +74,6 @@ public function saveAllInOrder()
return $this;
}
- /**
- * Save a single gift message
- *
- * @param int $entityId
- * @param array $giftmessage
- * @return $this
- * @throws Throwable
- */
- protected function _saveOne($entityId, $giftmessage)
- {
- /** @var Mage_GiftMessage_Model_Message $giftmessageModel */
- $giftmessageModel = Mage::getModel('giftmessage/message');
- $entityType = $this->_getMappedType($giftmessage['type']);
-
- switch ($entityType) {
- case 'quote':
- $entityModel = $this->_getQuote();
- break;
-
- case 'quote_item':
- $entityModel = $this->_getQuote()->getItemById($entityId);
- break;
-
- default:
- $entityModel = $giftmessageModel->getEntityModelByType($entityType)
- ->load($entityId);
- break;
- }
-
- if (!$entityModel) {
- return $this;
- }
-
- if ($entityModel->getGiftMessageId()) {
- $giftmessageModel->load($entityModel->getGiftMessageId());
- }
-
- $giftmessageModel->addData($giftmessage);
-
- if ($giftmessageModel->isMessageEmpty() && $giftmessageModel->getId()) {
- // remove empty giftmessage
- $this->_deleteOne($entityModel, $giftmessageModel);
- $this->_saved = false;
- } elseif (!$giftmessageModel->isMessageEmpty()) {
- $giftmessageModel->save();
- $entityModel->setGiftMessageId($giftmessageModel->getId());
- if ($entityType != 'quote') {
- $entityModel->save();
- }
- $this->_saved = true;
- }
-
- return $this;
- }
-
- /**
- * Delete a single gift message from entity
- *
- * @param Mage_GiftMessage_Model_Message|null $giftmessageModel
- * @param Varien_Object $entityModel
- * @return $this
- * @throws Throwable
- */
- protected function _deleteOne($entityModel, $giftmessageModel = null)
- {
- if (is_null($giftmessageModel)) {
- $giftmessageModel = Mage::getModel('giftmessage/message')
- ->load($entityModel->getGiftMessageId());
- }
- $giftmessageModel->delete();
- $entityModel->setGiftMessageId(0)
- ->save();
- return $this;
- }
-
/**
* Set allowed quote items for gift messages
*
@@ -311,6 +236,81 @@ public function importAllowQuoteItemsFromItems($items)
return $this;
}
+ /**
+ * Save a single gift message
+ *
+ * @param int $entityId
+ * @param array $giftmessage
+ * @return $this
+ * @throws Throwable
+ */
+ protected function _saveOne($entityId, $giftmessage)
+ {
+ /** @var Mage_GiftMessage_Model_Message $giftmessageModel */
+ $giftmessageModel = Mage::getModel('giftmessage/message');
+ $entityType = $this->_getMappedType($giftmessage['type']);
+
+ switch ($entityType) {
+ case 'quote':
+ $entityModel = $this->_getQuote();
+ break;
+
+ case 'quote_item':
+ $entityModel = $this->_getQuote()->getItemById($entityId);
+ break;
+
+ default:
+ $entityModel = $giftmessageModel->getEntityModelByType($entityType)
+ ->load($entityId);
+ break;
+ }
+
+ if (!$entityModel) {
+ return $this;
+ }
+
+ if ($entityModel->getGiftMessageId()) {
+ $giftmessageModel->load($entityModel->getGiftMessageId());
+ }
+
+ $giftmessageModel->addData($giftmessage);
+
+ if ($giftmessageModel->isMessageEmpty() && $giftmessageModel->getId()) {
+ // remove empty giftmessage
+ $this->_deleteOne($entityModel, $giftmessageModel);
+ $this->_saved = false;
+ } elseif (!$giftmessageModel->isMessageEmpty()) {
+ $giftmessageModel->save();
+ $entityModel->setGiftMessageId($giftmessageModel->getId());
+ if ($entityType != 'quote') {
+ $entityModel->save();
+ }
+ $this->_saved = true;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Delete a single gift message from entity
+ *
+ * @param Mage_GiftMessage_Model_Message|null $giftmessageModel
+ * @param Varien_Object $entityModel
+ * @return $this
+ * @throws Throwable
+ */
+ protected function _deleteOne($entityModel, $giftmessageModel = null)
+ {
+ if (is_null($giftmessageModel)) {
+ $giftmessageModel = Mage::getModel('giftmessage/message')
+ ->load($entityModel->getGiftMessageId());
+ }
+ $giftmessageModel->delete();
+ $entityModel->setGiftMessageId(0)
+ ->save();
+ return $this;
+ }
+
/**
* Retrieve mapped type for entity
*
diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order.php
index 024a571c9ac..746970e5ae2 100644
--- a/app/code/core/Mage/Adminhtml/Model/Sales/Order.php
+++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order.php
@@ -22,16 +22,6 @@
*/
class Mage_Adminhtml_Model_Sales_Order
{
- /**
- * Retrieve adminhtml session singleton
- *
- * @return Mage_Adminhtml_Model_Session
- */
- protected function _getSession()
- {
- return Mage::getSingleton('adminhtml/session');
- }
-
public function checkRelation(Mage_Sales_Model_Order $order)
{
/**
@@ -76,4 +66,13 @@ public function checkRelation(Mage_Sales_Model_Order $order)
}
return $this;
}
+ /**
+ * Retrieve adminhtml session singleton
+ *
+ * @return Mage_Adminhtml_Model_Session
+ */
+ protected function _getSession()
+ {
+ return Mage::getSingleton('adminhtml/session');
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
index 6e7451d8188..646f48c2a78 100644
--- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
+++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
@@ -135,22 +135,6 @@ public function getIsValidate()
return $this->_isValidate;
}
- /**
- * Retrieve quote item
- *
- * @param int|Mage_Sales_Model_Quote_Item $item
- * @return Mage_Sales_Model_Quote_Item|false
- */
- protected function _getQuoteItem($item)
- {
- if ($item instanceof Mage_Sales_Model_Quote_Item) {
- return $item;
- } elseif (is_numeric($item)) {
- return $this->getSession()->getQuote()->getItemById($item);
- }
- return false;
- }
-
/**
* Initialize data for price rules
*
@@ -379,31 +363,6 @@ public function initFromOrder(Mage_Sales_Model_Order $order)
return $this;
}
- protected function _initBillingAddressFromOrder(Mage_Sales_Model_Order $order)
- {
- $this->getQuote()->getBillingAddress()->setCustomerAddressId('');
- Mage::helper('core')->copyFieldset(
- 'sales_copy_order_billing_address',
- 'to_order',
- $order->getBillingAddress(),
- $this->getQuote()->getBillingAddress(),
- );
- }
-
- protected function _initShippingAddressFromOrder(Mage_Sales_Model_Order $order)
- {
- $orderShippingAddress = $order->getShippingAddress();
- $quoteShippingAddress = $this->getQuote()->getShippingAddress()
- ->setCustomerAddressId('')
- ->setSameAsBilling($orderShippingAddress && $orderShippingAddress->getSameAsBilling());
- Mage::helper('core')->copyFieldset(
- 'sales_copy_order_shipping_address',
- 'to_order',
- $orderShippingAddress,
- $quoteShippingAddress,
- );
- }
-
/**
* Initialize creation data from existing order Item
*
@@ -885,340 +844,118 @@ public function updateQuoteItems($data)
}
/**
- * Parse additional options and sync them with product options
+ * Retrieve oreder quote shipping address
*
- * @param string $additionalOptions
- * @return array
+ * @return Mage_Sales_Model_Quote_Address
*/
- protected function _parseOptions(Mage_Sales_Model_Quote_Item $item, $additionalOptions)
+ public function getShippingAddress()
{
- $productOptions = Mage::getSingleton('catalog/product_option_type_default')
- ->setProduct($item->getProduct())
- ->getProductOptions();
-
- $newOptions = [];
- $newAdditionalOptions = [];
-
- foreach (explode("\n", $additionalOptions) as $additionalOption) {
- if (strlen(trim($additionalOption))) {
- try {
- if (!str_contains($additionalOption, ':')) {
- Mage::throwException(
- Mage::helper('adminhtml')->__('There is an error in one of the option rows.'),
- );
- }
- list($label, $value) = explode(':', $additionalOption, 2);
- } catch (Exception $e) {
- Mage::throwException(Mage::helper('adminhtml')->__('There is an error in one of the option rows.'));
- }
- $label = trim($label);
- $value = trim($value);
- if (empty($value)) {
- continue;
- }
-
- if (array_key_exists($label, $productOptions)) {
- $optionId = $productOptions[$label]['option_id'];
- $option = $item->getProduct()->getOptionById($optionId);
-
- $group = Mage::getSingleton('catalog/product_option')->groupFactory($option->getType())
- ->setOption($option)
- ->setProduct($item->getProduct());
-
- $parsedValue = $group->parseOptionValue($value, $productOptions[$label]['values']);
-
- if ($parsedValue !== null) {
- $newOptions[$optionId] = $parsedValue;
- } else {
- $newAdditionalOptions[] = [
- 'label' => $label,
- 'value' => $value,
- ];
- }
- } else {
- $newAdditionalOptions[] = [
- 'label' => $label,
- 'value' => $value,
- ];
- }
- }
- }
-
- return [
- 'options' => $newOptions,
- 'additional_options' => $newAdditionalOptions,
- ];
+ return $this->getQuote()->getShippingAddress();
}
/**
- * Assign options to item
- *
- * @param array $options
+ * @param array|Mage_Sales_Model_Quote_Address $address
* @return $this
*/
- protected function _assignOptionsToItem(Mage_Sales_Model_Quote_Item $item, $options)
+ public function setShippingAddress($address)
{
- if ($optionIds = $item->getOptionByCode('option_ids')) {
- foreach (explode(',', $optionIds->getValue()) as $optionId) {
- $item->removeOption('option_' . $optionId);
+ if (is_array($address)) {
+ $address['save_in_address_book'] = isset($address['save_in_address_book'])
+ && !empty($address['save_in_address_book']);
+ $shippingAddress = Mage::getModel('sales/quote_address')
+ ->setData($address)
+ ->setAddressType(Mage_Sales_Model_Quote_Address::TYPE_SHIPPING);
+ if (!$this->getQuote()->isVirtual()) {
+ $this->_setQuoteAddress($shippingAddress, $address);
}
- $item->removeOption('option_ids');
+ $shippingAddress->implodeStreetAddress();
}
- if ($item->getOptionByCode('additional_options')) {
- $item->removeOption('additional_options');
+ if ($address instanceof Mage_Sales_Model_Quote_Address) {
+ $shippingAddress = $address;
}
- $item->save();
- if (!empty($options['options'])) {
- $item->addOption(new Varien_Object(
- [
- 'product' => $item->getProduct(),
- 'code' => 'option_ids',
- 'value' => implode(',', array_keys($options['options'])),
- ],
- ));
- foreach ($options['options'] as $optionId => $optionValue) {
- $item->addOption(new Varien_Object(
- [
- 'product' => $item->getProduct(),
- 'code' => 'option_' . $optionId,
- 'value' => $optionValue,
- ],
- ));
- }
- }
- if (!empty($options['additional_options'])) {
- $item->addOption(new Varien_Object(
- [
- 'product' => $item->getProduct(),
- 'code' => 'additional_options',
- 'value' => serialize($options['additional_options']),
- ],
- ));
- }
+ $this->setRecollect(true);
+ $this->getQuote()->setShippingAddress($shippingAddress);
+ return $this;
+ }
+ public function setShippingAsBilling($flag)
+ {
+ if ($flag) {
+ $tmpAddress = clone $this->getBillingAddress();
+ $tmpAddress->unsAddressId()
+ ->unsAddressType();
+ $data = $tmpAddress->getData();
+ $data['save_in_address_book'] = 0; // Do not duplicate address (billing address will do saving too)
+ unset($data['shipping_method']); // Do not reset shipping method to be able to recollect totals
+ $this->getShippingAddress()->addData($data);
+ }
+ $this->getShippingAddress()->setSameAsBilling($flag);
+ $this->setRecollect(true);
return $this;
}
/**
- * Prepare options array for info buy request
+ * Retrieve quote billing address
*
- * @param Mage_Sales_Model_Quote_Item $item
- * @return array
+ * @return Mage_Sales_Model_Quote_Address
*/
- protected function _prepareOptionsForRequest($item)
+ public function getBillingAddress()
{
- $newInfoOptions = [];
- if ($optionIds = $item->getOptionByCode('option_ids')) {
- foreach (explode(',', $optionIds->getValue()) as $optionId) {
- $option = $item->getProduct()->getOptionById($optionId);
- $optionValue = $item->getOptionByCode('option_' . $optionId)->getValue();
+ return $this->getQuote()->getBillingAddress();
+ }
- $group = Mage::getSingleton('catalog/product_option')->groupFactory($option->getType())
- ->setOption($option)
- ->setQuoteItem($item);
+ /**
+ * @param array|Mage_Sales_Model_Quote_Address $address
+ * @return $this
+ */
+ public function setBillingAddress($address)
+ {
+ if (is_array($address)) {
+ $address['save_in_address_book'] = isset($address['save_in_address_book']) ? 1 : 0;
+ $billingAddress = Mage::getModel('sales/quote_address')
+ ->setData($address)
+ ->setAddressType(Mage_Sales_Model_Quote_Address::TYPE_BILLING);
+ $this->_setQuoteAddress($billingAddress, $address);
+ $billingAddress->implodeStreetAddress();
+ } elseif ($address instanceof Mage_Sales_Model_Quote_Address) {
+ $billingAddress = $address;
+ }
- $newInfoOptions[$optionId] = $group->prepareOptionValueForRequest($optionValue);
- }
+ if ($this->getShippingAddress()->getSameAsBilling()) {
+ $shippingAddress = clone $billingAddress;
+ $shippingAddress->setSameAsBilling(true);
+ $shippingAddress->setSaveInAddressBook(false);
+ $address['save_in_address_book'] = 0;
+ $this->setShippingAddress($address);
}
- return $newInfoOptions;
+
+ $this->getQuote()->setBillingAddress($billingAddress);
+ return $this;
}
- protected function _parseCustomPrice($price)
+ public function setShippingMethod($method)
{
- $price = Mage::app()->getLocale()->getNumber($price);
- return $price > 0 ? $price : 0;
+ $this->getShippingAddress()->setShippingMethod($method);
+ $this->setRecollect(true);
+ return $this;
}
- /**
- * Retrieve oreder quote shipping address
- *
- * @return Mage_Sales_Model_Quote_Address
- */
- public function getShippingAddress()
+ public function resetShippingMethod()
{
- return $this->getQuote()->getShippingAddress();
+ $this->getShippingAddress()->setShippingMethod(false);
+ $this->getShippingAddress()->removeAllShippingRates();
+ return $this;
}
/**
- * Return Customer (Checkout) Form instance
- *
- * @return Mage_Customer_Model_Form
+ * Collect shipping data for quote shipping address
*/
- protected function _getCustomerForm()
+ public function collectShippingRates()
{
- if (is_null($this->_customerForm)) {
- $this->_customerForm = Mage::getModel('customer/form')
- ->setFormCode('adminhtml_checkout')
- ->ignoreInvisible(false);
- }
- return $this->_customerForm;
- }
-
- /**
- * Return Customer Address Form instance
- *
- * @return Mage_Customer_Model_Form
- */
- protected function _getCustomerAddressForm()
- {
- if (is_null($this->_customerAddressForm)) {
- $this->_customerAddressForm = Mage::getModel('customer/form')
- ->setFormCode('adminhtml_customer_address')
- ->ignoreInvisible(false);
- }
- return $this->_customerAddressForm;
- }
-
- /**
- * Set and validate Quote address
- * All errors added to _errors
- *
- * @return $this
- */
- protected function _setQuoteAddress(Mage_Sales_Model_Quote_Address $address, array $data)
- {
- $addressForm = $this->_getCustomerAddressForm()
- ->setEntity($address)
- ->setEntityType(Mage::getSingleton('eav/config')->getEntityType('customer_address'))
- ->setIsAjaxRequest(!$this->getIsValidate());
-
- // prepare request
- // save original request structure for files
- if ($address->getAddressType() == Mage_Sales_Model_Quote_Address::TYPE_SHIPPING) {
- $requestData = ['order' => ['shipping_address' => $data]];
- $requestScope = 'order/shipping_address';
- } else {
- $requestData = ['order' => ['billing_address' => $data]];
- $requestScope = 'order/billing_address';
- }
- $request = $addressForm->prepareRequest($requestData);
- $addressData = $addressForm->extractData($request, $requestScope);
- if ($this->getIsValidate()) {
- $errors = $addressForm->validateData($addressData);
- if ($errors !== true) {
- if ($address->getAddressType() == Mage_Sales_Model_Quote_Address::TYPE_SHIPPING) {
- $typeName = Mage::helper('adminhtml')->__('Shipping Address: ');
- } else {
- $typeName = Mage::helper('adminhtml')->__('Billing Address: ');
- }
- foreach ($errors as $error) {
- $this->_errors[] = $typeName . $error;
- }
- $addressForm->restoreData($addressData);
- } else {
- $addressForm->compactData($addressData);
- }
- } else {
- $addressForm->restoreData($addressData);
- }
-
- return $this;
- }
-
- /**
- * @param array|Mage_Sales_Model_Quote_Address $address
- * @return $this
- */
- public function setShippingAddress($address)
- {
- if (is_array($address)) {
- $address['save_in_address_book'] = isset($address['save_in_address_book'])
- && !empty($address['save_in_address_book']);
- $shippingAddress = Mage::getModel('sales/quote_address')
- ->setData($address)
- ->setAddressType(Mage_Sales_Model_Quote_Address::TYPE_SHIPPING);
- if (!$this->getQuote()->isVirtual()) {
- $this->_setQuoteAddress($shippingAddress, $address);
- }
- $shippingAddress->implodeStreetAddress();
- }
- if ($address instanceof Mage_Sales_Model_Quote_Address) {
- $shippingAddress = $address;
- }
-
- $this->setRecollect(true);
- $this->getQuote()->setShippingAddress($shippingAddress);
- return $this;
- }
-
- public function setShippingAsBilling($flag)
- {
- if ($flag) {
- $tmpAddress = clone $this->getBillingAddress();
- $tmpAddress->unsAddressId()
- ->unsAddressType();
- $data = $tmpAddress->getData();
- $data['save_in_address_book'] = 0; // Do not duplicate address (billing address will do saving too)
- unset($data['shipping_method']); // Do not reset shipping method to be able to recollect totals
- $this->getShippingAddress()->addData($data);
- }
- $this->getShippingAddress()->setSameAsBilling($flag);
- $this->setRecollect(true);
- return $this;
- }
-
- /**
- * Retrieve quote billing address
- *
- * @return Mage_Sales_Model_Quote_Address
- */
- public function getBillingAddress()
- {
- return $this->getQuote()->getBillingAddress();
- }
-
- /**
- * @param array|Mage_Sales_Model_Quote_Address $address
- * @return $this
- */
- public function setBillingAddress($address)
- {
- if (is_array($address)) {
- $address['save_in_address_book'] = isset($address['save_in_address_book']) ? 1 : 0;
- $billingAddress = Mage::getModel('sales/quote_address')
- ->setData($address)
- ->setAddressType(Mage_Sales_Model_Quote_Address::TYPE_BILLING);
- $this->_setQuoteAddress($billingAddress, $address);
- $billingAddress->implodeStreetAddress();
- } elseif ($address instanceof Mage_Sales_Model_Quote_Address) {
- $billingAddress = $address;
- }
-
- if ($this->getShippingAddress()->getSameAsBilling()) {
- $shippingAddress = clone $billingAddress;
- $shippingAddress->setSameAsBilling(true);
- $shippingAddress->setSaveInAddressBook(false);
- $address['save_in_address_book'] = 0;
- $this->setShippingAddress($address);
- }
-
- $this->getQuote()->setBillingAddress($billingAddress);
- return $this;
- }
-
- public function setShippingMethod($method)
- {
- $this->getShippingAddress()->setShippingMethod($method);
- $this->setRecollect(true);
- return $this;
- }
-
- public function resetShippingMethod()
- {
- $this->getShippingAddress()->setShippingMethod(false);
- $this->getShippingAddress()->removeAllShippingRates();
- return $this;
- }
-
- /**
- * Collect shipping data for quote shipping address
- */
- public function collectShippingRates()
- {
- $this->getQuote()->getShippingAddress()->setCollectShippingRates(true);
- $this->collectRates();
- return $this;
+ $this->getQuote()->getShippingAddress()->setCollectShippingRates(true);
+ $this->collectRates();
+ return $this;
}
public function collectRates()
@@ -1329,51 +1066,6 @@ public function importPostData($data)
return $this;
}
- /**
- * Check whether we need to create new customer (for another website) during order creation
- *
- * @param Mage_Core_Model_Store $store
- * @return bool
- */
- protected function _customerIsInStore($store)
- {
- $customer = $this->getSession()->getCustomer();
- if ($customer->getWebsiteId() == $store->getWebsiteId()) {
- return true;
- }
- return $customer->isInStore($store);
- }
-
- /**
- * Set and validate Customer data
- *
- * @return $this
- */
- protected function _setCustomerData(Mage_Customer_Model_Customer $customer)
- {
- $form = $this->_getCustomerForm();
- $form->setEntity($customer);
-
- // emulate request
- $request = $form->prepareRequest(['order' => $this->getData()]);
- $data = $form->extractData($request, 'order/account');
- if ($this->getIsValidate()) {
- $errors = $form->validateData($data);
- if ($errors !== true) {
- foreach ($errors as $error) {
- $this->_errors[] = $error;
- }
- $form->restoreData($data);
- } else {
- $form->compactData($data);
- }
- } else {
- $form->restoreData($data);
- }
-
- return $this;
- }
-
/**
* Prepare quote customer
*
@@ -1491,27 +1183,6 @@ public function _prepareCustomer()
return $this;
}
- /**
- * Prepare item options
- */
- protected function _prepareQuoteItems()
- {
- foreach ($this->getQuote()->getAllItems() as $item) {
- $options = [];
- $productOptions = $item->getProduct()->getTypeInstance(true)->getOrderOptions($item->getProduct());
- if ($productOptions) {
- $productOptions['info_buyRequest']['options'] = $this->_prepareOptionsForRequest($item);
- $options = $productOptions;
- }
- $addOptions = $item->getOptionByCode('additional_options');
- if ($addOptions) {
- $options['additional_options'] = unserialize($addOptions->getValue(), ['allowed_classes' => false]);
- }
- $item->setProductOrderOptions($options);
- }
- return $this;
- }
-
/**
* Create new order
*
@@ -1578,6 +1249,335 @@ public function createOrder()
return $order;
}
+ /**
+ * Retrieve quote item
+ *
+ * @param int|Mage_Sales_Model_Quote_Item $item
+ * @return Mage_Sales_Model_Quote_Item|false
+ */
+ protected function _getQuoteItem($item)
+ {
+ if ($item instanceof Mage_Sales_Model_Quote_Item) {
+ return $item;
+ } elseif (is_numeric($item)) {
+ return $this->getSession()->getQuote()->getItemById($item);
+ }
+ return false;
+ }
+
+ protected function _initBillingAddressFromOrder(Mage_Sales_Model_Order $order)
+ {
+ $this->getQuote()->getBillingAddress()->setCustomerAddressId('');
+ Mage::helper('core')->copyFieldset(
+ 'sales_copy_order_billing_address',
+ 'to_order',
+ $order->getBillingAddress(),
+ $this->getQuote()->getBillingAddress(),
+ );
+ }
+
+ protected function _initShippingAddressFromOrder(Mage_Sales_Model_Order $order)
+ {
+ $orderShippingAddress = $order->getShippingAddress();
+ $quoteShippingAddress = $this->getQuote()->getShippingAddress()
+ ->setCustomerAddressId('')
+ ->setSameAsBilling($orderShippingAddress && $orderShippingAddress->getSameAsBilling());
+ Mage::helper('core')->copyFieldset(
+ 'sales_copy_order_shipping_address',
+ 'to_order',
+ $orderShippingAddress,
+ $quoteShippingAddress,
+ );
+ }
+
+ /**
+ * Parse additional options and sync them with product options
+ *
+ * @param string $additionalOptions
+ * @return array
+ */
+ protected function _parseOptions(Mage_Sales_Model_Quote_Item $item, $additionalOptions)
+ {
+ $productOptions = Mage::getSingleton('catalog/product_option_type_default')
+ ->setProduct($item->getProduct())
+ ->getProductOptions();
+
+ $newOptions = [];
+ $newAdditionalOptions = [];
+
+ foreach (explode("\n", $additionalOptions) as $additionalOption) {
+ if (strlen(trim($additionalOption))) {
+ try {
+ if (!str_contains($additionalOption, ':')) {
+ Mage::throwException(
+ Mage::helper('adminhtml')->__('There is an error in one of the option rows.'),
+ );
+ }
+ list($label, $value) = explode(':', $additionalOption, 2);
+ } catch (Exception $e) {
+ Mage::throwException(Mage::helper('adminhtml')->__('There is an error in one of the option rows.'));
+ }
+ $label = trim($label);
+ $value = trim($value);
+ if (empty($value)) {
+ continue;
+ }
+
+ if (array_key_exists($label, $productOptions)) {
+ $optionId = $productOptions[$label]['option_id'];
+ $option = $item->getProduct()->getOptionById($optionId);
+
+ $group = Mage::getSingleton('catalog/product_option')->groupFactory($option->getType())
+ ->setOption($option)
+ ->setProduct($item->getProduct());
+
+ $parsedValue = $group->parseOptionValue($value, $productOptions[$label]['values']);
+
+ if ($parsedValue !== null) {
+ $newOptions[$optionId] = $parsedValue;
+ } else {
+ $newAdditionalOptions[] = [
+ 'label' => $label,
+ 'value' => $value,
+ ];
+ }
+ } else {
+ $newAdditionalOptions[] = [
+ 'label' => $label,
+ 'value' => $value,
+ ];
+ }
+ }
+ }
+
+ return [
+ 'options' => $newOptions,
+ 'additional_options' => $newAdditionalOptions,
+ ];
+ }
+
+ /**
+ * Assign options to item
+ *
+ * @param array $options
+ * @return $this
+ */
+ protected function _assignOptionsToItem(Mage_Sales_Model_Quote_Item $item, $options)
+ {
+ if ($optionIds = $item->getOptionByCode('option_ids')) {
+ foreach (explode(',', $optionIds->getValue()) as $optionId) {
+ $item->removeOption('option_' . $optionId);
+ }
+ $item->removeOption('option_ids');
+ }
+ if ($item->getOptionByCode('additional_options')) {
+ $item->removeOption('additional_options');
+ }
+ $item->save();
+ if (!empty($options['options'])) {
+ $item->addOption(new Varien_Object(
+ [
+ 'product' => $item->getProduct(),
+ 'code' => 'option_ids',
+ 'value' => implode(',', array_keys($options['options'])),
+ ],
+ ));
+
+ foreach ($options['options'] as $optionId => $optionValue) {
+ $item->addOption(new Varien_Object(
+ [
+ 'product' => $item->getProduct(),
+ 'code' => 'option_' . $optionId,
+ 'value' => $optionValue,
+ ],
+ ));
+ }
+ }
+ if (!empty($options['additional_options'])) {
+ $item->addOption(new Varien_Object(
+ [
+ 'product' => $item->getProduct(),
+ 'code' => 'additional_options',
+ 'value' => serialize($options['additional_options']),
+ ],
+ ));
+ }
+
+ return $this;
+ }
+
+ /**
+ * Prepare options array for info buy request
+ *
+ * @param Mage_Sales_Model_Quote_Item $item
+ * @return array
+ */
+ protected function _prepareOptionsForRequest($item)
+ {
+ $newInfoOptions = [];
+ if ($optionIds = $item->getOptionByCode('option_ids')) {
+ foreach (explode(',', $optionIds->getValue()) as $optionId) {
+ $option = $item->getProduct()->getOptionById($optionId);
+ $optionValue = $item->getOptionByCode('option_' . $optionId)->getValue();
+
+ $group = Mage::getSingleton('catalog/product_option')->groupFactory($option->getType())
+ ->setOption($option)
+ ->setQuoteItem($item);
+
+ $newInfoOptions[$optionId] = $group->prepareOptionValueForRequest($optionValue);
+ }
+ }
+ return $newInfoOptions;
+ }
+
+ protected function _parseCustomPrice($price)
+ {
+ $price = Mage::app()->getLocale()->getNumber($price);
+ return $price > 0 ? $price : 0;
+ }
+
+ /**
+ * Return Customer (Checkout) Form instance
+ *
+ * @return Mage_Customer_Model_Form
+ */
+ protected function _getCustomerForm()
+ {
+ if (is_null($this->_customerForm)) {
+ $this->_customerForm = Mage::getModel('customer/form')
+ ->setFormCode('adminhtml_checkout')
+ ->ignoreInvisible(false);
+ }
+ return $this->_customerForm;
+ }
+
+ /**
+ * Return Customer Address Form instance
+ *
+ * @return Mage_Customer_Model_Form
+ */
+ protected function _getCustomerAddressForm()
+ {
+ if (is_null($this->_customerAddressForm)) {
+ $this->_customerAddressForm = Mage::getModel('customer/form')
+ ->setFormCode('adminhtml_customer_address')
+ ->ignoreInvisible(false);
+ }
+ return $this->_customerAddressForm;
+ }
+
+ /**
+ * Set and validate Quote address
+ * All errors added to _errors
+ *
+ * @return $this
+ */
+ protected function _setQuoteAddress(Mage_Sales_Model_Quote_Address $address, array $data)
+ {
+ $addressForm = $this->_getCustomerAddressForm()
+ ->setEntity($address)
+ ->setEntityType(Mage::getSingleton('eav/config')->getEntityType('customer_address'))
+ ->setIsAjaxRequest(!$this->getIsValidate());
+
+ // prepare request
+ // save original request structure for files
+ if ($address->getAddressType() == Mage_Sales_Model_Quote_Address::TYPE_SHIPPING) {
+ $requestData = ['order' => ['shipping_address' => $data]];
+ $requestScope = 'order/shipping_address';
+ } else {
+ $requestData = ['order' => ['billing_address' => $data]];
+ $requestScope = 'order/billing_address';
+ }
+ $request = $addressForm->prepareRequest($requestData);
+ $addressData = $addressForm->extractData($request, $requestScope);
+ if ($this->getIsValidate()) {
+ $errors = $addressForm->validateData($addressData);
+ if ($errors !== true) {
+ if ($address->getAddressType() == Mage_Sales_Model_Quote_Address::TYPE_SHIPPING) {
+ $typeName = Mage::helper('adminhtml')->__('Shipping Address: ');
+ } else {
+ $typeName = Mage::helper('adminhtml')->__('Billing Address: ');
+ }
+ foreach ($errors as $error) {
+ $this->_errors[] = $typeName . $error;
+ }
+ $addressForm->restoreData($addressData);
+ } else {
+ $addressForm->compactData($addressData);
+ }
+ } else {
+ $addressForm->restoreData($addressData);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Check whether we need to create new customer (for another website) during order creation
+ *
+ * @param Mage_Core_Model_Store $store
+ * @return bool
+ */
+ protected function _customerIsInStore($store)
+ {
+ $customer = $this->getSession()->getCustomer();
+ if ($customer->getWebsiteId() == $store->getWebsiteId()) {
+ return true;
+ }
+ return $customer->isInStore($store);
+ }
+
+ /**
+ * Set and validate Customer data
+ *
+ * @return $this
+ */
+ protected function _setCustomerData(Mage_Customer_Model_Customer $customer)
+ {
+ $form = $this->_getCustomerForm();
+ $form->setEntity($customer);
+
+ // emulate request
+ $request = $form->prepareRequest(['order' => $this->getData()]);
+ $data = $form->extractData($request, 'order/account');
+ if ($this->getIsValidate()) {
+ $errors = $form->validateData($data);
+ if ($errors !== true) {
+ foreach ($errors as $error) {
+ $this->_errors[] = $error;
+ }
+ $form->restoreData($data);
+ } else {
+ $form->compactData($data);
+ }
+ } else {
+ $form->restoreData($data);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Prepare item options
+ */
+ protected function _prepareQuoteItems()
+ {
+ foreach ($this->getQuote()->getAllItems() as $item) {
+ $options = [];
+ $productOptions = $item->getProduct()->getTypeInstance(true)->getOrderOptions($item->getProduct());
+ if ($productOptions) {
+ $productOptions['info_buyRequest']['options'] = $this->_prepareOptionsForRequest($item);
+ $options = $productOptions;
+ }
+ $addOptions = $item->getOptionByCode('additional_options');
+ if ($addOptions) {
+ $options['additional_options'] = unserialize($addOptions->getValue(), ['allowed_classes' => false]);
+ }
+ $item->setProductOrderOptions($options);
+ }
+ return $this;
+ }
+
/**
* Validate quote data before order creation
*
diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php
index 28515f15baa..c895c246036 100644
--- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php
+++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php
@@ -48,6 +48,47 @@ public function __construct()
$this->_order = Mage::getModel('sales/order');
}
+ public function render()
+ {
+ $customer = $this->_getCustomer();
+ $this->_quote->setStore($this->_getStore())
+ ->setCustomer($customer);
+ $this->_quote->getBillingAddress()->importCustomerAddress($customer->getDefaultBillingAddress());
+ $this->_quote->getShippingAddress()->importCustomerAddress($customer->getDefaultShippingAddress());
+
+ $productCount = rand(3, 10);
+ for ($i = 0; $i < $productCount; $i++) {
+ $product = $this->_getRandomProduct();
+ if ($product) {
+ $product->setQuoteQty(1);
+ $this->_quote->addCatalogProduct($product);
+ }
+ }
+ $this->_quote->getPayment()->setMethod('checkmo');
+
+ $this->_quote->getShippingAddress()->setShippingMethod('freeshipping_freeshipping');//->collectTotals()->save();
+ $this->_quote->getShippingAddress()->setCollectShippingRates(true);
+ $this->_quote->collectTotals()
+ ->save();
+ $this->_quote->save();
+ return $this;
+ }
+
+ public function save()
+ {
+ $this->_order->setStoreId($this->_getStore()->getId());
+ $this->_order->createFromQuoteAddress($this->_quote->getShippingAddress());
+ $this->_order->validate();
+ $this->_order->setInitialStatus();
+ $this->_order->save();
+ $this->_order->setCreatedAt($this->_getRandomDate());
+ $this->_order->save();
+
+ $this->_quote->setIsActive(false);
+ $this->_quote->save();
+ return $this;
+ }
+
protected function _getStores()
{
if (!self::$_storeCollection) {
@@ -117,50 +158,9 @@ protected function _getStore()
return $this->_store;
}
- public function render()
- {
- $customer = $this->_getCustomer();
- $this->_quote->setStore($this->_getStore())
- ->setCustomer($customer);
- $this->_quote->getBillingAddress()->importCustomerAddress($customer->getDefaultBillingAddress());
- $this->_quote->getShippingAddress()->importCustomerAddress($customer->getDefaultShippingAddress());
-
- $productCount = rand(3, 10);
- for ($i = 0; $i < $productCount; $i++) {
- $product = $this->_getRandomProduct();
- if ($product) {
- $product->setQuoteQty(1);
- $this->_quote->addCatalogProduct($product);
- }
- }
- $this->_quote->getPayment()->setMethod('checkmo');
-
- $this->_quote->getShippingAddress()->setShippingMethod('freeshipping_freeshipping');//->collectTotals()->save();
- $this->_quote->getShippingAddress()->setCollectShippingRates(true);
- $this->_quote->collectTotals()
- ->save();
- $this->_quote->save();
- return $this;
- }
-
protected function _getRandomDate()
{
$timestamp = mktime(rand(0, 23), rand(0, 59), 0, rand(1, 11), rand(1, 28), rand(2006, 2007));
return date(Varien_Date::DATETIME_PHP_FORMAT, $timestamp);
}
-
- public function save()
- {
- $this->_order->setStoreId($this->_getStore()->getId());
- $this->_order->createFromQuoteAddress($this->_quote->getShippingAddress());
- $this->_order->validate();
- $this->_order->setInitialStatus();
- $this->_order->save();
- $this->_order->setCreatedAt($this->_getRandomDate());
- $this->_order->save();
-
- $this->_quote->setIsActive(false);
- $this->_quote->save();
- return $this;
- }
}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php
index c3f4dc4b054..d3d099ba908 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php
@@ -30,23 +30,6 @@ class Mage_Adminhtml_Model_System_Config_Backend_Admin_Custom extends Mage_Core_
public const XML_PATH_UNSECURE_BASE_LINK_URL = 'web/unsecure/base_link_url';
public const XML_PATH_SECURE_BASE_LINK_URL = 'web/secure/base_link_url';
- /**
- * Validate value before save
- *
- * @return $this
- */
- protected function _beforeSave()
- {
- $value = $this->getValue();
-
- if (!empty($value) && substr($value, -2) !== '}}') {
- $value = rtrim($value, '/') . '/';
- }
-
- $this->setValue($value);
- return $this;
- }
-
/**
* Change secure/unsecure base_url after use_custom_url was modified
*
@@ -78,4 +61,21 @@ public function _afterSave()
return $this;
}
+
+ /**
+ * Validate value before save
+ *
+ * @return $this
+ */
+ protected function _beforeSave()
+ {
+ $value = $this->getValue();
+
+ if (!empty($value) && substr($value, -2) !== '}}') {
+ $value = rtrim($value, '/') . '/';
+ }
+
+ $this->setValue($value);
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php
index 4c4399122e5..3787c9ebbad 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php
@@ -22,6 +22,15 @@
*/
class Mage_Adminhtml_Model_System_Config_Backend_Encrypted extends Mage_Core_Model_Config_Data
{
+ /**
+ * Get & decrypt old value from configuration
+ *
+ * @return string
+ */
+ public function getOldValue()
+ {
+ return Mage::helper('core')->decrypt(parent::getOldValue());
+ }
/**
* Decrypt value after loading
*/
@@ -50,14 +59,4 @@ protected function _beforeSave()
}
return $this;
}
-
- /**
- * Get & decrypt old value from configuration
- *
- * @return string
- */
- public function getOldValue()
- {
- return Mage::helper('core')->decrypt(parent::getOldValue());
- }
}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php
index d0365d8c504..fe39cb19013 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php
@@ -31,6 +31,19 @@ class Mage_Adminhtml_Model_System_Config_Backend_File extends Mage_Core_Model_Co
*/
protected $_maxFileSize = 0;
+ /**
+ * Validation callback for checking max file size
+ *
+ * @param string $filePath Path to temporary uploaded file
+ * @throws Mage_Core_Exception
+ */
+ public function validateMaxSize($filePath)
+ {
+ if ($this->_maxFileSize > 0 && filesize($filePath) > ($this->_maxFileSize * 1024)) {
+ throw Mage::exception('Mage_Core', Mage::helper('adminhtml')->__('Uploaded file is larger than %.2f kilobytes allowed by server', $this->_maxFileSize));
+ }
+ }
+
/**
* Save uploaded file before saving config value
*
@@ -79,19 +92,6 @@ protected function _beforeSave()
return $this;
}
- /**
- * Validation callback for checking max file size
- *
- * @param string $filePath Path to temporary uploaded file
- * @throws Mage_Core_Exception
- */
- public function validateMaxSize($filePath)
- {
- if ($this->_maxFileSize > 0 && filesize($filePath) > ($this->_maxFileSize * 1024)) {
- throw Mage::exception('Mage_Core', Mage::helper('adminhtml')->__('Uploaded file is larger than %.2f kilobytes allowed by server', $this->_maxFileSize));
- }
- }
-
/**
* Makes a decision about whether to add info about the scope.
*
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php
index 7b17b4ab579..39e1b4d8f38 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php
@@ -20,11 +20,10 @@
*/
class Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency
{
- protected static $_options;
-
public const CRON_DAILY = 'D';
public const CRON_WEEKLY = 'W';
public const CRON_MONTHLY = 'M';
+ protected static $_options;
public function toOptionArray()
{
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php
index b63abf55b06..a847af6de0c 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php
@@ -29,30 +29,6 @@ class Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database
*/
protected $_connections = [];
- /**
- * Recursively collect connection configuration
- *
- * @param string $connectionName
- * @return array
- */
- protected function _collectConnectionConfig($connectionName)
- {
- $config = [];
-
- if (isset($this->_connections[$connectionName])) {
- $connection = $this->_connections[$connectionName];
- $connection = (array) $connection->descend('connection');
-
- if (isset($connection['use'])) {
- $config = $this->_collectConnectionConfig((string) $connection['use']);
- }
-
- $config = array_merge($config, $connection);
- }
-
- return $config;
- }
-
/**
* Options getter
*
@@ -76,4 +52,28 @@ public function toOptionArray()
return $mediaStorages;
}
+
+ /**
+ * Recursively collect connection configuration
+ *
+ * @param string $connectionName
+ * @return array
+ */
+ protected function _collectConnectionConfig($connectionName)
+ {
+ $config = [];
+
+ if (isset($this->_connections[$connectionName])) {
+ $connection = $this->_connections[$connectionName];
+ $connection = (array) $connection->descend('connection');
+
+ if (isset($connection['use'])) {
+ $config = $this->_collectConnectionConfig((string) $connection['use']);
+ }
+
+ $config = array_merge($config, $connection);
+ }
+
+ return $config;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Store.php
index 18c831a35e6..750f0c0a828 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Store.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Store.php
@@ -61,44 +61,6 @@ public function __construct()
$this->reload();
}
- /**
- * Load/Reload Website collection
- *
- * @return $this
- */
- protected function _loadWebsiteCollection()
- {
- $this->_websiteCollection = Mage::app()->getWebsites();
- return $this;
- }
-
- /**
- * Load/Reload Group collection
- *
- * @return $this
- */
- protected function _loadGroupCollection()
- {
- $this->_groupCollection = [];
- foreach (Mage::app()->getWebsites() as $website) {
- foreach ($website->getGroups() as $group) {
- $this->_groupCollection[$group->getId()] = $group;
- }
- }
- return $this;
- }
-
- /**
- * Load/Reload Store collection
- *
- * @return $this
- */
- protected function _loadStoreCollection()
- {
- $this->_storeCollection = Mage::app()->getStores();
- return $this;
- }
-
/**
* Retrieve store values for form
*
@@ -486,4 +448,42 @@ public function setIsAdminScopeAllowed($value)
$this->_isAdminScopeAllowed = (bool) $value;
return $this;
}
+
+ /**
+ * Load/Reload Website collection
+ *
+ * @return $this
+ */
+ protected function _loadWebsiteCollection()
+ {
+ $this->_websiteCollection = Mage::app()->getWebsites();
+ return $this;
+ }
+
+ /**
+ * Load/Reload Group collection
+ *
+ * @return $this
+ */
+ protected function _loadGroupCollection()
+ {
+ $this->_groupCollection = [];
+ foreach (Mage::app()->getWebsites() as $website) {
+ foreach ($website->getGroups() as $group) {
+ $this->_groupCollection[$group->getId()] = $group;
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * Load/Reload Store collection
+ *
+ * @return $this
+ */
+ protected function _loadStoreCollection()
+ {
+ $this->_storeCollection = Mage::app()->getStores();
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
index a46ef0926e3..3618341381a 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
@@ -39,16 +39,6 @@ public function preDispatch()
return parent::preDispatch();
}
- protected function _initAction()
- {
- $this->loadLayout();
- $this->_setActiveMenu('system/api/roles');
- $this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
- $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
- $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
- return $this;
- }
-
public function indexAction()
{
$this->_title($this->__('System'))
@@ -206,6 +196,16 @@ public function editrolegridAction()
$this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/api_role_grid_user')->toHtml());
}
+ protected function _initAction()
+ {
+ $this->loadLayout();
+ $this->_setActiveMenu('system/api/roles');
+ $this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
+ $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
+ $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
+ return $this;
+ }
+
protected function _deleteUserFromRole($userId, $roleId)
{
try {
diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
index a92e73c277d..aff1b7d5f4a 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
@@ -37,17 +37,6 @@ public function preDispatch()
return parent::preDispatch();
}
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('system/api/users')
- ->_addBreadcrumb($this->__('Web Services'), $this->__('Web Services'))
- ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
- ->_addBreadcrumb($this->__('Users'), $this->__('Users'))
- ;
- return $this;
- }
-
public function indexAction()
{
$this->_title($this->__('System'))
@@ -235,4 +224,15 @@ public function roleGridAction()
->createBlock('adminhtml/api_user_grid')
->toHtml());
}
+
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('system/api/users')
+ ->_addBreadcrumb($this->__('Web Services'), $this->__('Web Services'))
+ ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
+ ->_addBreadcrumb($this->__('Users'), $this->__('Users'))
+ ;
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/CacheController.php
index 08fce26bdb7..fe028d11ec5 100644
--- a/app/code/core/Mage/Adminhtml/controllers/CacheController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/CacheController.php
@@ -26,16 +26,6 @@ class Mage_Adminhtml_CacheController extends Mage_Adminhtml_Controller_Action
*/
public const ADMIN_RESOURCE = 'system/cache';
- /**
- * Retrieve session model
- *
- * @return Mage_Adminhtml_Model_Session
- */
- protected function _getSession()
- {
- return Mage::getSingleton('adminhtml/session');
- }
-
/**
* Display cache management grid
*/
@@ -211,4 +201,14 @@ public function cleanSwatchesAction()
}
$this->_redirect('*/*');
}
+
+ /**
+ * Retrieve session model
+ *
+ * @return Mage_Adminhtml_Model_Session
+ */
+ protected function _getSession()
+ {
+ return Mage::getSingleton('adminhtml/session');
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
index a38e1bd1aa5..fa201e8b12b 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
@@ -27,50 +27,6 @@ class Mage_Adminhtml_Catalog_CategoryController extends Mage_Adminhtml_Controlle
* @see Mage_Adminhtml_Controller_Action::_isAllowed()
*/
public const ADMIN_RESOURCE = 'catalog/categories';
-
- /**
- * Initialize requested category and put it into registry.
- * Root category can be returned, if inappropriate store/category is specified
- *
- * @param bool $getRootInstead
- * @return Mage_Catalog_Model_Category|false
- */
- protected function _initCategory($getRootInstead = false)
- {
- $this->_title($this->__('Catalog'))
- ->_title($this->__('Categories'))
- ->_title($this->__('Manage Categories'));
-
- $categoryId = (int) $this->getRequest()->getParam('id', false);
- $storeId = (int) $this->getRequest()->getParam('store');
- $category = Mage::getModel('catalog/category');
- $category->setStoreId($storeId);
-
- if ($categoryId) {
- $category->load($categoryId);
- if ($storeId) {
- $rootId = Mage::app()->getStore($storeId)->getRootCategoryId();
- if (!in_array($rootId, $category->getPathIds())) {
- // load root category instead wrong one
- if ($getRootInstead) {
- $category->load($rootId);
- } else {
- $this->_redirect('*/*/', ['_current' => true, 'id' => null]);
- return false;
- }
- }
- }
- }
-
- if ($activeTabId = (string) $this->getRequest()->getParam('active_tab_id')) {
- Mage::getSingleton('admin/session')->setActiveTabId($activeTabId);
- }
-
- Mage::register('category', $category);
- Mage::register('current_category', $category);
- Mage::getSingleton('cms/wysiwyg_config')->setStoreId($this->getRequest()->getParam('store'));
- return $category;
- }
/**
* Catalog categories index action
*/
@@ -489,4 +445,48 @@ public function preDispatch()
$this->_setForcedFormKeyActions('delete');
return parent::preDispatch();
}
+
+ /**
+ * Initialize requested category and put it into registry.
+ * Root category can be returned, if inappropriate store/category is specified
+ *
+ * @param bool $getRootInstead
+ * @return Mage_Catalog_Model_Category|false
+ */
+ protected function _initCategory($getRootInstead = false)
+ {
+ $this->_title($this->__('Catalog'))
+ ->_title($this->__('Categories'))
+ ->_title($this->__('Manage Categories'));
+
+ $categoryId = (int) $this->getRequest()->getParam('id', false);
+ $storeId = (int) $this->getRequest()->getParam('store');
+ $category = Mage::getModel('catalog/category');
+ $category->setStoreId($storeId);
+
+ if ($categoryId) {
+ $category->load($categoryId);
+ if ($storeId) {
+ $rootId = Mage::app()->getStore($storeId)->getRootCategoryId();
+ if (!in_array($rootId, $category->getPathIds())) {
+ // load root category instead wrong one
+ if ($getRootInstead) {
+ $category->load($rootId);
+ } else {
+ $this->_redirect('*/*/', ['_current' => true, 'id' => null]);
+ return false;
+ }
+ }
+ }
+ }
+
+ if ($activeTabId = (string) $this->getRequest()->getParam('active_tab_id')) {
+ Mage::getSingleton('admin/session')->setActiveTabId($activeTabId);
+ }
+
+ Mage::register('category', $category);
+ Mage::register('current_category', $category);
+ Mage::getSingleton('cms/wysiwyg_config')->setStoreId($this->getRequest()->getParam('store'));
+ return $category;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php
index 18280d329cd..b0da457bdaa 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php
@@ -28,12 +28,6 @@ class Mage_Adminhtml_Catalog_Product_Action_AttributeController extends Mage_Adm
*/
public const ADMIN_RESOURCE = 'catalog/update_attributes';
- protected function _construct()
- {
- // Define module dependent translate
- $this->setUsedModuleName('Mage_Catalog');
- }
-
public function editAction()
{
if (!$this->_validateProducts()) {
@@ -188,39 +182,6 @@ public function saveAction()
$this->_redirect('*/catalog_product/', ['store' => $this->_getHelper()->getSelectedStoreId()]);
}
- /**
- * Validate selection of products for massupdate
- *
- * @return bool
- */
- protected function _validateProducts()
- {
- $error = false;
- $productIds = $this->_getHelper()->getProductIds();
- if (!is_array($productIds)) {
- $error = $this->__('Please select products for attributes update');
- } elseif (!Mage::getModel('catalog/product')->isProductsHasSku($productIds)) {
- $error = $this->__('Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.');
- }
-
- if ($error) {
- $this->_getSession()->addError($error);
- $this->_redirect('*/catalog_product/', ['_current' => true]);
- }
-
- return !$error;
- }
-
- /**
- * Retrieve data manipulation helper
- *
- * @return Mage_Adminhtml_Helper_Catalog_Product_Edit_Action_Attribute
- */
- protected function _getHelper()
- {
- return Mage::helper('adminhtml/catalog_product_edit_action_attribute');
- }
-
/**
* Attributes validation action
*
@@ -264,4 +225,43 @@ public function validateAction()
$this->getResponse()->setBody($response->toJson());
}
+
+ protected function _construct()
+ {
+ // Define module dependent translate
+ $this->setUsedModuleName('Mage_Catalog');
+ }
+
+ /**
+ * Validate selection of products for massupdate
+ *
+ * @return bool
+ */
+ protected function _validateProducts()
+ {
+ $error = false;
+ $productIds = $this->_getHelper()->getProductIds();
+ if (!is_array($productIds)) {
+ $error = $this->__('Please select products for attributes update');
+ } elseif (!Mage::getModel('catalog/product')->isProductsHasSku($productIds)) {
+ $error = $this->__('Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.');
+ }
+
+ if ($error) {
+ $this->_getSession()->addError($error);
+ $this->_redirect('*/catalog_product/', ['_current' => true]);
+ }
+
+ return !$error;
+ }
+
+ /**
+ * Retrieve data manipulation helper
+ *
+ * @return Mage_Adminhtml_Helper_Catalog_Product_Edit_Action_Attribute
+ */
+ protected function _getHelper()
+ {
+ return Mage::helper('adminhtml/catalog_product_edit_action_attribute');
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
index 40e1487c5f4..5bb7f14ca03 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
@@ -22,8 +22,6 @@
*/
class Mage_Adminhtml_Catalog_Product_AttributeController extends Mage_Adminhtml_Controller_Action
{
- protected $_entityTypeId;
-
/**
* ACL resource
* @see Mage_Adminhtml_Controller_Action::_isAllowed()
@@ -34,16 +32,7 @@ class Mage_Adminhtml_Catalog_Product_AttributeController extends Mage_Adminhtml_
* List of tags from setting
*/
public const XML_PATH_ALLOWED_TAGS = 'system/catalog/frontend/allowed_html_tags_list';
-
- /**
- * Get list of allowed text formatted as array
- *
- * @return array
- */
- protected function _getAllowedTags()
- {
- return explode(',', Mage::getStoreConfig(self::XML_PATH_ALLOWED_TAGS));
- }
+ protected $_entityTypeId;
public function preDispatch()
{
@@ -53,27 +42,6 @@ public function preDispatch()
return $this;
}
- protected function _initAction()
- {
- $this->_title($this->__('Catalog'))
- ->_title($this->__('Attributes'))
- ->_title($this->__('Manage Attributes'));
-
- if ($this->getRequest()->getParam('popup')) {
- $this->loadLayout('popup');
- } else {
- $this->loadLayout()
- ->_setActiveMenu('catalog/attributes/attributes')
- ->_addBreadcrumb(Mage::helper('catalog')->__('Catalog'), Mage::helper('catalog')->__('Catalog'))
- ->_addBreadcrumb(
- Mage::helper('catalog')->__('Manage Product Attributes'),
- Mage::helper('catalog')->__('Manage Product Attributes'),
- )
- ;
- }
- return $this;
- }
-
public function indexAction()
{
$this->_initAction()
@@ -157,39 +125,6 @@ public function validateAction()
$this->getResponse()->setBody($response->toJson());
}
- /**
- * Filter post data
- *
- * @param array $data
- * @return array
- */
- protected function _filterPostData($data)
- {
- if ($data) {
- /** @var Mage_Catalog_Helper_Data $helperCatalog */
- $helperCatalog = Mage::helper('catalog');
- //labels
- $data['frontend_label'] = (array) $data['frontend_label'];
- foreach ($data['frontend_label'] as & $value) {
- if ($value) {
- $value = $helperCatalog->stripTags($value);
- }
- }
-
- if (!empty($data['option']) && !empty($data['option']['value']) && is_array($data['option']['value'])) {
- $allowableTags = isset($data['is_html_allowed_on_front']) && $data['is_html_allowed_on_front']
- ? sprintf('<%s>', implode('><', $this->_getAllowedTags())) : null;
- foreach ($data['option']['value'] as $key => $values) {
- foreach ($values as $storeId => $storeLabel) {
- $data['option']['value'][$key][$storeId]
- = $helperCatalog->stripTags($storeLabel, $allowableTags);
- }
- }
- }
- }
- return $data;
- }
-
public function saveAction()
{
$data = $this->getRequest()->getPost();
@@ -372,4 +307,68 @@ public function deleteAction()
);
$this->_redirect('*/*/');
}
+
+ /**
+ * Get list of allowed text formatted as array
+ *
+ * @return array
+ */
+ protected function _getAllowedTags()
+ {
+ return explode(',', Mage::getStoreConfig(self::XML_PATH_ALLOWED_TAGS));
+ }
+
+ protected function _initAction()
+ {
+ $this->_title($this->__('Catalog'))
+ ->_title($this->__('Attributes'))
+ ->_title($this->__('Manage Attributes'));
+
+ if ($this->getRequest()->getParam('popup')) {
+ $this->loadLayout('popup');
+ } else {
+ $this->loadLayout()
+ ->_setActiveMenu('catalog/attributes/attributes')
+ ->_addBreadcrumb(Mage::helper('catalog')->__('Catalog'), Mage::helper('catalog')->__('Catalog'))
+ ->_addBreadcrumb(
+ Mage::helper('catalog')->__('Manage Product Attributes'),
+ Mage::helper('catalog')->__('Manage Product Attributes'),
+ )
+ ;
+ }
+ return $this;
+ }
+
+ /**
+ * Filter post data
+ *
+ * @param array $data
+ * @return array
+ */
+ protected function _filterPostData($data)
+ {
+ if ($data) {
+ /** @var Mage_Catalog_Helper_Data $helperCatalog */
+ $helperCatalog = Mage::helper('catalog');
+ //labels
+ $data['frontend_label'] = (array) $data['frontend_label'];
+ foreach ($data['frontend_label'] as & $value) {
+ if ($value) {
+ $value = $helperCatalog->stripTags($value);
+ }
+ }
+
+ if (!empty($data['option']) && !empty($data['option']['value']) && is_array($data['option']['value'])) {
+ $allowableTags = isset($data['is_html_allowed_on_front']) && $data['is_html_allowed_on_front']
+ ? sprintf('<%s>', implode('><', $this->_getAllowedTags())) : null;
+ foreach ($data['option']['value'] as $key => $values) {
+ foreach ($values as $storeId => $storeLabel) {
+ $data['option']['value'][$key][$storeId]
+ = $helperCatalog->stripTags($storeLabel, $allowableTags);
+ }
+ }
+ }
+ }
+ return $data;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
index e8a68682eae..3e996275eae 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
@@ -51,134 +51,6 @@ public function preDispatch()
return parent::preDispatch();
}
- protected function _construct()
- {
- // Define module dependent translate
- $this->setUsedModuleName('Mage_Catalog');
- }
-
- /**
- * Initialize product from request parameters
- *
- * @return Mage_Catalog_Model_Product
- * @throws Mage_Core_Exception
- */
- protected function _initProduct()
- {
- $this->_title($this->__('Catalog'))
- ->_title($this->__('Manage Products'));
-
- $productId = (int) $this->getRequest()->getParam('id');
- $product = Mage::getModel('catalog/product')
- ->setStoreId($this->getRequest()->getParam('store', 0));
-
- if (!$productId) {
- if ($setId = (int) $this->getRequest()->getParam('set')) {
- $product->setAttributeSetId($setId);
- }
-
- if ($typeId = $this->getRequest()->getParam('type')) {
- $product->setTypeId($typeId);
- }
- }
-
- $product->setData('_edit_mode', true);
- if ($productId) {
- try {
- $product->load($productId);
- } catch (Exception $e) {
- $product->setTypeId(Mage_Catalog_Model_Product_Type::DEFAULT_TYPE);
- Mage::logException($e);
- }
- }
-
- $attributes = $this->getRequest()->getParam('attributes');
- if ($attributes && $product->isConfigurable()) {
- /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */
- $productType = $product->getTypeInstance();
- if (!$productId || !$productType->getUsedProductAttributeIds()) {
- $productType->setUsedProductAttributeIds(
- explode(',', base64_decode(urldecode($attributes))),
- );
- }
- }
-
- // Required attributes of simple product for configurable creation
- if ($this->getRequest()->getParam('popup')
- && $requiredAttributes = $this->getRequest()->getParam('required')
- ) {
- $requiredAttributes = explode(',', $requiredAttributes);
- foreach ($product->getAttributes() as $attribute) {
- if (in_array($attribute->getId(), $requiredAttributes)) {
- $attribute->setIsRequired(1);
- }
- }
- }
-
- if ($this->getRequest()->getParam('popup')
- && $this->getRequest()->getParam('product')
- && !is_array($this->getRequest()->getParam('product'))
- && $this->getRequest()->getParam('id', false) === false
- ) {
- $configProduct = Mage::getModel('catalog/product')
- ->setStoreId(0)
- ->load($this->getRequest()->getParam('product'))
- ->setTypeId($this->getRequest()->getParam('type'));
-
- /** @var Mage_Catalog_Model_Product $configProduct */
- $data = [];
- // phpcs:ignore Ecg.Performance.Loop.DataLoad
- foreach ($configProduct->getTypeInstance()->getEditableAttributes() as $attribute) {
- /** @var Mage_Catalog_Model_Resource_Eav_Attribute $attribute */
- if (!$attribute->getIsUnique()
- && $attribute->getFrontend()->getInputType() != 'gallery'
- && $attribute->getAttributeCode() != 'required_options'
- && $attribute->getAttributeCode() != 'has_options'
- && $attribute->getAttributeCode() != $configProduct->getIdFieldName()
- ) {
- $data[$attribute->getAttributeCode()] = $configProduct->getData($attribute->getAttributeCode());
- }
- }
-
- $product->addData($data)
- ->setWebsiteIds($configProduct->getWebsiteIds());
- }
-
- Mage::register('product', $product);
- Mage::register('current_product', $product);
- Mage::getSingleton('cms/wysiwyg_config')->setStoreId($this->getRequest()->getParam('store'));
- return $product;
- }
-
- /**
- * Create serializer block for a grid
- *
- * @param string $inputName
- * @param array $productsArray
- * @return Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Ajax_Serializer
- */
- protected function _createSerializerBlock($inputName, Mage_Adminhtml_Block_Widget_Grid $gridBlock, $productsArray)
- {
- return $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_ajax_serializer')
- ->setGridBlock($gridBlock)
- ->setProducts($productsArray)
- ->setInputElementName($inputName)
- ;
- }
-
- /**
- * Output specified blocks as a text list
- */
- protected function _outputBlocks()
- {
- $blocks = func_get_args();
- $output = $this->getLayout()->createBlock('adminhtml/text_list');
- foreach ($blocks as $block) {
- $output->insert($block, '', true);
- }
- $this->getResponse()->setBody($output->toHtml());
- }
-
/**
* Product list page
*/
@@ -568,292 +440,115 @@ public function validateAction()
$this->getResponse()->setBody($response->toJson());
}
+ public function categoriesJsonAction()
+ {
+ $product = $this->_initProduct();
+
+ $this->getResponse()->setBody(
+ $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_categories')
+ ->getCategoryChildrenJson($this->getRequest()->getParam('category')),
+ );
+ }
+
/**
- * Initialize product before saving
- * @throws Mage_Core_Exception|Zend_Json_Exception
+ * Save product action
*/
- protected function _initProductSave()
+ public function saveAction()
{
- $product = $this->_initProduct();
- $productData = $this->getRequest()->getPost('product');
- if ($productData) {
- $this->_filterStockData($productData['stock_data']);
- }
+ $storeId = $this->getRequest()->getParam('store');
+ $redirectBack = $this->getRequest()->getParam('back', false);
+ $productId = $this->getRequest()->getParam('id');
+ $isEdit = (int) ($this->getRequest()->getParam('id') != null);
- if (!isset($productData['website_ids'])) {
- $productData['website_ids'] = [];
- }
+ $data = $this->getRequest()->getPost();
+ if ($data) {
+ $this->_filterStockData($data['product']['stock_data']);
- $wasLockedMedia = false;
- if ($product->isLockedAttribute('media')) {
- $product->unlockAttribute('media');
- $wasLockedMedia = true;
- }
+ $product = $this->_initProductSave();
+ // check sku attribute
+ $productSku = $product->getSku();
+ if ($productSku && $productSku != Mage::helper('core')->stripTags($productSku)) {
+ $this->_getSession()->addError($this->__('HTML tags are not allowed in SKU attribute.'));
+ $this->_redirect('*/*/edit', [
+ 'id' => $productId,
+ '_current' => true,
+ ]);
+ return;
+ }
- $product->addData($productData);
+ try {
+ $product->validate();
+ $product->save();
+ $productId = $product->getId();
- if ($wasLockedMedia) {
- $product->lockAttribute('media');
+ if (isset($data['copy_to_stores'])) {
+ $this->_copyAttributesBetweenStores($data['copy_to_stores'], $product);
+ }
+
+ $this->_getSession()->addSuccess($this->__('The product has been saved.'));
+ } catch (Mage_Core_Exception $e) {
+ $this->_getSession()->addError($e->getMessage())
+ ->setProductData($data);
+ $redirectBack = true;
+ } catch (Exception $e) {
+ Mage::logException($e);
+ $this->_getSession()->addError($e->getMessage());
+ $redirectBack = true;
+ }
}
- if (Mage::app()->isSingleStoreMode()) {
- $product->setWebsiteIds([Mage::app()->getStore(true)->getWebsite()->getId()]);
+ if ($redirectBack) {
+ $this->_redirect('*/*/edit', [
+ 'id' => $productId,
+ '_current' => true,
+ ]);
+ } elseif ($this->getRequest()->getParam('popup')) {
+ $this->_redirect('*/*/created', [
+ '_current' => true,
+ 'id' => $productId,
+ 'edit' => $isEdit,
+ ]);
+ } else {
+ $this->_redirect('*/*/', ['store' => $storeId]);
}
+ }
- /**
- * Create Permanent Redirect for old URL key
- */
- if ($product->getId() && isset($productData['url_key_create_redirect'])) {
- $product->setData('save_rewrites_history', (bool) $productData['url_key_create_redirect']);
+ /**
+ * Create product duplicate
+ * @throws Mage_Core_Exception
+ */
+ public function duplicateAction()
+ {
+ $product = $this->_initProduct();
+ try {
+ $newProduct = $product->duplicate();
+ $this->_getSession()->addSuccess($this->__('The product has been duplicated.'));
+ $this->_redirect('*/*/edit', ['_current' => true, 'id' => $newProduct->getId()]);
+ } catch (Exception $e) {
+ Mage::logException($e);
+ $this->_getSession()->addError($e->getMessage());
+ $this->_redirect('*/*/edit', ['_current' => true]);
}
+ }
- /**
- * Check "Use Default Value" checkboxes values
- */
- if ($useDefaults = $this->getRequest()->getPost('use_default')) {
- foreach ($useDefaults as $attributeCode) {
- $product->setData($attributeCode, false);
+ /**
+ * Delete product action
+ */
+ public function deleteAction()
+ {
+ if ($id = $this->getRequest()->getParam('id')) {
+ $product = Mage::getModel('catalog/product')
+ ->load($id);
+ try {
+ $product->delete();
+ $this->_getSession()->addSuccess($this->__('The product has been deleted.'));
+ } catch (Exception $e) {
+ $this->_getSession()->addError($e->getMessage());
}
}
-
- /**
- * Init product links data (related, upsell, crosssel)
- */
- $links = $this->getRequest()->getPost('links');
- if (isset($links['related']) && !$product->getRelatedReadonly()) {
- $product->setRelatedLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['related']));
- }
- if (isset($links['upsell']) && !$product->getUpsellReadonly()) {
- $product->setUpSellLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['upsell']));
- }
- if (isset($links['crosssell']) && !$product->getCrosssellReadonly()) {
- $product->setCrossSellLinkData(Mage::helper('adminhtml/js')
- ->decodeGridSerializedInput($links['crosssell']));
- }
- if (isset($links['grouped']) && !$product->getGroupedReadonly()) {
- $product->setGroupedLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['grouped']));
- }
-
- /**
- * Initialize product categories
- */
- $categoryIds = $this->getRequest()->getPost('category_ids');
- if ($categoryIds !== null) {
- if (empty($categoryIds)) {
- $categoryIds = [];
- }
- $product->setCategoryIds($categoryIds);
- }
-
- /**
- * Initialize data for configurable product
- */
- if (($data = $this->getRequest()->getPost('configurable_products_data'))
- && !$product->getConfigurableReadonly()
- ) {
- $product->setConfigurableProductsData(Mage::helper('core')->jsonDecode($data));
- }
- if (($data = $this->getRequest()->getPost('configurable_attributes_data'))
- && !$product->getConfigurableReadonly()
- ) {
- $product->setConfigurableAttributesData(Mage::helper('core')->jsonDecode($data));
- }
-
- $product->setCanSaveConfigurableAttributes(
- (bool) $this->getRequest()->getPost('affect_configurable_product_attributes')
- && !$product->getConfigurableReadonly(),
- );
-
- /**
- * Initialize product options
- */
- if (isset($productData['options']) && !$product->getOptionsReadonly()) {
- $product->setProductOptions($productData['options']);
- }
-
- $product->setCanSaveCustomOptions(
- (bool) $this->getRequest()->getPost('affect_product_custom_options')
- && !$product->getOptionsReadonly(),
- );
-
- Mage::dispatchEvent(
- 'catalog_product_prepare_save',
- ['product' => $product, 'request' => $this->getRequest()],
- );
-
- return $product;
- }
-
- /**
- * Filter product stock data
- *
- * @param array $stockData
- */
- protected function _filterStockData(&$stockData)
- {
- if (is_null($stockData)) {
- return;
- }
- if (!isset($stockData['use_config_manage_stock'])) {
- $stockData['use_config_manage_stock'] = 0;
- }
- if (isset($stockData['qty']) && (float) $stockData['qty'] > self::MAX_QTY_VALUE) {
- $stockData['qty'] = self::MAX_QTY_VALUE;
- }
- if (isset($stockData['min_qty']) && (int) $stockData['min_qty'] < 0) {
- $stockData['min_qty'] = 0;
- }
- if (!isset($stockData['is_decimal_divided']) || $stockData['is_qty_decimal'] == 0) {
- $stockData['is_decimal_divided'] = 0;
- }
- }
-
- public function categoriesJsonAction()
- {
- $product = $this->_initProduct();
-
- $this->getResponse()->setBody(
- $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_categories')
- ->getCategoryChildrenJson($this->getRequest()->getParam('category')),
- );
- }
-
- /**
- * Save product action
- */
- public function saveAction()
- {
- $storeId = $this->getRequest()->getParam('store');
- $redirectBack = $this->getRequest()->getParam('back', false);
- $productId = $this->getRequest()->getParam('id');
- $isEdit = (int) ($this->getRequest()->getParam('id') != null);
-
- $data = $this->getRequest()->getPost();
- if ($data) {
- $this->_filterStockData($data['product']['stock_data']);
-
- $product = $this->_initProductSave();
- // check sku attribute
- $productSku = $product->getSku();
- if ($productSku && $productSku != Mage::helper('core')->stripTags($productSku)) {
- $this->_getSession()->addError($this->__('HTML tags are not allowed in SKU attribute.'));
- $this->_redirect('*/*/edit', [
- 'id' => $productId,
- '_current' => true,
- ]);
- return;
- }
-
- try {
- $product->validate();
- $product->save();
- $productId = $product->getId();
-
- if (isset($data['copy_to_stores'])) {
- $this->_copyAttributesBetweenStores($data['copy_to_stores'], $product);
- }
-
- $this->_getSession()->addSuccess($this->__('The product has been saved.'));
- } catch (Mage_Core_Exception $e) {
- $this->_getSession()->addError($e->getMessage())
- ->setProductData($data);
- $redirectBack = true;
- } catch (Exception $e) {
- Mage::logException($e);
- $this->_getSession()->addError($e->getMessage());
- $redirectBack = true;
- }
- }
-
- if ($redirectBack) {
- $this->_redirect('*/*/edit', [
- 'id' => $productId,
- '_current' => true,
- ]);
- } elseif ($this->getRequest()->getParam('popup')) {
- $this->_redirect('*/*/created', [
- '_current' => true,
- 'id' => $productId,
- 'edit' => $isEdit,
- ]);
- } else {
- $this->_redirect('*/*/', ['store' => $storeId]);
- }
- }
-
- /**
- * Duplicates product attributes between stores.
- * @param array $stores list of store pairs: array(fromStore => toStore, fromStore => toStore,..)
- * @param Mage_Catalog_Model_Product $product whose attributes should be copied
- * @return $this
- * @throws Throwable
- */
- protected function _copyAttributesBetweenStores(array $stores, Mage_Catalog_Model_Product $product)
- {
- foreach ($stores as $storeTo => $storeFrom) {
- $productInStore = Mage::getModel('catalog/product')
- ->setStoreId($storeFrom)
- // phpcs:ignore Ecg.Performance.Loop.ModelLSD
- ->load($product->getId());
- Mage::dispatchEvent('product_duplicate_attributes', [
- 'product' => $productInStore,
- 'storeTo' => $storeTo,
- 'storeFrom' => $storeFrom,
- ]);
- // phpcs:ignore Ecg.Performance.Loop.ModelLSD
- $productInStore->setStoreId($storeTo)->save();
- }
- return $this;
- }
-
- /**
- * Create product duplicate
- * @throws Mage_Core_Exception
- */
- public function duplicateAction()
- {
- $product = $this->_initProduct();
- try {
- $newProduct = $product->duplicate();
- $this->_getSession()->addSuccess($this->__('The product has been duplicated.'));
- $this->_redirect('*/*/edit', ['_current' => true, 'id' => $newProduct->getId()]);
- } catch (Exception $e) {
- Mage::logException($e);
- $this->_getSession()->addError($e->getMessage());
- $this->_redirect('*/*/edit', ['_current' => true]);
- }
- }
-
- /**
- * @deprecated since 1.4.0.0-alpha2
- */
- protected function _decodeInput($encoded)
- {
- parse_str($encoded, $data);
- foreach ($data as $key => $value) {
- parse_str(base64_decode($value), $data[$key]);
- }
- return $data;
- }
-
- /**
- * Delete product action
- */
- public function deleteAction()
- {
- if ($id = $this->getRequest()->getParam('id')) {
- $product = Mage::getModel('catalog/product')
- ->load($id);
- try {
- $product->delete();
- $this->_getSession()->addSuccess($this->__('The product has been deleted.'));
- } catch (Exception $e) {
- $this->_getSession()->addError($e->getMessage());
- }
- }
- $this->getResponse()
- ->setRedirect($this->getUrl('*/*/', ['store' => $this->getRequest()->getParam('store')]));
- }
+ $this->getResponse()
+ ->setRedirect($this->getUrl('*/*/', ['store' => $this->getRequest()->getParam('store')]));
+ }
/**
* Get tag grid
@@ -1139,4 +834,309 @@ public function showUpdateResultAction()
return false;
}
}
+
+ protected function _construct()
+ {
+ // Define module dependent translate
+ $this->setUsedModuleName('Mage_Catalog');
+ }
+
+ /**
+ * Initialize product from request parameters
+ *
+ * @return Mage_Catalog_Model_Product
+ * @throws Mage_Core_Exception
+ */
+ protected function _initProduct()
+ {
+ $this->_title($this->__('Catalog'))
+ ->_title($this->__('Manage Products'));
+
+ $productId = (int) $this->getRequest()->getParam('id');
+ $product = Mage::getModel('catalog/product')
+ ->setStoreId($this->getRequest()->getParam('store', 0));
+
+ if (!$productId) {
+ if ($setId = (int) $this->getRequest()->getParam('set')) {
+ $product->setAttributeSetId($setId);
+ }
+
+ if ($typeId = $this->getRequest()->getParam('type')) {
+ $product->setTypeId($typeId);
+ }
+ }
+
+ $product->setData('_edit_mode', true);
+ if ($productId) {
+ try {
+ $product->load($productId);
+ } catch (Exception $e) {
+ $product->setTypeId(Mage_Catalog_Model_Product_Type::DEFAULT_TYPE);
+ Mage::logException($e);
+ }
+ }
+
+ $attributes = $this->getRequest()->getParam('attributes');
+ if ($attributes && $product->isConfigurable()) {
+ /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */
+ $productType = $product->getTypeInstance();
+ if (!$productId || !$productType->getUsedProductAttributeIds()) {
+ $productType->setUsedProductAttributeIds(
+ explode(',', base64_decode(urldecode($attributes))),
+ );
+ }
+ }
+
+ // Required attributes of simple product for configurable creation
+ if ($this->getRequest()->getParam('popup')
+ && $requiredAttributes = $this->getRequest()->getParam('required')
+ ) {
+ $requiredAttributes = explode(',', $requiredAttributes);
+ foreach ($product->getAttributes() as $attribute) {
+ if (in_array($attribute->getId(), $requiredAttributes)) {
+ $attribute->setIsRequired(1);
+ }
+ }
+ }
+
+ if ($this->getRequest()->getParam('popup')
+ && $this->getRequest()->getParam('product')
+ && !is_array($this->getRequest()->getParam('product'))
+ && $this->getRequest()->getParam('id', false) === false
+ ) {
+ $configProduct = Mage::getModel('catalog/product')
+ ->setStoreId(0)
+ ->load($this->getRequest()->getParam('product'))
+ ->setTypeId($this->getRequest()->getParam('type'));
+
+ /** @var Mage_Catalog_Model_Product $configProduct */
+ $data = [];
+ // phpcs:ignore Ecg.Performance.Loop.DataLoad
+ foreach ($configProduct->getTypeInstance()->getEditableAttributes() as $attribute) {
+ /** @var Mage_Catalog_Model_Resource_Eav_Attribute $attribute */
+ if (!$attribute->getIsUnique()
+ && $attribute->getFrontend()->getInputType() != 'gallery'
+ && $attribute->getAttributeCode() != 'required_options'
+ && $attribute->getAttributeCode() != 'has_options'
+ && $attribute->getAttributeCode() != $configProduct->getIdFieldName()
+ ) {
+ $data[$attribute->getAttributeCode()] = $configProduct->getData($attribute->getAttributeCode());
+ }
+ }
+
+ $product->addData($data)
+ ->setWebsiteIds($configProduct->getWebsiteIds());
+ }
+
+ Mage::register('product', $product);
+ Mage::register('current_product', $product);
+ Mage::getSingleton('cms/wysiwyg_config')->setStoreId($this->getRequest()->getParam('store'));
+ return $product;
+ }
+
+ /**
+ * Create serializer block for a grid
+ *
+ * @param string $inputName
+ * @param array $productsArray
+ * @return Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Ajax_Serializer
+ */
+ protected function _createSerializerBlock($inputName, Mage_Adminhtml_Block_Widget_Grid $gridBlock, $productsArray)
+ {
+ return $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_ajax_serializer')
+ ->setGridBlock($gridBlock)
+ ->setProducts($productsArray)
+ ->setInputElementName($inputName)
+ ;
+ }
+
+ /**
+ * Output specified blocks as a text list
+ */
+ protected function _outputBlocks()
+ {
+ $blocks = func_get_args();
+ $output = $this->getLayout()->createBlock('adminhtml/text_list');
+ foreach ($blocks as $block) {
+ $output->insert($block, '', true);
+ }
+ $this->getResponse()->setBody($output->toHtml());
+ }
+
+ /**
+ * Initialize product before saving
+ * @throws Mage_Core_Exception|Zend_Json_Exception
+ */
+ protected function _initProductSave()
+ {
+ $product = $this->_initProduct();
+ $productData = $this->getRequest()->getPost('product');
+ if ($productData) {
+ $this->_filterStockData($productData['stock_data']);
+ }
+
+ if (!isset($productData['website_ids'])) {
+ $productData['website_ids'] = [];
+ }
+
+ $wasLockedMedia = false;
+ if ($product->isLockedAttribute('media')) {
+ $product->unlockAttribute('media');
+ $wasLockedMedia = true;
+ }
+
+ $product->addData($productData);
+
+ if ($wasLockedMedia) {
+ $product->lockAttribute('media');
+ }
+
+ if (Mage::app()->isSingleStoreMode()) {
+ $product->setWebsiteIds([Mage::app()->getStore(true)->getWebsite()->getId()]);
+ }
+
+ /**
+ * Create Permanent Redirect for old URL key
+ */
+ if ($product->getId() && isset($productData['url_key_create_redirect'])) {
+ $product->setData('save_rewrites_history', (bool) $productData['url_key_create_redirect']);
+ }
+
+ /**
+ * Check "Use Default Value" checkboxes values
+ */
+ if ($useDefaults = $this->getRequest()->getPost('use_default')) {
+ foreach ($useDefaults as $attributeCode) {
+ $product->setData($attributeCode, false);
+ }
+ }
+
+ /**
+ * Init product links data (related, upsell, crosssel)
+ */
+ $links = $this->getRequest()->getPost('links');
+ if (isset($links['related']) && !$product->getRelatedReadonly()) {
+ $product->setRelatedLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['related']));
+ }
+ if (isset($links['upsell']) && !$product->getUpsellReadonly()) {
+ $product->setUpSellLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['upsell']));
+ }
+ if (isset($links['crosssell']) && !$product->getCrosssellReadonly()) {
+ $product->setCrossSellLinkData(Mage::helper('adminhtml/js')
+ ->decodeGridSerializedInput($links['crosssell']));
+ }
+ if (isset($links['grouped']) && !$product->getGroupedReadonly()) {
+ $product->setGroupedLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['grouped']));
+ }
+
+ /**
+ * Initialize product categories
+ */
+ $categoryIds = $this->getRequest()->getPost('category_ids');
+ if ($categoryIds !== null) {
+ if (empty($categoryIds)) {
+ $categoryIds = [];
+ }
+ $product->setCategoryIds($categoryIds);
+ }
+
+ /**
+ * Initialize data for configurable product
+ */
+ if (($data = $this->getRequest()->getPost('configurable_products_data'))
+ && !$product->getConfigurableReadonly()
+ ) {
+ $product->setConfigurableProductsData(Mage::helper('core')->jsonDecode($data));
+ }
+ if (($data = $this->getRequest()->getPost('configurable_attributes_data'))
+ && !$product->getConfigurableReadonly()
+ ) {
+ $product->setConfigurableAttributesData(Mage::helper('core')->jsonDecode($data));
+ }
+
+ $product->setCanSaveConfigurableAttributes(
+ (bool) $this->getRequest()->getPost('affect_configurable_product_attributes')
+ && !$product->getConfigurableReadonly(),
+ );
+
+ /**
+ * Initialize product options
+ */
+ if (isset($productData['options']) && !$product->getOptionsReadonly()) {
+ $product->setProductOptions($productData['options']);
+ }
+
+ $product->setCanSaveCustomOptions(
+ (bool) $this->getRequest()->getPost('affect_product_custom_options')
+ && !$product->getOptionsReadonly(),
+ );
+
+ Mage::dispatchEvent(
+ 'catalog_product_prepare_save',
+ ['product' => $product, 'request' => $this->getRequest()],
+ );
+
+ return $product;
+ }
+
+ /**
+ * Filter product stock data
+ *
+ * @param array $stockData
+ */
+ protected function _filterStockData(&$stockData)
+ {
+ if (is_null($stockData)) {
+ return;
+ }
+ if (!isset($stockData['use_config_manage_stock'])) {
+ $stockData['use_config_manage_stock'] = 0;
+ }
+ if (isset($stockData['qty']) && (float) $stockData['qty'] > self::MAX_QTY_VALUE) {
+ $stockData['qty'] = self::MAX_QTY_VALUE;
+ }
+ if (isset($stockData['min_qty']) && (int) $stockData['min_qty'] < 0) {
+ $stockData['min_qty'] = 0;
+ }
+ if (!isset($stockData['is_decimal_divided']) || $stockData['is_qty_decimal'] == 0) {
+ $stockData['is_decimal_divided'] = 0;
+ }
+ }
+
+ /**
+ * Duplicates product attributes between stores.
+ * @param array $stores list of store pairs: array(fromStore => toStore, fromStore => toStore,..)
+ * @param Mage_Catalog_Model_Product $product whose attributes should be copied
+ * @return $this
+ * @throws Throwable
+ */
+ protected function _copyAttributesBetweenStores(array $stores, Mage_Catalog_Model_Product $product)
+ {
+ foreach ($stores as $storeTo => $storeFrom) {
+ $productInStore = Mage::getModel('catalog/product')
+ ->setStoreId($storeFrom)
+ // phpcs:ignore Ecg.Performance.Loop.ModelLSD
+ ->load($product->getId());
+ Mage::dispatchEvent('product_duplicate_attributes', [
+ 'product' => $productInStore,
+ 'storeTo' => $storeTo,
+ 'storeFrom' => $storeFrom,
+ ]);
+ // phpcs:ignore Ecg.Performance.Loop.ModelLSD
+ $productInStore->setStoreId($storeTo)->save();
+ }
+ return $this;
+ }
+
+ /**
+ * @deprecated since 1.4.0.0-alpha2
+ */
+ protected function _decodeInput($encoded)
+ {
+ parse_str($encoded, $data);
+ foreach ($data as $key => $value) {
+ parse_str(base64_decode($value), $data[$key]);
+ }
+ return $data;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php
index 5f99d98d68d..eb87c3e225c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php
@@ -26,15 +26,6 @@ class Mage_Adminhtml_Catalog_SearchController extends Mage_Adminhtml_Controller_
*/
public const ADMIN_RESOURCE = 'catalog/search';
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('catalog/search')
- ->_addBreadcrumb(Mage::helper('catalog')->__('Search'), Mage::helper('catalog')->__('Search'))
- ;
- return $this;
- }
-
public function indexAction()
{
$this->_title($this->__('Catalog'))->_title($this->__('Search Terms'));
@@ -199,4 +190,13 @@ public function preDispatch()
$this->_setForcedFormKeyActions('delete', 'massDelete');
return parent::preDispatch();
}
+
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('catalog/search')
+ ->_addBreadcrumb(Mage::helper('catalog')->__('Search'), Mage::helper('catalog')->__('Search'))
+ ;
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php
index 10399620dd2..4ae47bb1d17 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php
@@ -39,22 +39,6 @@ public function preDispatch()
return parent::preDispatch();
}
- /**
- * Init actions
- *
- * @return $this
- */
- protected function _initAction()
- {
- // load layout, set active menu and breadcrumbs
- $this->loadLayout()
- ->_setActiveMenu('cms/block')
- ->_addBreadcrumb(Mage::helper('cms')->__('CMS'), Mage::helper('cms')->__('CMS'))
- ->_addBreadcrumb(Mage::helper('cms')->__('Static Blocks'), Mage::helper('cms')->__('Static Blocks'))
- ;
- return $this;
- }
-
/**
* Index action
*/
@@ -194,4 +178,20 @@ public function deleteAction()
// go to grid
$this->_redirect('*/*/');
}
+
+ /**
+ * Init actions
+ *
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ // load layout, set active menu and breadcrumbs
+ $this->loadLayout()
+ ->_setActiveMenu('cms/block')
+ ->_addBreadcrumb(Mage::helper('cms')->__('CMS'), Mage::helper('cms')->__('CMS'))
+ ->_addBreadcrumb(Mage::helper('cms')->__('Static Blocks'), Mage::helper('cms')->__('Static Blocks'))
+ ;
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
index 261520af044..a1bf1926492 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
@@ -22,22 +22,6 @@
*/
class Mage_Adminhtml_Cms_PageController extends Mage_Adminhtml_Controller_Action
{
- /**
- * Init actions
- *
- * @return $this
- */
- protected function _initAction()
- {
- // load layout, set active menu and breadcrumbs
- $this->loadLayout()
- ->_setActiveMenu('cms/page')
- ->_addBreadcrumb(Mage::helper('cms')->__('CMS'), Mage::helper('cms')->__('CMS'))
- ->_addBreadcrumb(Mage::helper('cms')->__('Manage Pages'), Mage::helper('cms')->__('Manage Pages'))
- ;
- return $this;
- }
-
/**
* Index action
*/
@@ -216,6 +200,21 @@ public function preDispatch()
$this->_setForcedFormKeyActions('delete');
return parent::preDispatch();
}
+ /**
+ * Init actions
+ *
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ // load layout, set active menu and breadcrumbs
+ $this->loadLayout()
+ ->_setActiveMenu('cms/page')
+ ->_addBreadcrumb(Mage::helper('cms')->__('CMS'), Mage::helper('cms')->__('CMS'))
+ ->_addBreadcrumb(Mage::helper('cms')->__('Manage Pages'), Mage::helper('cms')->__('Manage Pages'))
+ ;
+ return $this;
+ }
/**
* @inheritDoc
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
index f488dd7a0ed..86c2784b93f 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
@@ -28,17 +28,6 @@ class Mage_Adminhtml_Cms_Wysiwyg_ImagesController extends Mage_Adminhtml_Control
*/
public const ADMIN_RESOURCE = 'cms/media_gallery';
- /**
- * Init storage
- *
- * @return $this
- */
- protected function _initAction()
- {
- $this->getStorage();
- return $this;
- }
-
public function indexAction()
{
$storeId = (int) $this->getRequest()->getParam('store');
@@ -204,6 +193,17 @@ public function getStorage()
return Mage::registry('storage');
}
+ /**
+ * Init storage
+ *
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ $this->getStorage();
+ return $this;
+ }
+
/**
* Save current path in session
*
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php
index 00abbb210b4..b37c9a5b75b 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php
@@ -49,36 +49,6 @@ class Mage_Adminhtml_Customer_Cart_Product_Composite_CartController extends Mage
*/
protected $_quoteItem = null;
- /**
- * Loads customer, quote and quote item by request params
- *
- * @return $this
- */
- protected function _initData()
- {
- $customerId = (int) $this->getRequest()->getParam('customer_id');
- if (!$customerId) {
- Mage::throwException($this->__('No customer id defined.'));
- }
-
- $this->_customer = Mage::getModel('customer/customer')
- ->load($customerId);
-
- $quoteItemId = (int) $this->getRequest()->getParam('id');
- $websiteId = (int) $this->getRequest()->getParam('website_id');
-
- $this->_quote = Mage::getModel('sales/quote')
- ->setWebsite(Mage::app()->getWebsite($websiteId))
- ->loadByCustomer($this->_customer);
-
- $this->_quoteItem = $this->_quote->getItemById($quoteItemId);
- if (!$this->_quoteItem) {
- Mage::throwException($this->__('Wrong quote item.'));
- }
-
- return $this;
- }
-
/**
* Ajax handler to response configuration fieldset of composite product in customer's cart
*
@@ -144,4 +114,34 @@ public function updateAction()
return $this;
}
+
+ /**
+ * Loads customer, quote and quote item by request params
+ *
+ * @return $this
+ */
+ protected function _initData()
+ {
+ $customerId = (int) $this->getRequest()->getParam('customer_id');
+ if (!$customerId) {
+ Mage::throwException($this->__('No customer id defined.'));
+ }
+
+ $this->_customer = Mage::getModel('customer/customer')
+ ->load($customerId);
+
+ $quoteItemId = (int) $this->getRequest()->getParam('id');
+ $websiteId = (int) $this->getRequest()->getParam('website_id');
+
+ $this->_quote = Mage::getModel('sales/quote')
+ ->setWebsite(Mage::app()->getWebsite($websiteId))
+ ->loadByCustomer($this->_customer);
+
+ $this->_quoteItem = $this->_quote->getItemById($quoteItemId);
+ if (!$this->_quoteItem) {
+ Mage::throwException($this->__('Wrong quote item.'));
+ }
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php
index 47d6167e0cc..752e64d1da6 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php
@@ -39,17 +39,6 @@ public function preDispatch()
return parent::preDispatch();
}
- protected function _initGroup()
- {
- $this->_title($this->__('Customers'))->_title($this->__('Customer Groups'));
-
- Mage::register('current_group', Mage::getModel('customer/group'));
- $groupId = $this->getRequest()->getParam('id');
- if (!is_null($groupId)) {
- Mage::registry('current_group')->load($groupId);
- }
- }
-
/**
* Customer groups list.
*/
@@ -158,4 +147,15 @@ public function deleteAction()
$this->_redirect('*/customer_group');
}
+
+ protected function _initGroup()
+ {
+ $this->_title($this->__('Customers'))->_title($this->__('Customer Groups'));
+
+ Mage::register('current_group', Mage::getModel('customer/group'));
+ $groupId = $this->getRequest()->getParam('id');
+ if (!is_null($groupId)) {
+ Mage::registry('current_group')->load($groupId);
+ }
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php
index fc2aa3a7533..5023871df65 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php
@@ -28,19 +28,6 @@ class Mage_Adminhtml_Customer_System_Config_ValidatevatController extends Mage_A
*/
public const ADMIN_RESOURCE = 'system/config';
- /**
- * Perform customer VAT ID validation
- *
- * @return Varien_Object
- */
- protected function _validate()
- {
- return Mage::helper('customer')->checkVatNumber(
- $this->getRequest()->getParam('country'),
- $this->getRequest()->getParam('vat'),
- );
- }
-
/**
* Check whether vat is valid
*/
@@ -81,4 +68,17 @@ public function validateAdvancedAction()
]);
$this->getResponse()->setBody($body);
}
+
+ /**
+ * Perform customer VAT ID validation
+ *
+ * @return Varien_Object
+ */
+ protected function _validate()
+ {
+ return Mage::helper('customer')->checkVatNumber(
+ $this->getRequest()->getParam('country'),
+ $this->getRequest()->getParam('vat'),
+ );
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php
index 08d3bb739f3..32b4266babc 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php
@@ -42,34 +42,6 @@ class Mage_Adminhtml_Customer_Wishlist_Product_Composite_WishlistController exte
*/
protected $_wishlistItem = null;
- /**
- * Loads wishlist and wishlist item
- *
- * @return $this
- */
- protected function _initData()
- {
- $wishlistItemId = (int) $this->getRequest()->getParam('id');
- if (!$wishlistItemId) {
- Mage::throwException($this->__('No wishlist item id defined.'));
- }
-
- /** @var Mage_Wishlist_Model_Item $wishlistItem */
- $wishlistItem = Mage::getModel('wishlist/item')
- ->loadWithOptions($wishlistItemId);
-
- if (!$wishlistItem->getWishlistId()) {
- Mage::throwException($this->__('Wishlist item is not loaded.'));
- }
-
- $this->_wishlist = Mage::getModel('wishlist/wishlist')
- ->load($wishlistItem->getWishlistId());
-
- $this->_wishlistItem = $wishlistItem;
-
- return $this;
- }
-
/**
* Ajax handler to response configuration fieldset of composite product in customer's wishlist
*
@@ -129,4 +101,32 @@ public function updateAction()
return false;
}
+
+ /**
+ * Loads wishlist and wishlist item
+ *
+ * @return $this
+ */
+ protected function _initData()
+ {
+ $wishlistItemId = (int) $this->getRequest()->getParam('id');
+ if (!$wishlistItemId) {
+ Mage::throwException($this->__('No wishlist item id defined.'));
+ }
+
+ /** @var Mage_Wishlist_Model_Item $wishlistItem */
+ $wishlistItem = Mage::getModel('wishlist/item')
+ ->loadWithOptions($wishlistItemId);
+
+ if (!$wishlistItem->getWishlistId()) {
+ Mage::throwException($this->__('Wishlist item is not loaded.'));
+ }
+
+ $this->_wishlist = Mage::getModel('wishlist/wishlist')
+ ->load($wishlistItem->getWishlistId());
+
+ $this->_wishlistItem = $wishlistItem;
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
index 7e6e7b9d216..5d087ae5baa 100644
--- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
@@ -39,26 +39,6 @@ public function preDispatch()
return parent::preDispatch();
}
- /**
- * @param string $idFieldName
- * @return $this
- * @throws Mage_Core_Exception
- */
- protected function _initCustomer($idFieldName = 'id')
- {
- $this->_title($this->__('Customers'))->_title($this->__('Manage Customers'));
-
- $customerId = (int) $this->getRequest()->getParam($idFieldName);
- $customer = Mage::getModel('customer/customer');
-
- if ($customerId) {
- $customer->load($customerId);
- }
-
- Mage::register('current_customer', $customer);
- return $this;
- }
-
/**
* Customers list action
*/
@@ -431,21 +411,6 @@ public function exportXmlAction()
$this->_prepareDownloadResponse($fileName, $content);
}
- /**
- * Prepare file download response
- *
- * @todo remove in 1.3
- * @deprecated please use $this->_prepareDownloadResponse()
- * @see Mage_Adminhtml_Controller_Action::_prepareDownloadResponse()
- * @param string $fileName
- * @param string $content
- * @param string $contentType
- */
- protected function _sendUploadResponse($fileName, $content, $contentType = 'application/octet-stream')
- {
- $this->_prepareDownloadResponse($fileName, $content, $contentType);
- }
-
/**
* Customer orders grid
*/
@@ -862,6 +827,41 @@ public function viewfileAction()
exit();
}
+ /**
+ * @param string $idFieldName
+ * @return $this
+ * @throws Mage_Core_Exception
+ */
+ protected function _initCustomer($idFieldName = 'id')
+ {
+ $this->_title($this->__('Customers'))->_title($this->__('Manage Customers'));
+
+ $customerId = (int) $this->getRequest()->getParam($idFieldName);
+ $customer = Mage::getModel('customer/customer');
+
+ if ($customerId) {
+ $customer->load($customerId);
+ }
+
+ Mage::register('current_customer', $customer);
+ return $this;
+ }
+
+ /**
+ * Prepare file download response
+ *
+ * @todo remove in 1.3
+ * @deprecated please use $this->_prepareDownloadResponse()
+ * @see Mage_Adminhtml_Controller_Action::_prepareDownloadResponse()
+ * @param string $fileName
+ * @param string $content
+ * @param string $contentType
+ */
+ protected function _sendUploadResponse($fileName, $content, $contentType = 'application/octet-stream')
+ {
+ $this->_prepareDownloadResponse($fileName, $content, $contentType);
+ }
+
/**
* Filtering posted data. Converting localized data if needed
*
diff --git a/app/code/core/Mage/Adminhtml/controllers/IndexController.php b/app/code/core/Mage/Adminhtml/controllers/IndexController.php
index 121305613f8..c1ca7879022 100644
--- a/app/code/core/Mage/Adminhtml/controllers/IndexController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/IndexController.php
@@ -22,24 +22,6 @@
*/
class Mage_Adminhtml_IndexController extends Mage_Adminhtml_Controller_Action
{
- /**
- * Render specified template
- *
- * @param string $tplName
- * @param array $data parameters required by template
- */
- protected function _outTemplate($tplName, $data = [])
- {
- $this->_initLayoutMessages('adminhtml/session');
- $block = $this->getLayout()->createBlock('adminhtml/template')->setTemplate("$tplName.phtml");
- foreach ($data as $index => $value) {
- $block->assign($index, $value);
- }
- $html = $block->toHtml();
- Mage::getSingleton('core/translate_inline')->processResponseBody($html);
- $this->getResponse()->setBody($html);
- }
-
/**
* Admin area entry point
* Always redirects to the startup page url
@@ -179,17 +161,6 @@ public function deniedJsonAction()
$this->getResponse()->setBody($this->_getDeniedJson());
}
- /**
- * Retrieve response for deniedJsonAction()
- */
- protected function _getDeniedJson()
- {
- return Mage::helper('core')->jsonEncode([
- 'ajaxExpired' => 1,
- 'ajaxRedirect' => $this->getUrl('*/index/login'),
- ]);
- }
-
/**
* Denied IFrame action
*/
@@ -198,15 +169,6 @@ public function deniedIframeAction()
$this->getResponse()->setBody($this->_getDeniedIframe());
}
- /**
- * Retrieve response for deniedIframeAction()
- */
- protected function _getDeniedIframe()
- {
- return '';
- }
-
/**
* Forgot administrator password action
*/
@@ -356,6 +318,43 @@ public function resetPasswordPostAction()
return;
}
}
+ /**
+ * Render specified template
+ *
+ * @param string $tplName
+ * @param array $data parameters required by template
+ */
+ protected function _outTemplate($tplName, $data = [])
+ {
+ $this->_initLayoutMessages('adminhtml/session');
+ $block = $this->getLayout()->createBlock('adminhtml/template')->setTemplate("$tplName.phtml");
+ foreach ($data as $index => $value) {
+ $block->assign($index, $value);
+ }
+ $html = $block->toHtml();
+ Mage::getSingleton('core/translate_inline')->processResponseBody($html);
+ $this->getResponse()->setBody($html);
+ }
+
+ /**
+ * Retrieve response for deniedJsonAction()
+ */
+ protected function _getDeniedJson()
+ {
+ return Mage::helper('core')->jsonEncode([
+ 'ajaxExpired' => 1,
+ 'ajaxRedirect' => $this->getUrl('*/index/login'),
+ ]);
+ }
+
+ /**
+ * Retrieve response for deniedIframeAction()
+ */
+ protected function _getDeniedIframe()
+ {
+ return '';
+ }
/**
* Check if password reset token is valid
diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php
index 60fc647a0c6..fee3c845428 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php
@@ -83,21 +83,6 @@ public function exportXmlAction()
$this->_prepareDownloadResponse($fileName, $content);
}
- /**
- * Prepare file download response
- *
- * @todo remove in 1.3
- * @deprecated please use $this->_prepareDownloadResponse()
- * @see Mage_Adminhtml_Controller_Action::_prepareDownloadResponse()
- * @param string $fileName
- * @param string $content
- * @param string $contentType
- */
- protected function _sendUploadResponse($fileName, $content, $contentType = 'application/octet-stream')
- {
- $this->_prepareDownloadResponse($fileName, $content, $contentType);
- }
-
public function massUnsubscribeAction()
{
$subscribersIds = $this->getRequest()->getParam('subscriber');
@@ -141,4 +126,19 @@ public function massDeleteAction()
$this->_redirect('*/*/index');
}
+
+ /**
+ * Prepare file download response
+ *
+ * @todo remove in 1.3
+ * @deprecated please use $this->_prepareDownloadResponse()
+ * @see Mage_Adminhtml_Controller_Action::_prepareDownloadResponse()
+ * @param string $fileName
+ * @param string $content
+ * @param string $contentType
+ */
+ protected function _sendUploadResponse($fileName, $content, $contentType = 'application/octet-stream')
+ {
+ $this->_prepareDownloadResponse($fileName, $content, $contentType);
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php
index 1556793705d..2caf1689286 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php
@@ -21,27 +21,6 @@
*/
class Mage_Adminhtml_Newsletter_TemplateController extends Mage_Adminhtml_Controller_Action
{
- /**
- * Check is allowed access
- *
- * @return bool
- */
- protected function _isAllowed()
- {
- return Mage::getSingleton('admin/session')
- ->isAllowed('newsletter/template');
- }
-
- /**
- * Set title of page
- *
- * @return $this
- */
- protected function _setTitle()
- {
- return $this->_title($this->__('Newsletter'))->_title($this->__('Newsletter Templates'));
- }
-
/**
* View Templates list
*
@@ -246,4 +225,24 @@ public function preDispatch()
$this->_setForcedFormKeyActions('delete');
return parent::preDispatch();
}
+ /**
+ * Check is allowed access
+ *
+ * @return bool
+ */
+ protected function _isAllowed()
+ {
+ return Mage::getSingleton('admin/session')
+ ->isAllowed('newsletter/template');
+ }
+
+ /**
+ * Set title of page
+ *
+ * @return $this
+ */
+ protected function _setTitle()
+ {
+ return $this->_title($this->__('Newsletter'))->_title($this->__('Newsletter Templates'));
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php
index 1a311d0c98d..ce89d09c966 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php
@@ -28,19 +28,6 @@ class Mage_Adminhtml_Permissions_BlockController extends Mage_Adminhtml_Controll
*/
public const ADMIN_RESOURCE = 'system/acl/blocks';
- /**
- * @return $this
- */
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('system/acl/blocks')
- ->_addBreadcrumb($this->__('System'), $this->__('System'))
- ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
- ->_addBreadcrumb($this->__('Blocks'), $this->__('Blocks'));
- return $this;
- }
-
/**
* Index action
*/
@@ -206,4 +193,17 @@ public function preDispatch()
$this->_setForcedFormKeyActions('delete');
return parent::preDispatch();
}
+
+ /**
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('system/acl/blocks')
+ ->_addBreadcrumb($this->__('System'), $this->__('System'))
+ ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
+ ->_addBreadcrumb($this->__('Blocks'), $this->__('Blocks'));
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php
index 7c3d53d8ef5..dc08ce032ce 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php
@@ -22,19 +22,6 @@ class Mage_Adminhtml_Permissions_OrphanedResourceController extends Mage_Adminht
*/
public const ADMIN_RESOURCE = 'system/acl/orphaned_resources';
- /**
- * @return $this
- */
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('system/acl/orphaned_resources')
- ->_addBreadcrumb($this->__('System'), $this->__('System'))
- ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
- ->_addBreadcrumb($this->__('Orphaned Resources'), $this->__('Orphaned Role Resources'));
- return $this;
- }
-
/**
* Index action
*/
@@ -81,4 +68,17 @@ public function preDispatch()
$this->_setForcedFormKeyActions('massDelete');
return parent::preDispatch();
}
+
+ /**
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('system/acl/orphaned_resources')
+ ->_addBreadcrumb($this->__('System'), $this->__('System'))
+ ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
+ ->_addBreadcrumb($this->__('Orphaned Resources'), $this->__('Orphaned Role Resources'));
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
index ba5dea8076b..0608eaa50e3 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
@@ -39,42 +39,6 @@ public function preDispatch()
return parent::preDispatch();
}
- /**
- * Preparing layout for output
- *
- * @return $this
- */
- protected function _initAction()
- {
- $this->loadLayout();
- $this->_setActiveMenu('system/acl/roles');
- $this->_addBreadcrumb($this->__('System'), $this->__('System'));
- $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
- $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
- return $this;
- }
-
- /**
- * Initialize role model by passed parameter in request
- *
- * @return Mage_Admin_Model_Roles
- */
- protected function _initRole($requestVariable = 'rid')
- {
- $this->_title($this->__('System'))
- ->_title($this->__('Permissions'))
- ->_title($this->__('Roles'));
-
- $role = Mage::getModel('admin/roles')->load($this->getRequest()->getParam($requestVariable));
- // preventing edit of relation role
- if ($role->getId() && $role->getRoleType() != 'G') {
- $role->unsetData($role->getIdFieldName());
- }
-
- Mage::register('current_role', $role);
- return Mage::registry('current_role');
- }
-
/**
* Show grid with roles existing in systems
*/
@@ -261,46 +225,6 @@ public function editrolegridAction()
);
}
- /**
- * Remove user from role
- *
- * @param int $userId
- * @param int $roleId
- * @return true
- */
- protected function _deleteUserFromRole($userId, $roleId)
- {
- try {
- Mage::getModel('admin/user')
- ->setRoleId($roleId)
- ->setUserId($userId)
- ->deleteFromRole();
- } catch (Exception $e) {
- throw $e;
- }
- return true;
- }
-
- /**
- * Assign user to role
- *
- * @param int $userId
- * @param int $roleId
- * @return bool
- */
- protected function _addUserToRole($userId, $roleId)
- {
- $user = Mage::getModel('admin/user')->load($userId);
- $user->setRoleId($roleId)->setUserId($userId);
-
- if ($user->roleUserExists() === true) {
- return false;
- } else {
- $user->add();
- return true;
- }
- }
-
/**
* Action to refresh role-rule relations.
* This method will make sure the rendered ACL resource tree checkboxes match the actual ACL permissions.
@@ -345,4 +269,80 @@ public function refreshRolesAction()
$this->_redirect('*/*/');
}
+
+ /**
+ * Preparing layout for output
+ *
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ $this->loadLayout();
+ $this->_setActiveMenu('system/acl/roles');
+ $this->_addBreadcrumb($this->__('System'), $this->__('System'));
+ $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
+ $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
+ return $this;
+ }
+
+ /**
+ * Initialize role model by passed parameter in request
+ *
+ * @return Mage_Admin_Model_Roles
+ */
+ protected function _initRole($requestVariable = 'rid')
+ {
+ $this->_title($this->__('System'))
+ ->_title($this->__('Permissions'))
+ ->_title($this->__('Roles'));
+
+ $role = Mage::getModel('admin/roles')->load($this->getRequest()->getParam($requestVariable));
+ // preventing edit of relation role
+ if ($role->getId() && $role->getRoleType() != 'G') {
+ $role->unsetData($role->getIdFieldName());
+ }
+
+ Mage::register('current_role', $role);
+ return Mage::registry('current_role');
+ }
+
+ /**
+ * Remove user from role
+ *
+ * @param int $userId
+ * @param int $roleId
+ * @return true
+ */
+ protected function _deleteUserFromRole($userId, $roleId)
+ {
+ try {
+ Mage::getModel('admin/user')
+ ->setRoleId($roleId)
+ ->setUserId($userId)
+ ->deleteFromRole();
+ } catch (Exception $e) {
+ throw $e;
+ }
+ return true;
+ }
+
+ /**
+ * Assign user to role
+ *
+ * @param int $userId
+ * @param int $roleId
+ * @return bool
+ */
+ protected function _addUserToRole($userId, $roleId)
+ {
+ $user = Mage::getModel('admin/user')->load($userId);
+ $user->setRoleId($roleId)->setUserId($userId);
+
+ if ($user->roleUserExists() === true) {
+ return false;
+ } else {
+ $user->add();
+ return true;
+ }
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php
index 85ede974f4d..70b30d393fc 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php
@@ -37,17 +37,6 @@ public function preDispatch()
return parent::preDispatch();
}
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('system/acl/users')
- ->_addBreadcrumb($this->__('System'), $this->__('System'))
- ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
- ->_addBreadcrumb($this->__('Users'), $this->__('Users'))
- ;
- return $this;
- }
-
public function indexAction()
{
$this->_title($this->__('System'))
@@ -243,4 +232,15 @@ public function roleGridAction()
->createBlock('adminhtml/permissions_user_grid')
->toHtml());
}
+
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('system/acl/users')
+ ->_addBreadcrumb($this->__('System'), $this->__('System'))
+ ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
+ ->_addBreadcrumb($this->__('Users'), $this->__('Users'))
+ ;
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php
index 140136408b5..e07f91c89df 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php
@@ -28,19 +28,6 @@ class Mage_Adminhtml_Permissions_VariableController extends Mage_Adminhtml_Contr
*/
public const ADMIN_RESOURCE = 'system/acl/variables';
- /**
- * @return $this
- */
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('system/acl/variables')
- ->_addBreadcrumb($this->__('System'), $this->__('System'))
- ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
- ->_addBreadcrumb($this->__('Variables'), $this->__('Variables'));
- return $this;
- }
-
/**
* Index action
*/
@@ -194,4 +181,17 @@ public function variableGridAction()
->createBlock('adminhtml/permissions_variable_grid')
->toHtml());
}
+
+ /**
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('system/acl/variables')
+ ->_addBreadcrumb($this->__('System'), $this->__('System'))
+ ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
+ ->_addBreadcrumb($this->__('Variables'), $this->__('Variables'));
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
index c27fe2c321d..88336d17f52 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
@@ -46,17 +46,6 @@ public function preDispatch()
return parent::preDispatch();
}
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('promo/catalog')
- ->_addBreadcrumb(
- Mage::helper('catalogrule')->__('Promotions'),
- Mage::helper('catalogrule')->__('Promotions'),
- );
- return $this;
- }
-
public function indexAction()
{
$this->_title($this->__('Promotions'))->_title($this->__('Catalog Price Rules'));
@@ -348,4 +337,15 @@ public function getDirtyRulesNoticeMessage()
$defaultMessage = Mage::helper('catalogrule')->__('There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.');
return $this->_dirtyRulesNoticeMessage ? $this->_dirtyRulesNoticeMessage : $defaultMessage;
}
+
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('promo/catalog')
+ ->_addBreadcrumb(
+ Mage::helper('catalogrule')->__('Promotions'),
+ Mage::helper('catalogrule')->__('Promotions'),
+ );
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
index c13898a68a0..7eaee6aa116 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
@@ -37,31 +37,6 @@ public function preDispatch()
return parent::preDispatch();
}
- protected function _initRule()
- {
- $this->_title($this->__('Promotions'))->_title($this->__('Shopping Cart Price Rules'));
-
- Mage::register('current_promo_quote_rule', Mage::getModel('salesrule/rule'));
- $id = (int) $this->getRequest()->getParam('id');
-
- if (!$id && $this->getRequest()->getParam('rule_id')) {
- $id = (int) $this->getRequest()->getParam('rule_id');
- }
-
- if ($id) {
- Mage::registry('current_promo_quote_rule')->load($id);
- }
- }
-
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('promo/quote')
- ->_addBreadcrumb(Mage::helper('salesrule')->__('Promotions'), Mage::helper('salesrule')->__('Promotions'))
- ;
- return $this;
- }
-
public function indexAction()
{
$this->_title($this->__('Promotions'))->_title($this->__('Shopping Cart Price Rules'));
@@ -444,4 +419,29 @@ public function chooserAction()
]);
$this->getResponse()->setBody($chooserBlock->toHtml());
}
+
+ protected function _initRule()
+ {
+ $this->_title($this->__('Promotions'))->_title($this->__('Shopping Cart Price Rules'));
+
+ Mage::register('current_promo_quote_rule', Mage::getModel('salesrule/rule'));
+ $id = (int) $this->getRequest()->getParam('id');
+
+ if (!$id && $this->getRequest()->getParam('rule_id')) {
+ $id = (int) $this->getRequest()->getParam('rule_id');
+ }
+
+ if ($id) {
+ Mage::registry('current_promo_quote_rule')->load($id);
+ }
+ }
+
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('promo/quote')
+ ->_addBreadcrumb(Mage::helper('salesrule')->__('Promotions'), Mage::helper('salesrule')->__('Promotions'))
+ ;
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
index bf8bb87138d..1261bc48f9f 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
@@ -98,17 +98,6 @@ public function exportBestsellersExcelAction()
$this->_prepareDownloadResponse($fileName, $grid->getExcelFile($fileName));
}
- /**
- * Retrieve array of collection names by code specified in request
- *
- * @deprecated after 1.4.0.1
- * @return array
- */
- protected function _getCollectionNames()
- {
- return [];
- }
-
/**
* Refresh statistics for last 25 hours
*
@@ -376,6 +365,17 @@ public function refreshStatisticsAction()
return $this->_forward('index', 'report_statistics');
}
+ /**
+ * Retrieve array of collection names by code specified in request
+ *
+ * @deprecated after 1.4.0.1
+ * @return array
+ */
+ protected function _getCollectionNames()
+ {
+ return [];
+ }
+
/**
* @inheritDoc
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php
index 6115444fdb9..913e5991fda 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php
@@ -75,42 +75,6 @@ public function _initReportAction($blocks)
return $this;
}
- /**
- * Retrieve array of collection names by code specified in request
- *
- * @return array
- * @deprecated after 1.4.0.1
- */
- protected function _getCollectionNames()
- {
- $codes = $this->getRequest()->getParam('code');
- if (!$codes) {
- throw new Exception(Mage::helper('adminhtml')->__('No report code specified.'));
- }
-
- if (!is_array($codes) && !str_contains($codes, ',')) {
- $codes = [$codes];
- } elseif (!is_array($codes)) {
- $codes = explode(',', $codes);
- }
-
- $aliases = [
- 'sales' => 'sales/report_order',
- 'tax' => 'tax/report_tax',
- 'shipping' => 'sales/report_shipping',
- 'invoiced' => 'sales/report_invoiced',
- 'refunded' => 'sales/report_refunded',
- 'coupons' => 'salesrule/report_rule',
- 'bestsellers' => 'sales/report_bestsellers',
- 'viewed' => 'reports/report_product_viewed',
- ];
- $out = [];
- foreach ($codes as $code) {
- $out[] = $aliases[$code];
- }
- return $out;
- }
-
/**
* Refresh statistics for last 25 hours
*
@@ -180,6 +144,42 @@ public function indexAction()
->renderLayout();
}
+ /**
+ * Retrieve array of collection names by code specified in request
+ *
+ * @return array
+ * @deprecated after 1.4.0.1
+ */
+ protected function _getCollectionNames()
+ {
+ $codes = $this->getRequest()->getParam('code');
+ if (!$codes) {
+ throw new Exception(Mage::helper('adminhtml')->__('No report code specified.'));
+ }
+
+ if (!is_array($codes) && !str_contains($codes, ',')) {
+ $codes = [$codes];
+ } elseif (!is_array($codes)) {
+ $codes = explode(',', $codes);
+ }
+
+ $aliases = [
+ 'sales' => 'sales/report_order',
+ 'tax' => 'tax/report_tax',
+ 'shipping' => 'sales/report_shipping',
+ 'invoiced' => 'sales/report_invoiced',
+ 'refunded' => 'sales/report_refunded',
+ 'coupons' => 'salesrule/report_rule',
+ 'bestsellers' => 'sales/report_bestsellers',
+ 'viewed' => 'reports/report_product_viewed',
+ ];
+ $out = [];
+ foreach ($codes as $code) {
+ $out[] = $aliases[$code];
+ }
+ return $out;
+ }
+
/**
* Retrieve admin session model
*
diff --git a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php
index 78575a3dfb1..da9a10f7cb0 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php
@@ -22,21 +22,6 @@
*/
class Mage_Adminhtml_Rss_CatalogController extends Mage_Adminhtml_Controller_Rss_Abstract
{
- /**
- * @inheritDoc
- */
- protected function _isAllowed()
- {
- $path = '';
- $action = strtolower($this->getRequest()->getActionName());
- if ($action == 'review') {
- $path = 'catalog/reviews_ratings';
- } elseif ($action == 'notifystock') {
- $path = 'catalog/products';
- }
- return Mage::getSingleton('admin/session')->isAllowed($path);
- }
-
public function notifystockAction()
{
if ($this->checkFeedEnable('admin_catalog/notifystock')) {
@@ -52,4 +37,18 @@ public function reviewAction()
$this->renderLayout();
}
}
+ /**
+ * @inheritDoc
+ */
+ protected function _isAllowed()
+ {
+ $path = '';
+ $action = strtolower($this->getRequest()->getActionName());
+ if ($action == 'review') {
+ $path = 'catalog/reviews_ratings';
+ } elseif ($action == 'notifystock') {
+ $path = 'catalog/products';
+ }
+ return Mage::getSingleton('admin/session')->isAllowed($path);
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
index c84fd6cad5e..a4ef5cc92ec 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
@@ -22,6 +22,289 @@
*/
class Mage_Adminhtml_Sales_Order_CreateController extends Mage_Adminhtml_Controller_Action
{
+ /**
+ * Index page
+ */
+ public function indexAction()
+ {
+ $this->_title($this->__('Sales'))->_title($this->__('Orders'))->_title($this->__('New Order'));
+ $this->_initSession();
+ $this->loadLayout();
+
+ $this->_setActiveMenu('sales/order')
+ ->renderLayout();
+ }
+
+ public function reorderAction()
+ {
+ $this->_getSession()->clear();
+ $orderId = $this->getRequest()->getParam('order_id');
+ $order = Mage::getModel('sales/order')->load($orderId);
+ if (!Mage::helper('sales/reorder')->canReorder($order)) {
+ return $this->_forward('noRoute');
+ }
+
+ if ($order->getId()) {
+ $order->setReordered(true);
+ $this->_getSession()->setUseOldShippingMethod(true);
+ $this->_getOrderCreateModel()->initFromOrder($order);
+
+ $this->_redirect('*/*');
+ } else {
+ $this->_redirect('*/sales_order/');
+ }
+ }
+
+ /**
+ * Loading page block
+ */
+ public function loadBlockAction()
+ {
+ $request = $this->getRequest();
+ try {
+ $this->_initSession()
+ ->_processData();
+ } catch (Mage_Core_Exception $e) {
+ $this->_reloadQuote();
+ $this->_getSession()->addError($e->getMessage());
+ } catch (Exception $e) {
+ $this->_reloadQuote();
+ $this->_getSession()->addException($e, $e->getMessage());
+ }
+
+ $asJson = $request->getParam('json');
+ $block = $request->getParam('block');
+
+ $update = $this->getLayout()->getUpdate();
+ if ($asJson) {
+ $update->addHandle('adminhtml_sales_order_create_load_block_json');
+ } else {
+ $update->addHandle('adminhtml_sales_order_create_load_block_plain');
+ }
+
+ if ($block) {
+ $blocks = explode(',', $block);
+ if ($asJson && !in_array('message', $blocks)) {
+ $blocks[] = 'message';
+ }
+
+ foreach ($blocks as $block) {
+ $update->addHandle('adminhtml_sales_order_create_load_block_' . $block);
+ }
+ }
+ $this->loadLayoutUpdates()->generateLayoutXml()->generateLayoutBlocks();
+ $result = $this->getLayout()->getBlock('content')->toHtml();
+ if ($request->getParam('as_js_varname')) {
+ Mage::getSingleton('adminhtml/session')->setUpdateResult($result);
+ $this->_redirect('*/*/showUpdateResult');
+ } else {
+ $this->getResponse()->setBody($result);
+ }
+ }
+
+ /**
+ * Adds configured product to quote
+ */
+ public function addConfiguredAction()
+ {
+ $errorMessage = null;
+ try {
+ $this->_initSession()
+ ->_processData();
+ } catch (Exception $e) {
+ $this->_reloadQuote();
+ $errorMessage = $e->getMessage();
+ }
+
+ // Form result for client javascript
+ $updateResult = new Varien_Object();
+ if ($errorMessage) {
+ $updateResult->setError(true);
+ $updateResult->setMessage($errorMessage);
+ } else {
+ $updateResult->setOk(true);
+ }
+
+ $updateResult->setJsVarName($this->getRequest()->getParam('as_js_varname'));
+ Mage::getSingleton('adminhtml/session')->setCompositeProductResult($updateResult);
+ $this->_redirect('*/catalog_product/showUpdateResult');
+ }
+
+ /**
+ * Start order create action
+ */
+ public function startAction()
+ {
+ $this->_getSession()->clear();
+ $this->_redirect('*/*', ['customer_id' => $this->getRequest()->getParam('customer_id')]);
+ }
+
+ /**
+ * Cancel order create
+ */
+ public function cancelAction()
+ {
+ if ($orderId = $this->_getSession()->getReordered()) {
+ $this->_getSession()->clear();
+ $this->_redirect('*/sales_order/view', [
+ 'order_id' => $orderId,
+ ]);
+ } else {
+ $this->_getSession()->clear();
+ $this->_redirect('*/*');
+ }
+ }
+
+ /**
+ * Saving quote and create order
+ */
+ public function saveAction()
+ {
+ try {
+ $orderData = $this->getRequest()->getPost('order');
+ if (array_key_exists('reserved_order_id', $orderData['comment'])
+ && Mage::helper('adminhtml/sales')->hasTags($orderData['comment']['reserved_order_id'])
+ ) {
+ Mage::throwException($this->__('Invalid order data.'));
+ }
+
+ $this->_processActionData('save');
+ $paymentData = $this->getRequest()->getPost('payment');
+ if ($paymentData) {
+ $paymentData['checks'] = Mage_Payment_Model_Method_Abstract::CHECK_USE_INTERNAL
+ | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_COUNTRY
+ | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_CURRENCY
+ | Mage_Payment_Model_Method_Abstract::CHECK_ORDER_TOTAL_MIN_MAX
+ | Mage_Payment_Model_Method_Abstract::CHECK_ZERO_TOTAL;
+ $this->_getOrderCreateModel()->setPaymentData($paymentData);
+ $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
+ }
+
+ $order = $this->_getOrderCreateModel()
+ ->setIsValidate(true)
+ ->importPostData($this->getRequest()->getPost('order'))
+ ->createOrder();
+
+ $this->_getSession()->clear();
+ Mage::getSingleton('adminhtml/session')->addSuccess($this->__('The order has been created.'));
+ if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) {
+ $this->_redirect('*/sales_order/view', ['order_id' => $order->getId()]);
+ } else {
+ $this->_redirect('*/sales_order/index');
+ }
+ } catch (Mage_Payment_Model_Info_Exception $e) {
+ $this->_getOrderCreateModel()->saveQuote();
+ $message = $e->getMessage();
+ if (!empty($message)) {
+ $this->_getSession()->addError($message);
+ }
+ $this->_redirect('*/*/');
+ } catch (Mage_Core_Exception $e) {
+ $message = $e->getMessage();
+ if (!empty($message)) {
+ $this->_getSession()->addError($message);
+ }
+ $this->_redirect('*/*/');
+ } catch (Exception $e) {
+ $this->_getSession()->addException($e, $this->__('Order saving error: %s', $e->getMessage()));
+ $this->_redirect('*/*/');
+ }
+ }
+
+ /**
+ * Ajax handler to response configuration fieldset of composite product in order
+ *
+ * @return $this
+ */
+ public function configureProductToAddAction()
+ {
+ // Prepare data
+ $productId = (int) $this->getRequest()->getParam('id');
+
+ $configureResult = new Varien_Object();
+ $configureResult->setOk(true);
+ $configureResult->setProductId($productId);
+ $sessionQuote = Mage::getSingleton('adminhtml/session_quote');
+ $configureResult->setCurrentStoreId($sessionQuote->getStore()->getId());
+ $configureResult->setCurrentCustomerId($sessionQuote->getCustomerId());
+
+ // Render page
+ /** @var Mage_Adminhtml_Helper_Catalog_Product_Composite $helper */
+ $helper = Mage::helper('adminhtml/catalog_product_composite');
+ $helper->renderConfigureResult($this, $configureResult);
+
+ return $this;
+ }
+
+ /**
+ * Ajax handler to response configuration fieldset of composite product in quote items
+ *
+ * @return $this
+ */
+ public function configureQuoteItemsAction()
+ {
+ // Prepare data
+ $configureResult = new Varien_Object();
+ try {
+ $quoteItemId = (int) $this->getRequest()->getParam('id');
+ if (!$quoteItemId) {
+ Mage::throwException($this->__('Quote item id is not received.'));
+ }
+
+ $quoteItem = Mage::getModel('sales/quote_item')->load($quoteItemId);
+ if (!$quoteItem->getId()) {
+ Mage::throwException($this->__('Quote item is not loaded.'));
+ }
+
+ $configureResult->setOk(true);
+ $optionCollection = Mage::getModel('sales/quote_item_option')->getCollection()
+ ->addItemFilter([$quoteItemId]);
+ $quoteItem->setOptions($optionCollection->getOptionsByItem($quoteItem));
+
+ $configureResult->setBuyRequest($quoteItem->getBuyRequest());
+ $configureResult->setCurrentStoreId($quoteItem->getStoreId());
+ $configureResult->setProductId($quoteItem->getProductId());
+ $sessionQuote = Mage::getSingleton('adminhtml/session_quote');
+ $configureResult->setCurrentCustomerId($sessionQuote->getCustomerId());
+ } catch (Exception $e) {
+ $configureResult->setError(true);
+ $configureResult->setMessage($e->getMessage());
+ }
+
+ // Render page
+ /** @var Mage_Adminhtml_Helper_Catalog_Product_Composite $helper */
+ $helper = Mage::helper('adminhtml/catalog_product_composite');
+ $helper->renderConfigureResult($this, $configureResult);
+
+ return $this;
+ }
+
+ /**
+ * Show item update result from loadBlockAction
+ * to prevent popup alert with resend data question
+ *
+ */
+ public function showUpdateResultAction()
+ {
+ $session = Mage::getSingleton('adminhtml/session');
+ if ($session->hasUpdateResult() && is_scalar($session->getUpdateResult())) {
+ $this->getResponse()->setBody($session->getUpdateResult());
+ $session->unsUpdateResult();
+ } else {
+ $session->unsUpdateResult();
+ return false;
+ }
+ }
+
+ /**
+ * Process data and display index page
+ */
+ public function processDataAction()
+ {
+ $this->_initSession();
+ $this->_processData();
+ $this->_forward('index');
+ }
/**
* Additional initialization
*
@@ -263,270 +546,81 @@ protected function _processActionData($action = null)
Mage::dispatchEvent('adminhtml_sales_order_create_process_data', $eventData);
$this->_getOrderCreateModel()
- ->saveQuote();
-
- if ($paymentData = $this->getRequest()->getPost('payment')) {
- $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
- }
-
- /**
- * Saving of giftmessages
- */
- $giftmessages = $this->getRequest()->getPost('giftmessage');
- if ($giftmessages) {
- $this->_getGiftmessageSaveModel()->setGiftmessages($giftmessages)
- ->saveAllInQuote();
- }
-
- /**
- * Importing gift message allow items from specific product grid
- */
- if ($data = $this->getRequest()->getPost('add_products')) {
- $this->_getGiftmessageSaveModel()
- ->importAllowQuoteItemsFromProducts(Mage::helper('core')->jsonDecode($data));
- }
-
- /**
- * Importing gift message allow items on update quote items
- */
- if ($this->getRequest()->getPost('update_items')) {
- $items = $this->getRequest()->getPost('item', []);
- $this->_getGiftmessageSaveModel()->importAllowQuoteItemsFromItems($items);
- }
-
- $data = $this->getRequest()->getPost('order');
- $couponCode = '';
- if (isset($data) && isset($data['coupon']['code'])) {
- $couponCode = trim($data['coupon']['code']);
- }
- if (!empty($couponCode)) {
- if ($this->_getQuote()->getCouponCode() !== $couponCode) {
- $this->_getSession()->addError(
- $this->__('"%s" coupon code is not valid.', $this->_getHelper()->escapeHtml($couponCode)),
- );
- } else {
- $this->_getSession()->addSuccess($this->__('The coupon code has been accepted.'));
- }
- }
-
- return $this;
- }
-
- /**
- * Process buyRequest file options of items
- *
- * @param array $items
- * @return array
- */
- protected function _processFiles($items)
- {
- /** @var Mage_Catalog_Helper_Product $productHelper */
- $productHelper = Mage::helper('catalog/product');
- foreach ($items as $id => $item) {
- $buyRequest = new Varien_Object($item);
- $params = ['files_prefix' => 'item_' . $id . '_'];
- $buyRequest = $productHelper->addParamsToBuyRequest($buyRequest, $params);
- if ($buyRequest->hasData()) {
- $items[$id] = $buyRequest->toArray();
- }
- }
- return $items;
- }
-
- /**
- * Index page
- */
- public function indexAction()
- {
- $this->_title($this->__('Sales'))->_title($this->__('Orders'))->_title($this->__('New Order'));
- $this->_initSession();
- $this->loadLayout();
-
- $this->_setActiveMenu('sales/order')
- ->renderLayout();
- }
-
- public function reorderAction()
- {
- $this->_getSession()->clear();
- $orderId = $this->getRequest()->getParam('order_id');
- $order = Mage::getModel('sales/order')->load($orderId);
- if (!Mage::helper('sales/reorder')->canReorder($order)) {
- return $this->_forward('noRoute');
- }
-
- if ($order->getId()) {
- $order->setReordered(true);
- $this->_getSession()->setUseOldShippingMethod(true);
- $this->_getOrderCreateModel()->initFromOrder($order);
-
- $this->_redirect('*/*');
- } else {
- $this->_redirect('*/sales_order/');
- }
- }
-
- protected function _reloadQuote()
- {
- $id = $this->_getQuote()->getId();
- $this->_getQuote()->load($id);
- return $this;
- }
-
- /**
- * Loading page block
- */
- public function loadBlockAction()
- {
- $request = $this->getRequest();
- try {
- $this->_initSession()
- ->_processData();
- } catch (Mage_Core_Exception $e) {
- $this->_reloadQuote();
- $this->_getSession()->addError($e->getMessage());
- } catch (Exception $e) {
- $this->_reloadQuote();
- $this->_getSession()->addException($e, $e->getMessage());
- }
-
- $asJson = $request->getParam('json');
- $block = $request->getParam('block');
-
- $update = $this->getLayout()->getUpdate();
- if ($asJson) {
- $update->addHandle('adminhtml_sales_order_create_load_block_json');
- } else {
- $update->addHandle('adminhtml_sales_order_create_load_block_plain');
- }
-
- if ($block) {
- $blocks = explode(',', $block);
- if ($asJson && !in_array('message', $blocks)) {
- $blocks[] = 'message';
- }
+ ->saveQuote();
- foreach ($blocks as $block) {
- $update->addHandle('adminhtml_sales_order_create_load_block_' . $block);
- }
+ if ($paymentData = $this->getRequest()->getPost('payment')) {
+ $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
}
- $this->loadLayoutUpdates()->generateLayoutXml()->generateLayoutBlocks();
- $result = $this->getLayout()->getBlock('content')->toHtml();
- if ($request->getParam('as_js_varname')) {
- Mage::getSingleton('adminhtml/session')->setUpdateResult($result);
- $this->_redirect('*/*/showUpdateResult');
- } else {
- $this->getResponse()->setBody($result);
+
+ /**
+ * Saving of giftmessages
+ */
+ $giftmessages = $this->getRequest()->getPost('giftmessage');
+ if ($giftmessages) {
+ $this->_getGiftmessageSaveModel()->setGiftmessages($giftmessages)
+ ->saveAllInQuote();
}
- }
- /**
- * Adds configured product to quote
- */
- public function addConfiguredAction()
- {
- $errorMessage = null;
- try {
- $this->_initSession()
- ->_processData();
- } catch (Exception $e) {
- $this->_reloadQuote();
- $errorMessage = $e->getMessage();
+ /**
+ * Importing gift message allow items from specific product grid
+ */
+ if ($data = $this->getRequest()->getPost('add_products')) {
+ $this->_getGiftmessageSaveModel()
+ ->importAllowQuoteItemsFromProducts(Mage::helper('core')->jsonDecode($data));
}
- // Form result for client javascript
- $updateResult = new Varien_Object();
- if ($errorMessage) {
- $updateResult->setError(true);
- $updateResult->setMessage($errorMessage);
- } else {
- $updateResult->setOk(true);
+ /**
+ * Importing gift message allow items on update quote items
+ */
+ if ($this->getRequest()->getPost('update_items')) {
+ $items = $this->getRequest()->getPost('item', []);
+ $this->_getGiftmessageSaveModel()->importAllowQuoteItemsFromItems($items);
}
- $updateResult->setJsVarName($this->getRequest()->getParam('as_js_varname'));
- Mage::getSingleton('adminhtml/session')->setCompositeProductResult($updateResult);
- $this->_redirect('*/catalog_product/showUpdateResult');
- }
+ $data = $this->getRequest()->getPost('order');
+ $couponCode = '';
+ if (isset($data) && isset($data['coupon']['code'])) {
+ $couponCode = trim($data['coupon']['code']);
+ }
+ if (!empty($couponCode)) {
+ if ($this->_getQuote()->getCouponCode() !== $couponCode) {
+ $this->_getSession()->addError(
+ $this->__('"%s" coupon code is not valid.', $this->_getHelper()->escapeHtml($couponCode)),
+ );
+ } else {
+ $this->_getSession()->addSuccess($this->__('The coupon code has been accepted.'));
+ }
+ }
- /**
- * Start order create action
- */
- public function startAction()
- {
- $this->_getSession()->clear();
- $this->_redirect('*/*', ['customer_id' => $this->getRequest()->getParam('customer_id')]);
+ return $this;
}
/**
- * Cancel order create
+ * Process buyRequest file options of items
+ *
+ * @param array $items
+ * @return array
*/
- public function cancelAction()
+ protected function _processFiles($items)
{
- if ($orderId = $this->_getSession()->getReordered()) {
- $this->_getSession()->clear();
- $this->_redirect('*/sales_order/view', [
- 'order_id' => $orderId,
- ]);
- } else {
- $this->_getSession()->clear();
- $this->_redirect('*/*');
+ /** @var Mage_Catalog_Helper_Product $productHelper */
+ $productHelper = Mage::helper('catalog/product');
+ foreach ($items as $id => $item) {
+ $buyRequest = new Varien_Object($item);
+ $params = ['files_prefix' => 'item_' . $id . '_'];
+ $buyRequest = $productHelper->addParamsToBuyRequest($buyRequest, $params);
+ if ($buyRequest->hasData()) {
+ $items[$id] = $buyRequest->toArray();
+ }
}
+ return $items;
}
- /**
- * Saving quote and create order
- */
- public function saveAction()
+ protected function _reloadQuote()
{
- try {
- $orderData = $this->getRequest()->getPost('order');
- if (array_key_exists('reserved_order_id', $orderData['comment'])
- && Mage::helper('adminhtml/sales')->hasTags($orderData['comment']['reserved_order_id'])
- ) {
- Mage::throwException($this->__('Invalid order data.'));
- }
-
- $this->_processActionData('save');
- $paymentData = $this->getRequest()->getPost('payment');
- if ($paymentData) {
- $paymentData['checks'] = Mage_Payment_Model_Method_Abstract::CHECK_USE_INTERNAL
- | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_COUNTRY
- | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_CURRENCY
- | Mage_Payment_Model_Method_Abstract::CHECK_ORDER_TOTAL_MIN_MAX
- | Mage_Payment_Model_Method_Abstract::CHECK_ZERO_TOTAL;
- $this->_getOrderCreateModel()->setPaymentData($paymentData);
- $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
- }
-
- $order = $this->_getOrderCreateModel()
- ->setIsValidate(true)
- ->importPostData($this->getRequest()->getPost('order'))
- ->createOrder();
-
- $this->_getSession()->clear();
- Mage::getSingleton('adminhtml/session')->addSuccess($this->__('The order has been created.'));
- if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) {
- $this->_redirect('*/sales_order/view', ['order_id' => $order->getId()]);
- } else {
- $this->_redirect('*/sales_order/index');
- }
- } catch (Mage_Payment_Model_Info_Exception $e) {
- $this->_getOrderCreateModel()->saveQuote();
- $message = $e->getMessage();
- if (!empty($message)) {
- $this->_getSession()->addError($message);
- }
- $this->_redirect('*/*/');
- } catch (Mage_Core_Exception $e) {
- $message = $e->getMessage();
- if (!empty($message)) {
- $this->_getSession()->addError($message);
- }
- $this->_redirect('*/*/');
- } catch (Exception $e) {
- $this->_getSession()->addException($e, $this->__('Order saving error: %s', $e->getMessage()));
- $this->_redirect('*/*/');
- }
+ $id = $this->_getQuote()->getId();
+ $this->_getQuote()->load($id);
+ return $this;
}
/**
@@ -565,99 +659,4 @@ protected function _getAclResourse()
}
return $aclResource;
}
-
- /**
- * Ajax handler to response configuration fieldset of composite product in order
- *
- * @return $this
- */
- public function configureProductToAddAction()
- {
- // Prepare data
- $productId = (int) $this->getRequest()->getParam('id');
-
- $configureResult = new Varien_Object();
- $configureResult->setOk(true);
- $configureResult->setProductId($productId);
- $sessionQuote = Mage::getSingleton('adminhtml/session_quote');
- $configureResult->setCurrentStoreId($sessionQuote->getStore()->getId());
- $configureResult->setCurrentCustomerId($sessionQuote->getCustomerId());
-
- // Render page
- /** @var Mage_Adminhtml_Helper_Catalog_Product_Composite $helper */
- $helper = Mage::helper('adminhtml/catalog_product_composite');
- $helper->renderConfigureResult($this, $configureResult);
-
- return $this;
- }
-
- /**
- * Ajax handler to response configuration fieldset of composite product in quote items
- *
- * @return $this
- */
- public function configureQuoteItemsAction()
- {
- // Prepare data
- $configureResult = new Varien_Object();
- try {
- $quoteItemId = (int) $this->getRequest()->getParam('id');
- if (!$quoteItemId) {
- Mage::throwException($this->__('Quote item id is not received.'));
- }
-
- $quoteItem = Mage::getModel('sales/quote_item')->load($quoteItemId);
- if (!$quoteItem->getId()) {
- Mage::throwException($this->__('Quote item is not loaded.'));
- }
-
- $configureResult->setOk(true);
- $optionCollection = Mage::getModel('sales/quote_item_option')->getCollection()
- ->addItemFilter([$quoteItemId]);
- $quoteItem->setOptions($optionCollection->getOptionsByItem($quoteItem));
-
- $configureResult->setBuyRequest($quoteItem->getBuyRequest());
- $configureResult->setCurrentStoreId($quoteItem->getStoreId());
- $configureResult->setProductId($quoteItem->getProductId());
- $sessionQuote = Mage::getSingleton('adminhtml/session_quote');
- $configureResult->setCurrentCustomerId($sessionQuote->getCustomerId());
- } catch (Exception $e) {
- $configureResult->setError(true);
- $configureResult->setMessage($e->getMessage());
- }
-
- // Render page
- /** @var Mage_Adminhtml_Helper_Catalog_Product_Composite $helper */
- $helper = Mage::helper('adminhtml/catalog_product_composite');
- $helper->renderConfigureResult($this, $configureResult);
-
- return $this;
- }
-
- /**
- * Show item update result from loadBlockAction
- * to prevent popup alert with resend data question
- *
- */
- public function showUpdateResultAction()
- {
- $session = Mage::getSingleton('adminhtml/session');
- if ($session->hasUpdateResult() && is_scalar($session->getUpdateResult())) {
- $this->getResponse()->setBody($session->getUpdateResult());
- $session->unsUpdateResult();
- } else {
- $session->unsUpdateResult();
- return false;
- }
- }
-
- /**
- * Process data and display index page
- */
- public function processDataAction()
- {
- $this->_initSession();
- $this->_processData();
- $this->_forward('index');
- }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
index 78a5b89b17b..4a2df014435 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
@@ -22,155 +22,6 @@
*/
class Mage_Adminhtml_Sales_Order_CreditmemoController extends Mage_Adminhtml_Controller_Sales_Creditmemo
{
- /**
- * Get requested items qtys and return to stock flags
- */
- protected function _getItemData()
- {
- $data = $this->getRequest()->getParam('creditmemo');
- if (!$data) {
- $data = Mage::getSingleton('adminhtml/session')->getFormData(true);
- }
- return $data['items'] ?? [];
- }
-
- /**
- * Check if creditmeno can be created for order
- * @param Mage_Sales_Model_Order $order
- * @return bool
- */
- protected function _canCreditmemo($order)
- {
- /**
- * Check order existing
- */
- if (!$order->getId()) {
- $this->_getSession()->addError($this->__('The order no longer exists.'));
- return false;
- }
-
- /**
- * Check creditmemo create availability
- */
- if (!$order->canCreditmemo()) {
- $this->_getSession()->addError($this->__('Cannot create credit memo for the order.'));
- return false;
- }
- return true;
- }
-
- /**
- * Initialize requested invoice instance
- * @param Mage_Sales_Model_Order $order
- * @return false|Mage_Sales_Model_Order_Invoice
- */
- protected function _initInvoice($order)
- {
- $invoiceId = $this->getRequest()->getParam('invoice_id');
- if ($invoiceId) {
- $invoice = Mage::getModel('sales/order_invoice')
- ->load($invoiceId)
- ->setOrder($order);
- if ($invoice->getId()) {
- return $invoice;
- }
- }
- return false;
- }
-
- /**
- * Initialize creditmemo model instance
- *
- * @return Mage_Sales_Model_Order_Creditmemo|false
- * @throws Mage_Core_Exception
- */
- protected function _initCreditmemo($update = false)
- {
- $this->_title($this->__('Sales'))->_title($this->__('Credit Memos'));
-
- $creditmemo = false;
- $creditmemoId = $this->getRequest()->getParam('creditmemo_id');
- $orderId = $this->getRequest()->getParam('order_id');
- if ($creditmemoId) {
- $creditmemo = Mage::getModel('sales/order_creditmemo')->load($creditmemoId);
- if (!$creditmemo->getId()) {
- $this->_getSession()->addError($this->__('The credit memo no longer exists.'));
- return false;
- }
- } elseif ($orderId) {
- $data = $this->getRequest()->getParam('creditmemo');
- $order = Mage::getModel('sales/order')->load($orderId);
- $invoice = $this->_initInvoice($order);
-
- if (!$this->_canCreditmemo($order)) {
- return false;
- }
-
- $savedData = $this->_getItemData();
-
- $qtys = [];
- $backToStock = [];
- foreach ($savedData as $orderItemId => $itemData) {
- if (isset($itemData['qty'])) {
- $qtys[$orderItemId] = $itemData['qty'];
- }
- if (isset($itemData['back_to_stock'])) {
- $backToStock[$orderItemId] = true;
- }
- }
- $data['qtys'] = $qtys;
-
- $service = Mage::getModel('sales/service_order', $order);
- if ($invoice) {
- $creditmemo = $service->prepareInvoiceCreditmemo($invoice, $data);
- } else {
- $creditmemo = $service->prepareCreditmemo($data);
- }
-
- /**
- * Process back to stock flags
- */
- foreach ($creditmemo->getAllItems() as $creditmemoItem) {
- $orderItem = $creditmemoItem->getOrderItem();
- $parentId = $orderItem->getParentItemId();
- if (isset($backToStock[$orderItem->getId()])) {
- $creditmemoItem->setBackToStock(true);
- } elseif ($orderItem->getParentItem() && isset($backToStock[$parentId]) && $backToStock[$parentId]) {
- $creditmemoItem->setBackToStock(true);
- } elseif (empty($savedData)) {
- $creditmemoItem->setBackToStock(Mage::helper('cataloginventory')->isAutoReturnEnabled());
- } else {
- $creditmemoItem->setBackToStock(false);
- }
- }
- }
-
- $args = ['creditmemo' => $creditmemo, 'request' => $this->getRequest()];
- Mage::dispatchEvent('adminhtml_sales_order_creditmemo_register_before', $args);
-
- Mage::register('current_creditmemo', $creditmemo);
- return $creditmemo;
- }
-
- /**
- * Save creditmemo and related order, invoice in one transaction
- * @param Mage_Sales_Model_Order_Creditmemo $creditmemo
- * @return $this
- * @throws Exception
- */
- protected function _saveCreditmemo($creditmemo)
- {
- $transactionSave = Mage::getModel('core/resource_transaction')
- ->addObject($creditmemo)
- ->addObject($creditmemo->getOrder());
- if ($creditmemo->getInvoice()) {
- $transactionSave->addObject($creditmemo->getInvoice());
- }
- $transactionSave->save();
-
- return $this;
- }
-
/**
* creditmemo information page
*/
@@ -403,6 +254,163 @@ public function addCommentAction()
$this->getResponse()->setBody($response);
}
+ /**
+ * Create pdf for current creditmemo
+ */
+ public function printAction()
+ {
+ $this->_initCreditmemo();
+ parent::printAction();
+ }
+ /**
+ * Get requested items qtys and return to stock flags
+ */
+ protected function _getItemData()
+ {
+ $data = $this->getRequest()->getParam('creditmemo');
+ if (!$data) {
+ $data = Mage::getSingleton('adminhtml/session')->getFormData(true);
+ }
+ return $data['items'] ?? [];
+ }
+
+ /**
+ * Check if creditmeno can be created for order
+ * @param Mage_Sales_Model_Order $order
+ * @return bool
+ */
+ protected function _canCreditmemo($order)
+ {
+ /**
+ * Check order existing
+ */
+ if (!$order->getId()) {
+ $this->_getSession()->addError($this->__('The order no longer exists.'));
+ return false;
+ }
+
+ /**
+ * Check creditmemo create availability
+ */
+ if (!$order->canCreditmemo()) {
+ $this->_getSession()->addError($this->__('Cannot create credit memo for the order.'));
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Initialize requested invoice instance
+ * @param Mage_Sales_Model_Order $order
+ * @return false|Mage_Sales_Model_Order_Invoice
+ */
+ protected function _initInvoice($order)
+ {
+ $invoiceId = $this->getRequest()->getParam('invoice_id');
+ if ($invoiceId) {
+ $invoice = Mage::getModel('sales/order_invoice')
+ ->load($invoiceId)
+ ->setOrder($order);
+ if ($invoice->getId()) {
+ return $invoice;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Initialize creditmemo model instance
+ *
+ * @return Mage_Sales_Model_Order_Creditmemo|false
+ * @throws Mage_Core_Exception
+ */
+ protected function _initCreditmemo($update = false)
+ {
+ $this->_title($this->__('Sales'))->_title($this->__('Credit Memos'));
+
+ $creditmemo = false;
+ $creditmemoId = $this->getRequest()->getParam('creditmemo_id');
+ $orderId = $this->getRequest()->getParam('order_id');
+ if ($creditmemoId) {
+ $creditmemo = Mage::getModel('sales/order_creditmemo')->load($creditmemoId);
+ if (!$creditmemo->getId()) {
+ $this->_getSession()->addError($this->__('The credit memo no longer exists.'));
+ return false;
+ }
+ } elseif ($orderId) {
+ $data = $this->getRequest()->getParam('creditmemo');
+ $order = Mage::getModel('sales/order')->load($orderId);
+ $invoice = $this->_initInvoice($order);
+
+ if (!$this->_canCreditmemo($order)) {
+ return false;
+ }
+
+ $savedData = $this->_getItemData();
+
+ $qtys = [];
+ $backToStock = [];
+ foreach ($savedData as $orderItemId => $itemData) {
+ if (isset($itemData['qty'])) {
+ $qtys[$orderItemId] = $itemData['qty'];
+ }
+ if (isset($itemData['back_to_stock'])) {
+ $backToStock[$orderItemId] = true;
+ }
+ }
+ $data['qtys'] = $qtys;
+
+ $service = Mage::getModel('sales/service_order', $order);
+ if ($invoice) {
+ $creditmemo = $service->prepareInvoiceCreditmemo($invoice, $data);
+ } else {
+ $creditmemo = $service->prepareCreditmemo($data);
+ }
+
+ /**
+ * Process back to stock flags
+ */
+ foreach ($creditmemo->getAllItems() as $creditmemoItem) {
+ $orderItem = $creditmemoItem->getOrderItem();
+ $parentId = $orderItem->getParentItemId();
+ if (isset($backToStock[$orderItem->getId()])) {
+ $creditmemoItem->setBackToStock(true);
+ } elseif ($orderItem->getParentItem() && isset($backToStock[$parentId]) && $backToStock[$parentId]) {
+ $creditmemoItem->setBackToStock(true);
+ } elseif (empty($savedData)) {
+ $creditmemoItem->setBackToStock(Mage::helper('cataloginventory')->isAutoReturnEnabled());
+ } else {
+ $creditmemoItem->setBackToStock(false);
+ }
+ }
+ }
+
+ $args = ['creditmemo' => $creditmemo, 'request' => $this->getRequest()];
+ Mage::dispatchEvent('adminhtml_sales_order_creditmemo_register_before', $args);
+
+ Mage::register('current_creditmemo', $creditmemo);
+ return $creditmemo;
+ }
+
+ /**
+ * Save creditmemo and related order, invoice in one transaction
+ * @param Mage_Sales_Model_Order_Creditmemo $creditmemo
+ * @return $this
+ * @throws Exception
+ */
+ protected function _saveCreditmemo($creditmemo)
+ {
+ $transactionSave = Mage::getModel('core/resource_transaction')
+ ->addObject($creditmemo)
+ ->addObject($creditmemo->getOrder());
+ if ($creditmemo->getInvoice()) {
+ $transactionSave->addObject($creditmemo->getInvoice());
+ }
+ $transactionSave->save();
+
+ return $this;
+ }
+
/**
* Decides if we need to create dummy invoice item or not
* for example we don't need create dummy parent if all
@@ -439,13 +447,4 @@ protected function _needToAddDummy($item, $qtys)
return false;
}
-
- /**
- * Create pdf for current creditmemo
- */
- public function printAction()
- {
- $this->_initCreditmemo();
- parent::printAction();
- }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
index 8b7dc0b97c4..db7d9a3bf36 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
@@ -22,107 +22,6 @@
*/
class Mage_Adminhtml_Sales_Order_InvoiceController extends Mage_Adminhtml_Controller_Sales_Invoice
{
- /**
- * Get requested items qty's from request
- */
- protected function _getItemQtys()
- {
- $data = $this->getRequest()->getParam('invoice');
- return $data['items'] ?? [];
- }
-
- /**
- * Initialize invoice model instance
- *
- * @return Mage_Sales_Model_Order_Invoice|false
- * @throws Mage_Core_Exception
- */
- protected function _initInvoice($update = false)
- {
- $this->_title($this->__('Sales'))->_title($this->__('Invoices'));
-
- $invoice = false;
- $itemsToInvoice = 0;
- $invoiceId = $this->getRequest()->getParam('invoice_id');
- $orderId = $this->getRequest()->getParam('order_id');
- if ($invoiceId) {
- $invoice = Mage::getModel('sales/order_invoice')->load($invoiceId);
- if (!$invoice->getId()) {
- $this->_getSession()->addError($this->__('The invoice no longer exists.'));
- return false;
- }
- } elseif ($orderId) {
- $order = Mage::getModel('sales/order')->load($orderId);
- /**
- * Check order existing
- */
- if (!$order->getId()) {
- $this->_getSession()->addError($this->__('The order no longer exists.'));
- return false;
- }
- /**
- * Check invoice create availability
- */
- if (!$order->canInvoice()) {
- $this->_getSession()->addError($this->__('The order does not allow creating an invoice.'));
- return false;
- }
- $savedQtys = $this->_getItemQtys();
- $invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice($savedQtys);
- if (!$invoice->getTotalQty()) {
- Mage::throwException($this->__('Cannot create an invoice without products.'));
- }
- }
-
- Mage::register('current_invoice', $invoice);
- return $invoice;
- }
-
- /**
- * Save data for invoice and related order
- *
- * @param Mage_Sales_Model_Order_Invoice $invoice
- * @return Mage_Adminhtml_Sales_Order_InvoiceController
- * @throws Exception
- */
- protected function _saveInvoice($invoice)
- {
- $invoice->getOrder()->setIsInProcess(true);
- $transactionSave = Mage::getModel('core/resource_transaction')
- ->addObject($invoice)
- ->addObject($invoice->getOrder())
- ->save();
-
- return $this;
- }
-
- /**
- * Prepare shipment
- *
- * @param Mage_Sales_Model_Order_Invoice $invoice
- * @return Mage_Sales_Model_Order_Shipment|false
- * @throws Mage_Core_Exception
- */
- protected function _prepareShipment($invoice)
- {
- $savedQtys = $this->_getItemQtys();
- $shipment = Mage::getModel('sales/service_order', $invoice->getOrder())->prepareShipment($savedQtys);
- if (!$shipment->getTotalQty()) {
- return false;
- }
-
- $shipment->register();
- $tracks = $this->getRequest()->getPost('tracking');
- if ($tracks) {
- foreach ($tracks as $data) {
- $track = Mage::getModel('sales/order_shipment_track')
- ->addData($data);
- $shipment->addTrack($track);
- }
- }
- return $shipment;
- }
-
/**
* Invoice information page
*/
@@ -398,6 +297,115 @@ public function addCommentAction()
$this->getResponse()->setBody($response);
}
+ /**
+ * Create pdf for current invoice
+ */
+ public function printAction()
+ {
+ $this->_initInvoice();
+ parent::printAction();
+ }
+ /**
+ * Get requested items qty's from request
+ */
+ protected function _getItemQtys()
+ {
+ $data = $this->getRequest()->getParam('invoice');
+ return $data['items'] ?? [];
+ }
+
+ /**
+ * Initialize invoice model instance
+ *
+ * @return Mage_Sales_Model_Order_Invoice|false
+ * @throws Mage_Core_Exception
+ */
+ protected function _initInvoice($update = false)
+ {
+ $this->_title($this->__('Sales'))->_title($this->__('Invoices'));
+
+ $invoice = false;
+ $itemsToInvoice = 0;
+ $invoiceId = $this->getRequest()->getParam('invoice_id');
+ $orderId = $this->getRequest()->getParam('order_id');
+ if ($invoiceId) {
+ $invoice = Mage::getModel('sales/order_invoice')->load($invoiceId);
+ if (!$invoice->getId()) {
+ $this->_getSession()->addError($this->__('The invoice no longer exists.'));
+ return false;
+ }
+ } elseif ($orderId) {
+ $order = Mage::getModel('sales/order')->load($orderId);
+ /**
+ * Check order existing
+ */
+ if (!$order->getId()) {
+ $this->_getSession()->addError($this->__('The order no longer exists.'));
+ return false;
+ }
+ /**
+ * Check invoice create availability
+ */
+ if (!$order->canInvoice()) {
+ $this->_getSession()->addError($this->__('The order does not allow creating an invoice.'));
+ return false;
+ }
+ $savedQtys = $this->_getItemQtys();
+ $invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice($savedQtys);
+ if (!$invoice->getTotalQty()) {
+ Mage::throwException($this->__('Cannot create an invoice without products.'));
+ }
+ }
+
+ Mage::register('current_invoice', $invoice);
+ return $invoice;
+ }
+
+ /**
+ * Save data for invoice and related order
+ *
+ * @param Mage_Sales_Model_Order_Invoice $invoice
+ * @return Mage_Adminhtml_Sales_Order_InvoiceController
+ * @throws Exception
+ */
+ protected function _saveInvoice($invoice)
+ {
+ $invoice->getOrder()->setIsInProcess(true);
+ $transactionSave = Mage::getModel('core/resource_transaction')
+ ->addObject($invoice)
+ ->addObject($invoice->getOrder())
+ ->save();
+
+ return $this;
+ }
+
+ /**
+ * Prepare shipment
+ *
+ * @param Mage_Sales_Model_Order_Invoice $invoice
+ * @return Mage_Sales_Model_Order_Shipment|false
+ * @throws Mage_Core_Exception
+ */
+ protected function _prepareShipment($invoice)
+ {
+ $savedQtys = $this->_getItemQtys();
+ $shipment = Mage::getModel('sales/service_order', $invoice->getOrder())->prepareShipment($savedQtys);
+ if (!$shipment->getTotalQty()) {
+ return false;
+ }
+
+ $shipment->register();
+ $tracks = $this->getRequest()->getPost('tracking');
+ if ($tracks) {
+ foreach ($tracks as $data) {
+ $track = Mage::getModel('sales/order_shipment_track')
+ ->addData($data);
+ $shipment->addTrack($track);
+ }
+ }
+ return $shipment;
+ }
+
/**
* Decides if we need to create dummy invoice item or not
* for example we don't need create dummy parent if all
@@ -468,13 +476,4 @@ protected function _needToAddDummyForShipment($item, $qtys)
return false;
}
-
- /**
- * Create pdf for current invoice
- */
- public function printAction()
- {
- $this->_initInvoice();
- parent::printAction();
- }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
index 9bad471b905..a9bfd973bc5 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
@@ -22,96 +22,6 @@
*/
class Mage_Adminhtml_Sales_Order_ShipmentController extends Mage_Adminhtml_Controller_Sales_Shipment
{
- /**
- * Initialize shipment items QTY
- */
- protected function _getItemQtys()
- {
- $data = $this->getRequest()->getParam('shipment');
- return $data['items'] ?? [];
- }
-
- /**
- * Initialize shipment model instance
- *
- * @return Mage_Sales_Model_Order_Shipment|bool
- * @throws Mage_Core_Exception
- */
- protected function _initShipment()
- {
- $this->_title($this->__('Sales'))->_title($this->__('Shipments'));
-
- $shipment = false;
- $shipmentId = $this->getRequest()->getParam('shipment_id');
- $orderId = $this->getRequest()->getParam('order_id');
- if ($shipmentId) {
- $shipment = Mage::getModel('sales/order_shipment')->load($shipmentId);
- if (!$shipment->getId()) {
- $this->_getSession()->addError($this->__('The shipment no longer exists.'));
- return false;
- }
- } elseif ($orderId) {
- $order = Mage::getModel('sales/order')->load($orderId);
-
- /**
- * Check order existing
- */
- if (!$order->getId()) {
- $this->_getSession()->addError($this->__('The order no longer exists.'));
- return false;
- }
- /**
- * Check shipment is available to create separate from invoice
- */
- if ($order->getForcedDoShipmentWithInvoice()) {
- $this->_getSession()->addError($this->__('Cannot do shipment for the order separately from invoice.'));
- return false;
- }
- /**
- * Check shipment create availability
- */
- if (!$order->canShip()) {
- $this->_getSession()->addError($this->__('Cannot do shipment for the order.'));
- return false;
- }
- $savedQtys = $this->_getItemQtys();
- $shipment = Mage::getModel('sales/service_order', $order)->prepareShipment($savedQtys);
-
- $tracks = $this->getRequest()->getPost('tracking');
- if ($tracks) {
- foreach ($tracks as $data) {
- if (empty($data['number'])) {
- Mage::throwException($this->__('Tracking number cannot be empty.'));
- }
- $track = Mage::getModel('sales/order_shipment_track')
- ->addData($data);
- $shipment->addTrack($track);
- }
- }
- }
-
- Mage::register('current_shipment', $shipment);
- return $shipment;
- }
-
- /**
- * Save shipment and order in one transaction
- *
- * @param Mage_Sales_Model_Order_Shipment $shipment
- * @return $this
- * @throws Exception
- */
- protected function _saveShipment($shipment)
- {
- $shipment->getOrder()->setIsInProcess(true);
- $transactionSave = Mage::getModel('core/resource_transaction')
- ->addObject($shipment)
- ->addObject($shipment->getOrder())
- ->save();
-
- return $this;
- }
-
/**
* Shipment information page
*/
@@ -448,94 +358,6 @@ public function addCommentAction()
$this->getResponse()->setBody($response);
}
- /**
- * Decides if we need to create dummy shipment item or not
- * for example we don't need create dummy parent if all
- * children are not in process
- *
- * @deprecated after 1.4, Mage_Sales_Model_Service_Order used
- * @param Mage_Sales_Model_Order_Item $item
- * @param array $qtys
- * @return bool
- */
- protected function _needToAddDummy($item, $qtys)
- {
- if ($item->getHasChildren()) {
- foreach ($item->getChildrenItems() as $child) {
- if ($child->getIsVirtual()) {
- continue;
- }
- if ((isset($qtys[$child->getId()]) && $qtys[$child->getId()] > 0)
- || (!isset($qtys[$child->getId()]) && $child->getQtyToShip())
- ) {
- return true;
- }
- }
- return false;
- }
-
- if ($item->getParentItem()) {
- if ($item->getIsVirtual()) {
- return false;
- }
- if ((isset($qtys[$item->getParentItem()->getId()]) && $qtys[$item->getParentItem()->getId()] > 0)
- || (!isset($qtys[$item->getParentItem()->getId()]) && $item->getParentItem()->getQtyToShip())
- ) {
- return true;
- }
- return false;
- }
-
- return false;
- }
-
- /**
- * Create shipping label for specific shipment with validation.
- *
- * @return bool
- */
- protected function _createShippingLabel(Mage_Sales_Model_Order_Shipment $shipment)
- {
- if (!$shipment) {
- return false;
- }
- $carrier = $shipment->getOrder()->getShippingCarrier();
- if (!$carrier->isShippingLabelsAvailable()) {
- return false;
- }
- $shipment->setPackages($this->getRequest()->getParam('packages'));
- $response = Mage::getModel('shipping/shipping')->requestToShipment($shipment);
- if ($response->hasErrors()) {
- Mage::throwException($response->getErrors());
- }
- if (!$response->hasInfo()) {
- return false;
- }
- $labelsContent = [];
- $trackingNumbers = [];
- $info = $response->getInfo();
- foreach ($info as $inf) {
- if (!empty($inf['tracking_number']) && !empty($inf['label_content'])) {
- $labelsContent[] = $inf['label_content'];
- $trackingNumbers[] = $inf['tracking_number'];
- }
- }
- $outputPdf = $this->_combineLabelsPdf($labelsContent);
- $shipment->setShippingLabel($outputPdf->render());
- $carrierCode = $carrier->getCarrierCode();
- $carrierTitle = Mage::getStoreConfig('carriers/' . $carrierCode . '/title', $shipment->getStoreId());
- if ($trackingNumbers) {
- foreach ($trackingNumbers as $trackingNumber) {
- $track = Mage::getModel('sales/order_shipment_track')
- ->setNumber($trackingNumber)
- ->setCarrierCode($carrierCode)
- ->setTitle($carrierTitle);
- $shipment->addTrack($track);
- }
- }
- return true;
- }
-
/**
* Create shipping label action for specific shipment
*
@@ -677,6 +499,199 @@ public function massPrintShippingLabelAction()
}
}
+ /**
+ * Return grid with shipping items for Ajax request
+ *
+ * @return Mage_Core_Controller_Response_Http
+ */
+ public function getShippingItemsGridAction()
+ {
+ $this->_initShipment();
+ return $this->getResponse()->setBody(
+ $this->getLayout()
+ ->createBlock('adminhtml/sales_order_shipment_packaging_grid')
+ ->setIndex($this->getRequest()->getParam('index'))
+ ->toHtml(),
+ );
+ }
+ /**
+ * Initialize shipment items QTY
+ */
+ protected function _getItemQtys()
+ {
+ $data = $this->getRequest()->getParam('shipment');
+ return $data['items'] ?? [];
+ }
+
+ /**
+ * Initialize shipment model instance
+ *
+ * @return Mage_Sales_Model_Order_Shipment|bool
+ * @throws Mage_Core_Exception
+ */
+ protected function _initShipment()
+ {
+ $this->_title($this->__('Sales'))->_title($this->__('Shipments'));
+
+ $shipment = false;
+ $shipmentId = $this->getRequest()->getParam('shipment_id');
+ $orderId = $this->getRequest()->getParam('order_id');
+ if ($shipmentId) {
+ $shipment = Mage::getModel('sales/order_shipment')->load($shipmentId);
+ if (!$shipment->getId()) {
+ $this->_getSession()->addError($this->__('The shipment no longer exists.'));
+ return false;
+ }
+ } elseif ($orderId) {
+ $order = Mage::getModel('sales/order')->load($orderId);
+
+ /**
+ * Check order existing
+ */
+ if (!$order->getId()) {
+ $this->_getSession()->addError($this->__('The order no longer exists.'));
+ return false;
+ }
+ /**
+ * Check shipment is available to create separate from invoice
+ */
+ if ($order->getForcedDoShipmentWithInvoice()) {
+ $this->_getSession()->addError($this->__('Cannot do shipment for the order separately from invoice.'));
+ return false;
+ }
+ /**
+ * Check shipment create availability
+ */
+ if (!$order->canShip()) {
+ $this->_getSession()->addError($this->__('Cannot do shipment for the order.'));
+ return false;
+ }
+ $savedQtys = $this->_getItemQtys();
+ $shipment = Mage::getModel('sales/service_order', $order)->prepareShipment($savedQtys);
+
+ $tracks = $this->getRequest()->getPost('tracking');
+ if ($tracks) {
+ foreach ($tracks as $data) {
+ if (empty($data['number'])) {
+ Mage::throwException($this->__('Tracking number cannot be empty.'));
+ }
+ $track = Mage::getModel('sales/order_shipment_track')
+ ->addData($data);
+ $shipment->addTrack($track);
+ }
+ }
+ }
+
+ Mage::register('current_shipment', $shipment);
+ return $shipment;
+ }
+
+ /**
+ * Save shipment and order in one transaction
+ *
+ * @param Mage_Sales_Model_Order_Shipment $shipment
+ * @return $this
+ * @throws Exception
+ */
+ protected function _saveShipment($shipment)
+ {
+ $shipment->getOrder()->setIsInProcess(true);
+ $transactionSave = Mage::getModel('core/resource_transaction')
+ ->addObject($shipment)
+ ->addObject($shipment->getOrder())
+ ->save();
+
+ return $this;
+ }
+
+ /**
+ * Decides if we need to create dummy shipment item or not
+ * for example we don't need create dummy parent if all
+ * children are not in process
+ *
+ * @deprecated after 1.4, Mage_Sales_Model_Service_Order used
+ * @param Mage_Sales_Model_Order_Item $item
+ * @param array $qtys
+ * @return bool
+ */
+ protected function _needToAddDummy($item, $qtys)
+ {
+ if ($item->getHasChildren()) {
+ foreach ($item->getChildrenItems() as $child) {
+ if ($child->getIsVirtual()) {
+ continue;
+ }
+ if ((isset($qtys[$child->getId()]) && $qtys[$child->getId()] > 0)
+ || (!isset($qtys[$child->getId()]) && $child->getQtyToShip())
+ ) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ if ($item->getParentItem()) {
+ if ($item->getIsVirtual()) {
+ return false;
+ }
+ if ((isset($qtys[$item->getParentItem()->getId()]) && $qtys[$item->getParentItem()->getId()] > 0)
+ || (!isset($qtys[$item->getParentItem()->getId()]) && $item->getParentItem()->getQtyToShip())
+ ) {
+ return true;
+ }
+ return false;
+ }
+
+ return false;
+ }
+
+ /**
+ * Create shipping label for specific shipment with validation.
+ *
+ * @return bool
+ */
+ protected function _createShippingLabel(Mage_Sales_Model_Order_Shipment $shipment)
+ {
+ if (!$shipment) {
+ return false;
+ }
+ $carrier = $shipment->getOrder()->getShippingCarrier();
+ if (!$carrier->isShippingLabelsAvailable()) {
+ return false;
+ }
+ $shipment->setPackages($this->getRequest()->getParam('packages'));
+ $response = Mage::getModel('shipping/shipping')->requestToShipment($shipment);
+ if ($response->hasErrors()) {
+ Mage::throwException($response->getErrors());
+ }
+ if (!$response->hasInfo()) {
+ return false;
+ }
+ $labelsContent = [];
+ $trackingNumbers = [];
+ $info = $response->getInfo();
+ foreach ($info as $inf) {
+ if (!empty($inf['tracking_number']) && !empty($inf['label_content'])) {
+ $labelsContent[] = $inf['label_content'];
+ $trackingNumbers[] = $inf['tracking_number'];
+ }
+ }
+ $outputPdf = $this->_combineLabelsPdf($labelsContent);
+ $shipment->setShippingLabel($outputPdf->render());
+ $carrierCode = $carrier->getCarrierCode();
+ $carrierTitle = Mage::getStoreConfig('carriers/' . $carrierCode . '/title', $shipment->getStoreId());
+ if ($trackingNumbers) {
+ foreach ($trackingNumbers as $trackingNumber) {
+ $track = Mage::getModel('sales/order_shipment_track')
+ ->setNumber($trackingNumber)
+ ->setCarrierCode($carrierCode)
+ ->setTitle($carrierTitle);
+ $shipment->addTrack($track);
+ }
+ }
+ return true;
+ }
+
/**
* Combine array of labels as instance PDF
*
@@ -727,20 +742,4 @@ protected function _createPdfPageFromImageString($imageString)
unlink($tmpFileName);
return $page;
}
-
- /**
- * Return grid with shipping items for Ajax request
- *
- * @return Mage_Core_Controller_Response_Http
- */
- public function getShippingItemsGridAction()
- {
- $this->_initShipment();
- return $this->getResponse()->setBody(
- $this->getLayout()
- ->createBlock('adminhtml/sales_order_shipment_packaging_grid')
- ->setIndex($this->getRequest()->getParam('index'))
- ->toHtml(),
- );
- }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
index 5bfa1384309..c0bdb58c688 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
@@ -28,30 +28,6 @@ class Mage_Adminhtml_Sales_Order_StatusController extends Mage_Adminhtml_Control
*/
public const ADMIN_RESOURCE = 'system/order_statuses';
- /**
- * Additional initialization
- */
- protected function _construct()
- {
- $this->setUsedModuleName('Mage_Sales');
- }
-
- /**
- * Initialize status model based on status code in request
- *
- * @return Mage_Sales_Model_Order_Status | false
- */
- protected function _initStatus()
- {
- $statusCode = $this->getRequest()->getParam('status');
- if ($statusCode) {
- $status = Mage::getModel('sales/order_status')->load($statusCode);
- } else {
- $status = false;
- }
- return $status;
- }
-
/**
* Statuses grid page
*/
@@ -229,4 +205,28 @@ public function unassignAction()
}
$this->_redirect('*/*/');
}
+
+ /**
+ * Additional initialization
+ */
+ protected function _construct()
+ {
+ $this->setUsedModuleName('Mage_Sales');
+ }
+
+ /**
+ * Initialize status model based on status code in request
+ *
+ * @return Mage_Sales_Model_Order_Status | false
+ */
+ protected function _initStatus()
+ {
+ $statusCode = $this->getRequest()->getParam('status');
+ if ($statusCode) {
+ $status = Mage::getModel('sales/order_status')->load($statusCode);
+ } else {
+ $status = false;
+ }
+ return $status;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php
index 86a38e31c6f..d202e992718 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php
@@ -28,14 +28,6 @@ class Mage_Adminhtml_Sales_Order_View_GiftmessageController extends Mage_Adminht
*/
public const ADMIN_RESOURCE = 'sales/order';
- /**
- * Additional initialization
- */
- protected function _construct()
- {
- $this->setUsedModuleName('Mage_Sales');
- }
-
public function saveAction()
{
try {
@@ -59,6 +51,14 @@ public function saveAction()
}
}
+ /**
+ * Additional initialization
+ */
+ protected function _construct()
+ {
+ $this->setUsedModuleName('Mage_Sales');
+ }
+
/**
* Retrieve gift message save model
*
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
index 8c725343389..18a34736144 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
@@ -29,50 +29,6 @@ class Mage_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Controller_Act
*/
protected $_publicActions = ['view', 'index'];
- /**
- * Additional initialization
- *
- */
- protected function _construct()
- {
- $this->setUsedModuleName('Mage_Sales');
- }
-
- /**
- * Init layout, menu and breadcrumb
- *
- * @return $this
- */
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('sales/order')
- ->_addBreadcrumb($this->__('Sales'), $this->__('Sales'))
- ->_addBreadcrumb($this->__('Orders'), $this->__('Orders'));
- return $this;
- }
-
- /**
- * Initialize order model instance
- *
- * @return Mage_Sales_Model_Order | false
- */
- protected function _initOrder()
- {
- $id = $this->getRequest()->getParam('order_id');
- $order = Mage::getModel('sales/order')->load($id);
-
- if (!$order->getId()) {
- $this->_getSession()->addError($this->__('This order no longer exists.'));
- $this->_redirect('*/*/');
- $this->setFlag('', self::FLAG_NO_DISPATCH, true);
- return false;
- }
- Mage::register('sales_order', $order);
- Mage::register('current_order', $order);
- return $order;
- }
-
/**
* Orders grid
*/
@@ -649,44 +605,6 @@ public function voidPaymentAction()
$this->_redirect('*/*/view', ['order_id' => $order->getId()]);
}
- /**
- * @inheritDoc
- */
- protected function _isAllowed()
- {
- $action = strtolower($this->getRequest()->getActionName());
- switch ($action) {
- case 'hold':
- $aclResource = 'sales/order/actions/hold';
- break;
- case 'unhold':
- $aclResource = 'sales/order/actions/unhold';
- break;
- case 'email':
- $aclResource = 'sales/order/actions/email';
- break;
- case 'cancel':
- $aclResource = 'sales/order/actions/cancel';
- break;
- case 'view':
- $aclResource = 'sales/order/actions/view';
- break;
- case 'addcomment':
- $aclResource = 'sales/order/actions/comment';
- break;
- case 'creditmemos':
- $aclResource = 'sales/order/actions/creditmemo';
- break;
- case 'reviewpayment':
- $aclResource = 'sales/order/actions/review_payment';
- break;
- default:
- $aclResource = 'sales/order';
- break;
- }
- return Mage::getSingleton('admin/session')->isAllowed($aclResource);
- }
-
/**
* Export order grid to CSV format
*/
@@ -783,4 +701,86 @@ public function preDispatch()
$this->_setForcedFormKeyActions('cancel', 'massCancel');
return parent::preDispatch();
}
+
+ /**
+ * Additional initialization
+ *
+ */
+ protected function _construct()
+ {
+ $this->setUsedModuleName('Mage_Sales');
+ }
+
+ /**
+ * Init layout, menu and breadcrumb
+ *
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('sales/order')
+ ->_addBreadcrumb($this->__('Sales'), $this->__('Sales'))
+ ->_addBreadcrumb($this->__('Orders'), $this->__('Orders'));
+ return $this;
+ }
+
+ /**
+ * Initialize order model instance
+ *
+ * @return Mage_Sales_Model_Order | false
+ */
+ protected function _initOrder()
+ {
+ $id = $this->getRequest()->getParam('order_id');
+ $order = Mage::getModel('sales/order')->load($id);
+
+ if (!$order->getId()) {
+ $this->_getSession()->addError($this->__('This order no longer exists.'));
+ $this->_redirect('*/*/');
+ $this->setFlag('', self::FLAG_NO_DISPATCH, true);
+ return false;
+ }
+ Mage::register('sales_order', $order);
+ Mage::register('current_order', $order);
+ return $order;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _isAllowed()
+ {
+ $action = strtolower($this->getRequest()->getActionName());
+ switch ($action) {
+ case 'hold':
+ $aclResource = 'sales/order/actions/hold';
+ break;
+ case 'unhold':
+ $aclResource = 'sales/order/actions/unhold';
+ break;
+ case 'email':
+ $aclResource = 'sales/order/actions/email';
+ break;
+ case 'cancel':
+ $aclResource = 'sales/order/actions/cancel';
+ break;
+ case 'view':
+ $aclResource = 'sales/order/actions/view';
+ break;
+ case 'addcomment':
+ $aclResource = 'sales/order/actions/comment';
+ break;
+ case 'creditmemos':
+ $aclResource = 'sales/order/actions/creditmemo';
+ break;
+ case 'reviewpayment':
+ $aclResource = 'sales/order/actions/review_payment';
+ break;
+ default:
+ $aclResource = 'sales/order';
+ break;
+ }
+ return Mage::getSingleton('admin/session')->isAllowed($aclResource);
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php
index c80e92db326..345c87b3a5d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php
@@ -22,34 +22,6 @@
*/
class Mage_Adminhtml_Sales_TransactionsController extends Mage_Adminhtml_Controller_Action
{
- /**
- * Initialize payment transaction model
- *
- * @return Mage_Sales_Model_Order_Payment_Transaction | bool
- */
- protected function _initTransaction()
- {
- $txn = Mage::getModel('sales/order_payment_transaction')->load(
- $this->getRequest()->getParam('txn_id'),
- );
-
- if (!$txn->getId()) {
- $this->_getSession()->addError($this->__('Wrong transaction ID specified.'));
- $this->_redirect('*/*/');
- $this->setFlag('', self::FLAG_NO_DISPATCH, true);
- return false;
- }
- $orderId = $this->getRequest()->getParam('order_id');
- if ($orderId) {
- $txn->setOrderUrl(
- $this->getUrl('*/sales_order/view', ['order_id' => $orderId]),
- );
- }
-
- Mage::register('current_transaction', $txn);
- return $txn;
- }
-
public function indexAction()
{
$this->_title($this->__('Sales'))
@@ -114,6 +86,33 @@ public function fetchAction()
}
$this->_redirect('*/sales_transactions/view', ['_current' => true]);
}
+ /**
+ * Initialize payment transaction model
+ *
+ * @return Mage_Sales_Model_Order_Payment_Transaction | bool
+ */
+ protected function _initTransaction()
+ {
+ $txn = Mage::getModel('sales/order_payment_transaction')->load(
+ $this->getRequest()->getParam('txn_id'),
+ );
+
+ if (!$txn->getId()) {
+ $this->_getSession()->addError($this->__('Wrong transaction ID specified.'));
+ $this->_redirect('*/*/');
+ $this->setFlag('', self::FLAG_NO_DISPATCH, true);
+ return false;
+ }
+ $orderId = $this->getRequest()->getParam('order_id');
+ if ($orderId) {
+ $txn->setOrderUrl(
+ $this->getUrl('*/sales_order/view', ['order_id' => $orderId]),
+ );
+ }
+
+ Mage::register('current_transaction', $txn);
+ return $txn;
+ }
/**
* @inheritDoc
diff --git a/app/code/core/Mage/Adminhtml/controllers/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/SalesController.php
index b1621a58070..61a72898078 100644
--- a/app/code/core/Mage/Adminhtml/controllers/SalesController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/SalesController.php
@@ -28,15 +28,6 @@ class Mage_Adminhtml_SalesController extends Mage_Adminhtml_Controller_Action
*/
public const ADMIN_RESOURCE = 'sales';
- /**
- * Additional initialization
- *
- */
- protected function _construct()
- {
- $this->setUsedModuleName('Mage_Sales');
- }
-
public function indexAction()
{
$this->loadLayout();
@@ -49,4 +40,13 @@ public function indexAction()
$this->_addBreadcrumb($this->__('Orders'), $this->__('Orders'));
$this->renderLayout();
}
+
+ /**
+ * Additional initialization
+ *
+ */
+ protected function _construct()
+ {
+ $this->setUsedModuleName('Mage_Sales');
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php
index 472dd11c136..f16c58f3ac4 100644
--- a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php
@@ -44,28 +44,6 @@ public function preDispatch()
return parent::preDispatch();
}
- /**
- * Init actions
- *
- * @return $this
- */
- protected function _initAction()
- {
- // load layout, set active menu and breadcrumbs
- $this->loadLayout()
- ->_setActiveMenu('catalog/sitemap')
- ->_addBreadcrumb(
- Mage::helper('catalog')->__('Catalog'),
- Mage::helper('catalog')->__('Catalog'),
- )
- ->_addBreadcrumb(
- Mage::helper('sitemap')->__('Google Sitemap'),
- Mage::helper('sitemap')->__('Google Sitemap'),
- )
- ;
- return $this;
- }
-
/**
* Index action
*/
@@ -303,4 +281,26 @@ public function generateAction()
// go to grid
$this->_redirect('*/*/');
}
+
+ /**
+ * Init actions
+ *
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ // load layout, set active menu and breadcrumbs
+ $this->loadLayout()
+ ->_setActiveMenu('catalog/sitemap')
+ ->_addBreadcrumb(
+ Mage::helper('catalog')->__('Catalog'),
+ Mage::helper('catalog')->__('Catalog'),
+ )
+ ->_addBreadcrumb(
+ Mage::helper('sitemap')->__('Google Sitemap'),
+ Mage::helper('sitemap')->__('Google Sitemap'),
+ )
+ ;
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php
index f5d2f4b8536..25e1de00687 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php
@@ -28,16 +28,6 @@ class Mage_Adminhtml_System_CacheController extends Mage_Adminhtml_Controller_Ac
*/
public const ADMIN_RESOURCE = 'system/cache';
- /**
- * Retrieve session model
- *
- * @return Mage_Adminhtml_Model_Session
- */
- protected function _getSession()
- {
- return Mage::getSingleton('adminhtml/session');
- }
-
/**
* Display cache management form
*/
@@ -305,4 +295,14 @@ public function refreshLayeredNavigationAction()
$this->_redirect('*/*');
}
+
+ /**
+ * Retrieve session model
+ *
+ * @return Mage_Adminhtml_Model_Session
+ */
+ protected function _getSession()
+ {
+ return Mage::getSingleton('adminhtml/session');
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php
index ff9c1c15c40..d2259a1c105 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php
@@ -28,26 +28,6 @@ class Mage_Adminhtml_System_Config_System_StorageController extends Mage_Adminht
*/
public const ADMIN_RESOURCE = 'system/config';
- /**
- * Return file storage singleton
- *
- * @return Mage_Core_Model_File_Storage
- */
- protected function _getSyncSingleton()
- {
- return Mage::getSingleton('core/file_storage');
- }
-
- /**
- * Return synchronize process status flag
- *
- * @return Mage_Core_Model_File_Storage_Flag
- */
- protected function _getSyncFlag()
- {
- return $this->_getSyncSingleton()->getSyncFlag();
- }
-
/**
* Synchronize action between storages
*
@@ -175,4 +155,24 @@ public function statusAction()
$result = Mage::helper('core')->jsonEncode($result);
Mage::app()->getResponse()->setBody($result);
}
+
+ /**
+ * Return file storage singleton
+ *
+ * @return Mage_Core_Model_File_Storage
+ */
+ protected function _getSyncSingleton()
+ {
+ return Mage::getSingleton('core/file_storage');
+ }
+
+ /**
+ * Return synchronize process status flag
+ *
+ * @return Mage_Core_Model_File_Storage_Flag
+ */
+ protected function _getSyncFlag()
+ {
+ return $this->_getSyncSingleton()->getSyncFlag();
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php
index 95e3e98bb9c..42a3d08e014 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php
@@ -204,30 +204,6 @@ public function saveAction()
$this->_redirect('*/*/edit', ['_current' => ['section', 'website', 'store']]);
}
- /**
- * Custom save logic for section
- */
- protected function _saveSection()
- {
- $method = '_save' . uc_words($this->getRequest()->getParam('section'), '');
- if (method_exists($this, $method)) {
- $this->$method();
- }
- }
-
- /**
- * Advanced save procedure
- */
- protected function _saveAdvanced()
- {
- Mage::app()->cleanCache(
- [
- 'layout',
- Mage_Core_Model_Layout_Update::LAYOUT_GENERAL_CACHE_TAG,
- ],
- );
- }
-
/**
* Save fieldset state through AJAX
*
@@ -266,6 +242,30 @@ public function exportTableratesAction()
$this->_prepareDownloadResponse($fileName, $content);
}
+ /**
+ * Custom save logic for section
+ */
+ protected function _saveSection()
+ {
+ $method = '_save' . uc_words($this->getRequest()->getParam('section'), '');
+ if (method_exists($this, $method)) {
+ $this->$method();
+ }
+ }
+
+ /**
+ * Advanced save procedure
+ */
+ protected function _saveAdvanced()
+ {
+ Mage::app()->cleanCache(
+ [
+ 'layout',
+ Mage_Core_Model_Layout_Update::LAYOUT_GENERAL_CACHE_TAG,
+ ],
+ );
+ }
+
/**
* Check if specified section allowed in ACL
*
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
index 1591a874d84..7c357fc251f 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
@@ -28,32 +28,6 @@ class Mage_Adminhtml_System_Convert_ProfileController extends Mage_Adminhtml_Con
*/
public const ADMIN_RESOURCE = 'admin/system/convert/profiles';
- protected function _initProfile($idFieldName = 'id')
- {
- $this->_title($this->__('System'))
- ->_title($this->__('Import and Export'))
- ->_title($this->__('Profiles'));
-
- $profileId = (int) $this->getRequest()->getParam($idFieldName);
- $profile = Mage::getModel('dataflow/profile');
-
- if ($profileId) {
- $profile->load($profileId);
- if (!$profile->getId()) {
- Mage::getSingleton('adminhtml/session')->addError(
- $this->__('The profile you are trying to save no longer exists'),
- );
- $this->_redirect('*/*');
- return false;
- }
- }
-
- $profile->setAdminUserId(Mage::getSingleton('admin/session')->getUser()->getId());
- Mage::register('current_convert_profile', $profile);
-
- return $this;
- }
-
/**
* Profiles list action
*/
@@ -312,4 +286,30 @@ public function historyAction()
$this->getLayout()->createBlock('adminhtml/system_convert_profile_edit_tab_history')->toHtml(),
);
}
+
+ protected function _initProfile($idFieldName = 'id')
+ {
+ $this->_title($this->__('System'))
+ ->_title($this->__('Import and Export'))
+ ->_title($this->__('Profiles'));
+
+ $profileId = (int) $this->getRequest()->getParam($idFieldName);
+ $profile = Mage::getModel('dataflow/profile');
+
+ if ($profileId) {
+ $profile->load($profileId);
+ if (!$profile->getId()) {
+ Mage::getSingleton('adminhtml/session')->addError(
+ $this->__('The profile you are trying to save no longer exists'),
+ );
+ $this->_redirect('*/*');
+ return false;
+ }
+ }
+
+ $profile->setAdminUserId(Mage::getSingleton('admin/session')->getUser()->getId());
+ Mage::register('current_convert_profile', $profile);
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
index e7db0e9aad7..5267ee40ba3 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
@@ -28,21 +28,6 @@ class Mage_Adminhtml_System_CurrencyController extends Mage_Adminhtml_Controller
*/
public const ADMIN_RESOURCE = 'system/currency/rates';
- /**
- * Init currency by currency code from request
- *
- * @return Mage_Adminhtml_Controller_Action
- */
- protected function _initCurrency()
- {
- $code = $this->getRequest()->getParam('currency');
- $currency = Mage::getModel('directory/currency')
- ->load($code);
-
- Mage::register('currency', $currency);
- return $this;
- }
-
/**
* Currency management main page
*/
@@ -113,4 +98,19 @@ public function saveRatesAction()
$this->_redirect('*/*/');
}
+
+ /**
+ * Init currency by currency code from request
+ *
+ * @return Mage_Adminhtml_Controller_Action
+ */
+ protected function _initCurrency()
+ {
+ $code = $this->getRequest()->getParam('currency');
+ $currency = Mage::getModel('directory/currency')
+ ->load($code);
+
+ Mage::register('currency', $currency);
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
index 29ad5f08df9..cd988e9b6b9 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
@@ -39,22 +39,6 @@ public function preDispatch()
return parent::preDispatch();
}
- /**
- * Init actions
- *
- * @return $this
- */
- protected function _initAction()
- {
- // load layout, set active menu and breadcrumbs
- $this->loadLayout()
- ->_setActiveMenu('system/store')
- ->_addBreadcrumb(Mage::helper('adminhtml')->__('System'), Mage::helper('adminhtml')->__('System'))
- ->_addBreadcrumb(Mage::helper('adminhtml')->__('Manage Stores'), Mage::helper('adminhtml')->__('Manage Stores'))
- ;
- return $this;
- }
-
public function indexAction()
{
$this->_title($this->__('System'))
@@ -445,6 +429,22 @@ public function deleteStorePostAction()
$this->_redirect('*/*/editStore', ['store_id' => $itemId]);
}
+ /**
+ * Init actions
+ *
+ * @return $this
+ */
+ protected function _initAction()
+ {
+ // load layout, set active menu and breadcrumbs
+ $this->loadLayout()
+ ->_setActiveMenu('system/store')
+ ->_addBreadcrumb(Mage::helper('adminhtml')->__('System'), Mage::helper('adminhtml')->__('System'))
+ ->_addBreadcrumb(Mage::helper('adminhtml')->__('Manage Stores'), Mage::helper('adminhtml')->__('Manage Stores'))
+ ;
+ return $this;
+ }
+
/**
* Backup database
*
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php
index 921625e0b74..0437a63fd22 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php
@@ -28,41 +28,6 @@ class Mage_Adminhtml_System_VariableController extends Mage_Adminhtml_Controller
*/
public const ADMIN_RESOURCE = 'system/variable';
- /**
- * Initialize Layout and set breadcrumbs
- *
- * @return $this
- */
- protected function _initLayout()
- {
- $this->loadLayout()
- ->_setActiveMenu('system/variable')
- ->_addBreadcrumb(Mage::helper('adminhtml')->__('Custom Variables'), Mage::helper('adminhtml')->__('Custom Variables'));
- return $this;
- }
-
- /**
- * Initialize Variable object
- *
- * @return Mage_Core_Model_Variable
- * @throws Mage_Core_Exception
- */
- protected function _initVariable()
- {
- $this->_title($this->__('System'))->_title($this->__('Custom Variables'));
-
- $variableId = $this->getRequest()->getParam('variable_id', null);
- $storeId = (int) $this->getRequest()->getParam('store', 0);
- /** @var Mage_Core_Model_Variable $variable */
- $variable = Mage::getModel('core/variable');
- if ($variableId) {
- $variable->setStoreId($storeId)
- ->load($variableId);
- }
- Mage::register('current_variable', $variable);
- return $variable;
- }
-
/**
* Index Action
*/
@@ -185,4 +150,39 @@ public function wysiwygPluginAction()
$variables = [$storeContactVariabls, $customVariables];
$this->getResponse()->setBody(Zend_Json::encode($variables));
}
+
+ /**
+ * Initialize Layout and set breadcrumbs
+ *
+ * @return $this
+ */
+ protected function _initLayout()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('system/variable')
+ ->_addBreadcrumb(Mage::helper('adminhtml')->__('Custom Variables'), Mage::helper('adminhtml')->__('Custom Variables'));
+ return $this;
+ }
+
+ /**
+ * Initialize Variable object
+ *
+ * @return Mage_Core_Model_Variable
+ * @throws Mage_Core_Exception
+ */
+ protected function _initVariable()
+ {
+ $this->_title($this->__('System'))->_title($this->__('Custom Variables'));
+
+ $variableId = $this->getRequest()->getParam('variable_id', null);
+ $storeId = (int) $this->getRequest()->getParam('store', 0);
+ /** @var Mage_Core_Model_Variable $variable */
+ $variable = Mage::getModel('core/variable');
+ if ($variableId) {
+ $variable->setStoreId($storeId)
+ ->load($variableId);
+ }
+ Mage::register('current_variable', $variable);
+ return $variable;
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/TagController.php b/app/code/core/Mage/Adminhtml/controllers/TagController.php
index a39b5a0fcb3..4c48cec865d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/TagController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/TagController.php
@@ -22,41 +22,6 @@
*/
class Mage_Adminhtml_TagController extends Mage_Adminhtml_Controller_Action
{
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('catalog/tag')
- ->_addBreadcrumb(Mage::helper('adminhtml')->__('Catalog'), Mage::helper('adminhtml')->__('Catalog'))
- ->_addBreadcrumb(Mage::helper('adminhtml')->__('Tags'), Mage::helper('adminhtml')->__('Tags'));
-
- return $this;
- }
-
- /**
- * Prepare tag model for manipulation
- *
- * @return Mage_Tag_Model_Tag | false
- */
- protected function _initTag()
- {
- $model = Mage::getModel('tag/tag');
- $storeId = $this->getRequest()->getParam('store');
- $model->setStoreId($storeId);
-
- if (($id = $this->getRequest()->getParam('tag_id'))) {
- $model->setAddBasePopularity();
- $model->load($id);
- $model->setStoreId($storeId);
-
- if (!$model->getId()) {
- return false;
- }
- }
-
- Mage::register('current_tag', $model);
- return $model;
- }
-
/**
* Show grid action
*
@@ -324,6 +289,40 @@ public function massStatusAction()
$ret = $this->getRequest()->getParam('ret') ? $this->getRequest()->getParam('ret') : 'index';
$this->_redirect('*/*/' . $ret);
}
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('catalog/tag')
+ ->_addBreadcrumb(Mage::helper('adminhtml')->__('Catalog'), Mage::helper('adminhtml')->__('Catalog'))
+ ->_addBreadcrumb(Mage::helper('adminhtml')->__('Tags'), Mage::helper('adminhtml')->__('Tags'));
+
+ return $this;
+ }
+
+ /**
+ * Prepare tag model for manipulation
+ *
+ * @return Mage_Tag_Model_Tag | false
+ */
+ protected function _initTag()
+ {
+ $model = Mage::getModel('tag/tag');
+ $storeId = $this->getRequest()->getParam('store');
+ $model->setStoreId($storeId);
+
+ if (($id = $this->getRequest()->getParam('tag_id'))) {
+ $model->setAddBasePopularity();
+ $model->load($id);
+ $model->setStoreId($storeId);
+
+ if (!$model->getId()) {
+ return false;
+ }
+ }
+
+ Mage::register('current_tag', $model);
+ return $model;
+ }
/**
* @inheritDoc
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
index b8281621f67..c014971300f 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
@@ -213,20 +213,6 @@ public function exportXmlAction()
$this->_prepareDownloadResponse($fileName, $content);
}
- /**
- * Initialize action
- *
- * @return Mage_Adminhtml_Controller_Action
- */
- protected function _initAction()
- {
- $this->loadLayout()
- ->_setActiveMenu('sales/tax/rates')
- ->_addBreadcrumb(Mage::helper('tax')->__('Sales'), Mage::helper('tax')->__('Sales'))
- ->_addBreadcrumb(Mage::helper('tax')->__('Tax'), Mage::helper('tax')->__('Tax'));
- return $this;
- }
-
/**
* Import and export Page
*
@@ -268,6 +254,86 @@ public function importPostAction()
$this->_redirect('*/*/importExport');
}
+ /**
+ * export action from import/export tax
+ *
+ */
+ public function exportPostAction()
+ {
+ /** start csv content and set template */
+ $headers = new Varien_Object([
+ 'code' => Mage::helper('tax')->__('Code'),
+ 'country_name' => Mage::helper('tax')->__('Country'),
+ 'region_name' => Mage::helper('tax')->__('State'),
+ 'tax_postcode' => Mage::helper('tax')->__('Zip/Post Code'),
+ 'rate' => Mage::helper('tax')->__('Rate'),
+ 'zip_is_range' => Mage::helper('tax')->__('Zip/Post is Range'),
+ 'zip_from' => Mage::helper('tax')->__('Range From'),
+ 'zip_to' => Mage::helper('tax')->__('Range To'),
+ ]);
+ $template = '"{{code}}","{{country_name}}","{{region_name}}","{{tax_postcode}}","{{rate}}"'
+ . ',"{{zip_is_range}}","{{zip_from}}","{{zip_to}}"';
+ $content = $headers->toString($template);
+
+ $storeTaxTitleTemplate = [];
+ $taxCalculationRateTitleDict = [];
+
+ foreach (Mage::getModel('core/store')->getCollection()->setLoadDefault(false) as $store) {
+ $storeTitle = 'title_' . $store->getId();
+ $content .= ',"' . $store->getCode() . '"';
+ $template .= ',"{{' . $storeTitle . '}}"';
+ $storeTaxTitleTemplate[$storeTitle] = null;
+ }
+ unset($store);
+
+ $content .= "\n";
+
+ foreach (Mage::getModel('tax/calculation_rate_title')->getCollection() as $title) {
+ $rateId = $title->getTaxCalculationRateId();
+
+ if (!array_key_exists($rateId, $taxCalculationRateTitleDict)) {
+ $taxCalculationRateTitleDict[$rateId] = $storeTaxTitleTemplate;
+ }
+
+ $taxCalculationRateTitleDict[$rateId]['title_' . $title->getStoreId()] = $title->getValue();
+ }
+ unset($title);
+
+ $collection = Mage::getResourceModel('tax/calculation_rate_collection')
+ ->joinCountryTable()
+ ->joinRegionTable();
+
+ while ($rate = $collection->fetchItem()) {
+ if ($rate->getTaxRegionId() == 0) {
+ $rate->setRegionName('*');
+ }
+
+ if (array_key_exists($rate->getId(), $taxCalculationRateTitleDict)) {
+ $rate->addData($taxCalculationRateTitleDict[$rate->getId()]);
+ } else {
+ $rate->addData($storeTaxTitleTemplate);
+ }
+
+ $content .= $rate->toString($template) . "\n";
+ }
+
+ $this->_prepareDownloadResponse('tax_rates.csv', $content);
+ }
+
+ /**
+ * Initialize action
+ *
+ * @return Mage_Adminhtml_Controller_Action
+ */
+ protected function _initAction()
+ {
+ $this->loadLayout()
+ ->_setActiveMenu('sales/tax/rates')
+ ->_addBreadcrumb(Mage::helper('tax')->__('Sales'), Mage::helper('tax')->__('Sales'))
+ ->_addBreadcrumb(Mage::helper('tax')->__('Tax'), Mage::helper('tax')->__('Tax'));
+ return $this;
+ }
+
/**
* @SuppressWarnings("PHPMD.Superglobals")
*/
@@ -390,72 +456,6 @@ protected function _importRates()
}
}
- /**
- * export action from import/export tax
- *
- */
- public function exportPostAction()
- {
- /** start csv content and set template */
- $headers = new Varien_Object([
- 'code' => Mage::helper('tax')->__('Code'),
- 'country_name' => Mage::helper('tax')->__('Country'),
- 'region_name' => Mage::helper('tax')->__('State'),
- 'tax_postcode' => Mage::helper('tax')->__('Zip/Post Code'),
- 'rate' => Mage::helper('tax')->__('Rate'),
- 'zip_is_range' => Mage::helper('tax')->__('Zip/Post is Range'),
- 'zip_from' => Mage::helper('tax')->__('Range From'),
- 'zip_to' => Mage::helper('tax')->__('Range To'),
- ]);
- $template = '"{{code}}","{{country_name}}","{{region_name}}","{{tax_postcode}}","{{rate}}"'
- . ',"{{zip_is_range}}","{{zip_from}}","{{zip_to}}"';
- $content = $headers->toString($template);
-
- $storeTaxTitleTemplate = [];
- $taxCalculationRateTitleDict = [];
-
- foreach (Mage::getModel('core/store')->getCollection()->setLoadDefault(false) as $store) {
- $storeTitle = 'title_' . $store->getId();
- $content .= ',"' . $store->getCode() . '"';
- $template .= ',"{{' . $storeTitle . '}}"';
- $storeTaxTitleTemplate[$storeTitle] = null;
- }
- unset($store);
-
- $content .= "\n";
-
- foreach (Mage::getModel('tax/calculation_rate_title')->getCollection() as $title) {
- $rateId = $title->getTaxCalculationRateId();
-
- if (!array_key_exists($rateId, $taxCalculationRateTitleDict)) {
- $taxCalculationRateTitleDict[$rateId] = $storeTaxTitleTemplate;
- }
-
- $taxCalculationRateTitleDict[$rateId]['title_' . $title->getStoreId()] = $title->getValue();
- }
- unset($title);
-
- $collection = Mage::getResourceModel('tax/calculation_rate_collection')
- ->joinCountryTable()
- ->joinRegionTable();
-
- while ($rate = $collection->fetchItem()) {
- if ($rate->getTaxRegionId() == 0) {
- $rate->setRegionName('*');
- }
-
- if (array_key_exists($rate->getId(), $taxCalculationRateTitleDict)) {
- $rate->addData($taxCalculationRateTitleDict[$rate->getId()]);
- } else {
- $rate->addData($storeTaxTitleTemplate);
- }
-
- $content .= $rate->toString($template) . "\n";
- }
-
- $this->_prepareDownloadResponse('tax_rates.csv', $content);
- }
-
/**
* @inheritDoc
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
index 8a1f57250d2..db8fb306d24 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
@@ -136,37 +136,6 @@ public function saveAction()
$this->_redirectReferer();
}
- /**
- * Check if this a duplicate rule creation request
- *
- * @param Mage_Tax_Model_Calculation_Rule $ruleModel
- * @return bool
- */
- protected function _isValidRuleRequest($ruleModel)
- {
- $existingRules = $ruleModel->fetchRuleCodes(
- $ruleModel->getTaxRate(),
- $ruleModel->getTaxCustomerClass(),
- $ruleModel->getTaxProductClass(),
- );
-
- /** @var Mage_Adminhtml_Model_Session $session */
- $session = $this->_getSingletonModel('adminhtml/session');
-
- //Remove the current one from the list
- $existingRules = array_diff($existingRules, [$ruleModel->getOrigData('code')]);
-
- //Verify if a Rule already exists. If not throw an error
- if (count($existingRules) > 0) {
- $ruleCodes = implode(',', $existingRules);
- $session->addError(
- $this->_getHelperModel('tax')->__('Rules (%s) already exist for the specified Tax Rate, Customer Tax Class and Product Tax Class combinations', $ruleCodes),
- );
- return false;
- }
- return true;
- }
-
/**
* Delete action
*/
@@ -199,6 +168,48 @@ public function deleteAction()
$this->_redirectReferer();
}
+ /**
+ * Controller pre-dispatch method
+ *
+ * @return Mage_Adminhtml_Controller_Action
+ */
+ public function preDispatch()
+ {
+ $this->_setForcedFormKeyActions('delete');
+ return parent::preDispatch();
+ }
+
+ /**
+ * Check if this a duplicate rule creation request
+ *
+ * @param Mage_Tax_Model_Calculation_Rule $ruleModel
+ * @return bool
+ */
+ protected function _isValidRuleRequest($ruleModel)
+ {
+ $existingRules = $ruleModel->fetchRuleCodes(
+ $ruleModel->getTaxRate(),
+ $ruleModel->getTaxCustomerClass(),
+ $ruleModel->getTaxProductClass(),
+ );
+
+ /** @var Mage_Adminhtml_Model_Session $session */
+ $session = $this->_getSingletonModel('adminhtml/session');
+
+ //Remove the current one from the list
+ $existingRules = array_diff($existingRules, [$ruleModel->getOrigData('code')]);
+
+ //Verify if a Rule already exists. If not throw an error
+ if (count($existingRules) > 0) {
+ $ruleCodes = implode(',', $existingRules);
+ $session->addError(
+ $this->_getHelperModel('tax')->__('Rules (%s) already exist for the specified Tax Rate, Customer Tax Class and Product Tax Class combinations', $ruleCodes),
+ );
+ return false;
+ }
+ return true;
+ }
+
/**
* Initialize action
*
@@ -236,15 +247,4 @@ protected function _getHelperModel($className)
{
return Mage::helper($className);
}
-
- /**
- * Controller pre-dispatch method
- *
- * @return Mage_Adminhtml_Controller_Action
- */
- public function preDispatch()
- {
- $this->_setForcedFormKeyActions('delete');
- return parent::preDispatch();
- }
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php
index f95e56a47fe..318159acb42 100644
--- a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php
@@ -28,34 +28,6 @@ class Mage_Adminhtml_UrlrewriteController extends Mage_Adminhtml_Controller_Acti
*/
public const ADMIN_RESOURCE = 'catalog/urlrewrite';
- /**
- * Instantiate urlrewrite, product and category
- *
- * @return $this
- */
- protected function _initRegistry()
- {
- $this->_title($this->__('Rewrite Rules'));
-
- // initialize urlrewrite, product and category models
- Mage::register(
- 'current_urlrewrite',
- Mage::getSingleton('core/factory')->getUrlRewriteInstance()
- ->load($this->getRequest()->getParam('id', 0)),
- );
- $productId = $this->getRequest()->getParam('product', 0);
- $categoryId = $this->getRequest()->getParam('category', 0);
- if (Mage::registry('current_urlrewrite')->getId()) {
- $productId = Mage::registry('current_urlrewrite')->getProductId();
- $categoryId = Mage::registry('current_urlrewrite')->getCategoryId();
- }
-
- Mage::register('current_product', Mage::getModel('catalog/product')->load($productId));
- Mage::register('current_category', Mage::getModel('catalog/category')->load($categoryId));
-
- return $this;
- }
-
/**
* Show urlrewrites index page
*
@@ -217,4 +189,32 @@ public function deleteAction()
}
$this->_redirect('*/*/');
}
+
+ /**
+ * Instantiate urlrewrite, product and category
+ *
+ * @return $this
+ */
+ protected function _initRegistry()
+ {
+ $this->_title($this->__('Rewrite Rules'));
+
+ // initialize urlrewrite, product and category models
+ Mage::register(
+ 'current_urlrewrite',
+ Mage::getSingleton('core/factory')->getUrlRewriteInstance()
+ ->load($this->getRequest()->getParam('id', 0)),
+ );
+ $productId = $this->getRequest()->getParam('product', 0);
+ $categoryId = $this->getRequest()->getParam('category', 0);
+ if (Mage::registry('current_urlrewrite')->getId()) {
+ $productId = Mage::registry('current_urlrewrite')->getProductId();
+ $categoryId = Mage::registry('current_urlrewrite')->getCategoryId();
+ }
+
+ Mage::register('current_product', Mage::getModel('catalog/product')->load($productId));
+ Mage::register('current_category', Mage::getModel('catalog/category')->load($categoryId));
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php
index 4ff99e1d8a9..1ef301f3772 100644
--- a/app/code/core/Mage/Api/Helper/Data.php
+++ b/app/code/core/Mage/Api/Helper/Data.php
@@ -287,37 +287,6 @@ public function parseFilters($filters, $fieldsMap = null)
return $filters;
}
- /**
- * Parses complex filter, which may contain several nodes, e.g. when user want to fetch orders which were updated
- * between two dates.
- *
- * @param array $complexFilter
- * @return array
- */
- protected function _parseComplexFilter($complexFilter)
- {
- $parsedFilters = [];
-
- foreach ($complexFilter as $filter) {
- if (!isset($filter->key) || !isset($filter->value)) {
- continue;
- }
- $fieldName = $filter->key;
- $condition = $filter->value;
- $conditionName = $condition->key;
- $conditionValue = $condition->value;
- $this->formatFilterConditionValue($conditionName, $conditionValue);
-
- if (array_key_exists($fieldName, $parsedFilters)) {
- $parsedFilters[$fieldName] += [$conditionName => $conditionValue];
- } else {
- $parsedFilters[$fieldName] = [$conditionName => $conditionValue];
- }
- }
-
- return $parsedFilters;
- }
-
/**
* Convert condition value from the string into the array
* for the condition operators that require value to be an array.
@@ -379,4 +348,35 @@ public function getServiceUrl($routePath = null, $routeParams = null, $htmlSpeci
return $htmlSpecialChars === true ? htmlspecialchars($uri) : (string) $uri;
}
+
+ /**
+ * Parses complex filter, which may contain several nodes, e.g. when user want to fetch orders which were updated
+ * between two dates.
+ *
+ * @param array $complexFilter
+ * @return array
+ */
+ protected function _parseComplexFilter($complexFilter)
+ {
+ $parsedFilters = [];
+
+ foreach ($complexFilter as $filter) {
+ if (!isset($filter->key) || !isset($filter->value)) {
+ continue;
+ }
+ $fieldName = $filter->key;
+ $condition = $filter->value;
+ $conditionName = $condition->key;
+ $conditionValue = $condition->value;
+ $this->formatFilterConditionValue($conditionName, $conditionValue);
+
+ if (array_key_exists($fieldName, $parsedFilters)) {
+ $parsedFilters[$fieldName] += [$conditionName => $conditionValue];
+ } else {
+ $parsedFilters[$fieldName] = [$conditionName => $conditionValue];
+ }
+ }
+
+ return $parsedFilters;
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Acl.php b/app/code/core/Mage/Api/Model/Acl.php
index abb8a9dbe54..14759b6dd42 100644
--- a/app/code/core/Mage/Api/Model/Acl.php
+++ b/app/code/core/Mage/Api/Model/Acl.php
@@ -63,19 +63,6 @@ class Mage_Api_Model_Acl extends Zend_Acl
*/
public const RULE_PERM_ALLOW = 2;
- /**
- * Get role registry object or create one
- *
- * @return Mage_Api_Model_Acl_Role_Registry
- */
- protected function _getRoleRegistry()
- {
- if ($this->_roleRegistry === null) {
- $this->_roleRegistry = Mage::getModel('api/acl_role_registry');
- }
- return $this->_roleRegistry;
- }
-
/**
* Add parent to role object
*
@@ -88,4 +75,17 @@ public function addRoleParent($role, $parent)
$this->_getRoleRegistry()->addParent($role, $parent);
return $this;
}
+
+ /**
+ * Get role registry object or create one
+ *
+ * @return Mage_Api_Model_Acl_Role_Registry
+ */
+ protected function _getRoleRegistry()
+ {
+ if ($this->_roleRegistry === null) {
+ $this->_roleRegistry = Mage::getModel('api/acl_role_registry');
+ }
+ return $this->_roleRegistry;
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Config.php b/app/code/core/Mage/Api/Model/Config.php
index 66a3b30c5a3..8ba67751556 100644
--- a/app/code/core/Mage/Api/Model/Config.php
+++ b/app/code/core/Mage/Api/Model/Config.php
@@ -37,28 +37,6 @@ public function __construct($sourceData = null)
$this->_construct();
}
- /**
- * Init configuration for webservices api
- *
- * @return $this
- */
- protected function _construct()
- {
- if (Mage::app()->useCache('config_api')) {
- if ($this->loadCache()) {
- return $this;
- }
- }
-
- $config = Mage::getConfig()->loadModulesConfiguration('api.xml');
- $this->setXml($config->getNode('api'));
-
- if (Mage::app()->useCache('config_api')) {
- $this->saveCache();
- }
- return $this;
- }
-
/**
* Retrieve adapter aliases from config.
*
@@ -257,6 +235,28 @@ public function getCache()
return Mage::app()->getCache();
}
+ /**
+ * Init configuration for webservices api
+ *
+ * @return $this
+ */
+ protected function _construct()
+ {
+ if (Mage::app()->useCache('config_api')) {
+ if ($this->loadCache()) {
+ return $this;
+ }
+ }
+
+ $config = Mage::getConfig()->loadModulesConfiguration('api.xml');
+ $this->setXml($config->getNode('api'));
+
+ if (Mage::app()->useCache('config_api')) {
+ $this->saveCache();
+ }
+ return $this;
+ }
+
/**
* @param string $id
* @return bool|mixed
diff --git a/app/code/core/Mage/Api/Model/Resource/Abstract.php b/app/code/core/Mage/Api/Model/Resource/Abstract.php
index b49baf9ba57..dc2d8d63ca8 100644
--- a/app/code/core/Mage/Api/Model/Resource/Abstract.php
+++ b/app/code/core/Mage/Api/Model/Resource/Abstract.php
@@ -30,44 +30,44 @@ class Mage_Api_Model_Resource_Abstract
protected $_resourceConfig = null;
/**
- * Retrieve webservice session
+ * Set configuration for api resource
*
- * @return Mage_Api_Model_Session
+ * @return $this
*/
- protected function _getSession()
+ public function setResourceConfig(Varien_Simplexml_Element $xml)
{
- return Mage::getSingleton('api/session');
+ $this->_resourceConfig = $xml;
+ return $this;
}
/**
- * Retrieve webservice configuration
+ * Retrieve configuration for api resource
*
- * @return Mage_Api_Model_Config
+ * @return Varien_Simplexml_Element
*/
- protected function _getConfig()
+ public function getResourceConfig()
{
- return Mage::getSingleton('api/config');
+ return $this->_resourceConfig;
}
/**
- * Set configuration for api resource
+ * Retrieve webservice session
*
- * @return $this
+ * @return Mage_Api_Model_Session
*/
- public function setResourceConfig(Varien_Simplexml_Element $xml)
+ protected function _getSession()
{
- $this->_resourceConfig = $xml;
- return $this;
+ return Mage::getSingleton('api/session');
}
/**
- * Retrieve configuration for api resource
+ * Retrieve webservice configuration
*
- * @return Varien_Simplexml_Element
+ * @return Mage_Api_Model_Config
*/
- public function getResourceConfig()
+ protected function _getConfig()
{
- return $this->_resourceConfig;
+ return Mage::getSingleton('api/config');
}
/**
diff --git a/app/code/core/Mage/Api/Model/Resource/Acl.php b/app/code/core/Mage/Api/Model/Resource/Acl.php
index 6bc51511f79..d5e39ff0f99 100644
--- a/app/code/core/Mage/Api/Model/Resource/Acl.php
+++ b/app/code/core/Mage/Api/Model/Resource/Acl.php
@@ -22,15 +22,6 @@
*/
class Mage_Api_Model_Resource_Acl extends Mage_Core_Model_Resource_Db_Abstract
{
- /**
- * Initialize resource connections
- *
- */
- protected function _construct()
- {
- $this->_init('api/role', 'role_id');
- }
-
/**
* Load ACL for the user
*
@@ -122,4 +113,12 @@ public function loadRules(Mage_Api_Model_Acl $acl, array $rulesArr)
}
return $this;
}
+ /**
+ * Initialize resource connections
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('api/role', 'role_id');
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Resource/Role.php b/app/code/core/Mage/Api/Model/Resource/Role.php
index 2001879e5fc..6b45c092e23 100644
--- a/app/code/core/Mage/Api/Model/Resource/Role.php
+++ b/app/code/core/Mage/Api/Model/Resource/Role.php
@@ -22,6 +22,16 @@
*/
class Mage_Api_Model_Resource_Role extends Mage_Core_Model_Resource_Db_Abstract
{
+ /**
+ * @inheritDoc
+ */
+ public function load(Mage_Core_Model_Abstract $object, $value, $field = null)
+ {
+ if (!(int) $value && is_string($value)) {
+ $field = 'role_id';
+ }
+ return parent::load($object, $value, $field);
+ }
protected function _construct()
{
$this->_init('api/role', 'role_id');
@@ -41,15 +51,4 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object)
$object->setModified($now);
return $this;
}
-
- /**
- * @inheritDoc
- */
- public function load(Mage_Core_Model_Abstract $object, $value, $field = null)
- {
- if (!(int) $value && is_string($value)) {
- $field = 'role_id';
- }
- return parent::load($object, $value, $field);
- }
}
diff --git a/app/code/core/Mage/Api/Model/Resource/Role/Collection.php b/app/code/core/Mage/Api/Model/Resource/Role/Collection.php
index 1bbce7a3f0a..cb4beb888b8 100644
--- a/app/code/core/Mage/Api/Model/Resource/Role/Collection.php
+++ b/app/code/core/Mage/Api/Model/Resource/Role/Collection.php
@@ -22,15 +22,6 @@
*/
class Mage_Api_Model_Resource_Role_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Resource collection initialization
- *
- */
- protected function _construct()
- {
- $this->_init('api/role');
- }
-
/**
* Aet user filter
*
@@ -54,4 +45,12 @@ public function setRolesFilter()
$this->addFieldToFilter('role_type', Mage_Api_Model_Acl::ROLE_TYPE_GROUP);
return $this;
}
+ /**
+ * Resource collection initialization
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('api/role');
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Resource/Roles.php b/app/code/core/Mage/Api/Model/Resource/Roles.php
index 2607833060e..12eb78d8c6e 100644
--- a/app/code/core/Mage/Api/Model/Resource/Roles.php
+++ b/app/code/core/Mage/Api/Model/Resource/Roles.php
@@ -36,6 +36,22 @@ class Mage_Api_Model_Resource_Roles extends Mage_Core_Model_Resource_Db_Abstract
*/
protected $_ruleTable;
+ /**
+ * Get role users
+ *
+ * @return array
+ */
+ public function getRoleUsers(Mage_Api_Model_Roles $role)
+ {
+ $adapter = $this->_getReadAdapter();
+ $select = $adapter->select()
+ ->from($this->getMainTable(), ['user_id'])
+ ->where('parent_id = ?', $role->getId())
+ ->where('role_type = ?', Mage_Api_Model_Acl::ROLE_TYPE_USER)
+ ->where('user_id > 0');
+ return $adapter->fetchCol($select);
+ }
+
protected function _construct()
{
$this->_init('api/role', 'role_id');
@@ -96,22 +112,6 @@ protected function _afterDelete(Mage_Core_Model_Abstract $role)
return $this;
}
- /**
- * Get role users
- *
- * @return array
- */
- public function getRoleUsers(Mage_Api_Model_Roles $role)
- {
- $adapter = $this->_getReadAdapter();
- $select = $adapter->select()
- ->from($this->getMainTable(), ['user_id'])
- ->where('parent_id = ?', $role->getId())
- ->where('role_type = ?', Mage_Api_Model_Acl::ROLE_TYPE_USER)
- ->where('user_id > 0');
- return $adapter->fetchCol($select);
- }
-
/**
* Update role users
*
diff --git a/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php b/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php
index c9fb0bca65b..429f95b4d39 100644
--- a/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php
+++ b/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php
@@ -22,6 +22,15 @@
*/
class Mage_Api_Model_Resource_Roles_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
+ /**
+ * Convert items array to array for select options
+ *
+ * @return array
+ */
+ public function toOptionArray()
+ {
+ return $this->_toOptionArray('role_id', 'role_name');
+ }
/**
* Resource collection initialization
*
@@ -42,14 +51,4 @@ protected function _initSelect()
$this->getSelect()->where('main_table.role_type = ?', Mage_Api_Model_Acl::ROLE_TYPE_GROUP);
return $this;
}
-
- /**
- * Convert items array to array for select options
- *
- * @return array
- */
- public function toOptionArray()
- {
- return $this->_toOptionArray('role_id', 'role_name');
- }
}
diff --git a/app/code/core/Mage/Api/Model/Resource/Rules.php b/app/code/core/Mage/Api/Model/Resource/Rules.php
index 2960fcb86bb..a0e8eac63ff 100644
--- a/app/code/core/Mage/Api/Model/Resource/Rules.php
+++ b/app/code/core/Mage/Api/Model/Resource/Rules.php
@@ -22,11 +22,6 @@
*/
class Mage_Api_Model_Resource_Rules extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('api/rule', 'rule_id');
- }
-
/**
* Save rule
*/
@@ -68,4 +63,8 @@ public function saveRel(Mage_Api_Model_Rules $rule)
$adapter->rollBack();
}
}
+ protected function _construct()
+ {
+ $this->_init('api/rule', 'rule_id');
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php b/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php
index e21ef1cb475..80c3ed87645 100644
--- a/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php
+++ b/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php
@@ -22,15 +22,6 @@
*/
class Mage_Api_Model_Resource_Rules_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Resource collection initialization
- *
- */
- protected function _construct()
- {
- $this->_init('api/rules');
- }
-
/**
* Retrieve rules by role
*
@@ -54,4 +45,12 @@ public function addSortByLength()
->order('length DESC');
return $this;
}
+ /**
+ * Resource collection initialization
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('api/rules');
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Resource/User.php b/app/code/core/Mage/Api/Model/Resource/User.php
index 12c0082534f..92906539ac8 100644
--- a/app/code/core/Mage/Api/Model/Resource/User.php
+++ b/app/code/core/Mage/Api/Model/Resource/User.php
@@ -22,31 +22,6 @@
*/
class Mage_Api_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('api/user', 'user_id');
- }
-
- /**
- * Initialize unique fields
- *
- * @return $this
- */
- protected function _initUniqueFields()
- {
- $this->_uniqueFields = [
- [
- 'field' => 'email',
- 'title' => Mage::helper('api')->__('Email'),
- ],
- [
- 'field' => 'username',
- 'title' => Mage::helper('api')->__('User Name'),
- ],
- ];
- return $this;
- }
-
/**
* Authenticate user by $username and $password
*
@@ -204,21 +179,6 @@ public function hasAssigned2Role($user)
return $result;
}
- /**
- * Action before save
- *
- * @return $this
- */
- protected function _beforeSave(Mage_Core_Model_Abstract $user)
- {
- $now = Varien_Date::now();
- if (!$user->getId()) {
- $user->setCreated($now);
- }
- $user->setModified($now);
- return $this;
- }
-
/**
* Delete the object
*
@@ -416,4 +376,43 @@ public function userExists(Mage_Core_Model_Abstract $user)
->where($usersTable . '.user_id != ?', (int) $user->getId());
return $adapter->fetchRow($select);
}
+ protected function _construct()
+ {
+ $this->_init('api/user', 'user_id');
+ }
+
+ /**
+ * Initialize unique fields
+ *
+ * @return $this
+ */
+ protected function _initUniqueFields()
+ {
+ $this->_uniqueFields = [
+ [
+ 'field' => 'email',
+ 'title' => Mage::helper('api')->__('Email'),
+ ],
+ [
+ 'field' => 'username',
+ 'title' => Mage::helper('api')->__('User Name'),
+ ],
+ ];
+ return $this;
+ }
+
+ /**
+ * Action before save
+ *
+ * @return $this
+ */
+ protected function _beforeSave(Mage_Core_Model_Abstract $user)
+ {
+ $now = Varien_Date::now();
+ if (!$user->getId()) {
+ $user->setCreated($now);
+ }
+ $user->setModified($now);
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Roles.php b/app/code/core/Mage/Api/Model/Roles.php
index 68255a190f3..7ce37bd10eb 100644
--- a/app/code/core/Mage/Api/Model/Roles.php
+++ b/app/code/core/Mage/Api/Model/Roles.php
@@ -45,11 +45,6 @@ class Mage_Api_Model_Roles extends Mage_Core_Model_Abstract
*/
protected $_filters;
- protected function _construct()
- {
- $this->_init('api/roles');
- }
-
/**
* @return $this
*/
@@ -99,6 +94,29 @@ public function getRoleUsers()
return $this->getResource()->getRoleUsers($this);
}
+ /**
+ * Filter set data
+ *
+ * @return $this
+ */
+ public function filter()
+ {
+ $data = $this->getData();
+ if (!$this->_filters || !$data) {
+ return $this;
+ }
+ /** @var Mage_Core_Model_Input_Filter $filter */
+ $filter = Mage::getModel('core/input_filter');
+ $filter->setFilters($this->_filters);
+ $this->setData($filter->filter($data));
+ return $this;
+ }
+
+ protected function _construct()
+ {
+ $this->_init('api/roles');
+ }
+
/**
* @param string|null $parentName
* @param int $level
@@ -177,22 +195,4 @@ protected function _beforeSave()
parent::_beforeSave();
return $this;
}
-
- /**
- * Filter set data
- *
- * @return $this
- */
- public function filter()
- {
- $data = $this->getData();
- if (!$this->_filters || !$data) {
- return $this;
- }
- /** @var Mage_Core_Model_Input_Filter $filter */
- $filter = Mage::getModel('core/input_filter');
- $filter->setFilters($this->_filters);
- $this->setData($filter->filter($data));
- return $this;
- }
}
diff --git a/app/code/core/Mage/Api/Model/Rules.php b/app/code/core/Mage/Api/Model/Rules.php
index cf2d107bd98..088e7a9b50e 100644
--- a/app/code/core/Mage/Api/Model/Rules.php
+++ b/app/code/core/Mage/Api/Model/Rules.php
@@ -35,11 +35,6 @@
*/
class Mage_Api_Model_Rules extends Mage_Core_Model_Abstract
{
- protected function _construct()
- {
- $this->_init('api/rules');
- }
-
/**
* @return $this
*/
@@ -66,4 +61,8 @@ public function saveRel()
$this->getResource()->saveRel($this);
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('api/rules');
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
index 4ca5e114463..5ebf60f5e76 100644
--- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
+++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
@@ -36,33 +36,6 @@ class Mage_Api_Model_Server_Adapter_Soap extends Varien_Object implements Mage_A
*/
protected $_soap = null;
- /**
- * Internal constructor
- */
- protected function _construct()
- {
- $this->wsdlConfig = $this->_getWsdlConfig();
- }
-
- /**
- * Get wsdl config
- *
- * @return Varien_Object
- */
- protected function _getWsdlConfig()
- {
- $wsdlConfig = new Varien_Object();
- $queryParams = $this->getController()->getRequest()->getQuery();
- if (isset($queryParams['wsdl'])) {
- unset($queryParams['wsdl']);
- }
-
- $wsdlConfig->setUrl(Mage::helper('api')->getServiceUrl('*/*/*', ['_query' => $queryParams], true));
- $wsdlConfig->setName('Magento');
- $wsdlConfig->setHandler($this->getHandler());
- return $wsdlConfig;
- }
-
/**
* Set handler class name for webservice
*
@@ -193,6 +166,33 @@ public function fault($code, $message)
}
}
+ /**
+ * Internal constructor
+ */
+ protected function _construct()
+ {
+ $this->wsdlConfig = $this->_getWsdlConfig();
+ }
+
+ /**
+ * Get wsdl config
+ *
+ * @return Varien_Object
+ */
+ protected function _getWsdlConfig()
+ {
+ $wsdlConfig = new Varien_Object();
+ $queryParams = $this->getController()->getRequest()->getQuery();
+ if (isset($queryParams['wsdl'])) {
+ unset($queryParams['wsdl']);
+ }
+
+ $wsdlConfig->setUrl(Mage::helper('api')->getServiceUrl('*/*/*', ['_query' => $queryParams], true));
+ $wsdlConfig->setName('Magento');
+ $wsdlConfig->setHandler($this->getHandler());
+ return $wsdlConfig;
+ }
+
/**
* Check whether Soap extension is loaded
*
diff --git a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
index 2e5198c5a0c..c4a1eb8efed 100644
--- a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
+++ b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
@@ -45,125 +45,6 @@ public function handlePhpError($errorCode, $errorMessage, $errorFile, $errLine)
return true;
}
- /**
- * Retrieve webservice session
- *
- * @return Mage_Api_Model_Session
- */
- protected function _getSession()
- {
- return Mage::getSingleton('api/session');
- }
-
- /**
- * Retrieve webservice configuration
- *
- * @return Mage_Api_Model_Config
- */
- protected function _getConfig()
- {
- return Mage::getSingleton('api/config');
- }
-
- /**
- * Retrieve webservice server
- *
- * @return Mage_Api_Model_Server
- */
- protected function _getServer()
- {
- return Mage::getSingleton('api/server');
- }
-
- /**
- * Start webservice session
- *
- * @param string $sessionId
- * @return Mage_Api_Model_Server_Handler_Abstract
- */
- protected function _startSession($sessionId = null)
- {
- $this->_getSession()->setSessionId($sessionId);
- $this->_getSession()->init('api', 'api');
- return $this;
- }
-
- /**
- * Allow insta-login via HTTP Basic Auth
- *
- * @param stdClass|string|null $sessionId
- * @return $this
- * @SuppressWarnings("PHPMD.Superglobals")
- */
- protected function _instaLogin(&$sessionId)
- {
- if ($sessionId === null && !empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
- $this->_getSession()->setIsInstaLogin();
- $sessionId = $this->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
- }
- return $this;
- }
-
- /**
- * Check current user permission on resource and privilege
- *
- *
- * @param string $resource
- * @param string $privilege
- * @return bool
- */
- protected function _isAllowed($resource, $privilege = null)
- {
- return $this->_getSession()->isAllowed($resource, $privilege);
- }
-
- /**
- * Dispatch webservice fault
- *
- * @param string $faultName
- * @param string $resourceName
- * @param string $customMessage
- */
- protected function _fault($faultName, $resourceName = null, $customMessage = null)
- {
- $faults = $this->_getConfig()->getFaults($resourceName);
- if (!isset($faults[$faultName]) && !is_null($resourceName)) {
- $this->_fault($faultName);
- return;
- } elseif (!isset($faults[$faultName])) {
- $this->_fault('unknown');
- return;
- }
- $this->_getServer()->getAdapter()->fault(
- $faults[$faultName]['code'],
- (is_null($customMessage) ? $faults[$faultName]['message'] : $customMessage),
- );
- }
-
- /**
- * Retrieve webservice fault as array
- *
- * @param string $faultName
- * @param string $resourceName
- * @param string $customMessage
- * @return array
- */
- protected function _faultAsArray($faultName, $resourceName = null, $customMessage = null)
- {
- $faults = $this->_getConfig()->getFaults($resourceName);
- if (!isset($faults[$faultName]) && !is_null($resourceName)) {
- return $this->_faultAsArray($faultName);
- } elseif (!isset($faults[$faultName])) {
- return $this->_faultAsArray('unknown');
- }
-
- return [
- 'isFault' => true,
- 'faultCode' => $faults[$faultName]['code'],
- 'faultMessage' => (is_null($customMessage) ? $faults[$faultName]['message'] : $customMessage),
- ];
- }
-
/**
* Start web service session
*
@@ -188,18 +69,6 @@ public function endSession($sessionId)
return true;
}
- /**
- * @param string $resource
- * @return string
- */
- protected function _prepareResourceModelName($resource)
- {
- if ($this->_resourceSuffix !== null) {
- return $resource . $this->_resourceSuffix;
- }
- return $resource;
- }
-
/**
* Login user and Retrieve session id
*
@@ -614,4 +483,135 @@ function ($matches) {
$row,
);
}
+
+ /**
+ * Retrieve webservice session
+ *
+ * @return Mage_Api_Model_Session
+ */
+ protected function _getSession()
+ {
+ return Mage::getSingleton('api/session');
+ }
+
+ /**
+ * Retrieve webservice configuration
+ *
+ * @return Mage_Api_Model_Config
+ */
+ protected function _getConfig()
+ {
+ return Mage::getSingleton('api/config');
+ }
+
+ /**
+ * Retrieve webservice server
+ *
+ * @return Mage_Api_Model_Server
+ */
+ protected function _getServer()
+ {
+ return Mage::getSingleton('api/server');
+ }
+
+ /**
+ * Start webservice session
+ *
+ * @param string $sessionId
+ * @return Mage_Api_Model_Server_Handler_Abstract
+ */
+ protected function _startSession($sessionId = null)
+ {
+ $this->_getSession()->setSessionId($sessionId);
+ $this->_getSession()->init('api', 'api');
+ return $this;
+ }
+
+ /**
+ * Allow insta-login via HTTP Basic Auth
+ *
+ * @param stdClass|string|null $sessionId
+ * @return $this
+ * @SuppressWarnings("PHPMD.Superglobals")
+ */
+ protected function _instaLogin(&$sessionId)
+ {
+ if ($sessionId === null && !empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
+ $this->_getSession()->setIsInstaLogin();
+ $sessionId = $this->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
+ }
+ return $this;
+ }
+
+ /**
+ * Check current user permission on resource and privilege
+ *
+ *
+ * @param string $resource
+ * @param string $privilege
+ * @return bool
+ */
+ protected function _isAllowed($resource, $privilege = null)
+ {
+ return $this->_getSession()->isAllowed($resource, $privilege);
+ }
+
+ /**
+ * Dispatch webservice fault
+ *
+ * @param string $faultName
+ * @param string $resourceName
+ * @param string $customMessage
+ */
+ protected function _fault($faultName, $resourceName = null, $customMessage = null)
+ {
+ $faults = $this->_getConfig()->getFaults($resourceName);
+ if (!isset($faults[$faultName]) && !is_null($resourceName)) {
+ $this->_fault($faultName);
+ return;
+ } elseif (!isset($faults[$faultName])) {
+ $this->_fault('unknown');
+ return;
+ }
+ $this->_getServer()->getAdapter()->fault(
+ $faults[$faultName]['code'],
+ (is_null($customMessage) ? $faults[$faultName]['message'] : $customMessage),
+ );
+ }
+
+ /**
+ * Retrieve webservice fault as array
+ *
+ * @param string $faultName
+ * @param string $resourceName
+ * @param string $customMessage
+ * @return array
+ */
+ protected function _faultAsArray($faultName, $resourceName = null, $customMessage = null)
+ {
+ $faults = $this->_getConfig()->getFaults($resourceName);
+ if (!isset($faults[$faultName]) && !is_null($resourceName)) {
+ return $this->_faultAsArray($faultName);
+ } elseif (!isset($faults[$faultName])) {
+ return $this->_faultAsArray('unknown');
+ }
+
+ return [
+ 'isFault' => true,
+ 'faultCode' => $faults[$faultName]['code'],
+ 'faultMessage' => (is_null($customMessage) ? $faults[$faultName]['message'] : $customMessage),
+ ];
+ }
+
+ /**
+ * @param string $resource
+ * @return string
+ */
+ protected function _prepareResourceModelName($resource)
+ {
+ if ($this->_resourceSuffix !== null) {
+ return $resource . $this->_resourceSuffix;
+ }
+ return $resource;
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
index f7e29b61dd2..fad7b1d1df0 100644
--- a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
+++ b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
@@ -22,16 +22,6 @@
*/
class Mage_Api_Model_Server_V2_Adapter_Soap extends Mage_Api_Model_Server_Adapter_Soap
{
- /**
- * Get wsdl config
- *
- * @return Mage_Api_Model_Wsdl_Config
- */
- protected function _getWsdlConfig()
- {
- return Mage::getModel('api/wsdl_config');
- }
-
/**
* Run webservice
*
@@ -83,4 +73,13 @@ public function run()
return $this;
}
+ /**
+ * Get wsdl config
+ *
+ * @return Mage_Api_Model_Wsdl_Config
+ */
+ protected function _getWsdlConfig()
+ {
+ return Mage::getModel('api/wsdl_config');
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php
index 54f73e8ccfa..56e6bc6340d 100644
--- a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php
+++ b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php
@@ -22,19 +22,6 @@
*/
class Mage_Api_Model_Server_Wsi_Adapter_Soap extends Mage_Api_Model_Server_Adapter_Soap
{
- /**
- * Get wsdl config
- *
- * @return Mage_Api_Model_Wsdl_Config
- */
- protected function _getWsdlConfig()
- {
- $wsdlConfig = Mage::getModel('api/wsdl_config');
- $wsdlConfig->setHandler($this->getHandler())
- ->init();
- return $wsdlConfig;
- }
-
/**
* Run webservice
*
@@ -104,4 +91,16 @@ public function run()
return $this;
}
+ /**
+ * Get wsdl config
+ *
+ * @return Mage_Api_Model_Wsdl_Config
+ */
+ protected function _getWsdlConfig()
+ {
+ $wsdlConfig = Mage::getModel('api/wsdl_config');
+ $wsdlConfig->setHandler($this->getHandler())
+ ->init();
+ return $wsdlConfig;
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php
index e396035ab46..772948042c2 100644
--- a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php
+++ b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php
@@ -95,35 +95,6 @@ public function login($username, $apiKey = null)
return $stdObject;
}
- /**
- * Return called class and method names
- *
- * @param String $apiPath
- * @return array|void
- */
- protected function _getResourceName($apiPath)
- {
- list($resourceName, $methodName) = explode('.', $apiPath);
-
- if (empty($resourceName) || empty($methodName)) {
- $this->_fault('resource_path_invalid');
- return;
- }
-
- $resourcesAlias = $this->_getConfig()->getResourcesAlias();
- $resources = $this->_getConfig()->getResources();
- if (isset($resourcesAlias->$resourceName)) {
- $resourceName = (string) $resourcesAlias->$resourceName;
- }
-
- $methodInfo = $resources->$resourceName->methods->$methodName;
- $modelName = $this->_prepareResourceModelName((string) $resources->$resourceName->model);
- $modelClass = Mage::getConfig()->getModelClassName($modelName);
- $method = (isset($methodInfo->method) ? (string) $methodInfo->method : $methodName);
-
- return [$modelClass, $method];
- }
-
/**
* Return an array of parameters for the callable method.
*
@@ -178,4 +149,33 @@ public function endSession($sessionId)
$stdObject->result = parent::endSession($sessionId->sessionId);
return $stdObject;
}
+
+ /**
+ * Return called class and method names
+ *
+ * @param String $apiPath
+ * @return array|void
+ */
+ protected function _getResourceName($apiPath)
+ {
+ list($resourceName, $methodName) = explode('.', $apiPath);
+
+ if (empty($resourceName) || empty($methodName)) {
+ $this->_fault('resource_path_invalid');
+ return;
+ }
+
+ $resourcesAlias = $this->_getConfig()->getResourcesAlias();
+ $resources = $this->_getConfig()->getResources();
+ if (isset($resourcesAlias->$resourceName)) {
+ $resourceName = (string) $resourcesAlias->$resourceName;
+ }
+
+ $methodInfo = $resources->$resourceName->methods->$methodName;
+ $modelName = $this->_prepareResourceModelName((string) $resources->$resourceName->model);
+ $modelClass = Mage::getConfig()->getModelClassName($modelName);
+ $method = (isset($methodInfo->method) ? (string) $methodInfo->method : $methodName);
+
+ return [$modelClass, $method];
+ }
}
diff --git a/app/code/core/Mage/Api/Model/User.php b/app/code/core/Mage/Api/Model/User.php
index f9d76f1487f..e287fd84499 100644
--- a/app/code/core/Mage/Api/Model/User.php
+++ b/app/code/core/Mage/Api/Model/User.php
@@ -65,11 +65,6 @@ class Mage_Api_Model_User extends Mage_Core_Model_Abstract
*/
protected $_eventPrefix = 'api_user';
- protected function _construct()
- {
- $this->_init('api/user');
- }
-
/**
* @return $this
*/
@@ -339,28 +334,6 @@ public function hasAssigned2Role($user)
return $this->getResource()->hasAssigned2Role($user);
}
- /**
- * Retrieve encoded api key
- *
- * @param string $apiKey
- * @return string
- */
- protected function _getEncodedApiKey($apiKey)
- {
- return Mage::helper('core')->getHash($apiKey, Mage_Admin_Model_User::HASH_SALT_LENGTH);
- }
-
- /**
- * Get helper instance
- *
- * @param string $helperName
- * @return Mage_Core_Helper_Abstract
- */
- protected function _getHelper($helperName)
- {
- return Mage::helper($helperName);
- }
-
/**
* Validate user attribute values.
*
@@ -422,6 +395,33 @@ public function validate()
return (array) $errors;
}
+ protected function _construct()
+ {
+ $this->_init('api/user');
+ }
+
+ /**
+ * Retrieve encoded api key
+ *
+ * @param string $apiKey
+ * @return string
+ */
+ protected function _getEncodedApiKey($apiKey)
+ {
+ return Mage::helper('core')->getHash($apiKey, Mage_Admin_Model_User::HASH_SALT_LENGTH);
+ }
+
+ /**
+ * Get helper instance
+ *
+ * @param string $helperName
+ * @return Mage_Core_Helper_Abstract
+ */
+ protected function _getHelper($helperName)
+ {
+ return Mage::helper($helperName);
+ }
+
/**
* Get min customer password length
*
diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config.php b/app/code/core/Mage/Api/Model/Wsdl/Config.php
index 72a5d5579be..92051a5c351 100644
--- a/app/code/core/Mage/Api/Model/Wsdl/Config.php
+++ b/app/code/core/Mage/Api/Model/Wsdl/Config.php
@@ -68,36 +68,6 @@ public function getCache()
return Mage::app()->getCache();
}
- /**
- * @param string $id
- * @return bool|mixed
- */
- protected function _loadCache($id)
- {
- return Mage::app()->loadCache($id);
- }
-
- /**
- * @param string $data
- * @param string $id
- * @param array $tags
- * @param int|false|null $lifetime
- * @return bool|Mage_Core_Model_App
- */
- protected function _saveCache($data, $id, $tags = [], $lifetime = false)
- {
- return Mage::app()->saveCache($data, $id, $tags, $lifetime);
- }
-
- /**
- * @param string $id
- * @return Mage_Core_Model_App
- */
- protected function _removeCache($id)
- {
- return Mage::app()->removeCache($id);
- }
-
/**
* @return $this
*/
@@ -154,4 +124,34 @@ public function getXmlString()
{
return $this->getNode()->asXML();
}
+
+ /**
+ * @param string $id
+ * @return bool|mixed
+ */
+ protected function _loadCache($id)
+ {
+ return Mage::app()->loadCache($id);
+ }
+
+ /**
+ * @param string $data
+ * @param string $id
+ * @param array $tags
+ * @param int|false|null $lifetime
+ * @return bool|Mage_Core_Model_App
+ */
+ protected function _saveCache($data, $id, $tags = [], $lifetime = false)
+ {
+ return Mage::app()->saveCache($data, $id, $tags, $lifetime);
+ }
+
+ /**
+ * @param string $id
+ * @return Mage_Core_Model_App
+ */
+ protected function _removeCache($id)
+ {
+ return Mage::app()->removeCache($id);
+ }
}
diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
index ace6e7e7ec3..b763d91faa1 100644
--- a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
+++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
@@ -170,29 +170,6 @@ public function getChildren($source = null)
return self::_getChildren($source);
}
- /**
- * Return children of all namespaces
- *
- * @param Varien_Simplexml_Element $source
- * @return array
- */
- protected static function _getChildren($source)
- {
- $children = [];
- $namespaces = $source->getNamespaces(true);
-
- $isWsi = Mage::helper('api/data')->isComplianceWSI();
-
- foreach ($namespaces as $key => $value) {
- if ($key == '' || (!$isWsi && $key == 'wsdl')) {
- continue;
- }
- $children[$value] = $source->children($value);
- }
- $children[''] = $source->children('');
- return $children;
- }
-
/**
* Return if has children
*
@@ -262,4 +239,27 @@ public function getAttribute($name, $namespace = '')
$attrs = $this->attributes($namespace);
return isset($attrs[$name]) ? (string) $attrs[$name] : null;
}
+
+ /**
+ * Return children of all namespaces
+ *
+ * @param Varien_Simplexml_Element $source
+ * @return array
+ */
+ protected static function _getChildren($source)
+ {
+ $children = [];
+ $namespaces = $source->getNamespaces(true);
+
+ $isWsi = Mage::helper('api/data')->isComplianceWSI();
+
+ foreach ($namespaces as $key => $value) {
+ if ($key == '' || (!$isWsi && $key == 'wsdl')) {
+ continue;
+ }
+ $children[$value] = $source->children($value);
+ }
+ $children[''] = $source->children('');
+ return $children;
+ }
}
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
index 9b316a2da32..b56960ec750 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
@@ -28,34 +28,6 @@ public function __construct()
$this->setTemplate('api2/attribute/buttons.phtml');
}
- /**
- * Prepare global layout
- *
- * @return Mage_Core_Block_Abstract
- */
- protected function _prepareLayout()
- {
- $buttons = [
- 'backButton' => [
- 'label' => $this->__('Back'),
- 'onclick' => sprintf("window.location.href='%s';", $this->getUrl('*/*/')),
- 'class' => 'back',
- ],
- 'saveButton' => [
- 'label' => $this->__('Save'),
- 'onclick' => 'form.submit(); return false;',
- 'class' => 'save',
- ],
- ];
-
- foreach ($buttons as $name => $data) {
- $button = $this->getLayout()->createBlock('adminhtml/widget_button')->setData($data);
- $this->setChild($name, $button);
- }
-
- return parent::_prepareLayout();
- }
-
/**
* Get back button HTML
*
@@ -95,4 +67,32 @@ public function getCaption()
{
return $this->__('Edit');
}
+
+ /**
+ * Prepare global layout
+ *
+ * @return Mage_Core_Block_Abstract
+ */
+ protected function _prepareLayout()
+ {
+ $buttons = [
+ 'backButton' => [
+ 'label' => $this->__('Back'),
+ 'onclick' => sprintf("window.location.href='%s';", $this->getUrl('*/*/')),
+ 'class' => 'back',
+ ],
+ 'saveButton' => [
+ 'label' => $this->__('Save'),
+ 'onclick' => 'form.submit(); return false;',
+ 'class' => 'save',
+ ],
+ ];
+
+ foreach ($buttons as $name => $data) {
+ $button = $this->getLayout()->createBlock('adminhtml/widget_button')->setData($data);
+ $this->setChild($name, $button);
+ }
+
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php
index e2a7d3ebeaa..7a427b309c1 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php
@@ -33,6 +33,36 @@ public function __construct($attributes = [])
$this->setId('api2_attributes');
}
+ /**
+ * Disable unnecessary functionality
+ *
+ * @return $this
+ */
+ public function _prepareLayout()
+ {
+ $this->setFilterVisibility(false);
+ $this->setPagerVisibility(false);
+
+ return $this;
+ }
+
+ /**
+ * Get row URL
+ *
+ * @param Varien_Object $row
+ * @return string|null
+ */
+ public function getRowUrl($row)
+ {
+ /** @var Mage_Admin_Model_Session $session */
+ $session = Mage::getSingleton('admin/session');
+ if ($session->isAllowed('system/api/attributes/edit')) {
+ return $this->getUrl('*/*/edit', ['type' => $row->getUserTypeCode()]);
+ }
+
+ return null;
+ }
+
/**
* Collection object set up
* @return $this
@@ -66,34 +96,4 @@ protected function _prepareColumns()
return parent::_prepareColumns();
}
-
- /**
- * Disable unnecessary functionality
- *
- * @return $this
- */
- public function _prepareLayout()
- {
- $this->setFilterVisibility(false);
- $this->setPagerVisibility(false);
-
- return $this;
- }
-
- /**
- * Get row URL
- *
- * @param Varien_Object $row
- * @return string|null
- */
- public function getRowUrl($row)
- {
- /** @var Mage_Admin_Model_Session $session */
- $session = Mage::getSingleton('admin/session');
- if ($session->isAllowed('system/api/attributes/edit')) {
- return $this->getUrl('*/*/edit', ['type' => $row->getUserTypeCode()]);
- }
-
- return null;
- }
}
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php b/app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php
index 20eacfa0580..f1fe16fa255 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php
@@ -40,6 +40,59 @@ public function __construct()
->setUseAjax(true);
}
+ /**
+ * Prepare label for tab
+ *
+ * @return string
+ */
+ public function getTabLabel()
+ {
+ return $this->__('REST Role');
+ }
+
+ /**
+ * Prepare title for tab
+ *
+ * @return string
+ */
+ public function getTabTitle()
+ {
+ return $this->__('REST Role');
+ }
+
+ /**
+ * Returns status flag about this tab can be shown or not
+ *
+ * @return true
+ */
+ public function canShowTab()
+ {
+ return true;
+ }
+
+ /**
+ * Returns status flag about this tab hidden or not
+ *
+ * @return false
+ */
+ public function isHidden()
+ {
+ return false;
+ }
+
+ /**
+ * Get controller action url for grid ajax actions
+ *
+ * @return string
+ */
+ public function getGridUrl()
+ {
+ return $this->getUrl(
+ '*/api2_role/rolesGrid',
+ ['user_id' => Mage::registry('permissions_user')->getUserId()],
+ );
+ }
+
/**
* Prepare grid collection object
*
@@ -130,57 +183,4 @@ protected function _getSelectedRoles()
return $this->_selectedRoles;
}
-
- /**
- * Prepare label for tab
- *
- * @return string
- */
- public function getTabLabel()
- {
- return $this->__('REST Role');
- }
-
- /**
- * Prepare title for tab
- *
- * @return string
- */
- public function getTabTitle()
- {
- return $this->__('REST Role');
- }
-
- /**
- * Returns status flag about this tab can be shown or not
- *
- * @return true
- */
- public function canShowTab()
- {
- return true;
- }
-
- /**
- * Returns status flag about this tab hidden or not
- *
- * @return false
- */
- public function isHidden()
- {
- return false;
- }
-
- /**
- * Get controller action url for grid ajax actions
- *
- * @return string
- */
- public function getGridUrl()
- {
- return $this->getUrl(
- '*/api2_role/rolesGrid',
- ['user_id' => Mage::registry('permissions_user')->getUserId()],
- );
- }
}
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
index 5e2dbcc3f15..823cb3e8f7e 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
@@ -31,43 +31,6 @@ public function __construct()
$this->setTemplate('api2/role/buttons.phtml');
}
- /**
- * Preparing global layout
- *
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- $buttons = [
- 'backButton' => [
- 'label' => Mage::helper('adminhtml')->__('Back'),
- 'onclick' => sprintf("window.location.href='%s';", $this->getUrl('*/*/')),
- 'class' => 'back',
- ],
- 'resetButton' => [
- 'label' => Mage::helper('adminhtml')->__('Reset'),
- 'onclick' => 'window.location.reload()',
- ],
- 'saveButton' => [
- 'label' => Mage::helper('adminhtml')->__('Save Role'),
- 'onclick' => 'roleForm.submit(); return false;',
- 'class' => 'save',
- ],
- 'deleteButton' => [
- 'label' => Mage::helper('adminhtml')->__('Delete Role'),
- 'onclick' => '', //roleId is not set at this moment, so we set script later
- 'class' => 'delete',
- ],
- ];
-
- foreach ($buttons as $name => $data) {
- $button = $this->getLayout()->createBlock('adminhtml/widget_button')->setData($data);
- $this->setChild($name, $button);
- }
-
- return parent::_prepareLayout();
- }
-
/**
* Get back button HTML
*
@@ -131,4 +94,41 @@ public function getCaption()
? ($this->__('Edit Role') . " '{$this->escapeHtml($this->getRole()->getRoleName())}'")
: $this->__('Add New Role');
}
+
+ /**
+ * Preparing global layout
+ *
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ $buttons = [
+ 'backButton' => [
+ 'label' => Mage::helper('adminhtml')->__('Back'),
+ 'onclick' => sprintf("window.location.href='%s';", $this->getUrl('*/*/')),
+ 'class' => 'back',
+ ],
+ 'resetButton' => [
+ 'label' => Mage::helper('adminhtml')->__('Reset'),
+ 'onclick' => 'window.location.reload()',
+ ],
+ 'saveButton' => [
+ 'label' => Mage::helper('adminhtml')->__('Save Role'),
+ 'onclick' => 'roleForm.submit(); return false;',
+ 'class' => 'save',
+ ],
+ 'deleteButton' => [
+ 'label' => Mage::helper('adminhtml')->__('Delete Role'),
+ 'onclick' => '', //roleId is not set at this moment, so we set script later
+ 'class' => 'delete',
+ ],
+ ];
+
+ foreach ($buttons as $name => $data) {
+ $button = $this->getLayout()->createBlock('adminhtml/widget_button')->setData($data);
+ $this->setChild($name, $button);
+ }
+
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php
index 066dbe592e3..51e0739b106 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php
@@ -32,53 +32,6 @@ public function __construct()
->setDefaultDir(Varien_Db_Select::SQL_DESC);
}
- /**
- * Prepare collection
- *
- * @return $this
- */
- protected function _prepareCollection()
- {
- /** @var Mage_Api2_Model_Resource_Acl_Global_Role_Collection $collection */
- $collection = Mage::getModel('api2/acl_global_role')->getCollection();
- $this->setCollection($collection);
- parent::_prepareCollection();
- return $this;
- }
-
- /**
- * Prepare columns
- *
- * @return $this
- */
- protected function _prepareColumns()
- {
- $this->addColumn('entity_id', [
- 'header' => Mage::helper('oauth')->__('ID'),
- 'index' => 'entity_id',
- ]);
-
- $this->addColumn('role_name', [
- 'header' => Mage::helper('oauth')->__('Role Name'),
- 'index' => 'role_name',
- 'escape' => true,
- ]);
-
- $this->addColumn('tole_user_type', [
- 'header' => Mage::helper('oauth')->__('User Type'),
- 'sortable' => false,
- 'frame_callback' => [$this, 'decorateUserType'],
- ]);
-
- $this->addColumn('created_at', [
- 'header' => Mage::helper('oauth')->__('Created At'),
- 'index' => 'created_at',
- ]);
-
- parent::_prepareColumns();
- return $this;
- }
-
/**
* Get grid URL
*
@@ -130,4 +83,51 @@ public function decorateUserType($renderedValue, $row, $column, $isExport)
}
return $userType;
}
+
+ /**
+ * Prepare collection
+ *
+ * @return $this
+ */
+ protected function _prepareCollection()
+ {
+ /** @var Mage_Api2_Model_Resource_Acl_Global_Role_Collection $collection */
+ $collection = Mage::getModel('api2/acl_global_role')->getCollection();
+ $this->setCollection($collection);
+ parent::_prepareCollection();
+ return $this;
+ }
+
+ /**
+ * Prepare columns
+ *
+ * @return $this
+ */
+ protected function _prepareColumns()
+ {
+ $this->addColumn('entity_id', [
+ 'header' => Mage::helper('oauth')->__('ID'),
+ 'index' => 'entity_id',
+ ]);
+
+ $this->addColumn('role_name', [
+ 'header' => Mage::helper('oauth')->__('Role Name'),
+ 'index' => 'role_name',
+ 'escape' => true,
+ ]);
+
+ $this->addColumn('tole_user_type', [
+ 'header' => Mage::helper('oauth')->__('User Type'),
+ 'sortable' => false,
+ 'frame_callback' => [$this, 'decorateUserType'],
+ ]);
+
+ $this->addColumn('created_at', [
+ 'header' => Mage::helper('oauth')->__('Created At'),
+ 'index' => 'created_at',
+ ]);
+
+ parent::_prepareColumns();
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php
index 42dbe261288..9c4e2c60b6e 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php
@@ -25,6 +25,55 @@
*/
class Mage_Api2_Block_Adminhtml_Roles_Tab_Info extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface
{
+ /**
+ * Get tab label
+ *
+ * @return string
+ */
+ public function getTabLabel()
+ {
+ return Mage::helper('api2')->__('Role Info');
+ }
+
+ /**
+ * Get tab title
+ *
+ * @return string
+ */
+ public function getTabTitle()
+ {
+ return $this->getTabLabel();
+ }
+
+ /**
+ * Whether tab is available
+ *
+ * @return bool
+ */
+ public function canShowTab()
+ {
+ return true;
+ }
+
+ /**
+ * Whether tab is hidden
+ *
+ * @return bool
+ */
+ public function isHidden()
+ {
+ return false;
+ }
+
+ /**
+ * Whether role is system
+ *
+ * @return bool
+ */
+ public function isRoleSystem()
+ {
+ return $this->getRole() && Mage_Api2_Model_Acl_Global_Role::isSystemRole($this->getRole());
+ }
/**
* Prepare form object
*/
@@ -89,54 +138,4 @@ protected function _prepareForm()
$this->setForm($form);
return $this;
}
-
- /**
- * Get tab label
- *
- * @return string
- */
- public function getTabLabel()
- {
- return Mage::helper('api2')->__('Role Info');
- }
-
- /**
- * Get tab title
- *
- * @return string
- */
- public function getTabTitle()
- {
- return $this->getTabLabel();
- }
-
- /**
- * Whether tab is available
- *
- * @return bool
- */
- public function canShowTab()
- {
- return true;
- }
-
- /**
- * Whether tab is hidden
- *
- * @return bool
- */
- public function isHidden()
- {
- return false;
- }
-
- /**
- * Whether role is system
- *
- * @return bool
- */
- public function isRoleSystem()
- {
- return $this->getRole() && Mage_Api2_Model_Acl_Global_Role::isSystemRole($this->getRole());
- }
}
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php
index 1a844dbe565..734457c5a19 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php
@@ -38,64 +38,6 @@ public function __construct()
$this->setDefaultFilter(['filter_in_role_users' => 1]);
}
- /**
- * Prepare collection
- *
- * @return $this
- */
- protected function _prepareCollection()
- {
- /** @var Mage_Admin_Model_Resource_User_Collection $collection */
- $collection = Mage::getModel('admin/user')->getCollection();
- $collection->getSelect()->joinLeft(
- ['acl' => $collection->getTable('api2/acl_user')],
- 'acl.admin_id = main_table.user_id',
- 'role_id',
- );
- if ($this->getRole() && $this->getRole()->getId()) {
- $collection->addFilter('acl.role_id', $this->getRole()->getId());
- }
-
- $this->setCollection($collection);
- parent::_prepareCollection();
- return $this;
- }
-
- /**
- * Prepare columns
- *
- * @inheritDoc
- */
- protected function _prepareColumns()
- {
- $this->addColumn('filter_in_role_users', [
- 'header_css_class' => 'a-center',
- 'type' => 'checkbox',
- 'name' => 'filter_in_role_users',
- 'values' => $this->getUsers(),
- 'align' => 'center',
- 'index' => 'user_id',
- ]);
-
- $this->addColumn('user_id', [
- 'header' => Mage::helper('api2')->__('ID'), 'index' => 'user_id', 'align' => 'right', 'width' => '50px',
- ]);
-
- $this->addColumn('username', [
- 'header' => Mage::helper('adminhtml')->__('User Name'), 'align' => 'left', 'index' => 'username',
- ]);
-
- $this->addColumn('firstname', [
- 'header' => Mage::helper('adminhtml')->__('First Name'), 'align' => 'left', 'index' => 'firstname',
- ]);
-
- $this->addColumn('lastname', [
- 'header' => Mage::helper('adminhtml')->__('Last Name'), 'align' => 'left', 'index' => 'lastname',
- ]);
-
- return parent::_prepareColumns();
- }
-
/**
* Get grid URL
*
@@ -170,31 +112,6 @@ public function _toHtml()
return '';
}
- /**
- * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
- * @return $this
- */
- protected function _addColumnFilterToCollection($column)
- {
- if ($column->getId() == 'filter_in_role_users') {
- $inRoleIds = $this->getUsers();
- if (empty($inRoleIds)) {
- $inRoleIds = 0;
- }
-
- if ($column->getFilter()->getValue()) {
- $this->getCollection()->addFieldToFilter('user_id', ['in' => $inRoleIds]);
- } else {
- if ($inRoleIds) {
- $this->getCollection()->addFieldToFilter('user_id', ['nin' => $inRoleIds]);
- }
- }
- } else {
- parent::_addColumnFilterToCollection($column);
- }
- return $this;
- }
-
/**
* Get users
*
@@ -222,4 +139,87 @@ public function getUsers($json = false)
return $result;
}
+
+ /**
+ * Prepare collection
+ *
+ * @return $this
+ */
+ protected function _prepareCollection()
+ {
+ /** @var Mage_Admin_Model_Resource_User_Collection $collection */
+ $collection = Mage::getModel('admin/user')->getCollection();
+ $collection->getSelect()->joinLeft(
+ ['acl' => $collection->getTable('api2/acl_user')],
+ 'acl.admin_id = main_table.user_id',
+ 'role_id',
+ );
+ if ($this->getRole() && $this->getRole()->getId()) {
+ $collection->addFilter('acl.role_id', $this->getRole()->getId());
+ }
+
+ $this->setCollection($collection);
+ parent::_prepareCollection();
+ return $this;
+ }
+
+ /**
+ * Prepare columns
+ *
+ * @inheritDoc
+ */
+ protected function _prepareColumns()
+ {
+ $this->addColumn('filter_in_role_users', [
+ 'header_css_class' => 'a-center',
+ 'type' => 'checkbox',
+ 'name' => 'filter_in_role_users',
+ 'values' => $this->getUsers(),
+ 'align' => 'center',
+ 'index' => 'user_id',
+ ]);
+
+ $this->addColumn('user_id', [
+ 'header' => Mage::helper('api2')->__('ID'), 'index' => 'user_id', 'align' => 'right', 'width' => '50px',
+ ]);
+
+ $this->addColumn('username', [
+ 'header' => Mage::helper('adminhtml')->__('User Name'), 'align' => 'left', 'index' => 'username',
+ ]);
+
+ $this->addColumn('firstname', [
+ 'header' => Mage::helper('adminhtml')->__('First Name'), 'align' => 'left', 'index' => 'firstname',
+ ]);
+
+ $this->addColumn('lastname', [
+ 'header' => Mage::helper('adminhtml')->__('Last Name'), 'align' => 'left', 'index' => 'lastname',
+ ]);
+
+ return parent::_prepareColumns();
+ }
+
+ /**
+ * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
+ * @return $this
+ */
+ protected function _addColumnFilterToCollection($column)
+ {
+ if ($column->getId() == 'filter_in_role_users') {
+ $inRoleIds = $this->getUsers();
+ if (empty($inRoleIds)) {
+ $inRoleIds = 0;
+ }
+
+ if ($column->getFilter()->getValue()) {
+ $this->getCollection()->addFieldToFilter('user_id', ['in' => $inRoleIds]);
+ } else {
+ if ($inRoleIds) {
+ $this->getCollection()->addFieldToFilter('user_id', ['nin' => $inRoleIds]);
+ }
+ }
+ } else {
+ parent::_addColumnFilterToCollection($column);
+ }
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Api2/Helper/Data.php b/app/code/core/Mage/Api2/Helper/Data.php
index 369ca5c61fb..1daaca79ad4 100644
--- a/app/code/core/Mage/Api2/Helper/Data.php
+++ b/app/code/core/Mage/Api2/Helper/Data.php
@@ -40,21 +40,6 @@ class Mage_Api2_Helper_Data extends Mage_Core_Helper_Abstract
protected $_moduleName = 'Mage_Api2';
- /**
- * Compare order to be used in adapters list sort
- *
- * @param array $a
- * @param array $b
- * @return int
- */
- protected static function _compareOrder($a, $b)
- {
- if ($a['order'] == $b['order']) {
- return 0;
- }
- return ($a['order'] < $b['order']) ? -1 : 1;
- }
-
/**
* Retrieve Auth adapters info from configuration file as array
*
@@ -185,4 +170,19 @@ public function getTypeOfOperation($operation)
throw new Exception('Can not determine operation type');
}
}
+
+ /**
+ * Compare order to be used in adapters list sort
+ *
+ * @param array $a
+ * @param array $b
+ * @return int
+ */
+ protected static function _compareOrder($a, $b)
+ {
+ if ($a['order'] == $b['order']) {
+ return 0;
+ }
+ return ($a['order'] < $b['order']) ? -1 : 1;
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Acl.php b/app/code/core/Mage/Api2/Model/Acl.php
index b235e5f7b90..4406dedd431 100644
--- a/app/code/core/Mage/Api2/Model/Acl.php
+++ b/app/code/core/Mage/Api2/Model/Acl.php
@@ -69,6 +69,22 @@ public function __construct($options)
$this->_setRules();
}
+ /**
+ * Adds a Role having an identifier unique to the registry
+ * OVERRIDE to allow numeric roles identifiers
+ *
+ * @param int $roleId Role identifier
+ * @param Zend_Acl_Role_Interface|string|array $parents
+ * @return Zend_Acl Provides a fluent interface
+ */
+ public function addRole($roleId, $parents = null)
+ {
+ if (!is_numeric($roleId)) {
+ throw new Exception('Invalid role identifier');
+ }
+ return parent::addRole((string) $roleId);
+ }
+
/**
* Retrieve REST ACL roles collection
*
@@ -155,20 +171,4 @@ protected function _setRules()
}
return $this;
}
-
- /**
- * Adds a Role having an identifier unique to the registry
- * OVERRIDE to allow numeric roles identifiers
- *
- * @param int $roleId Role identifier
- * @param Zend_Acl_Role_Interface|string|array $parents
- * @return Zend_Acl Provides a fluent interface
- */
- public function addRole($roleId, $parents = null)
- {
- if (!is_numeric($roleId)) {
- throw new Exception('Invalid role identifier');
- }
- return parent::addRole((string) $roleId);
- }
}
diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter.php b/app/code/core/Mage/Api2/Model/Acl/Filter.php
index 2141be89c69..2286f4f52d2 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Filter.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Filter.php
@@ -51,23 +51,6 @@ public function __construct(Mage_Api2_Model_Resource $resource)
$this->_resource = $resource;
}
- /**
- * Return only the data which keys are allowed
- *
- * @param array $allowedAttributes List of attributes available to use
- * @param array $data Associative array attribute to value
- * @return array
- */
- protected function _filter(array $allowedAttributes, array $data)
- {
- foreach (array_keys($data) as $attribute) {
- if (!in_array($attribute, $allowedAttributes)) {
- unset($data[$attribute]);
- }
- }
- return $data;
- }
-
/**
* Strip attributes in of collection items
*
@@ -179,4 +162,21 @@ public function out(array $retrievedData)
{
return $this->_filter($this->getAttributesToInclude(), $retrievedData);
}
+
+ /**
+ * Return only the data which keys are allowed
+ *
+ * @param array $allowedAttributes List of attributes available to use
+ * @param array $data Associative array attribute to value
+ * @return array
+ */
+ protected function _filter(array $allowedAttributes, array $data)
+ {
+ foreach (array_keys($data) as $attribute) {
+ if (!in_array($attribute, $allowedAttributes)) {
+ unset($data[$attribute]);
+ }
+ }
+ return $data;
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php
index 62d7cfea373..0d0dc96cdd4 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php
@@ -42,11 +42,6 @@ class Mage_Api2_Model_Acl_Filter_Attribute extends Mage_Core_Model_Abstract
*/
protected $_permissionModel;
- protected function _construct()
- {
- $this->_init('api2/acl_filter_attribute');
- }
-
/**
* Get pairs resources-permissions for current attribute
*
@@ -59,4 +54,9 @@ public function getPermissionModel()
}
return $this->_permissionModel;
}
+
+ protected function _construct()
+ {
+ $this->_init('api2/acl_filter_attribute');
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Role.php b/app/code/core/Mage/Api2/Model/Acl/Global/Role.php
index a9dcbcf4f2c..6b6a4fdfc5d 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Global/Role.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Global/Role.php
@@ -53,59 +53,6 @@ class Mage_Api2_Model_Acl_Global_Role extends Mage_Core_Model_Abstract
*/
protected $_permissionModel;
- protected function _construct()
- {
- $this->_init('api2/acl_global_role');
- }
-
- /**
- * Before save actions
- *
- * @return $this
- */
- protected function _beforeSave()
- {
- if ($this->isObjectNew() && $this->getCreatedAt() === null) {
- $this->setCreatedAt(Varien_Date::now());
- } else {
- $this->setUpdatedAt(Varien_Date::now());
- }
-
- //check and protect guest role
-
- if (self::isSystemRole($this) && $this->getRoleName() != $this->getOrigData('role_name')) {
- /** @var Mage_Core_Helper_Data $helper */
- $helper = Mage::helper('core');
-
- Mage::throwException(
- Mage::helper('api2')->__('%s role is a special one and can\'t be changed.', $helper->escapeHtml($this->getRoleName())),
- );
- }
-
- parent::_beforeSave();
- return $this;
- }
-
- /**
- * Perform checks before role delete
- *
- * @return $this
- */
- protected function _beforeDelete()
- {
- if (self::isSystemRole($this)) {
- /** @var Mage_Core_Helper_Data $helper */
- $helper = Mage::helper('core');
-
- Mage::throwException(
- Mage::helper('api2')->__('%s role is a special one and can\'t be deleted.', $helper->escapeHtml($this->getRoleName())),
- );
- }
-
- parent::_beforeDelete();
- return $this;
- }
-
/**
* Get pairs resources-permissions for current role
*
@@ -162,4 +109,57 @@ public function getConfigNodeName()
}
return $roleNodeName;
}
+
+ protected function _construct()
+ {
+ $this->_init('api2/acl_global_role');
+ }
+
+ /**
+ * Before save actions
+ *
+ * @return $this
+ */
+ protected function _beforeSave()
+ {
+ if ($this->isObjectNew() && $this->getCreatedAt() === null) {
+ $this->setCreatedAt(Varien_Date::now());
+ } else {
+ $this->setUpdatedAt(Varien_Date::now());
+ }
+
+ //check and protect guest role
+
+ if (self::isSystemRole($this) && $this->getRoleName() != $this->getOrigData('role_name')) {
+ /** @var Mage_Core_Helper_Data $helper */
+ $helper = Mage::helper('core');
+
+ Mage::throwException(
+ Mage::helper('api2')->__('%s role is a special one and can\'t be changed.', $helper->escapeHtml($this->getRoleName())),
+ );
+ }
+
+ parent::_beforeSave();
+ return $this;
+ }
+
+ /**
+ * Perform checks before role delete
+ *
+ * @return $this
+ */
+ protected function _beforeDelete()
+ {
+ if (self::isSystemRole($this)) {
+ /** @var Mage_Core_Helper_Data $helper */
+ $helper = Mage::helper('core');
+
+ Mage::throwException(
+ Mage::helper('api2')->__('%s role is a special one and can\'t be deleted.', $helper->escapeHtml($this->getRoleName())),
+ );
+ }
+
+ parent::_beforeDelete();
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
index dd1213ff628..0747fa21fac 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
@@ -131,33 +131,6 @@ public function __construct($options)
}
}
- /**
- * Initialize block
- *
- * @return $this
- * @throws Exception
- */
- protected function _init()
- {
- if ($this->_initialized) {
- return $this;
- }
-
- /** @var Mage_Api2_Model_Config $config */
- $config = Mage::getModel('api2/config');
- $this->_resourcesConfig = $config->getResourceGroups();
-
- if ($this->_type == self::TYPE_ATTRIBUTE && !$this->_existOperations) {
- throw new Exception('Operations is not set');
- }
-
- if ($this->_type == self::TYPE_PRIVILEGE && !$this->_existPrivileges) {
- throw new Exception('Privileges is not set.');
- }
-
- return $this;
- }
-
/**
* Convert to array serialized post data from tree grid
*
@@ -252,6 +225,99 @@ public function getTreeResources()
return $root[self::NAME_CHILDREN] ?? [];
}
+ /**
+ * Set role
+ *
+ * @param Mage_Api2_Model_Acl_Global_Role $role
+ * @return $this
+ */
+ public function setRole($role)
+ {
+ $this->_role = $role;
+ return $this;
+ }
+
+ /**
+ * Get role
+ *
+ * @return Mage_Api2_Model_Acl_Global_Role
+ */
+ public function getRole()
+ {
+ return $this->_role;
+ }
+
+ /**
+ * Set resources permissions
+ *
+ * @param array $resourcesPermissions
+ * @return $this
+ */
+ public function setResourcesPermissions($resourcesPermissions)
+ {
+ $this->_resourcesPermissions = $resourcesPermissions;
+ return $this;
+ }
+
+ /**
+ * Get resources permissions
+ *
+ * @return array
+ */
+ public function getResourcesPermissions()
+ {
+ return $this->_resourcesPermissions;
+ }
+
+ /**
+ * Set has entity only attributes flag
+ *
+ * @param bool $hasEntityOnlyAttributes
+ * @return $this
+ */
+ public function setHasEntityOnlyAttributes($hasEntityOnlyAttributes)
+ {
+ $this->_hasEntityOnlyAttributes = $hasEntityOnlyAttributes;
+ return $this;
+ }
+
+ /**
+ * Get has entity only attributes flag
+ *
+ * @return bool
+ */
+ public function getHasEntityOnlyAttributes()
+ {
+ return $this->_hasEntityOnlyAttributes;
+ }
+
+ /**
+ * Initialize block
+ *
+ * @return $this
+ * @throws Exception
+ */
+ protected function _init()
+ {
+ if ($this->_initialized) {
+ return $this;
+ }
+
+ /** @var Mage_Api2_Model_Config $config */
+ $config = Mage::getModel('api2/config');
+ $this->_resourcesConfig = $config->getResourceGroups();
+
+ if ($this->_type == self::TYPE_ATTRIBUTE && !$this->_existOperations) {
+ throw new Exception('Operations is not set');
+ }
+
+ if ($this->_type == self::TYPE_PRIVILEGE && !$this->_existPrivileges) {
+ throw new Exception('Privileges is not set.');
+ }
+
+ return $this;
+ }
+
/**
* Get tree node
*
@@ -463,70 +529,4 @@ protected function _sortTree($a, $b)
{
return $a['sort_order'] < $b['sort_order'] ? -1 : ($a['sort_order'] > $b['sort_order'] ? 1 : 0);
}
-
- /**
- * Set role
- *
- * @param Mage_Api2_Model_Acl_Global_Role $role
- * @return $this
- */
- public function setRole($role)
- {
- $this->_role = $role;
- return $this;
- }
-
- /**
- * Get role
- *
- * @return Mage_Api2_Model_Acl_Global_Role
- */
- public function getRole()
- {
- return $this->_role;
- }
-
- /**
- * Set resources permissions
- *
- * @param array $resourcesPermissions
- * @return $this
- */
- public function setResourcesPermissions($resourcesPermissions)
- {
- $this->_resourcesPermissions = $resourcesPermissions;
- return $this;
- }
-
- /**
- * Get resources permissions
- *
- * @return array
- */
- public function getResourcesPermissions()
- {
- return $this->_resourcesPermissions;
- }
-
- /**
- * Set has entity only attributes flag
- *
- * @param bool $hasEntityOnlyAttributes
- * @return $this
- */
- public function setHasEntityOnlyAttributes($hasEntityOnlyAttributes)
- {
- $this->_hasEntityOnlyAttributes = $hasEntityOnlyAttributes;
- return $this;
- }
-
- /**
- * Get has entity only attributes flag
- *
- * @return bool
- */
- public function getHasEntityOnlyAttributes()
- {
- return $this->_hasEntityOnlyAttributes;
- }
}
diff --git a/app/code/core/Mage/Api2/Model/Auth/Adapter.php b/app/code/core/Mage/Api2/Model/Auth/Adapter.php
index 19b94705dd8..23dd3cda2e9 100644
--- a/app/code/core/Mage/Api2/Model/Auth/Adapter.php
+++ b/app/code/core/Mage/Api2/Model/Auth/Adapter.php
@@ -29,31 +29,6 @@ class Mage_Api2_Model_Auth_Adapter
*/
protected $_adapters = [];
- /**
- * Load adapters configuration and create adapters models
- *
- * @return $this
- * @throws Exception
- */
- protected function _initAdapters()
- {
- /** @var Mage_Api2_Helper_Data $helper */
- $helper = Mage::helper('api2');
-
- foreach ($helper->getAuthAdapters(true) as $adapterKey => $adapterParams) {
- $adapterModel = Mage::getModel($adapterParams['model']);
-
- if (!$adapterModel instanceof Mage_Api2_Model_Auth_Adapter_Abstract) {
- throw new Exception('Authentication adapter must to extend Mage_Api2_Model_Auth_Adapter_Abstract');
- }
- $this->_adapters[$adapterKey] = $adapterModel;
- }
- if (!$this->_adapters) {
- throw new Exception('No active authentication adapters found');
- }
- return $this;
- }
-
/**
* Process request and figure out an API user type and its identifier
*
@@ -78,4 +53,29 @@ public function getUserParams(Mage_Api2_Model_Request $request)
}
return (object) ['type' => Mage_Api2_Model_Auth::DEFAULT_USER_TYPE, 'id' => null];
}
+
+ /**
+ * Load adapters configuration and create adapters models
+ *
+ * @return $this
+ * @throws Exception
+ */
+ protected function _initAdapters()
+ {
+ /** @var Mage_Api2_Helper_Data $helper */
+ $helper = Mage::helper('api2');
+
+ foreach ($helper->getAuthAdapters(true) as $adapterKey => $adapterParams) {
+ $adapterModel = Mage::getModel($adapterParams['model']);
+
+ if (!$adapterModel instanceof Mage_Api2_Model_Auth_Adapter_Abstract) {
+ throw new Exception('Authentication adapter must to extend Mage_Api2_Model_Auth_Adapter_Abstract');
+ }
+ $this->_adapters[$adapterKey] = $adapterModel;
+ }
+ if (!$this->_adapters) {
+ throw new Exception('No active authentication adapters found');
+ }
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Renderer/Xml.php b/app/code/core/Mage/Api2/Model/Renderer/Xml.php
index 17905230dfb..f1688459731 100644
--- a/app/code/core/Mage/Api2/Model/Renderer/Xml.php
+++ b/app/code/core/Mage/Api2/Model/Renderer/Xml.php
@@ -76,6 +76,16 @@ public function render($data)
return $writer->render();
}
+ /**
+ * Get MIME type generated by renderer
+ *
+ * @return string
+ */
+ public function getMimeType()
+ {
+ return self::MIME_TYPE;
+ }
+
/**
* Prepare convert data
*
@@ -138,14 +148,4 @@ protected function _prepareKey($key)
}
return $key;
}
-
- /**
- * Get MIME type generated by renderer
- *
- * @return string
- */
- public function getMimeType()
- {
- return self::MIME_TYPE;
- }
}
diff --git a/app/code/core/Mage/Api2/Model/Request.php b/app/code/core/Mage/Api2/Model/Request.php
index d9bf78321d4..05fe06336db 100644
--- a/app/code/core/Mage/Api2/Model/Request.php
+++ b/app/code/core/Mage/Api2/Model/Request.php
@@ -65,19 +65,6 @@ public function __construct($uri = null)
parent::__construct($uri ? $uri : null);
}
- /**
- * Get request interpreter
- *
- * @return Mage_Api2_Model_Request_Interpreter_Interface
- */
- protected function _getInterpreter()
- {
- if ($this->_interpreter === null) {
- $this->_interpreter = Mage_Api2_Model_Request_Interpreter::factory($this->getContentType());
- }
- return $this->_interpreter;
- }
-
/**
* Retrieve accept types understandable by requester in a form of array sorted by quality descending
*
@@ -311,4 +298,17 @@ public function isAssocArrayInRequestBody()
}
return false;
}
+
+ /**
+ * Get request interpreter
+ *
+ * @return Mage_Api2_Model_Request_Interpreter_Interface
+ */
+ protected function _getInterpreter()
+ {
+ if ($this->_interpreter === null) {
+ $this->_interpreter = Mage_Api2_Model_Request_Interpreter::factory($this->getContentType());
+ }
+ return $this->_interpreter;
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Resource.php b/app/code/core/Mage/Api2/Model/Resource.php
index 9d76db69a0b..146acaa8217 100644
--- a/app/code/core/Mage/Api2/Model/Resource.php
+++ b/app/code/core/Mage/Api2/Model/Resource.php
@@ -273,29 +273,6 @@ public function dispatch()
}
}
- /**
- * Trigger error for not-implemented operations
- *
- * @param string $methodName
- */
- protected function _errorIfMethodNotExist($methodName)
- {
- if (!$this->_checkMethodExist($methodName)) {
- $this->_critical(self::RESOURCE_METHOD_NOT_IMPLEMENTED);
- }
- }
-
- /**
- * Check method exist
- *
- * @param string $methodName
- * @return bool
- */
- protected function _checkMethodExist($methodName)
- {
- return method_exists($this, $methodName);
- }
-
/**
* Get request
*
@@ -592,6 +569,182 @@ public function getWorkingModel()
return Mage::getModel($this->getConfig()->getResourceWorkingModel($this->getResourceType()));
}
+ /**
+ * Set 'returnData' flag
+ *
+ * @param bool $flag
+ * @return $this
+ */
+ public function setReturnData($flag)
+ {
+ $this->_returnData = $flag;
+ return $this;
+ }
+
+ /**
+ * Get available attributes of API resource
+ *
+ * @param string $userType
+ * @param string $operation
+ * @return array
+ */
+ public function getAvailableAttributes($userType, $operation)
+ {
+ $available = $this->getAvailableAttributesFromConfig();
+ $excludedAttrs = $this->getExcludedAttributes($userType, $operation);
+ $includedAttrs = $this->getIncludedAttributes($userType, $operation);
+ $entityOnlyAttrs = $this->getEntityOnlyAttributes($userType, $operation);
+ $resourceAttrs = $this->_getResourceAttributes();
+
+ // if resource returns not-associative array - attributes' codes only
+ if (key($resourceAttrs) === 0) {
+ $resourceAttrs = array_combine($resourceAttrs, $resourceAttrs);
+ }
+ foreach ($resourceAttrs as $attrCode => $attrLabel) {
+ if (!isset($available[$attrCode])) {
+ $available[$attrCode] = empty($attrLabel) ? $attrCode : $attrLabel;
+ }
+ }
+ foreach (array_keys($available) as $code) {
+ if (in_array($code, $excludedAttrs) || ($includedAttrs && !in_array($code, $includedAttrs))) {
+ unset($available[$code]);
+ }
+ if (in_array($code, $entityOnlyAttrs)) {
+ $available[$code] .= ' *';
+ }
+ }
+ return $available;
+ }
+
+ /**
+ * Get excluded attributes for user type
+ *
+ * @param string $userType
+ * @param string $operation
+ * @return array
+ */
+ public function getExcludedAttributes($userType, $operation)
+ {
+ return $this->getConfig()->getResourceExcludedAttributes($this->getResourceType(), $userType, $operation);
+ }
+
+ /**
+ * Get forced attributes
+ *
+ * @return array
+ */
+ public function getForcedAttributes()
+ {
+ return $this->getConfig()->getResourceForcedAttributes($this->getResourceType(), $this->getUserType());
+ }
+
+ /**
+ * Retrieve list of included attributes
+ *
+ * @param string $userType API user type
+ * @param string $operationType Type of operation: one of Mage_Api2_Model_Resource::OPERATION_ATTRIBUTE_... constant
+ * @return array
+ */
+ public function getIncludedAttributes($userType, $operationType)
+ {
+ return $this->getConfig()->getResourceIncludedAttributes($this->getResourceType(), $userType, $operationType);
+ }
+
+ /**
+ * Retrieve list of entity only attributes
+ *
+ * @param string $userType API user type
+ * @param string $operationType Type of operation: one of Mage_Api2_Model_Resource::OPERATION_ATTRIBUTE_... constant
+ * @return array
+ */
+ public function getEntityOnlyAttributes($userType, $operationType)
+ {
+ return $this->getConfig()->getResourceEntityOnlyAttributes($this->getResourceType(), $userType, $operationType);
+ }
+
+ /**
+ * Get available attributes of API resource from configuration file
+ *
+ * @return array
+ */
+ public function getAvailableAttributesFromConfig()
+ {
+ return $this->getConfig()->getResourceAttributes($this->getResourceType());
+ }
+
+ /**
+ * Get available attributes of API resource from data base
+ *
+ * @return array
+ */
+ public function getDbAttributes()
+ {
+ $available = [];
+ $workModel = $this->getConfig()->getResourceWorkingModel($this->getResourceType());
+
+ if ($workModel) {
+ /** @var Mage_Core_Model_Resource_Db_Abstract $resource */
+ $resource = Mage::getResourceModel($workModel);
+
+ if (method_exists($resource, 'getMainTable')) {
+ $available = array_keys($resource->getReadConnection()->describeTable($resource->getMainTable()));
+ }
+ }
+ return $available;
+ }
+
+ /**
+ * Get EAV attributes of working model
+ *
+ * @param bool $onlyVisible OPTIONAL Show only the attributes which are visible on frontend
+ * @param bool $excludeSystem OPTIONAL Exclude attributes marked as system
+ * @return array
+ */
+ public function getEavAttributes($onlyVisible = false, $excludeSystem = false)
+ {
+ $attributes = [];
+ $model = $this->getConfig()->getResourceWorkingModel($this->getResourceType());
+
+ /** @var Mage_Eav_Model_Entity_Type $entityType */
+ $entityType = Mage::getSingleton('eav/config')->getEntityType($model, 'entity_model');
+
+ /** @var Mage_Eav_Model_Entity_Attribute $attribute */
+ foreach ($entityType->getAttributeCollection() as $attribute) {
+ if ($onlyVisible && !$attribute->getIsVisible()) {
+ continue;
+ }
+ if ($excludeSystem && $attribute->getIsSystem()) {
+ continue;
+ }
+ $attributes[$attribute->getAttributeCode()] = $attribute->getFrontendLabel();
+ }
+
+ return $attributes;
+ }
+
+ /**
+ * Trigger error for not-implemented operations
+ *
+ * @param string $methodName
+ */
+ protected function _errorIfMethodNotExist($methodName)
+ {
+ if (!$this->_checkMethodExist($methodName)) {
+ $this->_critical(self::RESOURCE_METHOD_NOT_IMPLEMENTED);
+ }
+ }
+
+ /**
+ * Check method exist
+ *
+ * @param string $methodName
+ * @return bool
+ */
+ protected function _checkMethodExist($methodName)
+ {
+ return method_exists($this, $methodName);
+ }
+
/**
* Render data using registered Renderer
*
@@ -836,18 +989,6 @@ protected function _isSubCallAllowed($resourceId)
}
}
- /**
- * Set 'returnData' flag
- *
- * @param bool $flag
- * @return $this
- */
- public function setReturnData($flag)
- {
- $this->_returnData = $flag;
- return $this;
- }
-
/**
* Get resource location
*
@@ -881,147 +1022,6 @@ protected function _getResourceAttributes()
return [];
}
- /**
- * Get available attributes of API resource
- *
- * @param string $userType
- * @param string $operation
- * @return array
- */
- public function getAvailableAttributes($userType, $operation)
- {
- $available = $this->getAvailableAttributesFromConfig();
- $excludedAttrs = $this->getExcludedAttributes($userType, $operation);
- $includedAttrs = $this->getIncludedAttributes($userType, $operation);
- $entityOnlyAttrs = $this->getEntityOnlyAttributes($userType, $operation);
- $resourceAttrs = $this->_getResourceAttributes();
-
- // if resource returns not-associative array - attributes' codes only
- if (key($resourceAttrs) === 0) {
- $resourceAttrs = array_combine($resourceAttrs, $resourceAttrs);
- }
- foreach ($resourceAttrs as $attrCode => $attrLabel) {
- if (!isset($available[$attrCode])) {
- $available[$attrCode] = empty($attrLabel) ? $attrCode : $attrLabel;
- }
- }
- foreach (array_keys($available) as $code) {
- if (in_array($code, $excludedAttrs) || ($includedAttrs && !in_array($code, $includedAttrs))) {
- unset($available[$code]);
- }
- if (in_array($code, $entityOnlyAttrs)) {
- $available[$code] .= ' *';
- }
- }
- return $available;
- }
-
- /**
- * Get excluded attributes for user type
- *
- * @param string $userType
- * @param string $operation
- * @return array
- */
- public function getExcludedAttributes($userType, $operation)
- {
- return $this->getConfig()->getResourceExcludedAttributes($this->getResourceType(), $userType, $operation);
- }
-
- /**
- * Get forced attributes
- *
- * @return array
- */
- public function getForcedAttributes()
- {
- return $this->getConfig()->getResourceForcedAttributes($this->getResourceType(), $this->getUserType());
- }
-
- /**
- * Retrieve list of included attributes
- *
- * @param string $userType API user type
- * @param string $operationType Type of operation: one of Mage_Api2_Model_Resource::OPERATION_ATTRIBUTE_... constant
- * @return array
- */
- public function getIncludedAttributes($userType, $operationType)
- {
- return $this->getConfig()->getResourceIncludedAttributes($this->getResourceType(), $userType, $operationType);
- }
-
- /**
- * Retrieve list of entity only attributes
- *
- * @param string $userType API user type
- * @param string $operationType Type of operation: one of Mage_Api2_Model_Resource::OPERATION_ATTRIBUTE_... constant
- * @return array
- */
- public function getEntityOnlyAttributes($userType, $operationType)
- {
- return $this->getConfig()->getResourceEntityOnlyAttributes($this->getResourceType(), $userType, $operationType);
- }
-
- /**
- * Get available attributes of API resource from configuration file
- *
- * @return array
- */
- public function getAvailableAttributesFromConfig()
- {
- return $this->getConfig()->getResourceAttributes($this->getResourceType());
- }
-
- /**
- * Get available attributes of API resource from data base
- *
- * @return array
- */
- public function getDbAttributes()
- {
- $available = [];
- $workModel = $this->getConfig()->getResourceWorkingModel($this->getResourceType());
-
- if ($workModel) {
- /** @var Mage_Core_Model_Resource_Db_Abstract $resource */
- $resource = Mage::getResourceModel($workModel);
-
- if (method_exists($resource, 'getMainTable')) {
- $available = array_keys($resource->getReadConnection()->describeTable($resource->getMainTable()));
- }
- }
- return $available;
- }
-
- /**
- * Get EAV attributes of working model
- *
- * @param bool $onlyVisible OPTIONAL Show only the attributes which are visible on frontend
- * @param bool $excludeSystem OPTIONAL Exclude attributes marked as system
- * @return array
- */
- public function getEavAttributes($onlyVisible = false, $excludeSystem = false)
- {
- $attributes = [];
- $model = $this->getConfig()->getResourceWorkingModel($this->getResourceType());
-
- /** @var Mage_Eav_Model_Entity_Type $entityType */
- $entityType = Mage::getSingleton('eav/config')->getEntityType($model, 'entity_model');
-
- /** @var Mage_Eav_Model_Entity_Attribute $attribute */
- foreach ($entityType->getAttributeCollection() as $attribute) {
- if ($onlyVisible && !$attribute->getIsVisible()) {
- continue;
- }
- if ($excludeSystem && $attribute->getIsSystem()) {
- continue;
- }
- $attributes[$attribute->getAttributeCode()] = $attribute->getFrontendLabel();
- }
-
- return $attributes;
- }
-
/**
* Retrieve current store according to request and API user type
*
diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php
index cdb1fd42b6b..cd088525208 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php
@@ -27,11 +27,6 @@ class Mage_Api2_Model_Resource_Acl_Filter_Attribute extends Mage_Core_Model_Reso
*/
public const FILTER_RESOURCE_ALL = 'all';
- protected function _construct()
- {
- $this->_init('api2/acl_attribute', 'entity_id');
- }
-
/**
* @param string $userType
* @param string $resourceId
@@ -66,4 +61,9 @@ public function isAllAttributesAllowed($userType)
return ($this->getReadConnection()->fetchOne($select) == 1);
}
+
+ protected function _construct()
+ {
+ $this->_init('api2/acl_attribute', 'entity_id');
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php
index 6bf97531abe..edd44423ffe 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php
@@ -22,14 +22,6 @@
*/
class Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Initialize collection model
- */
- protected function _construct()
- {
- $this->_init('api2/acl_filter_attribute');
- }
-
/**
* Add filtering by user type
*
@@ -41,4 +33,11 @@ public function addFilterByUserType($userType)
$this->addFilter('user_type', $userType, 'public');
return $this;
}
+ /**
+ * Initialize collection model
+ */
+ protected function _construct()
+ {
+ $this->_init('api2/acl_filter_attribute');
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php
index bea25a47f05..d4b5306d156 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php
@@ -25,11 +25,6 @@
*/
class Mage_Api2_Model_Resource_Acl_Global_Role extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('api2/acl_role', 'entity_id');
- }
-
/**
* Create/update relation row of admin user to API2 role
*
@@ -100,4 +95,8 @@ public function getRoleUsers(Mage_Api2_Model_Acl_Global_Role $role)
return $adapter->fetchCol($select);
}
+ protected function _construct()
+ {
+ $this->_init('api2/acl_role', 'entity_id');
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php
index b40f65df61a..46608c0411e 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php
@@ -22,14 +22,6 @@
*/
class Mage_Api2_Model_Resource_Acl_Global_Role_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Initialize collection model
- */
- protected function _construct()
- {
- $this->_init('api2/acl_global_role');
- }
-
/**
* Add filter by admin user id and join table with appropriate information
*
@@ -48,4 +40,11 @@ public function addFilterByAdminId($id)
return $this;
}
+ /**
+ * Initialize collection model
+ */
+ protected function _construct()
+ {
+ $this->_init('api2/acl_global_role');
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php
index f6a4304bc7f..cf1ff4e5fc7 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php
@@ -22,14 +22,6 @@
*/
class Mage_Api2_Model_Resource_Acl_Global_Rule_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
- /**
- * Initialize collection model
- */
- protected function _construct()
- {
- $this->_init('api2/acl_global_rule');
- }
-
/**
* Add filtering by role ID
*
@@ -41,4 +33,11 @@ public function addFilterByRoleId($roleId)
$this->addFilter('role_id', $roleId, 'public');
return $this;
}
+ /**
+ * Initialize collection model
+ */
+ protected function _construct()
+ {
+ $this->_init('api2/acl_global_rule');
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator.php b/app/code/core/Mage/Api2/Model/Resource/Validator.php
index 597a98cb749..5f42f41f103 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Validator.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Validator.php
@@ -36,6 +36,21 @@ abstract class Mage_Api2_Model_Resource_Validator
*/
protected $_errors = [];
+ /**
+ * Returns an array of errors that explain why the most recent isValidData()
+ * call returned false. The array keys are validation failure error identifiers,
+ * and the array values are the corresponding human-readable error strings.
+ *
+ * If isValidData() was never called or if the most recent isValidData() call
+ * returned true, then this method returns an empty array.
+ *
+ * @return array
+ */
+ public function getErrors()
+ {
+ return $this->_errors;
+ }
+
/**
* Set an array of errors
*
@@ -72,19 +87,4 @@ protected function _addError($error)
$this->_errors[] = $error;
return $this;
}
-
- /**
- * Returns an array of errors that explain why the most recent isValidData()
- * call returned false. The array keys are validation failure error identifiers,
- * and the array values are the corresponding human-readable error strings.
- *
- * If isValidData() was never called or if the most recent isValidData() call
- * returned true, then this method returns an empty array.
- *
- * @return array
- */
- public function getErrors()
- {
- return $this->_errors;
- }
}
diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php
index 49b9d0210d5..898fb533da8 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php
@@ -109,46 +109,6 @@ public function __construct($options)
->ignoreInvisible(false);
}
- /**
- * Validate attribute value for attributes with source models
- *
- * @param mixed $attrValue
- * @return array|bool
- */
- protected function _validateAttributeWithSource(Mage_Eav_Model_Entity_Attribute_Abstract $attribute, $attrValue)
- {
- $errors = [];
-
- // validate attributes with source models
- if ($attrValue !== null && $attribute->getSourceModel()) {
- if ($attribute->getFrontendInput() !== 'multiselect' && is_array($attrValue)) {
- return ['Invalid value type for ' . $attribute->getAttributeCode()];
- }
- $possibleValues = $attribute->getSource()->getAllOptions(false);
-
- foreach ((array) $attrValue as $value) {
- if (is_scalar($value)) {
- $value = (string) $value;
- $isValid = false;
- foreach ($possibleValues as $optionData) {
- // comparison without types check is performed only when both values are numeric
- $useStrictMode = !(is_numeric($value) && is_numeric($optionData['value']));
- $isValid = $useStrictMode ? $value === $optionData['value'] : $value == $optionData['value'];
- if ($isValid) {
- break;
- }
- }
- if (!$isValid) {
- $errors[] = 'Invalid value "' . $value . '" for ' . $attribute->getAttributeCode();
- }
- } else {
- $errors[] = 'Invalid value type for ' . $attribute->getAttributeCode();
- }
- }
- }
- return $errors ? $errors : true;
- }
-
/**
* Filter request data.
*
@@ -239,4 +199,44 @@ public function getErrors()
}
return $errors;
}
+
+ /**
+ * Validate attribute value for attributes with source models
+ *
+ * @param mixed $attrValue
+ * @return array|bool
+ */
+ protected function _validateAttributeWithSource(Mage_Eav_Model_Entity_Attribute_Abstract $attribute, $attrValue)
+ {
+ $errors = [];
+
+ // validate attributes with source models
+ if ($attrValue !== null && $attribute->getSourceModel()) {
+ if ($attribute->getFrontendInput() !== 'multiselect' && is_array($attrValue)) {
+ return ['Invalid value type for ' . $attribute->getAttributeCode()];
+ }
+ $possibleValues = $attribute->getSource()->getAllOptions(false);
+
+ foreach ((array) $attrValue as $value) {
+ if (is_scalar($value)) {
+ $value = (string) $value;
+ $isValid = false;
+ foreach ($possibleValues as $optionData) {
+ // comparison without types check is performed only when both values are numeric
+ $useStrictMode = !(is_numeric($value) && is_numeric($optionData['value']));
+ $isValid = $useStrictMode ? $value === $optionData['value'] : $value == $optionData['value'];
+ if ($isValid) {
+ break;
+ }
+ }
+ if (!$isValid) {
+ $errors[] = 'Invalid value "' . $value . '" for ' . $attribute->getAttributeCode();
+ }
+ } else {
+ $errors[] = 'Invalid value type for ' . $attribute->getAttributeCode();
+ }
+ }
+ }
+ return $errors ? $errors : true;
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php
index 12792095fed..2d75a3c7eee 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php
@@ -75,6 +75,49 @@ public function __construct($options)
$this->_buildValidatorsChain($validationConfig);
}
+ /**
+ * Validate data.
+ * If fails validation, then this method returns false, and
+ * getErrors() will return an array of errors that explain why the
+ * validation failed.
+ *
+ * @param bool $isPartial
+ * @return bool
+ */
+ public function isValidData(array $data, $isPartial = false)
+ {
+ $isValid = true;
+
+ // required fields
+ if (!$isPartial && count($this->_requiredFields) > 0) {
+ $notEmptyValidator = new Zend_Validate_NotEmpty();
+ foreach ($this->_requiredFields as $requiredField) {
+ if (!$notEmptyValidator->isValid($data[$requiredField] ?? null)) {
+ $isValid = false;
+ foreach ($notEmptyValidator->getMessages() as $message) {
+ $this->_addError(sprintf('%s: %s', $requiredField, $message));
+ }
+ }
+ }
+ }
+
+ // fields rules
+ foreach ($data as $field => $value) {
+ if (isset($this->_validators[$field])) {
+ /** @var Zend_Validate_Interface $validator */
+ $validator = $this->_validators[$field];
+ if (!$validator->isValid($value)) {
+ $isValid = false;
+ foreach ($validator->getMessages() as $message) {
+ $this->_addError(sprintf('%s: %s', $field, $message));
+ }
+ }
+ }
+ }
+
+ return $isValid;
+ }
+
/**
* Build validator chain with config data
*
@@ -129,47 +172,4 @@ protected function _getValidatorInstance($type, $options)
}
return new $validatorClass($options);
}
-
- /**
- * Validate data.
- * If fails validation, then this method returns false, and
- * getErrors() will return an array of errors that explain why the
- * validation failed.
- *
- * @param bool $isPartial
- * @return bool
- */
- public function isValidData(array $data, $isPartial = false)
- {
- $isValid = true;
-
- // required fields
- if (!$isPartial && count($this->_requiredFields) > 0) {
- $notEmptyValidator = new Zend_Validate_NotEmpty();
- foreach ($this->_requiredFields as $requiredField) {
- if (!$notEmptyValidator->isValid($data[$requiredField] ?? null)) {
- $isValid = false;
- foreach ($notEmptyValidator->getMessages() as $message) {
- $this->_addError(sprintf('%s: %s', $requiredField, $message));
- }
- }
- }
- }
-
- // fields rules
- foreach ($data as $field => $value) {
- if (isset($this->_validators[$field])) {
- /** @var Zend_Validate_Interface $validator */
- $validator = $this->_validators[$field];
- if (!$validator->isValid($value)) {
- $isValid = false;
- foreach ($validator->getMessages() as $message) {
- $this->_addError(sprintf('%s: %s', $field, $message));
- }
- }
- }
- }
-
- return $isValid;
- }
}
diff --git a/app/code/core/Mage/Api2/Model/Route/Abstract.php b/app/code/core/Mage/Api2/Model/Route/Abstract.php
index 6755ed8e74b..a552ca1324a 100644
--- a/app/code/core/Mage/Api2/Model/Route/Abstract.php
+++ b/app/code/core/Mage/Api2/Model/Route/Abstract.php
@@ -58,17 +58,6 @@ public function __construct(array $arguments)
);
}
- /**
- * Retrieve argument value
- *
- * @param string $name argument name
- * @return mixed
- */
- protected function _getArgumentValue($name, array $arguments)
- {
- return $arguments[$name] ?? $this->_paramsDefaultValues[$name];
- }
-
/**
* Matches a Request with parts defined by a map. Assigns and
* returns an array of variables on a successful match.
@@ -81,4 +70,15 @@ public function match($request, $partial = false)
{
return parent::match(ltrim($request->getPathInfo(), $this->_urlDelimiter), $partial);
}
+
+ /**
+ * Retrieve argument value
+ *
+ * @param string $name argument name
+ * @return mixed
+ */
+ protected function _getArgumentValue($name, array $arguments)
+ {
+ return $arguments[$name] ?? $this->_paramsDefaultValues[$name];
+ }
}
diff --git a/app/code/core/Mage/Api2/Model/Server.php b/app/code/core/Mage/Api2/Model/Server.php
index 1897a52cb2f..dd442a7c2d8 100644
--- a/app/code/core/Mage/Api2/Model/Server.php
+++ b/app/code/core/Mage/Api2/Model/Server.php
@@ -122,6 +122,16 @@ public function internalCall(Mage_Api2_Model_Request $request, Mage_Api2_Model_R
->_dispatch($request, $response, $apiUser);
}
+ /**
+ * Retrieve api types
+ *
+ * @return array
+ */
+ public static function getApiTypes()
+ {
+ return self::$_apiTypes;
+ }
+
/**
* Authenticate user
*
@@ -279,14 +289,4 @@ protected function _renderException(
return $this;
}
-
- /**
- * Retrieve api types
- *
- * @return array
- */
- public static function getApiTypes()
- {
- return self::$_apiTypes;
- }
}
diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php
index be43c8afcb9..7e15ffd1229 100644
--- a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php
+++ b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php
@@ -285,16 +285,6 @@ public function deleteAction()
$this->_redirect('*/*/');
}
- /**
- * @inheritDoc
- */
- protected function _isAllowed()
- {
- /** @var Mage_Admin_Model_Session $session */
- $session = Mage::getSingleton('admin/session');
- return $session->isAllowed('system/api/rest_roles');
- }
-
/**
* Get API2 roles ajax grid action
*/
@@ -309,6 +299,16 @@ public function rolesGridAction()
->setBody($this->getLayout()->createBlock('api2/adminhtml_permissions_user_edit_tab_roles')->toHtml());
}
+ /**
+ * @inheritDoc
+ */
+ protected function _isAllowed()
+ {
+ /** @var Mage_Admin_Model_Session $session */
+ $session = Mage::getSingleton('admin/session');
+ return $session->isAllowed('system/api/rest_roles');
+ }
+
/**
* Get users possessing the role
*
diff --git a/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php b/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php
index 9f0c3eabdd2..eca59f1c8a8 100644
--- a/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php
+++ b/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php
@@ -22,32 +22,6 @@
*/
class Mage_Authorizenet_Block_Directpost_Form extends Mage_Payment_Block_Form_Cc
{
- /**
- * Internal constructor
- * Set info template for payment step
- *
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('authorizenet/directpost/info.phtml');
- }
-
- /**
- * Render block HTML
- * If method is not directpost - nothing to return
- *
- * @return string|null
- */
- protected function _toHtml()
- {
- if ($this->getMethod()->getCode() != Mage::getSingleton('authorizenet/directpost')->getCode()) {
- return null;
- }
-
- return parent::_toHtml();
- }
-
/**
* Set method info
*
@@ -74,4 +48,29 @@ public function isAjaxRequest()
->getRequest()
->getParam('isAjax');
}
+ /**
+ * Internal constructor
+ * Set info template for payment step
+ *
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('authorizenet/directpost/info.phtml');
+ }
+
+ /**
+ * Render block HTML
+ * If method is not directpost - nothing to return
+ *
+ * @return string|null
+ */
+ protected function _toHtml()
+ {
+ if ($this->getMethod()->getCode() != Mage::getSingleton('authorizenet/directpost')->getCode()) {
+ return null;
+ }
+
+ return parent::_toHtml();
+ }
}
diff --git a/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php b/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php
index e24e7e0929a..514edec824d 100644
--- a/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php
+++ b/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php
@@ -28,15 +28,6 @@ class Mage_Authorizenet_Block_Directpost_Iframe extends Mage_Core_Block_Template
*/
protected $_params = [];
- /**
- * Set template for iframe
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('authorizenet/directpost/iframe.phtml');
- }
-
/**
* Set output params
*
@@ -58,4 +49,13 @@ public function getParams()
{
return $this->_params;
}
+
+ /**
+ * Set template for iframe
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('authorizenet/directpost/iframe.phtml');
+ }
}
diff --git a/app/code/core/Mage/Authorizenet/Helper/Data.php b/app/code/core/Mage/Authorizenet/Helper/Data.php
index 7f2ad4d45a1..ac62eefda94 100644
--- a/app/code/core/Mage/Authorizenet/Helper/Data.php
+++ b/app/code/core/Mage/Authorizenet/Helper/Data.php
@@ -36,24 +36,6 @@ public function getAdminUrl($route, $params)
return Mage::getModel('adminhtml/url')->getUrl($route, $params);
}
- /**
- * Set secure url checkout is secure for current store.
- *
- * @param string $route
- * @param array $params
- * @return string
- */
- protected function _getUrl($route, $params = [])
- {
- $params['_type'] = Mage_Core_Model_Store::URL_TYPE_LINK;
- if (isset($params['is_secure'])) {
- $params['_secure'] = (bool) $params['is_secure'];
- } elseif (Mage::app()->getStore()->isCurrentlySecure()) {
- $params['_secure'] = true;
- }
- return parent::_getUrl($route, $params);
- }
-
/**
* Retrieve save order url params
*
@@ -143,4 +125,22 @@ public function updateOrderEditIncrements(Mage_Sales_Model_Order $order)
}
}
}
+
+ /**
+ * Set secure url checkout is secure for current store.
+ *
+ * @param string $route
+ * @param array $params
+ * @return string
+ */
+ protected function _getUrl($route, $params = [])
+ {
+ $params['_type'] = Mage_Core_Model_Store::URL_TYPE_LINK;
+ if (isset($params['is_secure'])) {
+ $params['_secure'] = (bool) $params['is_secure'];
+ } elseif (Mage::app()->getStore()->isCurrentlySecure()) {
+ $params['_secure'] = true;
+ }
+ return parent::_getUrl($route, $params);
+ }
}
diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost.php b/app/code/core/Mage/Authorizenet/Model/Directpost.php
index f6206256437..89b74710106 100644
--- a/app/code/core/Mage/Authorizenet/Model/Directpost.php
+++ b/app/code/core/Mage/Authorizenet/Model/Directpost.php
@@ -219,55 +219,6 @@ public function refund(Varien_Object $payment, $amount)
return $this;
}
- /**
- * refund the amount with transaction id
- *
- * @param Mage_Sales_Model_Order_Payment $payment
- * @param string $amount
- * @return $this
- * @throws Mage_Core_Exception
- */
- protected function _refund(Varien_Object $payment, $amount)
- {
- if ($amount <= 0) {
- Mage::throwException(Mage::helper('paygate')->__('Invalid amount for refund.'));
- }
-
- if (!$payment->getParentTransactionId()) {
- Mage::throwException(Mage::helper('paygate')->__('Invalid transaction ID.'));
- }
-
- $payment->setAnetTransType(self::REQUEST_TYPE_CREDIT);
- $payment->setAmount($amount);
- $payment->setXTransId($this->_getRealParentTransactionId($payment));
-
- $request = $this->_buildRequest($payment);
- $result = $this->_postRequest($request);
-
- switch ($result->getResponseCode()) {
- case self::RESPONSE_CODE_APPROVED:
- if ($result->getResponseReasonCode() == self::RESPONSE_REASON_CODE_APPROVED) {
- if ($result->getTransactionId() != $payment->getParentTransactionId()) {
- $payment->setTransactionId($result->getTransactionId());
- }
- $shouldCloseCaptureTransaction = $payment->getOrder()->canCreditmemo() ? 0 : 1;
- $payment
- ->setIsTransactionClosed(1)
- ->setShouldCloseParentTransaction($shouldCloseCaptureTransaction)
- ->setTransactionAdditionalInfo($this->_realTransactionIdKey, $result->getTransactionId());
- return $this;
- }
- Mage::throwException($this->_wrapGatewayError($result->getResponseReasonText()));
- // no break
- case self::RESPONSE_CODE_DECLINED:
- case self::RESPONSE_CODE_ERROR:
- Mage::throwException($this->_wrapGatewayError($result->getResponseReasonText()));
- // no break
- default:
- Mage::throwException(Mage::helper('paygate')->__('Payment refunding error.'));
- }
- }
-
/**
* Get CGI url
*
@@ -295,16 +246,6 @@ public function getRelayUrl($storeId = null)
'authorizenet/directpost_payment/response';
}
- /**
- * Return request model for form data building
- *
- * @return Mage_Authorizenet_Model_Directpost_Request
- */
- protected function _getRequestModel()
- {
- return Mage::getModel('authorizenet/directpost_request');
- }
-
/**
* Return response.
*
@@ -451,23 +392,6 @@ public function process(array $responseData)
}
}
- /**
- * Fill payment with credit card data from response from Authorize.net.
- */
- protected function _fillPaymentByResponse(Varien_Object $payment)
- {
- $response = $this->getResponse();
- $payment->setTransactionId($response->getXTransId())
- ->setParentTransactionId(null)
- ->setIsTransactionClosed(0)
- ->setTransactionAdditionalInfo($this->_realTransactionIdKey, $response->getXTransId());
-
- if ($response->getXMethod() == self::REQUEST_METHOD_CC) {
- $payment->setCcAvsStatus($response->getXAvsCode())
- ->setCcLast4($payment->encrypt(substr($response->getXAccountNumber(), -4)));
- }
- }
-
/**
* Check response code came from authorize.net.
*
@@ -504,6 +428,82 @@ public function checkTransId()
return true;
}
+ /**
+ * refund the amount with transaction id
+ *
+ * @param Mage_Sales_Model_Order_Payment $payment
+ * @param string $amount
+ * @return $this
+ * @throws Mage_Core_Exception
+ */
+ protected function _refund(Varien_Object $payment, $amount)
+ {
+ if ($amount <= 0) {
+ Mage::throwException(Mage::helper('paygate')->__('Invalid amount for refund.'));
+ }
+
+ if (!$payment->getParentTransactionId()) {
+ Mage::throwException(Mage::helper('paygate')->__('Invalid transaction ID.'));
+ }
+
+ $payment->setAnetTransType(self::REQUEST_TYPE_CREDIT);
+ $payment->setAmount($amount);
+ $payment->setXTransId($this->_getRealParentTransactionId($payment));
+
+ $request = $this->_buildRequest($payment);
+ $result = $this->_postRequest($request);
+
+ switch ($result->getResponseCode()) {
+ case self::RESPONSE_CODE_APPROVED:
+ if ($result->getResponseReasonCode() == self::RESPONSE_REASON_CODE_APPROVED) {
+ if ($result->getTransactionId() != $payment->getParentTransactionId()) {
+ $payment->setTransactionId($result->getTransactionId());
+ }
+ $shouldCloseCaptureTransaction = $payment->getOrder()->canCreditmemo() ? 0 : 1;
+ $payment
+ ->setIsTransactionClosed(1)
+ ->setShouldCloseParentTransaction($shouldCloseCaptureTransaction)
+ ->setTransactionAdditionalInfo($this->_realTransactionIdKey, $result->getTransactionId());
+ return $this;
+ }
+ Mage::throwException($this->_wrapGatewayError($result->getResponseReasonText()));
+ // no break
+ case self::RESPONSE_CODE_DECLINED:
+ case self::RESPONSE_CODE_ERROR:
+ Mage::throwException($this->_wrapGatewayError($result->getResponseReasonText()));
+ // no break
+ default:
+ Mage::throwException(Mage::helper('paygate')->__('Payment refunding error.'));
+ }
+ }
+
+ /**
+ * Return request model for form data building
+ *
+ * @return Mage_Authorizenet_Model_Directpost_Request
+ */
+ protected function _getRequestModel()
+ {
+ return Mage::getModel('authorizenet/directpost_request');
+ }
+
+ /**
+ * Fill payment with credit card data from response from Authorize.net.
+ */
+ protected function _fillPaymentByResponse(Varien_Object $payment)
+ {
+ $response = $this->getResponse();
+ $payment->setTransactionId($response->getXTransId())
+ ->setParentTransactionId(null)
+ ->setIsTransactionClosed(0)
+ ->setTransactionAdditionalInfo($this->_realTransactionIdKey, $response->getXTransId());
+
+ if ($response->getXMethod() == self::REQUEST_METHOD_CC) {
+ $payment->setCcAvsStatus($response->getXAvsCode())
+ ->setCcLast4($payment->encrypt(substr($response->getXAccountNumber(), -4)));
+ }
+ }
+
/**
* Compare amount with amount from the response from Authorize.net.
*
diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php
index 246aec6a3cc..249a6c8dcdc 100644
--- a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php
+++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php
@@ -31,30 +31,6 @@ class Mage_Authorizenet_Model_Directpost_Request extends Varien_Object
*/
protected $_signatureKey = '';
- /**
- * Return merchant transaction key.
- * Needed to generate MD5 sign.
- *
- * @return string
- */
- protected function _getTransactionKey()
- {
- return $this->_transKey;
- }
-
- /**
- * Set merchant transaction key.
- * Needed to generate MD5 sign.
- *
- * @param string $transKey
- * @return $this
- */
- protected function _setTransactionKey($transKey)
- {
- $this->_transKey = $transKey;
- return $this;
- }
-
/**
* Generates the MD5 fingerprint for request.
*
@@ -189,6 +165,30 @@ public function signRequestData()
return $this;
}
+ /**
+ * Return merchant transaction key.
+ * Needed to generate MD5 sign.
+ *
+ * @return string
+ */
+ protected function _getTransactionKey()
+ {
+ return $this->_transKey;
+ }
+
+ /**
+ * Set merchant transaction key.
+ * Needed to generate MD5 sign.
+ *
+ * @param string $transKey
+ * @return $this
+ */
+ protected function _setTransactionKey($transKey)
+ {
+ $this->_transKey = $transKey;
+ return $this;
+ }
+
/**
* Generates the SHA2 fingerprint for request.
*
diff --git a/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php b/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php
index 3d6176a48e7..0feeb3a2b76 100644
--- a/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php
+++ b/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php
@@ -23,36 +23,6 @@
*/
class Mage_Authorizenet_Adminhtml_Authorizenet_Directpost_PaymentController extends Mage_Adminhtml_Sales_Order_CreateController
{
- /**
- * Get session model
- *
- * @return Mage_Authorizenet_Model_Directpost_Session
- */
- protected function _getDirectPostSession()
- {
- return Mage::getSingleton('authorizenet/directpost_session');
- }
-
- /**
- * Retrieve session object
- *
- * @return Mage_Adminhtml_Model_Session_Quote
- */
- protected function _getOrderSession()
- {
- return Mage::getSingleton('adminhtml/session_quote');
- }
-
- /**
- * Retrieve order create model
- *
- * @return Mage_Adminhtml_Model_Sales_Order_Create
- */
- protected function _getOrderCreateModel()
- {
- return Mage::getSingleton('adminhtml/sales_order_create');
- }
-
/**
* Send request to authorize.net
*
@@ -195,6 +165,35 @@ public function returnQuoteAction()
$this->_returnQuote();
$this->getResponse()->setBody(Mage::helper('core')->jsonEncode(['success' => 1]));
}
+ /**
+ * Get session model
+ *
+ * @return Mage_Authorizenet_Model_Directpost_Session
+ */
+ protected function _getDirectPostSession()
+ {
+ return Mage::getSingleton('authorizenet/directpost_session');
+ }
+
+ /**
+ * Retrieve session object
+ *
+ * @return Mage_Adminhtml_Model_Session_Quote
+ */
+ protected function _getOrderSession()
+ {
+ return Mage::getSingleton('adminhtml/session_quote');
+ }
+
+ /**
+ * Retrieve order create model
+ *
+ * @return Mage_Adminhtml_Model_Sales_Order_Create
+ */
+ protected function _getOrderCreateModel()
+ {
+ return Mage::getSingleton('adminhtml/sales_order_create');
+ }
/**
* Return quote
diff --git a/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php b/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php
index 9b90b63b69d..4ed05cf58ca 100644
--- a/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php
+++ b/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php
@@ -22,34 +22,6 @@
*/
class Mage_Authorizenet_Directpost_PaymentController extends Mage_Core_Controller_Front_Action
{
- /**
- * @return Mage_Checkout_Model_Session
- */
- protected function _getCheckout()
- {
- return Mage::getSingleton('checkout/session');
- }
-
- /**
- * Get session model
-
- * @return Mage_Authorizenet_Model_Directpost_Session
- */
- protected function _getDirectPostSession()
- {
- return Mage::getSingleton('authorizenet/directpost_session');
- }
-
- /**
- * Get iframe block instance
- *
- * @return Mage_Authorizenet_Block_Directpost_Iframe
- */
- protected function _getIframeBlock()
- {
- return $this->getLayout()->createBlock('directpost/iframe');
- }
-
/**
* Response action.
* Action for Authorize.net SIM Relay Request.
@@ -155,6 +127,33 @@ public function returnQuoteAction()
$this->_returnCustomerQuote();
$this->getResponse()->setBody(Mage::helper('core')->jsonEncode(['success' => 1]));
}
+ /**
+ * @return Mage_Checkout_Model_Session
+ */
+ protected function _getCheckout()
+ {
+ return Mage::getSingleton('checkout/session');
+ }
+
+ /**
+ * Get session model
+
+ * @return Mage_Authorizenet_Model_Directpost_Session
+ */
+ protected function _getDirectPostSession()
+ {
+ return Mage::getSingleton('authorizenet/directpost_session');
+ }
+
+ /**
+ * Get iframe block instance
+ *
+ * @return Mage_Authorizenet_Block_Directpost_Iframe
+ */
+ protected function _getIframeBlock()
+ {
+ return $this->getLayout()->createBlock('directpost/iframe');
+ }
/**
* Return customer quote
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
index c134a908db4..53012bd92b4 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
@@ -22,14 +22,6 @@
*/
class Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Checkbox extends Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Checkbox
{
- /**
- * Set template
- */
- protected function _construct()
- {
- $this->setTemplate('bundle/product/composite/fieldset/options/type/checkbox.phtml');
- }
-
/**
* @param string $elementId
* @param string $containerId
@@ -41,4 +33,11 @@ public function setValidationContainer($elementId, $containerId)
$(\'' . $elementId . '\').advaiceContainer = \'' . $containerId . '\';
';
}
+ /**
+ * Set template
+ */
+ protected function _construct()
+ {
+ $this->setTemplate('bundle/product/composite/fieldset/options/type/checkbox.phtml');
+ }
}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
index c10094333e0..015f8e43afd 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
@@ -22,14 +22,6 @@
*/
class Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Multi extends Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Multi
{
- /**
- * Set template
- */
- protected function _construct()
- {
- $this->setTemplate('bundle/product/composite/fieldset/options/type/multi.phtml');
- }
-
/**
* @param string $elementId
* @param string $containerId
@@ -41,4 +33,11 @@ public function setValidationContainer($elementId, $containerId)
$(\'' . $elementId . '\').advaiceContainer = \'' . $containerId . '\';
';
}
+ /**
+ * Set template
+ */
+ protected function _construct()
+ {
+ $this->setTemplate('bundle/product/composite/fieldset/options/type/multi.phtml');
+ }
}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
index d581e031170..fa9450cb658 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
@@ -22,14 +22,6 @@
*/
class Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Radio extends Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Radio
{
- /**
- * Set template
- */
- protected function _construct()
- {
- $this->setTemplate('bundle/product/composite/fieldset/options/type/radio.phtml');
- }
-
/**
* @param string $elementId
* @param string $containerId
@@ -41,4 +33,11 @@ public function setValidationContainer($elementId, $containerId)
$(\'' . $elementId . '\').advaiceContainer = \'' . $containerId . '\';
';
}
+ /**
+ * Set template
+ */
+ protected function _construct()
+ {
+ $this->setTemplate('bundle/product/composite/fieldset/options/type/radio.phtml');
+ }
}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
index 233a4c2cf25..8c37a3775f2 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
@@ -22,14 +22,6 @@
*/
class Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Select extends Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Select
{
- /**
- * Set template
- */
- protected function _construct()
- {
- $this->setTemplate('bundle/product/composite/fieldset/options/type/select.phtml');
- }
-
/**
* @param string $elementId
* @param string $containerId
@@ -41,4 +33,11 @@ public function setValidationContainer($elementId, $containerId)
$(\'' . $elementId . '\').advaiceContainer = \'' . $containerId . '\';
';
}
+ /**
+ * Set template
+ */
+ protected function _construct()
+ {
+ $this->setTemplate('bundle/product/composite/fieldset/options/type/select.phtml');
+ }
}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
index a292f10fbdd..265cd752441 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
@@ -24,6 +24,18 @@
*/
class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Attributes extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes
{
+ /**
+ * Get current product from registry
+ *
+ * @return Mage_Catalog_Model_Product
+ */
+ public function getProduct()
+ {
+ if (!$this->getData('product')) {
+ $this->setData('product', Mage::registry('product'));
+ }
+ return $this->getData('product');
+ }
/**
* Prepare attributes form of bundle product
*
@@ -152,17 +164,4 @@ function changePriceTypeMap() {
return $this;
}
-
- /**
- * Get current product from registry
- *
- * @return Mage_Catalog_Model_Product
- */
- public function getProduct()
- {
- if (!$this->getData('product')) {
- $this->setData('product', Mage::registry('product'));
- }
- return $this->getData('product');
- }
}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index e792fb5b0fe..152e9562d76 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -46,35 +46,6 @@ public function getTabClass()
return 'ajax';
}
- /**
- * Prepare layout
- *
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- $this->setChild(
- 'add_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData([
- 'label' => Mage::helper('bundle')->__('Add New Option'),
- 'class' => 'add',
- 'id' => 'add_new_option',
- 'on_click' => 'bOption.add()',
- ]),
- );
-
- $this->setChild(
- 'options_box',
- $this->getLayout()->createBlock(
- 'bundle/adminhtml_catalog_product_edit_tab_bundle_option',
- 'adminhtml.catalog.product.edit.tab.bundle.option',
- ),
- );
-
- return parent::_prepareLayout();
- }
-
/**
* Check block readonly
*
@@ -148,4 +119,33 @@ public function isHidden()
{
return false;
}
+
+ /**
+ * Prepare layout
+ *
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ $this->setChild(
+ 'add_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData([
+ 'label' => Mage::helper('bundle')->__('Add New Option'),
+ 'class' => 'add',
+ 'id' => 'add_new_option',
+ 'on_click' => 'bOption.add()',
+ ]),
+ );
+
+ $this->setChild(
+ 'options_box',
+ $this->getLayout()->createBlock(
+ 'bundle/adminhtml_catalog_product_edit_tab_bundle_option',
+ 'adminhtml.catalog.product.edit.tab.bundle.option',
+ ),
+ );
+
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 4e67dbb6f2d..5a5c7ecaba9 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -132,51 +132,6 @@ public function isMultiWebsites()
return !Mage::app()->isSingleStoreMode();
}
- /**
- * @return Mage_Adminhtml_Block_Widget
- */
- protected function _prepareLayout()
- {
- $this->setChild(
- 'add_selection_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData([
- 'id' => $this->getFieldId() . '_{{index}}_add_button',
- 'label' => Mage::helper('bundle')->__('Add Selection'),
- 'on_click' => 'bSelection.showSearch(event)',
- 'class' => 'add',
- ]),
- );
-
- $this->setChild(
- 'close_search_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData([
- 'id' => $this->getFieldId() . '_{{index}}_close_button',
- 'label' => Mage::helper('bundle')->__('Close'),
- 'on_click' => 'bSelection.closeSearch(event)',
- 'class' => 'back no-display',
- ]),
- );
-
- $this->setChild(
- 'option_delete_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData([
- 'label' => Mage::helper('catalog')->__('Delete Option'),
- 'class' => 'delete delete-product-option',
- 'on_click' => 'bOption.remove(event)',
- ]),
- );
-
- $this->setChild(
- 'selection_template',
- $this->getLayout()->createBlock('bundle/adminhtml_catalog_product_edit_tab_bundle_option_selection'),
- );
-
- return parent::_prepareLayout();
- }
-
/**
* @return string
*/
@@ -308,4 +263,49 @@ public function isDefaultStore()
{
return ($this->getProduct()->getStoreId() == '0');
}
+
+ /**
+ * @return Mage_Adminhtml_Block_Widget
+ */
+ protected function _prepareLayout()
+ {
+ $this->setChild(
+ 'add_selection_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData([
+ 'id' => $this->getFieldId() . '_{{index}}_add_button',
+ 'label' => Mage::helper('bundle')->__('Add Selection'),
+ 'on_click' => 'bSelection.showSearch(event)',
+ 'class' => 'add',
+ ]),
+ );
+
+ $this->setChild(
+ 'close_search_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData([
+ 'id' => $this->getFieldId() . '_{{index}}_close_button',
+ 'label' => Mage::helper('bundle')->__('Close'),
+ 'on_click' => 'bSelection.closeSearch(event)',
+ 'class' => 'back no-display',
+ ]),
+ );
+
+ $this->setChild(
+ 'option_delete_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData([
+ 'label' => Mage::helper('catalog')->__('Delete Option'),
+ 'class' => 'delete delete-product-option',
+ 'on_click' => 'bOption.remove(event)',
+ ]),
+ );
+
+ $this->setChild(
+ 'selection_template',
+ $this->getLayout()->createBlock('bundle/adminhtml_catalog_product_edit_tab_bundle_option_selection'),
+ );
+
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
index 2721fc493e1..c5eb97381e5 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
@@ -27,18 +27,39 @@
*/
class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Search extends Mage_Adminhtml_Block_Widget
{
- protected function _construct()
+ /**
+ * @return string
+ */
+ public function getHeaderText()
{
- $this->setId('bundle_option_selection_search');
- $this->setTemplate('bundle/product/edit/bundle/option/search.phtml');
+ return Mage::helper('bundle')->__('Please Select Products to Add');
}
/**
* @return string
*/
- public function getHeaderText()
+ public function getButtonsHtml()
{
- return Mage::helper('bundle')->__('Please Select Products to Add');
+ $addButtonData = [
+ 'id' => 'add_button_' . $this->getIndex(),
+ 'label' => Mage::helper('sales')->__('Add Selected Product(s) to Option'),
+ 'onclick' => 'bSelection.productGridAddSelected(event)',
+ 'class' => 'add',
+ ];
+ return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml();
+ }
+
+ /**
+ * @return string
+ */
+ public function getHeaderCssClass()
+ {
+ return 'head-catalog-product';
+ }
+ protected function _construct()
+ {
+ $this->setId('bundle_option_selection_search');
+ $this->setTemplate('bundle/product/edit/bundle/option/search.phtml');
}
/**
@@ -66,26 +87,4 @@ protected function _beforeToHtml()
return parent::_beforeToHtml();
}
-
- /**
- * @return string
- */
- public function getButtonsHtml()
- {
- $addButtonData = [
- 'id' => 'add_button_' . $this->getIndex(),
- 'label' => Mage::helper('sales')->__('Add Selected Product(s) to Option'),
- 'onclick' => 'bSelection.productGridAddSelected(event)',
- 'class' => 'add',
- ];
- return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml();
- }
-
- /**
- * @return string
- */
- public function getHeaderCssClass()
- {
- return 'head-catalog-product';
- }
}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
index 4c133c0beab..9c9a4a3871d 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
@@ -37,6 +37,34 @@ public function __construct()
$this->setUseAjax(true);
}
+ /**
+ * @return string
+ * @throws Exception
+ */
+ public function getGridUrl()
+ {
+ return $this->getUrl('*/bundle_selection/grid', ['index' => $this->getIndex(), 'productss' => implode(',', $this->_getProducts())]);
+ }
+
+ /**
+ * @return Mage_Core_Model_Store
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ public function getStore()
+ {
+ return Mage::app()->getStore();
+ }
+
+ /**
+ * Retrieve array of allowed product types for bundle selection product
+ *
+ * @return array
+ */
+ public function getAllowedSelectionTypes()
+ {
+ return Mage::helper('bundle')->getAllowedSelectionTypes();
+ }
+
/**
* @inheritDoc
*/
@@ -153,15 +181,6 @@ protected function _prepareColumns()
return parent::_prepareColumns();
}
- /**
- * @return string
- * @throws Exception
- */
- public function getGridUrl()
- {
- return $this->getUrl('*/bundle_selection/grid', ['index' => $this->getIndex(), 'productss' => implode(',', $this->_getProducts())]);
- }
-
/**
* @return array
* @throws Exception
@@ -185,23 +204,4 @@ protected function _getProducts()
return [];
}
}
-
- /**
- * @return Mage_Core_Model_Store
- * @throws Mage_Core_Model_Store_Exception
- */
- public function getStore()
- {
- return Mage::app()->getStore();
- }
-
- /**
- * Retrieve array of allowed product types for bundle selection product
- *
- * @return array
- */
- public function getAllowedSelectionTypes()
- {
- return Mage::helper('bundle')->getAllowedSelectionTypes();
- }
}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index 9bdd9b0becb..ed5ac89eb2b 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -57,25 +57,6 @@ public function getFieldName()
return 'bundle_selections';
}
- /**
- * Prepare block layout
- *
- * @inheritDoc
- */
- protected function _prepareLayout()
- {
- $this->setChild(
- 'selection_delete_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData([
- 'label' => Mage::helper('catalog')->__('Delete'),
- 'class' => 'delete icon-btn',
- 'on_click' => 'bSelection.remove(event)',
- ]),
- );
- return parent::_prepareLayout();
- }
-
/**
* Retrieve delete button html
*
@@ -164,4 +145,23 @@ public function getCheckboxScopeHtml()
}
return $checkboxHtml;
}
+
+ /**
+ * Prepare block layout
+ *
+ * @inheritDoc
+ */
+ protected function _prepareLayout()
+ {
+ $this->setChild(
+ 'selection_delete_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData([
+ 'label' => Mage::helper('catalog')->__('Delete'),
+ 'class' => 'delete icon-btn',
+ 'on_click' => 'bSelection.remove(event)',
+ ]),
+ );
+ return parent::_prepareLayout();
+ }
}
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php
index 6c3d075bae5..5137e8b32f6 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php
@@ -27,46 +27,6 @@ class Mage_Bundle_Block_Catalog_Product_List_Partof extends Mage_Catalog_Block_P
protected $_itemCollection;
protected $_product = null;
- /**
- * @return $this
- */
- protected function _prepareData()
- {
- $collection = Mage::getModel('catalog/product')->getResourceCollection()
- ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes())
- ->addAttributeToSort('position', 'asc')
- ->addStoreFilter()
- ->addAttributeToFilter('status', [
- 'in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds(),
- ])
- ->addMinimalPrice()
- ->joinTable('bundle/option', 'parent_id=entity_id', ['option_id' => 'option_id'])
- ->joinTable('bundle/selection', 'option_id=option_id', ['product_id' => 'product_id'], '{{table}}.product_id=' . $this->getProduct()->getId());
-
- $ids = Mage::getSingleton('checkout/cart')->getProductIds();
-
- if (count($ids)) {
- $collection->addIdFilter(Mage::getSingleton('checkout/cart')->getProductIds(), true);
- }
-
- Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($collection);
- $collection->getSelect()->group('entity_id');
-
- $collection->load();
- $this->_itemCollection = $collection;
-
- return $this;
- }
-
- /**
- * @return Mage_Catalog_Block_Product_Abstract
- */
- protected function _beforeToHtml()
- {
- $this->_prepareData();
- return parent::_beforeToHtml();
- }
-
/**
* @return mixed
*/
@@ -142,4 +102,44 @@ public function getProduct()
}
return $this->_product;
}
+
+ /**
+ * @return $this
+ */
+ protected function _prepareData()
+ {
+ $collection = Mage::getModel('catalog/product')->getResourceCollection()
+ ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes())
+ ->addAttributeToSort('position', 'asc')
+ ->addStoreFilter()
+ ->addAttributeToFilter('status', [
+ 'in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds(),
+ ])
+ ->addMinimalPrice()
+ ->joinTable('bundle/option', 'parent_id=entity_id', ['option_id' => 'option_id'])
+ ->joinTable('bundle/selection', 'option_id=option_id', ['product_id' => 'product_id'], '{{table}}.product_id=' . $this->getProduct()->getId());
+
+ $ids = Mage::getSingleton('checkout/cart')->getProductIds();
+
+ if (count($ids)) {
+ $collection->addIdFilter(Mage::getSingleton('checkout/cart')->getProductIds(), true);
+ }
+
+ Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($collection);
+ $collection->getSelect()->group('entity_id');
+
+ $collection->load();
+ $this->_itemCollection = $collection;
+
+ return $this;
+ }
+
+ /**
+ * @return Mage_Catalog_Block_Product_Abstract
+ */
+ protected function _beforeToHtml()
+ {
+ $this->_prepareData();
+ return parent::_beforeToHtml();
+ }
}
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index e8ac67d2005..63c2361d52b 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -40,126 +40,6 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option extends Mage_Bun
*/
protected $_showSingle = null;
- /**
- * Check if option has a single selection
- *
- * @return bool
- */
- protected function _showSingle()
- {
- if (is_null($this->_showSingle)) {
- $option = $this->getOption();
- $selections = $option->getSelections();
-
- $this->_showSingle = (count($selections) === 1 && $option->getRequired());
- }
-
- return $this->_showSingle;
- }
-
- /**
- * Retrieve default values for template
- *
- * @return array
- */
- protected function _getDefaultValues()
- {
- $option = $this->getOption();
- $default = $option->getDefaultSelection();
- $selections = $option->getSelections();
- $selectedOptions = $this->_getSelectedOptions();
- $inPreConfigured = $this->getProduct()->hasPreconfiguredValues()
- && $this->getProduct()->getPreconfiguredValues()
- ->getData('bundle_option_qty/' . $option->getId());
-
- if (empty($selectedOptions) && $default) {
- $_defaultQty = $default->getSelectionQty() * 1;
- $_canChangeQty = $default->getSelectionCanChangeQty();
- } elseif (!$inPreConfigured && $selectedOptions && is_numeric($selectedOptions)) {
- $selectedSelection = $option->getSelectionById($selectedOptions);
- if ($selectedSelection) {
- $_defaultQty = $selectedSelection->getSelectionQty() * 1;
- $_canChangeQty = $selectedSelection->getSelectionCanChangeQty();
- } else {
- $_defaultQty = $selections[0]->getSelectionQty() * 1;
- $_canChangeQty = $selections[0]->getSelectionCanChangeQty();
- }
- } elseif (!$this->_showSingle() || $inPreConfigured) {
- $_defaultQty = $this->_getSelectedQty();
- $_canChangeQty = (bool) $_defaultQty;
- } else {
- $_defaultQty = $selections[0]->getSelectionQty() * 1;
- $_canChangeQty = $selections[0]->getSelectionCanChangeQty();
- }
-
- return [$_defaultQty, $_canChangeQty];
- }
-
- /**
- * Collect selected options
- *
- * @return int|array|string
- */
- protected function _getSelectedOptions()
- {
- if (is_null($this->_selectedOptions)) {
- $this->_selectedOptions = [];
- $option = $this->getOption();
-
- if ($this->getProduct()->hasPreconfiguredValues()) {
- $configValue = $this->getProduct()->getPreconfiguredValues()
- ->getData('bundle_option/' . $option->getId());
- if ($configValue) {
- $this->_selectedOptions = $configValue;
- } elseif (!$option->getRequired()) {
- $this->_selectedOptions = 'None';
- }
- }
- }
-
- return $this->_selectedOptions;
- }
-
- /**
- * Define if selection is selected
- *
- * @param Mage_Catalog_Model_Product $selection
- * @return bool
- */
- protected function _isSelected($selection)
- {
- $selectedOptions = $this->_getSelectedOptions();
- if (is_numeric($selectedOptions)) {
- return ($selection->getSelectionId() == $this->_getSelectedOptions());
- } elseif (is_array($selectedOptions) && !empty($selectedOptions)) {
- return in_array($selection->getSelectionId(), $this->_getSelectedOptions());
- } elseif ($selectedOptions === 'None') {
- return false;
- } else {
- return ($selection->getIsDefault() && $selection->isSaleable());
- }
- }
-
- /**
- * Retrieve selected option qty
- *
- * @return int
- */
- protected function _getSelectedQty()
- {
- if ($this->getProduct()->hasPreconfiguredValues()) {
- $selectedQty = (float) $this->getProduct()->getPreconfiguredValues()
- ->getData('bundle_option_qty/' . $this->getOption()->getId());
- if ($selectedQty < 0) {
- $selectedQty = 0;
- }
- } else {
- $selectedQty = 0;
- }
-
- return $selectedQty;
- }
-
/**
* Get product model
*
@@ -281,4 +161,124 @@ public function formatPriceString($price, $includeContainer = true)
return $formated;
}
+
+ /**
+ * Check if option has a single selection
+ *
+ * @return bool
+ */
+ protected function _showSingle()
+ {
+ if (is_null($this->_showSingle)) {
+ $option = $this->getOption();
+ $selections = $option->getSelections();
+
+ $this->_showSingle = (count($selections) === 1 && $option->getRequired());
+ }
+
+ return $this->_showSingle;
+ }
+
+ /**
+ * Retrieve default values for template
+ *
+ * @return array
+ */
+ protected function _getDefaultValues()
+ {
+ $option = $this->getOption();
+ $default = $option->getDefaultSelection();
+ $selections = $option->getSelections();
+ $selectedOptions = $this->_getSelectedOptions();
+ $inPreConfigured = $this->getProduct()->hasPreconfiguredValues()
+ && $this->getProduct()->getPreconfiguredValues()
+ ->getData('bundle_option_qty/' . $option->getId());
+
+ if (empty($selectedOptions) && $default) {
+ $_defaultQty = $default->getSelectionQty() * 1;
+ $_canChangeQty = $default->getSelectionCanChangeQty();
+ } elseif (!$inPreConfigured && $selectedOptions && is_numeric($selectedOptions)) {
+ $selectedSelection = $option->getSelectionById($selectedOptions);
+ if ($selectedSelection) {
+ $_defaultQty = $selectedSelection->getSelectionQty() * 1;
+ $_canChangeQty = $selectedSelection->getSelectionCanChangeQty();
+ } else {
+ $_defaultQty = $selections[0]->getSelectionQty() * 1;
+ $_canChangeQty = $selections[0]->getSelectionCanChangeQty();
+ }
+ } elseif (!$this->_showSingle() || $inPreConfigured) {
+ $_defaultQty = $this->_getSelectedQty();
+ $_canChangeQty = (bool) $_defaultQty;
+ } else {
+ $_defaultQty = $selections[0]->getSelectionQty() * 1;
+ $_canChangeQty = $selections[0]->getSelectionCanChangeQty();
+ }
+
+ return [$_defaultQty, $_canChangeQty];
+ }
+
+ /**
+ * Collect selected options
+ *
+ * @return int|array|string
+ */
+ protected function _getSelectedOptions()
+ {
+ if (is_null($this->_selectedOptions)) {
+ $this->_selectedOptions = [];
+ $option = $this->getOption();
+
+ if ($this->getProduct()->hasPreconfiguredValues()) {
+ $configValue = $this->getProduct()->getPreconfiguredValues()
+ ->getData('bundle_option/' . $option->getId());
+ if ($configValue) {
+ $this->_selectedOptions = $configValue;
+ } elseif (!$option->getRequired()) {
+ $this->_selectedOptions = 'None';
+ }
+ }
+ }
+
+ return $this->_selectedOptions;
+ }
+
+ /**
+ * Define if selection is selected
+ *
+ * @param Mage_Catalog_Model_Product $selection
+ * @return bool
+ */
+ protected function _isSelected($selection)
+ {
+ $selectedOptions = $this->_getSelectedOptions();
+ if (is_numeric($selectedOptions)) {
+ return ($selection->getSelectionId() == $this->_getSelectedOptions());
+ } elseif (is_array($selectedOptions) && !empty($selectedOptions)) {
+ return in_array($selection->getSelectionId(), $this->_getSelectedOptions());
+ } elseif ($selectedOptions === 'None') {
+ return false;
+ } else {
+ return ($selection->getIsDefault() && $selection->isSaleable());
+ }
+ }
+
+ /**
+ * Retrieve selected option qty
+ *
+ * @return int
+ */
+ protected function _getSelectedQty()
+ {
+ if ($this->getProduct()->hasPreconfiguredValues()) {
+ $selectedQty = (float) $this->getProduct()->getPreconfiguredValues()
+ ->getData('bundle_option_qty/' . $this->getOption()->getId());
+ if ($selectedQty < 0) {
+ $selectedQty = 0;
+ }
+ } else {
+ $selectedQty = 0;
+ }
+
+ return $selectedQty;
+ }
}
diff --git a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php
index 2893c1121ba..da797a0b680 100644
--- a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php
@@ -22,6 +22,40 @@
*/
class Mage_Bundle_Block_Checkout_Cart_Item_Renderer extends Mage_Checkout_Block_Cart_Item_Renderer
{
+ /**
+ * Overloaded method for getting list of bundle options
+ * Caches result in quote item, because it can be used in cart 'recent view' and on same page in cart checkout
+ *
+ * @return array
+ */
+ public function getOptionList()
+ {
+ return Mage::helper('bundle/catalog_product_configuration')->getOptions($this->getItem());
+ }
+
+ /**
+ * Return cart item error messages
+ *
+ * @return array
+ */
+ public function getMessages()
+ {
+ $messages = [];
+ $quoteItem = $this->getItem();
+
+ // Add basic messages occurring during this page load
+ $baseMessages = $quoteItem->getMessage(false);
+ if ($baseMessages) {
+ foreach ($baseMessages as $message) {
+ $messages[] = [
+ 'text' => $message,
+ 'type' => $quoteItem->getHasError() ? 'error' : 'notice',
+ ];
+ }
+ }
+
+ return $messages;
+ }
/**
* Get bundled selections (slections-products collection)
*
@@ -58,39 +92,4 @@ protected function _getSelectionQty($selectionId)
{
return Mage::helper('bundle/catalog_product_configuration')->getSelectionQty($this->getProduct(), $selectionId);
}
-
- /**
- * Overloaded method for getting list of bundle options
- * Caches result in quote item, because it can be used in cart 'recent view' and on same page in cart checkout
- *
- * @return array
- */
- public function getOptionList()
- {
- return Mage::helper('bundle/catalog_product_configuration')->getOptions($this->getItem());
- }
-
- /**
- * Return cart item error messages
- *
- * @return array
- */
- public function getMessages()
- {
- $messages = [];
- $quoteItem = $this->getItem();
-
- // Add basic messages occurring during this page load
- $baseMessages = $quoteItem->getMessage(false);
- if ($baseMessages) {
- foreach ($baseMessages as $message) {
- $messages[] = [
- 'text' => $message,
- 'type' => $quoteItem->getHasError() ? 'error' : 'notice',
- ];
- }
- }
-
- return $messages;
- }
}
diff --git a/app/code/core/Mage/Bundle/Model/Option.php b/app/code/core/Mage/Bundle/Model/Option.php
index 037f26d1a7d..d4e56b59812 100644
--- a/app/code/core/Mage/Bundle/Model/Option.php
+++ b/app/code/core/Mage/Bundle/Model/Option.php
@@ -50,12 +50,6 @@ class Mage_Bundle_Model_Option extends Mage_Core_Model_Abstract
*/
protected $_defaultSelection = null;
- protected function _construct()
- {
- $this->_init('bundle/option');
- parent::_construct();
- }
-
/**
* Add selection to option
*
@@ -172,4 +166,10 @@ public function getSelectionById($selectionId)
return $i == -1 ? false : $selections[$i];
}
+
+ protected function _construct()
+ {
+ $this->_init('bundle/option');
+ parent::_construct();
+ }
}
diff --git a/app/code/core/Mage/Bundle/Model/Price/Index.php b/app/code/core/Mage/Bundle/Model/Price/Index.php
index 801826455e7..239c2a41a05 100644
--- a/app/code/core/Mage/Bundle/Model/Price/Index.php
+++ b/app/code/core/Mage/Bundle/Model/Price/Index.php
@@ -34,24 +34,6 @@
*/
class Mage_Bundle_Model_Price_Index extends Mage_Core_Model_Abstract
{
- protected function _construct()
- {
- $this->_init('bundle/price_index');
- }
-
- /**
- * Reindex Product price
- *
- * @param int $productId
- * @param int $priceType
- * @return $this
- */
- protected function _reindexProduct($productId, $priceType)
- {
- $this->_getResource()->reindexProduct($productId, $priceType);
- return $this;
- }
-
/**
* Reindex Bundle product Price Index
*
@@ -125,4 +107,21 @@ public function addPriceIndexToProduct($product)
}
return $this;
}
+ protected function _construct()
+ {
+ $this->_init('bundle/price_index');
+ }
+
+ /**
+ * Reindex Product price
+ *
+ * @param int $productId
+ * @param int $priceType
+ * @return $this
+ */
+ protected function _reindexProduct($productId, $priceType)
+ {
+ $this->_getResource()->reindexProduct($productId, $priceType);
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Bundle/Model/Product/Price.php b/app/code/core/Mage/Bundle/Model/Product/Price.php
index c4039dd46bd..5076104ca0e 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Price.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Price.php
@@ -273,166 +273,6 @@ public function getTotalPrices($product, $which = null, $includeTax = null, $tak
return [$minimalPrice, $maximalPrice];
}
- /**
- * Get minimal possible price for bundle option
- *
- * @param Mage_Catalog_Model_Product $product
- * @param bool|null $includeTax
- * @param bool $takeTierPrice
- * @return int|mixed
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _getMinimalBundleOptionsPrice($product, $includeTax, $takeTierPrice)
- {
- $options = $this->getOptions($product);
- $minimalPrice = 0;
- $minimalPriceWithTax = 0;
- $hasRequiredOptions = $this->_hasRequiredOptions($product);
- $selectionMinimalPrices = [];
- $selectionMinimalPricesWithTax = [];
-
- if (!$options) {
- return $minimalPrice;
- }
-
- foreach ($options as $option) {
- /** @var Mage_Bundle_Model_Option $option */
- $selectionPrices = $this->_getSelectionPrices($product, $option, $takeTierPrice, $includeTax);
- $selectionPricesWithTax = $this->_getSelectionPrices($product, $option, $takeTierPrice, true);
-
- if (count($selectionPrices)) {
- $selectionMinPrice = is_array($selectionPrices) ? min($selectionPrices) : $selectionPrices;
- $selectMinPriceWithTax = is_array($selectionPricesWithTax) ?
- min($selectionPricesWithTax) : $selectionPricesWithTax;
- if ($option->getRequired()) {
- $minimalPrice += $selectionMinPrice;
- $minimalPriceWithTax += $selectMinPriceWithTax;
- } elseif (!$hasRequiredOptions) {
- $selectionMinimalPrices[] = $selectionMinPrice;
- $selectionMinimalPricesWithTax[] = $selectMinPriceWithTax;
- }
- }
- }
- // condition is TRUE when all product options are NOT required
- if (!$hasRequiredOptions) {
- $minimalPrice = empty($selectionMinimalPrices) ? 0 : min($selectionMinimalPrices);
- $minimalPriceWithTax = empty($selectionMinimalPricesWithTax) ? max(0, $minimalPrice) : min($selectionMinimalPricesWithTax);
- }
-
- /** @var Mage_Tax_Helper_Data $taxHelper */
- $taxHelper = $this->_getHelperData('tax');
- $taxConfig = $taxHelper->getConfig();
-
- //In the case of total base calculation we round the tax first and
- //deduct the tax from the price including tax
- if ($taxConfig->priceIncludesTax($product->getStore())
- && Mage_Tax_Model_Calculation::CALC_TOTAL_BASE == $taxConfig->getAlgorithm($product->getStore())
- && ($minimalPriceWithTax > $minimalPrice)
- ) {
- //We convert the value to string to maintain the precision
- $tax = (string) ($minimalPriceWithTax - $minimalPrice);
- $roundedTax = $this->_getApp()->getStore()->roundPrice($tax);
- $minimalPrice = $minimalPriceWithTax - $roundedTax;
- }
- return $minimalPrice;
- }
-
- /**
- * Get maximal possible price for bundle option
- *
- * @param Mage_Catalog_Model_Product $product
- * @param bool|null $includeTax
- * @param bool $takeTierPrice
- * @return float
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _getMaximalBundleOptionsPrice($product, $includeTax, $takeTierPrice)
- {
- $maximalPrice = 0;
- $options = $this->getOptions($product);
-
- if (!$options) {
- return $maximalPrice;
- }
-
- foreach ($options as $option) {
- $selectionPrices = $this->_getSelectionPrices($product, $option, $takeTierPrice, $includeTax);
- if (count($selectionPrices)) {
- $maximalPrice += ($option->isMultiSelection())
- ? array_sum($selectionPrices)
- : max($selectionPrices);
- }
- }
- return $maximalPrice;
- }
-
- /**
- * Get all prices for bundle option selection
- *
- * @param Mage_Catalog_Model_Product $product
- * @param Mage_Bundle_Model_Option $option
- * @param bool $takeTierPrice
- * @param bool|null $includeTax
- * @return array
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _getSelectionPrices($product, $option, $takeTierPrice, $includeTax)
- {
- $selectionPrices = [];
- /** @var Mage_Tax_Helper_Data $taxHelper */
- $taxHelper = $this->_getHelperData('tax');
- $taxCalcMethod = $taxHelper->getConfig()->getAlgorithm($product->getStore());
- $isPriceFixedType = ($product->getPriceType() == self::PRICE_TYPE_FIXED);
-
- $selections = $option->getSelections();
- if (!$selections) {
- return $selectionPrices;
- }
-
- foreach ($selections as $selection) {
- /** @var Mage_Bundle_Model_Selection $selection */
- if (!$selection->isSalable()) {
- /**
- * @todo CatalogInventory Show out of stock Products
- */
- continue;
- }
-
- $item = $isPriceFixedType ? $product : $selection;
-
- $selectionUnitPrice = $this->getSelectionFinalTotalPrice(
- $product,
- $selection,
- 1,
- null,
- false,
- $takeTierPrice,
- );
- $selectionQty = $selection->getSelectionQty();
- if ($isPriceFixedType || $taxCalcMethod == Mage_Tax_Model_Calculation::CALC_TOTAL_BASE) {
- $selectionPrice = $selectionQty * $taxHelper->getPrice(
- $item,
- $selectionUnitPrice,
- $includeTax,
- null,
- null,
- null,
- null,
- null,
- false,
- );
- $selectionPrices[] = $selectionPrice;
- } elseif ($taxCalcMethod == Mage_Tax_Model_Calculation::CALC_ROW_BASE) {
- $selectionPrice = $taxHelper->getPrice($item, $selectionUnitPrice * $selectionQty, $includeTax);
- $selectionPrices[] = $selectionPrice;
- } else { //dynamic price and Mage_Tax_Model_Calculation::CALC_UNIT_BASE
- $selectionPrice = $taxHelper->getPrice($item, $selectionUnitPrice, $includeTax) * $selectionQty;
- $selectionPrices[] = $selectionPrice;
- }
- }
- return $selectionPrices;
- }
-
/**
* Calculate Minimal price of bundle (counting all required options)
*
@@ -609,28 +449,6 @@ public function getLowestPrice($bundleProduct, $price, $bundleQty = 1)
);
}
- /**
- * Apply group price for bundle product
- *
- * @param Mage_Catalog_Model_Product $product
- * @param float $finalPrice
- * @return float
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _applyGroupPrice($product, $finalPrice)
- {
- $result = $finalPrice;
- $groupPrice = $product->getGroupPrice();
-
- if (is_numeric($groupPrice)) {
- $groupPrice = $finalPrice - ($finalPrice * ($groupPrice / 100));
- $groupPrice = $this->_getApp()->getStore()->roundPrice($groupPrice);
- $result = min($finalPrice, $groupPrice);
- }
-
- return $result;
- }
-
/**
* Get product group price
*
@@ -668,32 +486,6 @@ public function getGroupPrice($product)
return $matchedPrice;
}
- /**
- * Apply tier price for bundle
- *
- * @param Mage_Catalog_Model_Product $product
- * @param float $qty
- * @param float $finalPrice
- * @return float
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _applyTierPrice($product, $qty, $finalPrice)
- {
- if (is_null($qty)) {
- return $finalPrice;
- }
-
- $tierPrice = $product->getTierPrice($qty);
-
- if (is_numeric($tierPrice)) {
- $tierPrice = $finalPrice - ($finalPrice * ($tierPrice / 100));
- $tierPrice = $this->_getApp()->getStore()->roundPrice($tierPrice);
- $finalPrice = min($finalPrice, $tierPrice);
- }
-
- return $finalPrice;
- }
-
/**
* Get product tier price by qty
*
@@ -979,6 +771,214 @@ public function isGroupPriceFixed()
return false;
}
+ /**
+ * Get minimal possible price for bundle option
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @param bool|null $includeTax
+ * @param bool $takeTierPrice
+ * @return int|mixed
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ protected function _getMinimalBundleOptionsPrice($product, $includeTax, $takeTierPrice)
+ {
+ $options = $this->getOptions($product);
+ $minimalPrice = 0;
+ $minimalPriceWithTax = 0;
+ $hasRequiredOptions = $this->_hasRequiredOptions($product);
+ $selectionMinimalPrices = [];
+ $selectionMinimalPricesWithTax = [];
+
+ if (!$options) {
+ return $minimalPrice;
+ }
+
+ foreach ($options as $option) {
+ /** @var Mage_Bundle_Model_Option $option */
+ $selectionPrices = $this->_getSelectionPrices($product, $option, $takeTierPrice, $includeTax);
+ $selectionPricesWithTax = $this->_getSelectionPrices($product, $option, $takeTierPrice, true);
+
+ if (count($selectionPrices)) {
+ $selectionMinPrice = is_array($selectionPrices) ? min($selectionPrices) : $selectionPrices;
+ $selectMinPriceWithTax = is_array($selectionPricesWithTax) ?
+ min($selectionPricesWithTax) : $selectionPricesWithTax;
+ if ($option->getRequired()) {
+ $minimalPrice += $selectionMinPrice;
+ $minimalPriceWithTax += $selectMinPriceWithTax;
+ } elseif (!$hasRequiredOptions) {
+ $selectionMinimalPrices[] = $selectionMinPrice;
+ $selectionMinimalPricesWithTax[] = $selectMinPriceWithTax;
+ }
+ }
+ }
+ // condition is TRUE when all product options are NOT required
+ if (!$hasRequiredOptions) {
+ $minimalPrice = empty($selectionMinimalPrices) ? 0 : min($selectionMinimalPrices);
+ $minimalPriceWithTax = empty($selectionMinimalPricesWithTax) ? max(0, $minimalPrice) : min($selectionMinimalPricesWithTax);
+ }
+
+ /** @var Mage_Tax_Helper_Data $taxHelper */
+ $taxHelper = $this->_getHelperData('tax');
+ $taxConfig = $taxHelper->getConfig();
+
+ //In the case of total base calculation we round the tax first and
+ //deduct the tax from the price including tax
+ if ($taxConfig->priceIncludesTax($product->getStore())
+ && Mage_Tax_Model_Calculation::CALC_TOTAL_BASE == $taxConfig->getAlgorithm($product->getStore())
+ && ($minimalPriceWithTax > $minimalPrice)
+ ) {
+ //We convert the value to string to maintain the precision
+ $tax = (string) ($minimalPriceWithTax - $minimalPrice);
+ $roundedTax = $this->_getApp()->getStore()->roundPrice($tax);
+ $minimalPrice = $minimalPriceWithTax - $roundedTax;
+ }
+ return $minimalPrice;
+ }
+
+ /**
+ * Get maximal possible price for bundle option
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @param bool|null $includeTax
+ * @param bool $takeTierPrice
+ * @return float
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ protected function _getMaximalBundleOptionsPrice($product, $includeTax, $takeTierPrice)
+ {
+ $maximalPrice = 0;
+ $options = $this->getOptions($product);
+
+ if (!$options) {
+ return $maximalPrice;
+ }
+
+ foreach ($options as $option) {
+ $selectionPrices = $this->_getSelectionPrices($product, $option, $takeTierPrice, $includeTax);
+ if (count($selectionPrices)) {
+ $maximalPrice += ($option->isMultiSelection())
+ ? array_sum($selectionPrices)
+ : max($selectionPrices);
+ }
+ }
+ return $maximalPrice;
+ }
+
+ /**
+ * Get all prices for bundle option selection
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @param Mage_Bundle_Model_Option $option
+ * @param bool $takeTierPrice
+ * @param bool|null $includeTax
+ * @return array
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ protected function _getSelectionPrices($product, $option, $takeTierPrice, $includeTax)
+ {
+ $selectionPrices = [];
+ /** @var Mage_Tax_Helper_Data $taxHelper */
+ $taxHelper = $this->_getHelperData('tax');
+ $taxCalcMethod = $taxHelper->getConfig()->getAlgorithm($product->getStore());
+ $isPriceFixedType = ($product->getPriceType() == self::PRICE_TYPE_FIXED);
+
+ $selections = $option->getSelections();
+ if (!$selections) {
+ return $selectionPrices;
+ }
+
+ foreach ($selections as $selection) {
+ /** @var Mage_Bundle_Model_Selection $selection */
+ if (!$selection->isSalable()) {
+ /**
+ * @todo CatalogInventory Show out of stock Products
+ */
+ continue;
+ }
+
+ $item = $isPriceFixedType ? $product : $selection;
+
+ $selectionUnitPrice = $this->getSelectionFinalTotalPrice(
+ $product,
+ $selection,
+ 1,
+ null,
+ false,
+ $takeTierPrice,
+ );
+ $selectionQty = $selection->getSelectionQty();
+ if ($isPriceFixedType || $taxCalcMethod == Mage_Tax_Model_Calculation::CALC_TOTAL_BASE) {
+ $selectionPrice = $selectionQty * $taxHelper->getPrice(
+ $item,
+ $selectionUnitPrice,
+ $includeTax,
+ null,
+ null,
+ null,
+ null,
+ null,
+ false,
+ );
+ $selectionPrices[] = $selectionPrice;
+ } elseif ($taxCalcMethod == Mage_Tax_Model_Calculation::CALC_ROW_BASE) {
+ $selectionPrice = $taxHelper->getPrice($item, $selectionUnitPrice * $selectionQty, $includeTax);
+ $selectionPrices[] = $selectionPrice;
+ } else { //dynamic price and Mage_Tax_Model_Calculation::CALC_UNIT_BASE
+ $selectionPrice = $taxHelper->getPrice($item, $selectionUnitPrice, $includeTax) * $selectionQty;
+ $selectionPrices[] = $selectionPrice;
+ }
+ }
+ return $selectionPrices;
+ }
+
+ /**
+ * Apply group price for bundle product
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @param float $finalPrice
+ * @return float
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ protected function _applyGroupPrice($product, $finalPrice)
+ {
+ $result = $finalPrice;
+ $groupPrice = $product->getGroupPrice();
+
+ if (is_numeric($groupPrice)) {
+ $groupPrice = $finalPrice - ($finalPrice * ($groupPrice / 100));
+ $groupPrice = $this->_getApp()->getStore()->roundPrice($groupPrice);
+ $result = min($finalPrice, $groupPrice);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Apply tier price for bundle
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @param float $qty
+ * @param float $finalPrice
+ * @return float
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ protected function _applyTierPrice($product, $qty, $finalPrice)
+ {
+ if (is_null($qty)) {
+ return $finalPrice;
+ }
+
+ $tierPrice = $product->getTierPrice($qty);
+
+ if (is_numeric($tierPrice)) {
+ $tierPrice = $finalPrice - ($finalPrice * ($tierPrice / 100));
+ $tierPrice = $this->_getApp()->getStore()->roundPrice($tierPrice);
+ $finalPrice = min($finalPrice, $tierPrice);
+ }
+
+ return $finalPrice;
+ }
+
/**
* Get data helper
*
diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php
index 5d8f1886832..a5b229c02ac 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Type.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Type.php
@@ -507,189 +507,6 @@ public function isSalable($product = null)
return (array_sum($requiredOptionIds) == count($requiredOptionIds) && $salableSelectionCount);
}
- /**
- * Prepare product and its configuration to be added to some products list.
- * Perform standard preparation process and then prepare of bundle selections options.
- *
- * @param Mage_Catalog_Model_Product $product
- * @param string $processMode
- * @return array|string
- */
- protected function _prepareProduct(Varien_Object $buyRequest, $product, $processMode)
- {
- $result = parent::_prepareProduct($buyRequest, $product, $processMode);
-
- if (is_string($result)) {
- return $result;
- }
-
- $selections = [];
- $product = $this->getProduct($product);
- $isStrictProcessMode = $this->_isStrictProcessMode($processMode);
-
- $skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck();
- $_appendAllSelections = (bool) $product->getSkipCheckRequiredOption() || $skipSaleableCheck;
-
- $options = $buyRequest->getBundleOption();
- if (is_array($options)) {
- $options = array_filter($options, '\intval');
- $qtys = $buyRequest->getBundleOptionQty();
- foreach ($options as $_optionId => $_selections) {
- if (empty($_selections)) {
- unset($options[$_optionId]);
- }
- }
- $optionIds = array_keys($options);
-
- if (empty($optionIds) && $isStrictProcessMode) {
- return Mage::helper('bundle')->__('Please select options for product.');
- }
-
- $product->getTypeInstance(true)->setStoreFilter($product->getStoreId(), $product);
- $optionsCollection = $this->getOptionsCollection($product);
- if (!$this->getProduct($product)->getSkipCheckRequiredOption() && $isStrictProcessMode) {
- foreach ($optionsCollection->getItems() as $option) {
- if ($option->getRequired() && !isset($options[$option->getId()])) {
- return Mage::helper('bundle')->__('Required options are not selected.');
- }
- }
- }
- $selectionIds = [];
-
- foreach ($options as $optionId => $selectionId) {
- if (!is_array($selectionId)) {
- if ($selectionId != '') {
- $selectionIds[] = (int) $selectionId;
- }
- } else {
- foreach ($selectionId as $id) {
- if ($id != '') {
- $selectionIds[] = (int) $id;
- }
- }
- }
- }
- // If product has not been configured yet then $selections array should be empty
- if (!empty($selectionIds)) {
- $selections = $this->getSelectionsByIds($selectionIds, $product);
-
- // Check if added selections are still on sale
- foreach ($selections->getItems() as $selection) {
- if (!$selection->isSalable() && !$skipSaleableCheck) {
- $selectedOption = $optionsCollection->getItemById($selection->getOptionId());
- if (is_array($options[$selectedOption->getId()]) && count($options[$selectedOption->getId()]) > 1) {
- $moreSelections = true;
- } else {
- $moreSelections = false;
- }
- if ($selectedOption->getRequired()
- && (!$selectedOption->isMultiSelection() || ($selectedOption->isMultiSelection() && !$moreSelections))
- ) {
- return Mage::helper('bundle')->__('Selected required options are not available.');
- }
- }
- }
-
- $optionsCollection->appendSelections($selections, false, $_appendAllSelections);
-
- $selections = $selections->getItems();
- } else {
- $selections = [];
- }
- } else {
- $product->setOptionsValidationFail(true);
- $product->getTypeInstance(true)->setStoreFilter($product->getStoreId(), $product);
-
- /** @var Mage_Bundle_Model_Product_Type $productType */
- $productType = $product->getTypeInstance(true);
-
- $optionCollection = $productType->getOptionsCollection($product);
-
- $optionIds = $productType->getOptionsIds($product);
-
- $selectionCollection = $productType->getSelectionsCollection(
- $optionIds,
- $product,
- );
-
- $options = $optionCollection->appendSelections($selectionCollection, false, $_appendAllSelections);
-
- foreach ($options as $option) {
- if ($option->getRequired() && count($option->getSelections()) == 1) {
- $selections = array_merge($selections, $option->getSelections());
- } else {
- $selections = [];
- break;
- }
- }
- }
- if (count($selections) > 0 || !$isStrictProcessMode) {
- $uniqueKey = [$product->getId()];
- $selectionIds = [];
-
- // Shuffle selection array by option position
- usort($selections, [$this, 'shakeSelections']);
-
- foreach ($selections as $selection) {
- if ($selection->getSelectionCanChangeQty() && isset($qtys[$selection->getOptionId()])) {
- $qty = (float) $qtys[$selection->getOptionId()] > 0 ? $qtys[$selection->getOptionId()] : 1;
- } else {
- $qty = (float) $selection->getSelectionQty() ? $selection->getSelectionQty() : 1;
- }
- $qty = (float) $qty;
-
- $product->addCustomOption('selection_qty_' . $selection->getSelectionId(), $qty, $selection);
- $selection->addCustomOption('selection_id', $selection->getSelectionId());
- $product->addCustomOption('product_qty_' . $selection->getId(), $qty, $selection);
-
- /*
- * Create extra attributes that will be converted to product options in order item
- * for selection (not for all bundle)
- */
- $price = $product->getPriceModel()->getSelectionFinalTotalPrice($product, $selection, 0, $qty);
- $attributes = [
- 'price' => Mage::app()->getStore()->convertPrice($price),
- 'qty' => $qty,
- 'option_label' => $selection->getOption()->getTitle(),
- 'option_id' => $selection->getOption()->getId(),
- ];
-
- $_result = $selection->getTypeInstance(true)->prepareForCart($buyRequest, $selection);
- if (is_string($_result) && !is_array($_result)) {
- return $_result;
- }
-
- if (!isset($_result[0])) {
- return Mage::helper('checkout')->__('Cannot add item to the shopping cart.');
- }
-
- $result[] = $_result[0]->setParentProductId($product->getId())
- ->addCustomOption('bundle_option_ids', serialize(array_map('\intval', $optionIds)))
- ->addCustomOption('bundle_selection_attributes', serialize($attributes));
-
- if ($isStrictProcessMode) {
- $_result[0]->setCartQty($qty);
- }
-
- $selectionIds[] = $_result[0]->getSelectionId();
- $uniqueKey[] = $_result[0]->getSelectionId();
- $uniqueKey[] = $qty;
- }
-
- // "unique" key for bundle selection and add it to selections and bundle for selections
- $uniqueKey = implode('_', $uniqueKey);
- foreach ($result as $item) {
- $item->addCustomOption('bundle_identity', $uniqueKey);
- }
- $product->addCustomOption('bundle_option_ids', serialize(array_map('\intval', $optionIds)));
- $product->addCustomOption('bundle_selection_ids', serialize($selectionIds));
-
- return $result;
- }
-
- return $this->getSpecifyOptionMessage();
- }
-
/**
* Retrieve message for specify option(s)
*
@@ -1070,4 +887,187 @@ public function isMapEnabledInOptions($product, $visibility = null)
return null;
}
+
+ /**
+ * Prepare product and its configuration to be added to some products list.
+ * Perform standard preparation process and then prepare of bundle selections options.
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @param string $processMode
+ * @return array|string
+ */
+ protected function _prepareProduct(Varien_Object $buyRequest, $product, $processMode)
+ {
+ $result = parent::_prepareProduct($buyRequest, $product, $processMode);
+
+ if (is_string($result)) {
+ return $result;
+ }
+
+ $selections = [];
+ $product = $this->getProduct($product);
+ $isStrictProcessMode = $this->_isStrictProcessMode($processMode);
+
+ $skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck();
+ $_appendAllSelections = (bool) $product->getSkipCheckRequiredOption() || $skipSaleableCheck;
+
+ $options = $buyRequest->getBundleOption();
+ if (is_array($options)) {
+ $options = array_filter($options, '\intval');
+ $qtys = $buyRequest->getBundleOptionQty();
+ foreach ($options as $_optionId => $_selections) {
+ if (empty($_selections)) {
+ unset($options[$_optionId]);
+ }
+ }
+ $optionIds = array_keys($options);
+
+ if (empty($optionIds) && $isStrictProcessMode) {
+ return Mage::helper('bundle')->__('Please select options for product.');
+ }
+
+ $product->getTypeInstance(true)->setStoreFilter($product->getStoreId(), $product);
+ $optionsCollection = $this->getOptionsCollection($product);
+ if (!$this->getProduct($product)->getSkipCheckRequiredOption() && $isStrictProcessMode) {
+ foreach ($optionsCollection->getItems() as $option) {
+ if ($option->getRequired() && !isset($options[$option->getId()])) {
+ return Mage::helper('bundle')->__('Required options are not selected.');
+ }
+ }
+ }
+ $selectionIds = [];
+
+ foreach ($options as $optionId => $selectionId) {
+ if (!is_array($selectionId)) {
+ if ($selectionId != '') {
+ $selectionIds[] = (int) $selectionId;
+ }
+ } else {
+ foreach ($selectionId as $id) {
+ if ($id != '') {
+ $selectionIds[] = (int) $id;
+ }
+ }
+ }
+ }
+ // If product has not been configured yet then $selections array should be empty
+ if (!empty($selectionIds)) {
+ $selections = $this->getSelectionsByIds($selectionIds, $product);
+
+ // Check if added selections are still on sale
+ foreach ($selections->getItems() as $selection) {
+ if (!$selection->isSalable() && !$skipSaleableCheck) {
+ $selectedOption = $optionsCollection->getItemById($selection->getOptionId());
+ if (is_array($options[$selectedOption->getId()]) && count($options[$selectedOption->getId()]) > 1) {
+ $moreSelections = true;
+ } else {
+ $moreSelections = false;
+ }
+ if ($selectedOption->getRequired()
+ && (!$selectedOption->isMultiSelection() || ($selectedOption->isMultiSelection() && !$moreSelections))
+ ) {
+ return Mage::helper('bundle')->__('Selected required options are not available.');
+ }
+ }
+ }
+
+ $optionsCollection->appendSelections($selections, false, $_appendAllSelections);
+
+ $selections = $selections->getItems();
+ } else {
+ $selections = [];
+ }
+ } else {
+ $product->setOptionsValidationFail(true);
+ $product->getTypeInstance(true)->setStoreFilter($product->getStoreId(), $product);
+
+ /** @var Mage_Bundle_Model_Product_Type $productType */
+ $productType = $product->getTypeInstance(true);
+
+ $optionCollection = $productType->getOptionsCollection($product);
+
+ $optionIds = $productType->getOptionsIds($product);
+
+ $selectionCollection = $productType->getSelectionsCollection(
+ $optionIds,
+ $product,
+ );
+
+ $options = $optionCollection->appendSelections($selectionCollection, false, $_appendAllSelections);
+
+ foreach ($options as $option) {
+ if ($option->getRequired() && count($option->getSelections()) == 1) {
+ $selections = array_merge($selections, $option->getSelections());
+ } else {
+ $selections = [];
+ break;
+ }
+ }
+ }
+ if (count($selections) > 0 || !$isStrictProcessMode) {
+ $uniqueKey = [$product->getId()];
+ $selectionIds = [];
+
+ // Shuffle selection array by option position
+ usort($selections, [$this, 'shakeSelections']);
+
+ foreach ($selections as $selection) {
+ if ($selection->getSelectionCanChangeQty() && isset($qtys[$selection->getOptionId()])) {
+ $qty = (float) $qtys[$selection->getOptionId()] > 0 ? $qtys[$selection->getOptionId()] : 1;
+ } else {
+ $qty = (float) $selection->getSelectionQty() ? $selection->getSelectionQty() : 1;
+ }
+ $qty = (float) $qty;
+
+ $product->addCustomOption('selection_qty_' . $selection->getSelectionId(), $qty, $selection);
+ $selection->addCustomOption('selection_id', $selection->getSelectionId());
+ $product->addCustomOption('product_qty_' . $selection->getId(), $qty, $selection);
+
+ /*
+ * Create extra attributes that will be converted to product options in order item
+ * for selection (not for all bundle)
+ */
+ $price = $product->getPriceModel()->getSelectionFinalTotalPrice($product, $selection, 0, $qty);
+ $attributes = [
+ 'price' => Mage::app()->getStore()->convertPrice($price),
+ 'qty' => $qty,
+ 'option_label' => $selection->getOption()->getTitle(),
+ 'option_id' => $selection->getOption()->getId(),
+ ];
+
+ $_result = $selection->getTypeInstance(true)->prepareForCart($buyRequest, $selection);
+ if (is_string($_result) && !is_array($_result)) {
+ return $_result;
+ }
+
+ if (!isset($_result[0])) {
+ return Mage::helper('checkout')->__('Cannot add item to the shopping cart.');
+ }
+
+ $result[] = $_result[0]->setParentProductId($product->getId())
+ ->addCustomOption('bundle_option_ids', serialize(array_map('\intval', $optionIds)))
+ ->addCustomOption('bundle_selection_attributes', serialize($attributes));
+
+ if ($isStrictProcessMode) {
+ $_result[0]->setCartQty($qty);
+ }
+
+ $selectionIds[] = $_result[0]->getSelectionId();
+ $uniqueKey[] = $_result[0]->getSelectionId();
+ $uniqueKey[] = $qty;
+ }
+
+ // "unique" key for bundle selection and add it to selections and bundle for selections
+ $uniqueKey = implode('_', $uniqueKey);
+ foreach ($result as $item) {
+ $item->addCustomOption('bundle_identity', $uniqueKey);
+ }
+ $product->addCustomOption('bundle_option_ids', serialize(array_map('\intval', $optionIds)));
+ $product->addCustomOption('bundle_selection_ids', serialize($selectionIds));
+
+ return $result;
+ }
+
+ return $this->getSpecifyOptionMessage();
+ }
}
diff --git a/app/code/core/Mage/Bundle/Model/Resource/Bundle.php b/app/code/core/Mage/Bundle/Model/Resource/Bundle.php
index c9b23a96cfe..5a518fee5d5 100644
--- a/app/code/core/Mage/Bundle/Model/Resource/Bundle.php
+++ b/app/code/core/Mage/Bundle/Model/Resource/Bundle.php
@@ -22,28 +22,6 @@
*/
class Mage_Bundle_Model_Resource_Bundle extends Mage_CatalogIndex_Model_Resource_Data_Abstract
{
- /**
- * Preparing select for getting selection's raw data by product id
- * also can be specified extra parameter for limit which columns should be selected
- *
- * @param int $productId
- * @param array $columns
- * @return Zend_Db_Select
- */
- protected function _getSelect($productId, $columns = [])
- {
- return $this->_getReadAdapter()->select()
- ->from(['bundle_option' => $this->getTable('bundle/option')], ['type', 'option_id'])
- ->where('bundle_option.parent_id = ?', $productId)
- ->where('bundle_option.required = 1')
- ->joinLeft(
- [
- 'bundle_selection' => $this->getTable('bundle/selection')],
- 'bundle_selection.option_id = bundle_option.option_id',
- $columns,
- );
- }
-
/**
* Retrieve selection data for specified product id
*
@@ -112,4 +90,25 @@ public function saveProductRelations($parentId, $childIds)
return $this;
}
+ /**
+ * Preparing select for getting selection's raw data by product id
+ * also can be specified extra parameter for limit which columns should be selected
+ *
+ * @param int $productId
+ * @param array $columns
+ * @return Zend_Db_Select
+ */
+ protected function _getSelect($productId, $columns = [])
+ {
+ return $this->_getReadAdapter()->select()
+ ->from(['bundle_option' => $this->getTable('bundle/option')], ['type', 'option_id'])
+ ->where('bundle_option.parent_id = ?', $productId)
+ ->where('bundle_option.required = 1')
+ ->joinLeft(
+ [
+ 'bundle_selection' => $this->getTable('bundle/selection')],
+ 'bundle_selection.option_id = bundle_option.option_id',
+ $columns,
+ );
+ }
}
diff --git a/app/code/core/Mage/Bundle/Model/Resource/Option.php b/app/code/core/Mage/Bundle/Model/Resource/Option.php
index 34a96d0095f..bd695fa108d 100644
--- a/app/code/core/Mage/Bundle/Model/Resource/Option.php
+++ b/app/code/core/Mage/Bundle/Model/Resource/Option.php
@@ -22,6 +22,44 @@
*/
class Mage_Bundle_Model_Resource_Option extends Mage_Core_Model_Resource_Db_Abstract
{
+ /**
+ * Retrieve options searchable data
+ *
+ * @param int $productId
+ * @param int $storeId
+ * @return array
+ */
+ public function getSearchableData($productId, $storeId)
+ {
+ $adapter = $this->_getReadAdapter();
+
+ $title = $adapter->getCheckSql(
+ 'option_title_store.title IS NOT NULL',
+ 'option_title_store.title',
+ 'option_title_default.title',
+ );
+ $bind = [
+ 'store_id' => $storeId,
+ 'product_id' => $productId,
+ ];
+ $select = $adapter->select()
+ ->from(['opt' => $this->getMainTable()], [])
+ ->join(
+ ['option_title_default' => $this->getTable('bundle/option_value')],
+ 'option_title_default.option_id = opt.option_id AND option_title_default.store_id = 0',
+ [],
+ )
+ ->joinLeft(
+ ['option_title_store' => $this->getTable('bundle/option_value')],
+ 'option_title_store.option_id = opt.option_id AND option_title_store.store_id = :store_id',
+ ['title' => $title],
+ )
+ ->where('opt.parent_id=:product_id');
+ if (!$searchData = $adapter->fetchCol($select, $bind)) {
+ $searchData = [];
+ }
+ return $searchData;
+ }
protected function _construct()
{
$this->_init('bundle/option', 'option_id');
@@ -78,43 +116,4 @@ protected function _afterDelete(Mage_Core_Model_Abstract $object)
return $this;
}
-
- /**
- * Retrieve options searchable data
- *
- * @param int $productId
- * @param int $storeId
- * @return array
- */
- public function getSearchableData($productId, $storeId)
- {
- $adapter = $this->_getReadAdapter();
-
- $title = $adapter->getCheckSql(
- 'option_title_store.title IS NOT NULL',
- 'option_title_store.title',
- 'option_title_default.title',
- );
- $bind = [
- 'store_id' => $storeId,
- 'product_id' => $productId,
- ];
- $select = $adapter->select()
- ->from(['opt' => $this->getMainTable()], [])
- ->join(
- ['option_title_default' => $this->getTable('bundle/option_value')],
- 'option_title_default.option_id = opt.option_id AND option_title_default.store_id = 0',
- [],
- )
- ->joinLeft(
- ['option_title_store' => $this->getTable('bundle/option_value')],
- 'option_title_store.option_id = opt.option_id AND option_title_store.store_id = :store_id',
- ['title' => $title],
- )
- ->where('opt.parent_id=:product_id');
- if (!$searchData = $adapter->fetchCol($select, $bind)) {
- $searchData = [];
- }
- return $searchData;
- }
}
diff --git a/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php b/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php
index f6e901f5e06..c9942046107 100644
--- a/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php
+++ b/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php
@@ -39,15 +39,6 @@ class Mage_Bundle_Model_Resource_Option_Collection extends Mage_Core_Model_Resou
*/
protected $_selectionsAppended = false;
- /**
- * Init model and resource model
- *
- */
- protected function _construct()
- {
- $this->_init('bundle/option');
- }
-
/**
* Joins values to options
*
@@ -141,20 +132,6 @@ public function appendSelections($selectionsCollection, $stripBefore = false, $a
return $this->getItems();
}
- /**
- * Removes appended selections before
- *
- * @return $this
- */
- protected function _stripSelections()
- {
- foreach ($this->getItems() as $option) {
- $option->setSelections([]);
- }
- $this->_selectionsAppended = false;
- return $this;
- }
-
/**
* Sets filter by option id
*
@@ -194,4 +171,27 @@ public function getAllIds()
}
return $this->_itemIds;
}
+
+ /**
+ * Init model and resource model
+ *
+ */
+ protected function _construct()
+ {
+ $this->_init('bundle/option');
+ }
+
+ /**
+ * Removes appended selections before
+ *
+ * @return $this
+ */
+ protected function _stripSelections()
+ {
+ foreach ($this->getItems() as $option) {
+ $option->setSelections([]);
+ }
+ $this->_selectionsAppended = false;
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php
index 6d85e9e1369..18150eac6f3 100644
--- a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php
+++ b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php
@@ -43,56 +43,6 @@ class Mage_Bundle_Model_Resource_Price_Index extends Mage_Core_Model_Resource_Db
*/
protected $_customerGroups;
- protected function _construct()
- {
- $this->_init('bundle/price_index', 'entity_id');
- }
-
- /**
- * Retrieve attribute object
- *
- * @param string $attributeCode
- * @return Mage_Catalog_Model_Resource_Eav_Attribute
- */
- protected function _getAttribute($attributeCode)
- {
- if (!isset($this->_attributes[$attributeCode])) {
- $this->_attributes[$attributeCode] = Mage::getSingleton('catalog/config')
- ->getAttribute(Mage_Catalog_Model_Product::ENTITY, $attributeCode);
- }
- return $this->_attributes[$attributeCode];
- }
-
- /**
- * Retrieve websites collection array
- *
- * @return array
- */
- protected function _getWebsites()
- {
- if (is_null($this->_websites)) {
- $this->_websites = Mage::app()->getWebsites(false);
- }
- return $this->_websites;
- }
-
- /**
- * Retrieve customer groups collection array
- *
- * @return array
- * @throws Mage_Core_Exception
- */
- protected function _getCustomerGroups()
- {
- if (is_null($this->_customerGroups)) {
- $this->_customerGroups = [];
- foreach (Mage::getModel('customer/group')->getCollection() as $group) {
- $this->_customerGroups[$group->getId()] = $group;
- }
- }
- return $this->_customerGroups;
- }
-
/**
* Retrieve product ids array by product condition
*
@@ -168,99 +118,6 @@ public function reindex($products = null)
return $this;
}
- /**
- * Reindex product price
- *
- * @param int $productId
- * @param int $priceType
- * @return $this
- * @throws Mage_Core_Exception
- */
- protected function _reindexProduct($productId, $priceType)
- {
- $options = $this->getSelections($productId);
- $selectionProducts = [];
- foreach ($options as $option) {
- foreach ($option['selections'] as $selection) {
- $selectionProducts[$selection['product_id']] = $selection['product_id'];
- }
- }
-
- $priceIndex = [];
- if ($priceType == Mage_Bundle_Model_Product_Price::PRICE_TYPE_DYNAMIC) {
- // load selection product prices from index for dynamic bundle
- $priceIndex = $this->getProductsPriceFromIndex($selectionProducts);
- }
-
- /** @var Mage_Core_Model_Website $website */
- foreach ($this->_getWebsites() as $website) {
- if (!$website->getDefaultStore()) {
- continue;
- }
- $salableStatus = $this->getProductsSalableStatus($selectionProducts, $website);
- $priceData = $this->getProductsPriceData($productId, $website);
- $priceData = $priceData[$productId];
-
- /** @var Mage_Customer_Model_Group $group */
- foreach ($this->_getCustomerGroups() as $group) {
- if ($priceType == Mage_Bundle_Model_Product_Price::PRICE_TYPE_FIXED) {
- $basePrice = $this->_getBasePrice($productId, $priceData, $website, $group);
- $customOptions = $this->getCustomOptions($productId, $website);
- } elseif ($priceType == Mage_Bundle_Model_Product_Price::PRICE_TYPE_DYNAMIC) {
- $basePrice = 0;
- }
-
- list($minPrice, $maxPrice) = $this->_calculateBundleSelections(
- $options,
- $salableStatus,
- $productId,
- $priceType,
- $basePrice,
- $priceData,
- $priceIndex,
- $website,
- $group,
- );
-
- if ($priceType == Mage_Bundle_Model_Product_Price::PRICE_TYPE_FIXED) {
- list($minPrice, $maxPrice) =
- $this->_calculateCustomOptions($customOptions, $basePrice, $minPrice, $maxPrice);
- }
-
- $this->_savePriceIndex($productId, $website->getId(), $group->getId(), $minPrice, $maxPrice);
- }
- }
-
- return $this;
- }
-
- /**
- * Save price index
- *
- * @param int $productId
- * @param int $websiteId
- * @param int $groupId
- * @param float $minPrice
- * @param float $maxPrice
- * @return $this
- * @throws Zend_Db_Exception
- */
- protected function _savePriceIndex($productId, $websiteId, $groupId, $minPrice, $maxPrice)
- {
- $adapter = $this->_getWriteAdapter();
- $adapter->beginTransaction();
- try {
- $bind = [$productId, $websiteId, $groupId, $minPrice, $maxPrice];
- $adapter->insertOnDuplicate($this->getMainTable(), $bind, ['min_price', 'max_price']);
- $adapter->commit();
- } catch (Exception $e) {
- $adapter->rollBack();
- throw $e;
- }
-
- return $this;
- }
-
/**
* Retrieve bundle options with selections and prices by product
*
@@ -450,81 +307,6 @@ public function getProductsPriceData($products, Mage_Core_Model_Website $website
return $productsData;
}
- /**
- * Add attribute data to select
- *
- * @param string $attributeCode
- * @return $this
- * @throws Mage_Core_Exception
- */
- protected function _addAttributeDataToSelect(
- Varien_Db_Select $select,
- $attributeCode,
- Mage_Core_Model_Website $website
- ) {
- $attribute = $this->_getAttribute($attributeCode);
- $store = $website->getDefaultStore();
- if ($attribute->isScopeGlobal()) {
- $table = 't_' . $attribute->getAttributeCode();
- $select->joinLeft(
- [$table => $attribute->getBackend()->getTable()],
- "e.entity_id={$table}.entity_id"
- . " AND {$table}.attribute_id={$attribute->getAttributeId()}"
- . " AND {$table}.store_id=0",
- [$attribute->getAttributeCode() => $table . '.value'],
- );
- } else {
- $tableName = $attribute->getBackend()->getTable();
- $tableGlobal = 't1_' . $attribute->getAttributeCode();
- $tableStore = 't2_' . $attribute->getAttributeCode();
-
- $attributeCond = $this->getReadConnection()->getCheckSql(
- $tableStore . '.value_id > 0',
- $tableStore . '.value',
- $tableGlobal . '.value',
- );
- $select->joinLeft(
- [$tableGlobal => $tableName],
- "e.entity_id = {$tableGlobal}.entity_id"
- . " AND {$tableGlobal}.attribute_id = {$attribute->getAttributeId()}"
- . " AND {$tableGlobal}.store_id = 0",
- [$attribute->getAttributeCode() => $attributeCond],
- )
- ->joinLeft(
- [$tableStore => $tableName],
- "{$tableGlobal}.entity_id = {$tableStore}.entity_id"
- . " AND {$tableGlobal}.attribute_id = {$tableStore}.attribute_id"
- . " AND {$tableStore}.store_id = " . $store->getId(),
- [],
- );
- }
- return $this;
- }
-
- /**
- * Retrieve fixed bundle base price (with special price and rules)
- *
- * @param int $productId
- * @param Mage_Core_Model_Website $website
- * @param Mage_Customer_Model_Group $customerGroup
- * @return float
- */
- protected function _getBasePrice($productId, array $priceData, $website, $customerGroup)
- {
- $store = $website->getDefaultStore();
- $storeTimeStamp = Mage::app()->getLocale()->storeTimeStamp($store);
- $finalPrice = $this->_calculateSpecialPrice($priceData['price'], $priceData, $website);
-
- $rulePrice = Mage::getResourceModel('catalogrule/rule')
- ->getRulePrice($storeTimeStamp, $website->getId(), $customerGroup->getId(), $productId);
-
- if ($rulePrice !== null && $rulePrice !== false) {
- $finalPrice = min($finalPrice, $rulePrice);
- }
-
- return $finalPrice;
- }
-
/**
* Retrieve custom options for product
*
@@ -860,4 +642,222 @@ public function loadPriceIndex($productIds, $websiteId, $groupId)
return $prices;
}
+
+ protected function _construct()
+ {
+ $this->_init('bundle/price_index', 'entity_id');
+ }
+
+ /**
+ * Retrieve attribute object
+ *
+ * @param string $attributeCode
+ * @return Mage_Catalog_Model_Resource_Eav_Attribute
+ */
+ protected function _getAttribute($attributeCode)
+ {
+ if (!isset($this->_attributes[$attributeCode])) {
+ $this->_attributes[$attributeCode] = Mage::getSingleton('catalog/config')
+ ->getAttribute(Mage_Catalog_Model_Product::ENTITY, $attributeCode);
+ }
+ return $this->_attributes[$attributeCode];
+ }
+
+ /**
+ * Retrieve websites collection array
+ *
+ * @return array
+ */
+ protected function _getWebsites()
+ {
+ if (is_null($this->_websites)) {
+ $this->_websites = Mage::app()->getWebsites(false);
+ }
+ return $this->_websites;
+ }
+
+ /**
+ * Retrieve customer groups collection array
+ *
+ * @return array
+ * @throws Mage_Core_Exception
+ */
+ protected function _getCustomerGroups()
+ {
+ if (is_null($this->_customerGroups)) {
+ $this->_customerGroups = [];
+ foreach (Mage::getModel('customer/group')->getCollection() as $group) {
+ $this->_customerGroups[$group->getId()] = $group;
+ }
+ }
+ return $this->_customerGroups;
+ }
+
+ /**
+ * Reindex product price
+ *
+ * @param int $productId
+ * @param int $priceType
+ * @return $this
+ * @throws Mage_Core_Exception
+ */
+ protected function _reindexProduct($productId, $priceType)
+ {
+ $options = $this->getSelections($productId);
+ $selectionProducts = [];
+ foreach ($options as $option) {
+ foreach ($option['selections'] as $selection) {
+ $selectionProducts[$selection['product_id']] = $selection['product_id'];
+ }
+ }
+
+ $priceIndex = [];
+ if ($priceType == Mage_Bundle_Model_Product_Price::PRICE_TYPE_DYNAMIC) {
+ // load selection product prices from index for dynamic bundle
+ $priceIndex = $this->getProductsPriceFromIndex($selectionProducts);
+ }
+
+ /** @var Mage_Core_Model_Website $website */
+ foreach ($this->_getWebsites() as $website) {
+ if (!$website->getDefaultStore()) {
+ continue;
+ }
+ $salableStatus = $this->getProductsSalableStatus($selectionProducts, $website);
+ $priceData = $this->getProductsPriceData($productId, $website);
+ $priceData = $priceData[$productId];
+
+ /** @var Mage_Customer_Model_Group $group */
+ foreach ($this->_getCustomerGroups() as $group) {
+ if ($priceType == Mage_Bundle_Model_Product_Price::PRICE_TYPE_FIXED) {
+ $basePrice = $this->_getBasePrice($productId, $priceData, $website, $group);
+ $customOptions = $this->getCustomOptions($productId, $website);
+ } elseif ($priceType == Mage_Bundle_Model_Product_Price::PRICE_TYPE_DYNAMIC) {
+ $basePrice = 0;
+ }
+
+ list($minPrice, $maxPrice) = $this->_calculateBundleSelections(
+ $options,
+ $salableStatus,
+ $productId,
+ $priceType,
+ $basePrice,
+ $priceData,
+ $priceIndex,
+ $website,
+ $group,
+ );
+
+ if ($priceType == Mage_Bundle_Model_Product_Price::PRICE_TYPE_FIXED) {
+ list($minPrice, $maxPrice) =
+ $this->_calculateCustomOptions($customOptions, $basePrice, $minPrice, $maxPrice);
+ }
+
+ $this->_savePriceIndex($productId, $website->getId(), $group->getId(), $minPrice, $maxPrice);
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Save price index
+ *
+ * @param int $productId
+ * @param int $websiteId
+ * @param int $groupId
+ * @param float $minPrice
+ * @param float $maxPrice
+ * @return $this
+ * @throws Zend_Db_Exception
+ */
+ protected function _savePriceIndex($productId, $websiteId, $groupId, $minPrice, $maxPrice)
+ {
+ $adapter = $this->_getWriteAdapter();
+ $adapter->beginTransaction();
+ try {
+ $bind = [$productId, $websiteId, $groupId, $minPrice, $maxPrice];
+ $adapter->insertOnDuplicate($this->getMainTable(), $bind, ['min_price', 'max_price']);
+ $adapter->commit();
+ } catch (Exception $e) {
+ $adapter->rollBack();
+ throw $e;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add attribute data to select
+ *
+ * @param string $attributeCode
+ * @return $this
+ * @throws Mage_Core_Exception
+ */
+ protected function _addAttributeDataToSelect(
+ Varien_Db_Select $select,
+ $attributeCode,
+ Mage_Core_Model_Website $website
+ ) {
+ $attribute = $this->_getAttribute($attributeCode);
+ $store = $website->getDefaultStore();
+ if ($attribute->isScopeGlobal()) {
+ $table = 't_' . $attribute->getAttributeCode();
+ $select->joinLeft(
+ [$table => $attribute->getBackend()->getTable()],
+ "e.entity_id={$table}.entity_id"
+ . " AND {$table}.attribute_id={$attribute->getAttributeId()}"
+ . " AND {$table}.store_id=0",
+ [$attribute->getAttributeCode() => $table . '.value'],
+ );
+ } else {
+ $tableName = $attribute->getBackend()->getTable();
+ $tableGlobal = 't1_' . $attribute->getAttributeCode();
+ $tableStore = 't2_' . $attribute->getAttributeCode();
+
+ $attributeCond = $this->getReadConnection()->getCheckSql(
+ $tableStore . '.value_id > 0',
+ $tableStore . '.value',
+ $tableGlobal . '.value',
+ );
+ $select->joinLeft(
+ [$tableGlobal => $tableName],
+ "e.entity_id = {$tableGlobal}.entity_id"
+ . " AND {$tableGlobal}.attribute_id = {$attribute->getAttributeId()}"
+ . " AND {$tableGlobal}.store_id = 0",
+ [$attribute->getAttributeCode() => $attributeCond],
+ )
+ ->joinLeft(
+ [$tableStore => $tableName],
+ "{$tableGlobal}.entity_id = {$tableStore}.entity_id"
+ . " AND {$tableGlobal}.attribute_id = {$tableStore}.attribute_id"
+ . " AND {$tableStore}.store_id = " . $store->getId(),
+ [],
+ );
+ }
+ return $this;
+ }
+
+ /**
+ * Retrieve fixed bundle base price (with special price and rules)
+ *
+ * @param int $productId
+ * @param Mage_Core_Model_Website $website
+ * @param Mage_Customer_Model_Group $customerGroup
+ * @return float
+ */
+ protected function _getBasePrice($productId, array $priceData, $website, $customerGroup)
+ {
+ $store = $website->getDefaultStore();
+ $storeTimeStamp = Mage::app()->getLocale()->storeTimeStamp($store);
+ $finalPrice = $this->_calculateSpecialPrice($priceData['price'], $priceData, $website);
+
+ $rulePrice = Mage::getResourceModel('catalogrule/rule')
+ ->getRulePrice($storeTimeStamp, $website->getId(), $customerGroup->getId(), $productId);
+
+ if ($rulePrice !== null && $rulePrice !== false) {
+ $finalPrice = min($finalPrice, $rulePrice);
+ }
+
+ return $finalPrice;
+ }
}
diff --git a/app/code/core/Mage/Bundle/Model/Resource/Selection.php b/app/code/core/Mage/Bundle/Model/Resource/Selection.php
index 231ba26cd57..50f20e15265 100644
--- a/app/code/core/Mage/Bundle/Model/Resource/Selection.php
+++ b/app/code/core/Mage/Bundle/Model/Resource/Selection.php
@@ -22,11 +22,6 @@
*/
class Mage_Bundle_Model_Resource_Selection extends Mage_Core_Model_Resource_Db_Abstract
{
- protected function _construct()
- {
- $this->_init('bundle/selection', 'selection_id');
- }
-
/**
* Retrieve Price From index
*
@@ -178,4 +173,8 @@ public function saveSelectionPrice($item)
);
}
}
+ protected function _construct()
+ {
+ $this->_init('bundle/selection', 'selection_id');
+ }
}
diff --git a/app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php b/app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php
index bcecc193e6d..1a99c892fd1 100644
--- a/app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php
+++ b/app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php
@@ -29,17 +29,6 @@ class Mage_Bundle_Model_Resource_Selection_Collection extends Mage_Catalog_Model
*/
protected $_selectionTable;
- /**
- * Initialize collection
- *
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setRowIdFieldName('selection_id');
- $this->_selectionTable = $this->getTable('bundle/selection');
- }
-
/**
* Set store id for each collection item when collection was loaded
*
@@ -56,22 +45,6 @@ public function _afterLoad()
return $this;
}
- /**
- * Initialize collection select
- *
- */
- protected function _initSelect()
- {
- parent::_initSelect();
- $this->getSelect()->join(
- ['selection' => $this->_selectionTable],
- 'selection.product_id = e.entity_id',
- ['*'],
- );
-
- return $this;
- }
-
/**
* Join website scope prices to collection, override default prices
*
@@ -142,4 +115,31 @@ public function setPositionOrder()
->order('selection.selection_id asc');
return $this;
}
+
+ /**
+ * Initialize collection
+ *
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setRowIdFieldName('selection_id');
+ $this->_selectionTable = $this->getTable('bundle/selection');
+ }
+
+ /**
+ * Initialize collection select
+ *
+ */
+ protected function _initSelect()
+ {
+ parent::_initSelect();
+ $this->getSelect()->join(
+ ['selection' => $this->_selectionTable],
+ 'selection.product_id = e.entity_id',
+ ['*'],
+ );
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php
index d66529f334d..c0ae053b1a5 100644
--- a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php
+++ b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php
@@ -24,11 +24,6 @@
*/
class Mage_Bundle_Adminhtml_Bundle_Product_EditController extends Mage_Adminhtml_Catalog_ProductController
{
- protected function _construct()
- {
- $this->setUsedModuleName('Mage_Bundle');
- }
-
public function formAction()
{
$product = $this->_initProduct();
@@ -38,4 +33,8 @@ public function formAction()
->toHtml(),
);
}
+ protected function _construct()
+ {
+ $this->setUsedModuleName('Mage_Bundle');
+ }
}
diff --git a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php
index ac44657bae6..d9162545b1a 100644
--- a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php
+++ b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php
@@ -28,11 +28,6 @@ class Mage_Bundle_Adminhtml_Bundle_SelectionController extends Mage_Adminhtml_Co
*/
public const ADMIN_RESOURCE = 'catalog/products';
- protected function _construct()
- {
- $this->setUsedModuleName('Mage_Bundle');
- }
-
/**
* @return Zend_Controller_Response_Abstract
*/
@@ -62,4 +57,9 @@ public function gridAction()
->toHtml(),
);
}
+
+ protected function _construct()
+ {
+ $this->setUsedModuleName('Mage_Bundle');
+ }
}
diff --git a/app/code/core/Mage/Captcha/Block/Captcha/Zend.php b/app/code/core/Mage/Captcha/Block/Captcha/Zend.php
index 98e1bb38955..bd6eb25d15d 100644
--- a/app/code/core/Mage/Captcha/Block/Captcha/Zend.php
+++ b/app/code/core/Mage/Captcha/Block/Captcha/Zend.php
@@ -55,6 +55,16 @@ public function getRefreshUrl()
);
}
+ /**
+ * Returns captcha model
+ *
+ * @return Mage_Captcha_Model_Zend
+ */
+ public function getCaptchaModel()
+ {
+ return Mage::helper('captcha')->getCaptcha($this->getFormId());
+ }
+
/**
* Renders captcha HTML (if required)
*
@@ -68,14 +78,4 @@ protected function _toHtml()
}
return '';
}
-
- /**
- * Returns captcha model
- *
- * @return Mage_Captcha_Model_Zend
- */
- public function getCaptchaModel()
- {
- return Mage::helper('captcha')->getCaptcha($this->getFormId());
- }
}
diff --git a/app/code/core/Mage/Captcha/Model/Observer.php b/app/code/core/Mage/Captcha/Model/Observer.php
index 57b302cc680..52969228b54 100644
--- a/app/code/core/Mage/Captcha/Model/Observer.php
+++ b/app/code/core/Mage/Captcha/Model/Observer.php
@@ -161,16 +161,6 @@ public function checkUserLoginBackend($observer)
return $this;
}
- /**
- * Returns backend session
- *
- * @return Mage_Adminhtml_Model_Session
- */
- protected function _getBackendSession()
- {
- return Mage::getSingleton('adminhtml/session');
- }
-
/**
* Check Captcha On User Login Backend Page
*
@@ -252,31 +242,6 @@ public function deleteExpiredImages()
return $this;
}
- /**
- * Reset Attempts
- *
- * @param string $login
- * @return $this
- */
- protected function _resetAttempt($login)
- {
- Mage::getResourceModel('captcha/log')->deleteUserAttempts($login);
- return $this;
- }
-
- /**
- * Get Captcha String
- *
- * @param Mage_Core_Controller_Request_Http $request
- * @param string $formId
- * @return string
- */
- protected function _getCaptchaString($request, $formId)
- {
- $captchaParams = $request->getPost(Mage_Captcha_Helper_Data::INPUT_NAME_FIELD_VALUE);
- return $captchaParams[$formId] ?? '';
- }
-
/**
* Check Captcha On Share Wishlist Page
*
@@ -329,4 +294,39 @@ public function checkSendfriendSend($observer)
}
return $this;
}
+
+ /**
+ * Returns backend session
+ *
+ * @return Mage_Adminhtml_Model_Session
+ */
+ protected function _getBackendSession()
+ {
+ return Mage::getSingleton('adminhtml/session');
+ }
+
+ /**
+ * Reset Attempts
+ *
+ * @param string $login
+ * @return $this
+ */
+ protected function _resetAttempt($login)
+ {
+ Mage::getResourceModel('captcha/log')->deleteUserAttempts($login);
+ return $this;
+ }
+
+ /**
+ * Get Captcha String
+ *
+ * @param Mage_Core_Controller_Request_Http $request
+ * @param string $formId
+ * @return string
+ */
+ protected function _getCaptchaString($request, $formId)
+ {
+ $captchaParams = $request->getPost(Mage_Captcha_Helper_Data::INPUT_NAME_FIELD_VALUE);
+ return $captchaParams[$formId] ?? '';
+ }
}
diff --git a/app/code/core/Mage/Captcha/Model/Resource/Log.php b/app/code/core/Mage/Captcha/Model/Resource/Log.php
index f87ff3fab2c..474c31041c9 100644
--- a/app/code/core/Mage/Captcha/Model/Resource/Log.php
+++ b/app/code/core/Mage/Captcha/Model/Resource/Log.php
@@ -32,11 +32,6 @@ class Mage_Captcha_Model_Resource_Log extends Mage_Core_Model_Resource_Db_Abstra
*/
public const TYPE_LOGIN = 2;
- protected function _construct()
- {
- $this->_setMainTable('captcha/log');
- }
-
/**
* Save or Update count Attempts
*
@@ -138,4 +133,9 @@ public function deleteOldAttempts()
['updated_at < ?' => Mage::getSingleton('core/date')->gmtDate(null, time() - 60 * 30)],
);
}
+
+ protected function _construct()
+ {
+ $this->_setMainTable('captcha/log');
+ }
}
diff --git a/app/code/core/Mage/Captcha/Model/Zend.php b/app/code/core/Mage/Captcha/Model/Zend.php
index feaa2c2038f..ae0fbb9f572 100644
--- a/app/code/core/Mage/Captcha/Model/Zend.php
+++ b/app/code/core/Mage/Captcha/Model/Zend.php
@@ -83,17 +83,6 @@ public function __construct($params)
$this->setExpiration($this->getTimeout());
}
- /**
- * Returns key with respect of current form ID
- *
- * @param string $key
- * @return string
- */
- protected function _getFormIdKey($key)
- {
- return $this->_formId . '_' . $key;
- }
-
/**
* Get Block Name
*
@@ -125,75 +114,6 @@ public function isRequired($login = null)
);
}
- /**
- * Check is overlimit attempts
- *
- * @param string $login
- * @return bool
- */
- protected function _isOverLimitAttempts($login)
- {
- return ($this->_isOverLimitIpAttempt() || $this->_isOverLimitLoginAttempts($login));
- }
-
- /**
- * Returns number of allowed attempts for same login
- *
- * @return int
- */
- protected function _getAllowedAttemptsForSameLogin()
- {
- return (int) $this->_getHelper()->getConfigNode('failed_attempts_login');
- }
-
- /**
- * Returns number of allowed attempts from same IP
- *
- * @return int
- */
- protected function _getAllowedAttemptsFromSameIp()
- {
- return (int) $this->_getHelper()->getConfigNode('failed_attempts_ip');
- }
-
- /**
- * Check is overlimit saved attempts from one ip
- *
- * @return bool
- */
- protected function _isOverLimitIpAttempt()
- {
- $countAttemptsByIp = Mage::getResourceModel('captcha/log')->countAttemptsByRemoteAddress();
- return $countAttemptsByIp >= $this->_getAllowedAttemptsFromSameIp();
- }
-
- /**
- * Is Over Limit Login Attempts
- *
- * @param string $login
- * @return bool
- */
- protected function _isOverLimitLoginAttempts($login)
- {
- if ($login != false) {
- $countAttemptsByLogin = Mage::getResourceModel('captcha/log')->countAttemptsByUserLogin($login);
- return ($countAttemptsByLogin >= $this->_getAllowedAttemptsForSameLogin());
- }
- return false;
- }
-
- /**
- * Check is user auth
- *
- * @return bool
- */
- protected function _isUserAuth()
- {
- return Mage::app()->getStore()->isAdmin()
- ? Mage::getSingleton('admin/session')->isLoggedIn()
- : Mage::getSingleton('customer/session')->isLoggedIn();
- }
-
/**
* Whether to respect case while checking the answer
*
@@ -310,6 +230,100 @@ public function logAttempt($login)
return $this;
}
+ /**
+ * Get captcha word
+ *
+ * @return string|null
+ */
+ public function getWord()
+ {
+ $sessionData = $this->getSession()->getData($this->_getFormIdKey(self::SESSION_WORD));
+ if (!is_array($sessionData)) {
+ return null;
+ }
+ return time() < $sessionData['expires'] ? $sessionData['data'] : null;
+ }
+
+ /**
+ * Returns key with respect of current form ID
+ *
+ * @param string $key
+ * @return string
+ */
+ protected function _getFormIdKey($key)
+ {
+ return $this->_formId . '_' . $key;
+ }
+
+ /**
+ * Check is overlimit attempts
+ *
+ * @param string $login
+ * @return bool
+ */
+ protected function _isOverLimitAttempts($login)
+ {
+ return ($this->_isOverLimitIpAttempt() || $this->_isOverLimitLoginAttempts($login));
+ }
+
+ /**
+ * Returns number of allowed attempts for same login
+ *
+ * @return int
+ */
+ protected function _getAllowedAttemptsForSameLogin()
+ {
+ return (int) $this->_getHelper()->getConfigNode('failed_attempts_login');
+ }
+
+ /**
+ * Returns number of allowed attempts from same IP
+ *
+ * @return int
+ */
+ protected function _getAllowedAttemptsFromSameIp()
+ {
+ return (int) $this->_getHelper()->getConfigNode('failed_attempts_ip');
+ }
+
+ /**
+ * Check is overlimit saved attempts from one ip
+ *
+ * @return bool
+ */
+ protected function _isOverLimitIpAttempt()
+ {
+ $countAttemptsByIp = Mage::getResourceModel('captcha/log')->countAttemptsByRemoteAddress();
+ return $countAttemptsByIp >= $this->_getAllowedAttemptsFromSameIp();
+ }
+
+ /**
+ * Is Over Limit Login Attempts
+ *
+ * @param string $login
+ * @return bool
+ */
+ protected function _isOverLimitLoginAttempts($login)
+ {
+ if ($login != false) {
+ $countAttemptsByLogin = Mage::getResourceModel('captcha/log')->countAttemptsByUserLogin($login);
+ return ($countAttemptsByLogin >= $this->_getAllowedAttemptsForSameLogin());
+ }
+ return false;
+ }
+
+ /**
+ * Check is user auth
+ *
+ * @return bool
+ */
+ protected function _isUserAuth()
+ {
+ return Mage::app()->getStore()->isAdmin()
+ ? Mage::getSingleton('admin/session')->isLoggedIn()
+ : Mage::getSingleton('customer/session')->isLoggedIn();
+ }
+
/**
* Returns path for the font file, chosen to generate captcha
*
@@ -446,20 +460,6 @@ protected function _getTargetForms()
return explode(',', $formsString);
}
- /**
- * Get captcha word
- *
- * @return string|null
- */
- public function getWord()
- {
- $sessionData = $this->getSession()->getData($this->_getFormIdKey(self::SESSION_WORD));
- if (!is_array($sessionData)) {
- return null;
- }
- return time() < $sessionData['expires'] ? $sessionData['data'] : null;
- }
-
/**
* Set captcha word
*
diff --git a/app/code/core/Mage/Catalog/Block/Category/View.php b/app/code/core/Mage/Catalog/Block/Category/View.php
index de6df9c7dc1..25476db762d 100644
--- a/app/code/core/Mage/Catalog/Block/Category/View.php
+++ b/app/code/core/Mage/Catalog/Block/Category/View.php
@@ -22,47 +22,6 @@
*/
class Mage_Catalog_Block_Category_View extends Mage_Core_Block_Template
{
- /**
- * @return $this|Mage_Core_Block_Template
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _prepareLayout()
- {
- parent::_prepareLayout();
-
- $this->getLayout()->createBlock('catalog/breadcrumbs');
-
- /** @var Mage_Page_Block_Html_Head $headBlock */
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $category = $this->getCurrentCategory();
- if ($title = $category->getMetaTitle()) {
- $headBlock->setTitle($title);
- }
- if ($description = $category->getMetaDescription()) {
- $headBlock->setDescription($description);
- }
- if ($keywords = $category->getMetaKeywords()) {
- $headBlock->setKeywords($keywords);
- }
-
- /** @var Mage_Catalog_Helper_Category $helper */
- $helper = $this->helper('catalog/category');
- if ($helper->canUseCanonicalTag()) {
- $headBlock->addLinkRel('canonical', $category->getUrl());
- }
- /*
- want to show rss feed in the url
- */
- if ($this->isRssCatalogEnable() && $this->isTopCategory()) {
- $title = $this->helper('rss')->__('%s RSS Feed', $this->getCurrentCategory()->getName());
- $headBlock->addItem('rss', $this->getRssLink(), 'title="' . $title . '"');
- }
- }
-
- return $this;
- }
-
/**
* @return string
*/
@@ -178,4 +137,44 @@ public function getCacheTags()
{
return array_merge(parent::getCacheTags(), $this->getCurrentCategory()->getCacheIdTags());
}
+ /**
+ * @return $this|Mage_Core_Block_Template
+ * @throws Mage_Core_Model_Store_Exception
+ */
+ protected function _prepareLayout()
+ {
+ parent::_prepareLayout();
+
+ $this->getLayout()->createBlock('catalog/breadcrumbs');
+
+ /** @var Mage_Page_Block_Html_Head $headBlock */
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $category = $this->getCurrentCategory();
+ if ($title = $category->getMetaTitle()) {
+ $headBlock->setTitle($title);
+ }
+ if ($description = $category->getMetaDescription()) {
+ $headBlock->setDescription($description);
+ }
+ if ($keywords = $category->getMetaKeywords()) {
+ $headBlock->setKeywords($keywords);
+ }
+
+ /** @var Mage_Catalog_Helper_Category $helper */
+ $helper = $this->helper('catalog/category');
+ if ($helper->canUseCanonicalTag()) {
+ $headBlock->addLinkRel('canonical', $category->getUrl());
+ }
+ /*
+ want to show rss feed in the url
+ */
+ if ($this->isRssCatalogEnable() && $this->isTopCategory()) {
+ $title = $this->helper('rss')->__('%s RSS Feed', $this->getCurrentCategory()->getName());
+ $headBlock->addItem('rss', $this->getRssLink(), 'title="' . $title . '"');
+ }
+ }
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php
index 4ed822319bd..75d19f370df 100644
--- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php
+++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php
@@ -65,34 +65,6 @@ public function init()
return $this;
}
- /**
- * Init filter model object
- *
- * @return Mage_Catalog_Block_Layer_Filter_Abstract
- */
- protected function _initFilter()
- {
- if (!$this->_filterModelName) {
- Mage::throwException(Mage::helper('catalog')->__('Filter model name must be declared.'));
- }
- $this->_filter = Mage::getModel($this->_filterModelName)
- ->setLayer($this->getLayer());
- $this->_prepareFilter();
-
- $this->_filter->apply($this->getRequest(), $this);
- return $this;
- }
-
- /**
- * Prepare filter process
- *
- * @return Mage_Catalog_Block_Layer_Filter_Abstract
- */
- protected function _prepareFilter()
- {
- return $this;
- }
-
/**
* Retrieve name of the filter block
*
@@ -144,4 +116,32 @@ public function getHtml()
{
return parent::_toHtml();
}
+
+ /**
+ * Init filter model object
+ *
+ * @return Mage_Catalog_Block_Layer_Filter_Abstract
+ */
+ protected function _initFilter()
+ {
+ if (!$this->_filterModelName) {
+ Mage::throwException(Mage::helper('catalog')->__('Filter model name must be declared.'));
+ }
+ $this->_filter = Mage::getModel($this->_filterModelName)
+ ->setLayer($this->getLayer());
+ $this->_prepareFilter();
+
+ $this->_filter->apply($this->getRequest(), $this);
+ return $this;
+ }
+
+ /**
+ * Prepare filter process
+ *
+ * @return Mage_Catalog_Block_Layer_Filter_Abstract
+ */
+ protected function _prepareFilter()
+ {
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Catalog/Block/Layer/View.php b/app/code/core/Mage/Catalog/Block/Layer/View.php
index ed731979783..2282e3fd962 100644
--- a/app/code/core/Mage/Catalog/Block/Layer/View.php
+++ b/app/code/core/Mage/Catalog/Block/Layer/View.php
@@ -57,6 +57,82 @@ class Mage_Catalog_Block_Layer_View extends Mage_Core_Block_Template
*/
protected $_decimalFilterBlockName;
+ /**
+ * Get layer object
+ *
+ * @return Mage_Catalog_Model_Layer
+ */
+ public function getLayer()
+ {
+ return Mage::getSingleton('catalog/layer');
+ }
+
+ /**
+ * Get layered navigation state html
+ *
+ * @return string
+ */
+ public function getStateHtml()
+ {
+ return $this->getChildHtml('layer_state');
+ }
+
+ /**
+ * Get all layer filters
+ *
+ * @return array
+ */
+ public function getFilters()
+ {
+ $filters = [];
+ if ($categoryFilter = $this->_getCategoryFilter()) {
+ $filters[] = $categoryFilter;
+ }
+
+ $filterableAttributes = $this->_getFilterableAttributes();
+ foreach ($filterableAttributes as $attribute) {
+ $filters[] = $this->getChild($attribute->getAttributeCode() . '_filter');
+ }
+
+ return $filters;
+ }
+
+ /**
+ * Check availability display layer options
+ *
+ * @return bool
+ */
+ public function canShowOptions()
+ {
+ foreach ($this->getFilters() as $filter) {
+ if ($filter->getItemsCount()) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Check availability display layer block
+ *
+ * @return bool
+ */
+ public function canShowBlock()
+ {
+ return $this->canShowOptions() || count($this->getLayer()->getState()->getFilters());
+ }
+
+ /**
+ * Get url for 'Clear All' link
+ *
+ * @return string
+ */
+ public function getClearUrl()
+ {
+ return $this->getChild('layer_state')->getClearUrl();
+ }
+
/**
* Internal constructor
*/
@@ -132,16 +208,6 @@ protected function _prepareLayout()
return parent::_prepareLayout();
}
- /**
- * Get layer object
- *
- * @return Mage_Catalog_Model_Layer
- */
- public function getLayer()
- {
- return Mage::getSingleton('catalog/layer');
- }
-
/**
* Get all fiterable attributes of current category
*
@@ -158,36 +224,6 @@ protected function _getFilterableAttributes()
return $attributes;
}
- /**
- * Get layered navigation state html
- *
- * @return string
- */
- public function getStateHtml()
- {
- return $this->getChildHtml('layer_state');
- }
-
- /**
- * Get all layer filters
- *
- * @return array
- */
- public function getFilters()
- {
- $filters = [];
- if ($categoryFilter = $this->_getCategoryFilter()) {
- $filters[] = $categoryFilter;
- }
-
- $filterableAttributes = $this->_getFilterableAttributes();
- foreach ($filterableAttributes as $attribute) {
- $filters[] = $this->getChild($attribute->getAttributeCode() . '_filter');
- }
-
- return $filters;
- }
-
/**
* Get category filter block
*
@@ -198,32 +234,6 @@ protected function _getCategoryFilter()
return $this->getChild('category_filter');
}
- /**
- * Check availability display layer options
- *
- * @return bool
- */
- public function canShowOptions()
- {
- foreach ($this->getFilters() as $filter) {
- if ($filter->getItemsCount()) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Check availability display layer block
- *
- * @return bool
- */
- public function canShowBlock()
- {
- return $this->canShowOptions() || count($this->getLayer()->getState()->getFilters());
- }
-
/**
* Retrieve Price Filter block
*
@@ -233,14 +243,4 @@ protected function _getPriceFilter()
{
return $this->getChild('_price_filter');
}
-
- /**
- * Get url for 'Clear All' link
- *
- * @return string
- */
- public function getClearUrl()
- {
- return $this->getChild('layer_state')->getClearUrl();
- }
}
diff --git a/app/code/core/Mage/Catalog/Block/Navigation.php b/app/code/core/Mage/Catalog/Block/Navigation.php
index df0ecf6819d..a12a22e57ca 100644
--- a/app/code/core/Mage/Catalog/Block/Navigation.php
+++ b/app/code/core/Mage/Catalog/Block/Navigation.php
@@ -50,18 +50,6 @@ class Mage_Catalog_Block_Navigation extends Mage_Core_Block_Template
*/
protected $_currentChildCategories;
- /**
- * Set cache data
- */
- protected function _construct()
- {
- $this->addData(['cache_lifetime' => false]);
- $this->addCacheTag([
- Mage_Catalog_Model_Category::CACHE_TAG,
- Mage_Core_Model_Store_Group::CACHE_TAG,
- ]);
- }
-
/**
* Get Key pieces for caching block content
*
@@ -151,19 +139,6 @@ public function isCategoryActive($category)
? in_array($category->getId(), $this->getCurrentCategory()->getPathIds()) : false;
}
- /**
- * Retrieve category instance
- *
- * @return Mage_Catalog_Model_Category
- */
- protected function _getCategoryInstance()
- {
- if (is_null($this->_categoryInstance)) {
- $this->_categoryInstance = Mage::getModel('catalog/category');
- }
- return $this->_categoryInstance;
- }
-
/**
* Get url for category data
*
@@ -183,6 +158,149 @@ public function getCategoryUrl($category)
return $url;
}
+ /**
+ * Render category to html
+ *
+ * @deprecated deprecated after 1.4
+ * @param Mage_Catalog_Model_Category $category
+ * @param int $level Nesting level number
+ * @param bool $last Whether ot not this item is last, affects list item class
+ * @return string
+ */
+ public function drawItem($category, $level = 0, $last = false)
+ {
+ return $this->_renderCategoryMenuItemHtml($category, $level, $last);
+ }
+
+ /**
+ * @return Mage_Catalog_Model_Category|false
+ */
+ public function getCurrentCategory()
+ {
+ if (Mage::getSingleton('catalog/layer')) {
+ return Mage::getSingleton('catalog/layer')->getCurrentCategory();
+ }
+ return false;
+ }
+
+ /**
+ * @return array
+ */
+ public function getCurrentCategoryPath()
+ {
+ if ($this->getCurrentCategory()) {
+ return explode(',', $this->getCurrentCategory()->getPathInStore());
+ }
+ return [];
+ }
+
+ /**
+ * @param Mage_Catalog_Model_Category $category
+ * @return string
+ */
+ public function drawOpenCategoryItem($category)
+ {
+ $html = '';
+ if (!$category->getIsActive()) {
+ return $html;
+ }
+
+ $html .= '