(For internal use)'), diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php index 7200b4bbd8..3a48bb52ac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php @@ -52,4 +52,20 @@ public function getProductsJSON() } return $result ? Zend_Json_Encoder::encode($result) : '{}'; } + + /** + * Initialize grid block under the "Related Products", "Up-sells", "Cross-sells" sections + * + * @param string $blockName + * @param string $getProductFunction + * @param string $inputName + */ + public function initSerializerBlock($blockName, $getProductFunction, $inputName) + { + if ($block = $this->getLayout()->getBlock($blockName)) { + $this->setGridBlock($block) + ->setProducts(Mage::registry('current_product')->$getProductFunction()) + ->setInputElementName($inputName); + } + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php index bf7d8330ed..08e8578211 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php @@ -33,6 +33,10 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Crosssell extends Mage_Adminhtml_Block_Widget_Grid { + /** + * Set grid params + * + */ public function __construct() { parent::__construct(); @@ -54,6 +58,12 @@ protected function _getProduct() return Mage::registry('current_product'); } + /** + * Add filter + * + * @param object $column + * @return Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Crosssell + */ protected function _addColumnFilterToCollection($column) { // Set custom filter for in product flag @@ -64,19 +74,22 @@ protected function _addColumnFilterToCollection($column) } if ($column->getFilter()->getValue()) { $this->getCollection()->addFieldToFilter('entity_id', array('in'=>$productIds)); - } - else { + } else { if($productIds) { $this->getCollection()->addFieldToFilter('entity_id', array('nin'=>$productIds)); } } - } - else { + } else { parent::_addColumnFilterToCollection($column); } return $this; } + /** + * Prepare collection + * + * @return Mage_Adminhtml_Block_Widget_Grid + */ protected function _prepareCollection() { $collection = Mage::getModel('catalog/product_link')->useCrossSellLinks() @@ -107,37 +120,42 @@ public function isReadonly() return $this->_getProduct()->getCrosssellReadonly(); } + /** + * Add columns to grid + * + * @return Mage_Adminhtml_Block_Widget_Grid + */ protected function _prepareColumns() { if (!$this->isReadonly()) { $this->addColumn('in_products', array( - 'header_css_class' => 'a-center', - 'type' => 'checkbox', - 'name' => 'in_products', - 'values' => $this->_getSelectedProducts(), - 'align' => 'center', - 'index' => 'entity_id' + 'header_css_class' => 'a-center', + 'type' => 'checkbox', + 'name' => 'in_products', + 'values' => $this->_getSelectedProducts(), + 'align' => 'center', + 'index' => 'entity_id' )); } $this->addColumn('entity_id', array( 'header' => Mage::helper('catalog')->__('ID'), 'sortable' => true, - 'width' => '60px', + 'width' => 60, 'index' => 'entity_id' )); + $this->addColumn('name', array( 'header' => Mage::helper('catalog')->__('Name'), 'index' => 'name' )); - $this->addColumn('type', - array( - 'header'=> Mage::helper('catalog')->__('Type'), - 'width' => '100px', - 'index' => 'type_id', - 'type' => 'options', - 'options' => Mage::getSingleton('catalog/product_type')->getOptionArray(), + $this->addColumn('type', array( + 'header' => Mage::helper('catalog')->__('Type'), + 'width' => 100, + 'index' => 'type_id', + 'type' => 'options', + 'options' => Mage::getSingleton('catalog/product_type')->getOptionArray(), )); $sets = Mage::getResourceModel('eav/entity_attribute_set_collection') @@ -145,73 +163,89 @@ protected function _prepareColumns() ->load() ->toOptionHash(); - $this->addColumn('set_name', - array( - 'header'=> Mage::helper('catalog')->__('Attrib. Set Name'), - 'width' => '130px', - 'index' => 'attribute_set_id', - 'type' => 'options', - 'options' => $sets, + $this->addColumn('set_name', array( + 'header' => Mage::helper('catalog')->__('Attrib. Set Name'), + 'width' => 130, + 'index' => 'attribute_set_id', + 'type' => 'options', + 'options' => $sets, )); - $this->addColumn('status', - array( - 'header'=> Mage::helper('catalog')->__('Status'), - 'width' => '90px', - 'index' => 'status', - 'type' => 'options', - 'options' => Mage::getSingleton('catalog/product_status')->getOptionArray(), + $this->addColumn('status', array( + 'header' => Mage::helper('catalog')->__('Status'), + 'width' => 90, + 'index' => 'status', + 'type' => 'options', + 'options' => Mage::getSingleton('catalog/product_status')->getOptionArray(), )); - $this->addColumn('visibility', - array( - 'header'=> Mage::helper('catalog')->__('Visibility'), - 'width' => '90px', - 'index' => 'visibility', - 'type' => 'options', - 'options' => Mage::getSingleton('catalog/product_visibility')->getOptionArray(), + $this->addColumn('visibility', array( + 'header' => Mage::helper('catalog')->__('Visibility'), + 'width' => 90, + 'index' => 'visibility', + 'type' => 'options', + 'options' => Mage::getSingleton('catalog/product_visibility')->getOptionArray(), )); $this->addColumn('sku', array( 'header' => Mage::helper('catalog')->__('SKU'), - 'width' => '80px', + 'width' => 80, 'index' => 'sku' )); + $this->addColumn('price', array( - 'header' => Mage::helper('catalog')->__('Price'), - 'type' => 'currency', + 'header' => Mage::helper('catalog')->__('Price'), + 'type' => 'currency', 'currency_code' => (string) Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE), - 'index' => 'price' + 'index' => 'price' )); $this->addColumn('position', array( - 'header' => Mage::helper('catalog')->__('Position'), - 'name' => 'position', - 'width' => '60px', - 'type' => 'number', - 'validate_class' => 'validate-number', - 'index' => 'position', - 'editable' => !$this->isReadonly(), - 'edit_only' => !$this->_getProduct()->getId() + 'header' => Mage::helper('catalog')->__('Position'), + 'name' => 'position', + 'width' => 60, + 'type' => 'number', + 'validate_class' => 'validate-number', + 'index' => 'position', + 'editable' => !$this->isReadonly(), + 'edit_only' => !$this->_getProduct()->getId() )); - - return parent::_prepareColumns(); } + /** + * Rerieve grid URL + * + * @return string + */ public function getGridUrl() { - return $this->_getData('grid_url') ? $this->_getData('grid_url') : $this->getUrl('*/*/crosssell', array('_current'=>true)); + return $this->_getData('grid_url') ? $this->_getData('grid_url') : $this->getUrl('*/*/crosssellGrid', array('_current'=>true)); } + /** + * Retrieve selected crosssell products + * + * @return array + */ protected function _getSelectedProducts() { - $products = $this->getRequest()->getPost('products', null); + $products = $this->getProductsCrossSell(); if (!is_array($products)) { - $products = $this->_getProduct()->getCrossSellProductIds(); + $products = $this->getSelectedCrossSellProducts(); } return $products; } + + /** + * Retrieve crosssell products + * + * @return array + */ + public function getSelectedCrossSellProducts() + { + return Mage::registry('current_product')->getCrossSellProductIds(); + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php index bdf569c05f..63c23c3bc8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php @@ -38,9 +38,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option extends Mage_ protected $_productInstance; - protected $_name = 'product[options]'; - protected $_id = 'product_option'; - protected $_values; protected $_itemCount = 1; @@ -86,14 +83,24 @@ public function setProduct($product) return $this; } + /** + * Retrieve options field name prefix + * + * @return string + */ public function getFieldName() { - return $this->_name; + return 'product[options]'; } + /** + * Retrieve options field id prefix + * + * @return string + */ public function getFieldId() { - return $this->_id; + return 'product_option'; } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php index 3fb72af344..2d38dffe35 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php @@ -44,10 +44,12 @@ protected function _prepareLayout() 'id' => 'product_option_{{option_id}}_price_type', 'class' => 'select product-option-price-type' )) - ->setName('product[options][{{option_id}}][price_type]') - ->setOptions(Mage::getSingleton('adminhtml/system_config_source_product_options_price')->toOptionArray()) ); + $this->getChild('option_price_type')->setName('product[options][{{option_id}}][price_type]') + ->setOptions(Mage::getSingleton('adminhtml/system_config_source_product_options_price') + ->toOptionArray()); + return parent::_prepareLayout(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php index 10f9199c1d..654f4d8c54 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php @@ -25,154 +25,273 @@ */ /** - * Adminhtml tier pricing item renderer + * Adminhtml tier price item renderer * * @category Mage * @package Mage_Adminhtml - * @author Magento Core Team
' . Mage::helper('cms')->__('(eg: domain.com/identifier)') . '
', + 'disabled' => $isElementDisabled )); /** @@ -77,6 +91,7 @@ protected function _prepareForm() 'title' => Mage::helper('cms')->__('Store View'), 'required' => true, 'values' => Mage::getSingleton('adminhtml/system_store')->getStoreValuesForForm(false, true), + 'disabled' => $isElementDisabled )); } else { @@ -87,30 +102,71 @@ protected function _prepareForm() $model->setStoreId(Mage::app()->getStore(true)->getId()); } - $fieldset->addField('is_active', 'select', array( + $fieldset->addField('is_active', 'select', array( 'label' => Mage::helper('cms')->__('Status'), 'title' => Mage::helper('cms')->__('Page Status'), 'name' => 'is_active', 'required' => true, - 'options' => array( - '1' => Mage::helper('cms')->__('Enabled'), - '0' => Mage::helper('cms')->__('Disabled'), - ), - )); - - $fieldset->addField('content', 'editor', array( - 'name' => 'content', - 'label' => Mage::helper('cms')->__('Content'), - 'title' => Mage::helper('cms')->__('Content'), - 'style' => 'height:36em;', - 'wysiwyg' => false, - 'required' => true, + 'options' => $model->getAvailableStatuses(), + 'disabled' => $isElementDisabled )); + Mage::dispatchEvent('adminhtml_cms_page_edit_tab_main_prepare_form', array('form' => $form)); $form->setValues($model->getData()); $this->setForm($form); return parent::_prepareForm(); } + + /** + * Prepare label for tab + * + * @return string + */ + public function getTabLabel() + { + return Mage::helper('cms')->__('Page Information'); + } + + /** + * Prepare title for tab + * + * @return string + */ + public function getTabTitle() + { + return Mage::helper('cms')->__('Page Information'); + } + + /** + * 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 true + */ + public function isHidden() + { + return false; + } + + /** + * Check permission for passed action + * + * @param string $action + * @return bool + */ + protected function _isAllowedAction($action) + { + return Mage::getSingleton('admin/session')->isAllowed('cms/page/' . $action); + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php index d4eab819a2..a0f2121633 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php @@ -31,7 +31,9 @@ * @package Mage_Adminhtml * @author Magento Core Team- ';
foreach ($this->getMessages($type) as $message) {
- $html.= '';
+ $html.= '';
}
$html .= '
'; if (isset($this->_connections[$name])) { return $this->_connections[$name]; } $connConfig = Mage::getConfig()->getResourceConnectionConfig($name); - - if (!$connConfig || !$connConfig->is('active', 1)) { + if (!$connConfig) { + $this->_connections[$name] = $this->_getDefaultConnection($name); + return $this->_connections[$name]; + } + if (!$connConfig->is('active', 1)) { return false; } $origName = $connConfig->getParent()->getName(); @@ -93,6 +100,14 @@ public function getConnection($name) return $conn; } + protected function _getDefaultConnection($requiredConnectionName) + { + if (strpos($requiredConnectionName, 'read') !== false) { + return $this->getConnection(self::DEFAULT_READ_RESOURCE); + } + return $this->getConnection(self::DEFAULT_WRITE_RESOURCE); + } + /** * Get connection type instance * diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php index 5498e9c9fe..b3b2e3902f 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup.php @@ -31,6 +31,7 @@ */ class Mage_Core_Model_Resource_Setup { + const DEFAULT_SETUP_CONNECTION = 'core_setup'; const VERSION_COMPARE_EQUAL = 0; const VERSION_COMPARE_LOWER = -1; const VERSION_COMPARE_GREATER = 1; @@ -56,7 +57,13 @@ public function __construct($resourceName) $config = Mage::getConfig(); $this->_resourceName = $resourceName; $this->_resourceConfig = $config->getResourceConfig($resourceName); - $this->_connectionConfig = $config->getResourceConnectionConfig($resourceName); + $connection = $config->getResourceConnectionConfig($resourceName); + if ($connection) { + $this->_connectionConfig = $connection; + } else { + $this->_connectionConfig = $config->getResourceConnectionConfig(self::DEFAULT_SETUP_CONNECTION); + } + $modName = (string)$this->_resourceConfig->setup->module; $this->_moduleConfig = $config->getModuleConfig($modName); $this->_conn = Mage::getSingleton('core/resource')->getConnection($this->_resourceName); diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php index cad2ee993e..36961c55e2 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php @@ -45,12 +45,6 @@ public function start($sessionName=null) return $this; } - Varien_Profiler::start(__METHOD__.'/setOptions'); - if (is_writable(Mage::getBaseDir('session'))) { - session_save_path($this->getSessionSavePath()); - } - Varien_Profiler::stop(__METHOD__.'/setOptions'); - switch($this->getSessionSaveMethod()) { case 'db': ini_set('session.save_handler', 'user'); @@ -62,27 +56,49 @@ public function start($sessionName=null) ini_set('session.save_handler', 'memcache'); session_save_path($this->getSessionSavePath()); break; + case 'eaccelerator': + ini_set('session.save_handler', 'eaccelerator'); + break; default: session_module_name('files'); + if (is_writable(Mage::getBaseDir('session'))) { + session_save_path($this->getSessionSavePath()); + } break; } if (Mage::app()->getStore()->isAdmin()) { $adminSessionLifetime = (int)Mage::getStoreConfig('admin/security/session_cookie_lifetime'); if ($adminSessionLifetime > 60) { - Mage::getSingleton('core/cookie')->setLifetime($adminSessionLifetime); + $this->getCookie()->setLifetime($adminSessionLifetime); } } - // set session cookie params - session_set_cookie_params( - $this->getCookie()->getLifetime(), - $this->getCookie()->getPath(), - $this->getCookie()->getDomain(), - $this->getCookie()->isSecure(), - $this->getCookie()->getHttponly() + // session cookie params + $cookieParams = array( + 'lifetime' => $this->getCookie()->getLifetime(), + 'path' => $this->getCookie()->getPath(), + 'domain' => $this->getCookie()->getConfigDomain(), + 'secure' => $this->getCookie()->isSecure(), + 'httponly' => $this->getCookie()->getHttponly() ); + if (!$cookieParams['httponly']) { + unset($cookieParams['httponly']); + if (!$cookieParams['secure']) { + unset($cookieParams['secure']); + if (!$cookieParams['domain']) { + unset($cookieParams['domain']); + } + } + } + + if (isset($cookieParams['domain'])) { + $cookieParams['domain'] = $this->getCookie()->getDomain(); + } + + call_user_func_array('session_set_cookie_params', $cookieParams); + if (!empty($sessionName)) { $this->setSessionName($sessionName); } diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php index 709bab5655..529969f4f4 100644 --- a/app/code/core/Mage/Core/Model/Store.php +++ b/app/code/core/Mage/Core/Model/Store.php @@ -28,12 +28,14 @@ /** * Store model * - * @author Magento Core Team
-- +
+++- -
-
';
- //var_dump( (array)$res);
usort($res, array($this, '_sortMethods'));
- //var_dump((array)$res);
- // echo '';
return $res;
}
protected function _sortMethods($a, $b)
{
- // var_dump($a);
if (is_object($a)) {
- //var_dump($a->getData());
- //var_dump($a->sort_order);
- //die ();
-
return (int)$a->sort_order < (int)$b->sort_order ? -1 : ((int)$a->sort_order > (int)$b->sort_order ? 1 : 0);
}
return 0;
@@ -154,4 +127,4 @@ public function getInfoBlock(Mage_Payment_Model_Info $info)
$block->setInfo($info);
return $block;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Payment/Model/Method/Abstract.php b/app/code/core/Mage/Payment/Model/Method/Abstract.php
index b7e180ec84..97220b40f6 100644
--- a/app/code/core/Mage/Payment/Model/Method/Abstract.php
+++ b/app/code/core/Mage/Payment/Model/Method/Abstract.php
@@ -447,13 +447,21 @@ public function prepareSave()
}
/**
- * Return true if the method can be used at this time
+ * Check whether payment method can be used
*
+ * @param Mage_Sales_Model_Quote
* @return bool
*/
- public function isAvailable($quote=null)
+ public function isAvailable($quote = null)
{
- return true;
+ $checkResult = new StdClass;
+ $checkResult->isAvailable = (bool)(int)$this->getConfigData('active', ($quote ? $quote->getStoreId() : null));
+ Mage::dispatchEvent('payment_method_is_active', array(
+ 'result' => $checkResult,
+ 'method_instance' => $this,
+ 'quote' => $quote,
+ ));
+ return $checkResult->isAvailable;
}
/**
@@ -467,5 +475,4 @@ public function initialize($paymentAction, $stateObject)
{
return $this;
}
-
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Payment/Model/Method/Cc.php b/app/code/core/Mage/Payment/Model/Method/Cc.php
index 0311ccbf2d..4262279f16 100644
--- a/app/code/core/Mage/Payment/Model/Method/Cc.php
+++ b/app/code/core/Mage/Payment/Model/Method/Cc.php
@@ -137,7 +137,7 @@ public function validate()
$errorMsg = $this->_getHelper()->__('Credit card type is not allowed for this payment method');
}
- //validate credit card verification number
+ //validate credit card verification number
if ($errorMsg === false && $this->hasVerification()) {
$verifcationRegEx = $this->getVerificationRegEx();
$regExp = isset($verifcationRegEx[$info->getCcType()]) ? $verifcationRegEx[$info->getCcType()] : '';
@@ -154,7 +154,7 @@ public function validate()
return $this;
}
- public function hasVerification()
+ public function hasVerification()
{
$configData = $this->getConfigData('useccv');
if(is_null($configData)){
@@ -163,7 +163,7 @@ public function hasVerification()
return (bool) $configData;
}
- public function getVerificationRegEx()
+ public function getVerificationRegEx()
{
$verificationExpList = array(
'VI' => '/^[0-9]{3}$/', // Visa
@@ -240,4 +240,14 @@ public function validateCcNumOther($ccNumber)
return preg_match('/^\\d+$/', $ccNumber);
}
-}
\ No newline at end of file
+ /**
+ * Check whether there are CC types set in configuration
+ *
+ * @return bool
+ */
+ public function isAvailable($quote = null)
+ {
+ return $this->getConfigData('cctypes', ($quote ? $quote->getStoreId() : null))
+ && parent::isAvailable($quote);
+ }
+}
diff --git a/app/code/core/Mage/Payment/Model/Method/Free.php b/app/code/core/Mage/Payment/Model/Method/Free.php
index 6a1dc2fee6..ba50e9b44f 100644
--- a/app/code/core/Mage/Payment/Model/Method/Free.php
+++ b/app/code/core/Mage/Payment/Model/Method/Free.php
@@ -42,20 +42,14 @@ class Mage_Payment_Model_Method_Free extends Mage_Payment_Model_Method_Abstract
protected $_code = 'free';
/**
- * Check method is available
+ * Check whether method is available
*
* @param Mage_Sales_Model_Quote $quote
* @return bool
*/
- public function isAvailable($quote=null)
+ public function isAvailable($quote = null)
{
- if (is_null($quote)) {
- return false;
- }
-
- if (Mage::app()->getStore()->roundPrice($quote->getGrandTotal()) == 0) {
- return true;
- }
- return false;
+ return parent::isAvailable($quote) && (!empty($quote))
+ && (Mage::app()->getStore()->roundPrice($quote->getGrandTotal()) == 0);
}
}
diff --git a/app/code/core/Mage/Payment/etc/config.xml b/app/code/core/Mage/Payment/etc/config.xml
index a518c4fac3..6e1847bb63 100644
--- a/app/code/core/Mage/Payment/etc/config.xml
+++ b/app/code/core/Mage/Payment/etc/config.xml
@@ -44,9 +44,6 @@
";
-//print_r($data);
+
$rssObj->_addHeader($data);
$_collection = $category->getCollection();
@@ -81,18 +80,6 @@ protected function _toHtml()
$layer->prepareProductCollection($productCollection);
$productCollection->addCountToCategories($_collection);
- /*if ($_collection->count()) {
- foreach ($_collection as $_category){
- $data = array(
- 'title' => $_category->getName(),
- 'link' => $_category->getCategoryUrl(),
- 'description' => $this->helper('rss')->__('Total Products: %s', $_category->getProductCount()),
- );
-
- $rssObj->_addEntry($data);
- }
- }
- */
$category->getProductCollection()->setStoreId($storeId);
/*
only load latest 50 products
@@ -100,35 +87,61 @@ protected function _toHtml()
$_productCollection = $currentyCateogry
->getProductCollection()
->addAttributeToSort('updated_at','desc')
+ ->setVisibility(Mage::getSingleton('catalog/product_visibility')->getVisibleInCatalogIds())
->setCurPage(1)
->setPageSize(50)
;
-//echo "
".$_productCollection->getSelect();
+
if ($_productCollection->getSize()>0) {
+ $args = array('rssObj' => $rssObj);
foreach ($_productCollection as $_product) {
- $final_price = $_product->getFinalPrice();
- $description = '| '.$_product->getDescription().
- ' Price:'.Mage::helper('core')->currency($_product->getPrice()). - ($_product->getPrice() != $final_price ? ' Special Price:'. Mage::helper('core')->currency($final_price) : ''). - ' '. - ' | '.
- '
| ' . $product->getDescription();
+
+ if ($product->getAllowedPriceInRss()) {
+ $description .= ' Price:'.Mage::helper('core')->currency($product->getPrice()); + if ($product->getPrice() != $product->getFinalPrice()) { + $description .= ' Special Price:' . Mage::helper('core')->currency($product->getFinalPrice()); + } + $description .= ' '; + } + + $description .= ' |
| '.$product->getDescription().
- ' Price:'.Mage::helper('core')->currency($product->getPrice()). - ($product->getPrice() != $final_price ? ' Special Price:'. Mage::helper('core')->currency($final_price) : ''). - ' '. - ' | '.
+ ''.$product->getDescription();
+
+ if ($allowedPriceInRss) {
+ $description .= ' Price:' . Mage::helper('core')->currency($product->getPrice()); + if ($product->getPrice() != $product->getFinalPrice()){ + $description .= ' Special Price:' . Mage::helper('core')->currency($product->getFinalPrice()); + } + $description .= ' '; + } + + $description .= ' | '.
'
| '.$product->getDescription().
- ' Price:'.Mage::helper('core')->currency($product->getPrice()).
- ' Special Price:'. Mage::helper('core')->currency($special_price).
- ($result['use_special'] && $result['special_to_date'] ? ' | '.
- '
| '.$product->getDescription();
+
+ if ($product->getAllowedPriceInRss()) {
+ $specialPrice = ($result['use_special'] ? $result['special_price'] : $result['rule_price']);
+ $description .= ' Price:'.Mage::helper('core')->currency($product->getPrice()).
+ ' Special Price:'. Mage::helper('core')->currency($specialPrice).
+ ($result['use_special'] && $result['special_to_date'] ? ' |
";
-//print_r($args['row']);
$row = $args['row'];
- $special_price = $row['special_price'];
- $rule_price = $row['rule_price'];
- if (!$rule_price || ($rule_price && $special_price && $special_price<=$rule_price)) {
- $row['start_date'] = $row['special_from_date'];
- $row['use_special'] = true;
+
+ if ($product->getAllowedPriceInRss()) {
+ $specialPrice = $row['special_price'];
+ $rule_price = $row['rule_price'];
+ if (!$rulePrice || ($rulePrice && $specialPrice && $specialPrice<=$rulePrice)) {
+ $row['start_date'] = $row['special_from_date'];
+ $row['use_special'] = true;
+ } else {
+ $row['start_date'] = $row['rule_start_date'];
+ $row['use_special'] = false;
+ }
+ $row['allowed_price_in_rss'] = true;
} else {
- $row['start_date'] = $row['rule_start_date'];
- $row['use_special'] = false;
+ $row['allowed_price_in_rss'] = false;
}
$args['results'][] = $row;
}
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Tag.php b/app/code/core/Mage/Rss/Block/Catalog/Tag.php
index 1bf0b34726..be79fdcaad 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Tag.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Tag.php
@@ -64,6 +64,8 @@ protected function _toHtml()
->addTagFilter($tagModel->getId())
->addStoreFilter($storeId);
+ $_collection->setVisibility(Mage::getSingleton('catalog/product_visibility')->getVisibleInCatalogIds());
+
$product = Mage::getModel('catalog/product');
Mage::getSingleton('core/resource_iterator')
@@ -72,6 +74,11 @@ protected function _toHtml()
return $rssObj->createRssXml();
}
+ /**
+ * Preparing data and adding to rss object
+ *
+ * @param array $args
+ */
public function addTaggedItemXml($args)
{
$product = $args['product'];
@@ -84,20 +91,25 @@ public function addTaggedItemXml($args)
return;
}
+ $allowedPriceInRss = $product->getAllowedPriceInRss();
+
$product->unsetData()->load($args['row']['entity_id']);
$description = '| '.$product->getDescription().
- ' Price:'.Mage::helper('core')->currency($product->getFinalPrice()).' '. - ' | '.
- '
Price:'.Mage::helper('core')->currency($product->getFinalPrice()).'
'; + } + + $description .='.' "'.$this->__('Apply').'")
';
- }
+ if ($element->getExplicitApply()) {
+ $html.= ' ';
+ }
- $html.= ' ';
- }
- return $html;
- }
+ $html.= ' ';
+ }
+ return $html;
+ }
}
\ No newline at end of file
diff --git a/app/code/core/Mage/Rule/Block/Newchild.php b/app/code/core/Mage/Rule/Block/Newchild.php
index fbcbd8d3b7..180054a21d 100644
--- a/app/code/core/Mage/Rule/Block/Newchild.php
+++ b/app/code/core/Mage/Rule/Block/Newchild.php
@@ -28,14 +28,15 @@
class Mage_Rule_Block_Newchild extends Mage_Core_Block_Abstract
implements Varien_Data_Form_Element_Renderer_Interface
{
- public function render(Varien_Data_Form_Element_Abstract $element)
- {
- $html = ' getParamId() ? ' id="' . $element->getParamId() . '"' : '') . '>';
- $html.= '';
- $html.= $element->getValueName();
- $html.= '';
- $html.= $element->getElementHtml();
- $html.= ' ';
- return $html;
- }
+ public function render(Varien_Data_Form_Element_Abstract $element)
+ {
+ $element->addClass('element-value-changer');
+ $html = ' getParamId() ? ' id="' . $element->getParamId() . '"' : '') . '>';
+ $html.= '';
+ $html.= $element->getValueName();
+ $html.= '';
+ $html.= $element->getElementHtml();
+ $html.= ' ';
+ return $html;
+ }
}
\ No newline at end of file
diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
index 915d0bfbba..065f3133ad 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
@@ -33,10 +33,50 @@ abstract class Mage_Rule_Model_Condition_Abstract
extends Varien_Object
implements Mage_Rule_Model_Condition_Interface
{
+ /**
+ * Defines which operators will be available for this condition
+ *
+ * @var string
+ */
+ protected $_inputType = null;
+
+ /**
+ * Default values for possible operator options
+ * @var array
+ */
+ protected $_defaultOperatorOptions;
+
+ /**
+ * Default combinations of operator options, depending on input type
+ * @var array
+ */
+ protected $_defaultOperatorInputByType = array(
+ 'string' => array('==', '!=', '>=', '>', '<=', '<', '{}', '!{}', '()', '!()'),
+ 'numeric' => array('==', '!=', '>=', '>', '<=', '<', '()', '!()'),
+ 'date' => array('==', '>=', '<='),
+ 'select' => array('==', '!='),
+ 'multiselect' => array('==', '!=', '{}', '!{}'),
+ 'grid' => array('()', '!()'),
+ );
+
public function __construct()
{
parent::__construct();
+ $this->_defaultOperatorOptions = array(
+ '==' => Mage::helper('rule')->__('is'),
+ '!=' => Mage::helper('rule')->__('is not'),
+ '>=' => Mage::helper('rule')->__('equals or greater than'),
+ '<=' => Mage::helper('rule')->__('equals or less than'),
+ '>' => Mage::helper('rule')->__('greater than'),
+ '<' => Mage::helper('rule')->__('less than'),
+ '{}' => Mage::helper('rule')->__('contains'),
+ '!{}' => Mage::helper('rule')->__('does not contain'),
+ '!{}' => Mage::helper('rule')->__('does not contain'),
+ '()' => Mage::helper('rule')->__('is one of'),
+ '!()' => Mage::helper('rule')->__('is not one of'),
+ );
+
$this->loadAttributeOptions()->loadOperatorOptions()->loadValueOptions();
if ($options = $this->getAttributeOptions()) {
@@ -123,39 +163,24 @@ public function getAttributeName()
public function loadOperatorOptions()
{
- $this->setOperatorOption(array(
- '==' => Mage::helper('rule')->__('is'),
- '!=' => Mage::helper('rule')->__('is not'),
- '>=' => Mage::helper('rule')->__('equals or greater than'),
- '<=' => Mage::helper('rule')->__('equals or less than'),
- '>' => Mage::helper('rule')->__('greater than'),
- '<' => Mage::helper('rule')->__('less than'),
- '{}' => Mage::helper('rule')->__('contains'),
- '!{}' => Mage::helper('rule')->__('does not contain'),
- '()' => Mage::helper('rule')->__('is one of'),
- '!()' => Mage::helper('rule')->__('is not one of'),
- ));
- $this->setOperatorByInputType(array(
- 'string' => array('==', '!=', '>=', '>', '<=', '<', '{}', '!{}', '()', '!()'),
- 'numeric' => array('==', '!=', '>=', '>', '<=', '<', '()', '!()'),
- 'date' => array('==', '>=', '<='),
- 'select' => array('==', '!='),
- 'multiselect' => array('==', '!=', '{}', '!{}'),
- 'grid' => array('()', '!()'),
- ));
+ $this->setOperatorOption($this->_defaultOperatorOptions);
+ $this->setOperatorByInputType($this->_defaultOperatorInputByType);
return $this;
}
/**
* This value will define which operators will be available for this condition.
*
- * Possible values are: string, numeric, date, select, multiselect, grid
+ * Possible values are: string, numeric, date, select, multiselect, grid, boolean
*
* @return string
*/
public function getInputType()
{
- return 'string';
+ if (null === $this->_inputType) {
+ return 'string';
+ }
+ return $this->_inputType;
}
public function getOperatorSelectOptions()
diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php
index ead83c1721..4e1f7845c8 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Combine.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Combine.php
@@ -157,8 +157,10 @@ public function asXml($containerKey='conditions', $itemKey='condition')
public function loadArray($arr, $key='conditions')
{
- $this->setAggregator(isset($arr['aggregator']) ? $arr['aggregator'] : $arr['attribute'])
- ->setValue(isset($arr['value']) ? $arr['value'] : $arr['operator']);
+ $this->setAggregator(isset($arr['aggregator']) ? $arr['aggregator']
+ : (isset($arr['attribute']) ? $arr['attribute'] : null))
+ ->setValue(isset($arr['value']) ? $arr['value']
+ : (isset($arr['operator']) ? $arr['operator'] : null));
if (!empty($arr[$key]) && is_array($arr[$key])) {
foreach ($arr[$key] as $condArr) {
@@ -169,7 +171,7 @@ public function loadArray($arr, $key='conditions')
$cond->loadArray($condArr, $key);
}
} catch (Exception $e) {
-
+ Mage::logException($e);
}
}
}
diff --git a/app/code/core/Mage/Rule/Model/Rule.php b/app/code/core/Mage/Rule/Model/Rule.php
index 4ddb5a6014..0eda1c8516 100644
--- a/app/code/core/Mage/Rule/Model/Rule.php
+++ b/app/code/core/Mage/Rule/Model/Rule.php
@@ -44,7 +44,11 @@ class Mage_Rule_Model_Rule extends Mage_Core_Model_Abstract
*/
protected $_isReadonly = false;
-
+ /**
+ * Init resoirce
+ *
+ * @return unknown_type
+ */
protected function _construct()
{
$this->_init('rule/rule');
diff --git a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
index 6d658debb7..89ef543317 100644
--- a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
+++ b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
@@ -53,6 +53,17 @@ public function __construct()
}
}
+ /**
+ * Retrieve form action url and set "secure" param to avoid confirm
+ * message when we submit form from secure page to unsecure
+ *
+ * @return string
+ */
+ public function getFormActionUrl()
+ {
+ return $this->getUrl('checkout/cart/addgroup', array('_secure' => true));
+ }
+
public function getLastOrder()
{
foreach ($this->getOrders() as $order) {
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php
index 8165cb11b4..72753173a5 100644
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php
@@ -73,20 +73,15 @@ public function getSelectCountSql()
}
/**
- * Retrive all ids for collection
+ * Reset left join
*
- * @return array
+ * @return Mage_Eav_Model_Entity_Collection_Abstract
*/
- public function getAllIds($limit=null, $offset=null)
+ 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->from(null, 'e.'.$this->getEntity()->getIdFieldName());
- $idsSelect->limit($limit, $offset);
+ $idsSelect = parent::_getAllIdsSelect($limit, $offset);
$idsSelect->resetJoinLeft();
- return $this->getConnection()->fetchCol($idsSelect, $this->_bindParams);
+ return $idsSelect;
}
+
}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php
index 0bb13eae8c..325c3d5eec 100644
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php
@@ -34,21 +34,40 @@
class Mage_Sales_Model_Mysql4_Order_Invoice_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
+ /**
+ * Initialize orders collection
+ *
+ */
protected function _construct()
{
$this->_init('sales/order_invoice');
}
+ /**
+ * Add order filter
+ *
+ * @return Mage_Sales_Model_Mysql4_Order_Invoice_Collection
+ */
public function setOrderFilter($order)
{
if ($order instanceof Mage_Sales_Model_Order) {
$this->addAttributeToFilter('order_id', $order->getId());
- }
- else {
+ } else {
$this->addAttributeToFilter('order_id', $order);
}
-
return $this;
}
+ /**
+ * Reset left join
+ *
+ * @return Mage_Eav_Model_Entity_Collection_Abstract
+ */
+ protected function _getAllIdsSelect($limit = null, $offset = null)
+ {
+ $idsSelect = parent::_getAllIdsSelect($limit, $offset);
+ $idsSelect->resetJoinLeft();
+ return $idsSelect;
+ }
+
}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php
index 25fa721aac..fd92965ae4 100644
--- a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php
@@ -420,6 +420,8 @@ public function getDefaultEntities()
'base_shipping_canceled' => array('type'=>'static'),
'base_shipping_invoiced' => array('type'=>'static'),
+ 'protect_code' => array('type' => 'static'),
+
'customer_id' => array('type'=>'static', 'visible'=>false),
'customer_group_id' => array('type'=>'int', 'visible'=>false),
'customer_email' => array('type'=>'varchar', 'visible'=>false),
diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php
index 0b17f7a7a0..b61400258d 100644
--- a/app/code/core/Mage/Sales/Model/Order.php
+++ b/app/code/core/Mage/Sales/Model/Order.php
@@ -434,7 +434,6 @@ protected function _placePayment()
$this->getPayment()->place();
return $this;
}
-
/**
* Retrieve order payment model object
*
@@ -570,7 +569,23 @@ public function addStatusToHistory($status, $comment='', $isCustomerNotified = f
public function place()
{
Mage::dispatchEvent('sales_order_place_before', array('order'=>$this));
- $this->_placePayment();
+ $this->setState(self::STATE_NEW, true)->save();
+ try {
+ $this->_placePayment();
+ } catch (Mage_Core_Exception $e){
+ $message = $e->getMessage();
+ Mage::logException($e);
+ $this->addStatusToHistory(
+ $this->getStatus(),
+ Mage::helper('sales')->__('Payment failed: %s', $message)
+ )->save();
+ } catch (Exception $e){
+ Mage::logException($e);
+ $this->addStatusToHistory(
+ $this->getStatus(),
+ Mage::helper('sales')->__('Payment failed')
+ )->save();
+ }
Mage::dispatchEvent('sales_order_place_after', array('order'=>$this));
return $this;
}
@@ -1428,6 +1443,8 @@ protected function _beforeSave()
}
}
+ $this->setData('protect_code', substr(md5(uniqid(mt_rand(), true) . ':' . microtime(true)), 5, 6));
+
return $this;
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
index 53214bd9b6..4b3a2b2137 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
@@ -412,6 +412,10 @@ public function register()
);
}
+ $this->getOrder()->setBaseTotalInvoicedCost(
+ $this->getOrder()->getBaseTotalInvoicedCost()-$this->getBaseCost()
+ );
+
$state = $this->getState();
if (is_null($state)) {
$this->setState(self::STATE_OPEN);
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Invoice.php
index c307ce1579..8c9acdda33 100644
--- a/app/code/core/Mage/Sales/Model/Order/Invoice.php
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice.php
@@ -484,6 +484,9 @@ public function register()
$this->getOrder()->setBaseDiscountInvoiced(
$this->getOrder()->getBaseDiscountInvoiced()+$this->getBaseDiscountAmount()
);
+ $this->getOrder()->setBaseTotalInvoicedCost(
+ $this->getOrder()->getBaseTotalInvoicedCost()+$this->getBaseCost()
+ );
$state = $this->getState();
if (is_null($state)) {
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php
index 30efefb937..4cf2ac59dc 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment.php
@@ -92,6 +92,17 @@ public function setOrder(Mage_Sales_Model_Order $order)
return $this;
}
+
+ /**
+ * Retrieve hash code of current order
+ *
+ * @return string
+ */
+ public function getProtectCode()
+ {
+ return (string)$this->getOrder()->getProtectCode();
+ }
+
/**
* Retrieve the order the shipment for created for
*
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 a040f8eb08..f00507e7cf 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php
@@ -71,6 +71,16 @@ public function isCustom()
return $this->getCarrierCode() == self::CUSTOM_CARRIER_CODE;
}
+ /**
+ * Retrieve hash code of current order
+ *
+ * @return string
+ */
+ public function getProtectCode()
+ {
+ return (string)$this->getShipment()->getProtectCode();
+ }
+
/**
* Retrieve detail for shipment track
*
diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php
index fd717ffee5..c1d28afc05 100644
--- a/app/code/core/Mage/Sales/Model/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Quote.php
@@ -894,6 +894,12 @@ public function removePayment()
*/
public function collectTotals()
{
+ /**
+ * Protect double totals collection
+ */
+ if ($this->getTotalsCollectedFlag()) {
+ return $this;
+ }
Mage::dispatchEvent(
$this->_eventPrefix . '_collect_totals_before',
array(
@@ -966,6 +972,7 @@ public function collectTotals()
)
);
+ $this->setTotalsCollectedFlag(true);
return $this;
}
@@ -984,14 +991,25 @@ public function getTotals()
if ($this->isVirtual()) {
return $this->getBillingAddress()->getTotals();
}
-
- $totals = $this->getShippingAddress()->getTotals();
- foreach ($this->getBillingAddress()->getTotals() as $code => $total) {
- if (isset($totals[$code])) {
- $totals[$code]->setValue($totals[$code]->getValue()+$total->getValue());
+
+ $totals = null;
+ // Going through all quote addresses and sum their totals
+ foreach ($this->getAddressesCollection() as $address) {
+ if ($address->isDeleted()) {
+ continue;
}
- else {
- $totals[$code] = $total;
+ if (!$totals) {
+ $totals = $address->getTotals();
+ } else {
+ foreach ($address->getTotals() as $code => $total) {
+ if (isset($totals[$code])) {
+ $totals[$code]->setValue($totals[$code]->getValue()+$total->getValue());
+ $totals[$code]->setValueExclTax($totals[$code]->getValueExclTax()+$total->getValueExclTax());
+ $totals[$code]->setValueInclTax($totals[$code]->getValueInclTax()+$total->getValueInclTax());
+ } else {
+ $totals[$code] = $total;
+ }
+ }
}
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php
index fc53b6d161..8bb04bbd9d 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address.php
@@ -265,8 +265,7 @@ public function getAllItems()
if ($this->getAddressType() == self::TYPE_BILLING) {
$items[] = $qItem;
}
- }
- else {
+ } else {
if ($this->getAddressType() == self::TYPE_SHIPPING) {
$items[] = $qItem;
}
@@ -568,9 +567,10 @@ public function collectShippingRates()
$this->removeAllShippingRates();
- $havingOptionalZip = Mage::helper('directory')->getCountriesWithOptionalZip();
- $postcodeValid = $this->getPostcode() || in_array($this->getCountryId(), $havingOptionalZip);
- if (!$this->getCountryId() && !$postcodeValid) {
+ $countryId = $this->getCountryId();
+ $postCode = $this->getPostcode();
+ if ((!$countryId && !$postCode)
+ || ($countryId && !$postCode && !Mage::helper('directory')->isZipCodeOptional($countryId))) {
return $this;
}
@@ -844,6 +844,34 @@ public function setBaseTotalAmount($code, $amount)
return $this;
}
+ /**
+ * Add amount total amount value
+ *
+ * @param string $code
+ * @param float $amount
+ * @return Mage_Sales_Model_Quote_Address
+ */
+ public function addTotalAmount($code, $amount)
+ {
+ $amount = $this->getTotalAmount($code)+$amount;
+ $this->setTotalAmount($code, $amount);
+ return $this;
+ }
+
+ /**
+ * Add amount total amount value in base store currency
+ *
+ * @param string $code
+ * @param float $amount
+ * @return Mage_Sales_Model_Quote_Address
+ */
+ public function addBaseTotalAmount($code, $amount)
+ {
+ $amount = $this->getBaseTotalAmount($code)+$amount;
+ $this->setBaseTotalAmount($code, $amount);
+ return $this;
+ }
+
/**
* Get total amount value by code
*
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 7336a398a2..95fd306e06 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
@@ -153,10 +153,7 @@ protected function _setBaseAmount($baseAmount)
*/
protected function _addAmount($amount)
{
- $this->_getAddress()->setTotalAmount(
- $this->getCode(),
- $this->_getAddress()->getTotalAmount($this->getCode())+$amount
- );
+ $this->_getAddress()->addTotalAmount($this->getCode(),$amount);
return $this;
}
@@ -168,10 +165,7 @@ protected function _addAmount($amount)
*/
protected function _addBaseAmount($baseAmount)
{
- $this->_getAddress()->setBaseTotalAmount(
- $this->getCode(),
- $this->_getAddress()->getBaseTotalAmount($this->getCode())+$baseAmount
- );
+ $this->_getAddress()->addBaseTotalAmount($this->getCode(), $baseAmount);
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 9f9f227496..6091f7c26b 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Item.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Item.php
@@ -215,6 +215,23 @@ public function getQtyOptions()
return $return;
}
+ /**
+ * Checking item data
+ *
+ * @return Mage_Sales_Model_Quote_Item_Abstract
+ */
+ public function checkData()
+ {
+ $parent = parent::checkData();
+ if ($this->getProduct()->getHasError()) {
+ $this->setHasError(true);
+ $this->setMessage(Mage::helper('sales')->__('Item options declare error'));
+ $this->getQuote()->setHasError(true);
+ $this->getQuote()->addMessage($this->getProduct()->getMessage(), 'options');
+ }
+ return $parent;
+ }
+
/**
* Setup product for quote item
*
@@ -233,8 +250,10 @@ public function setProduct($product)
->setName($product->getName())
->setWeight($this->getProduct()->getWeight())
->setTaxClassId($product->getTaxClassId())
- ->setCost($product->getCost())
- ->setIsQtyDecimal($product->getIsQtyDecimal());
+ ->setBaseCost($product->getCost());
+ if ($product->getStockItem()) {
+ $this->setIsQtyDecimal($product->getStockItem()->getIsQtyDecimal());
+ }
Mage::dispatchEvent('sales_quote_item_set_product', array(
'product' => $product,
@@ -261,6 +280,7 @@ public function getProduct()
$product = Mage::getModel('catalog/product')
->setStoreId($this->getQuote()->getStoreId())
->load($this->getProductId());
+
$this->setProduct($product);
}
diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml
index d68e0d08b2..96f885efb2 100644
--- a/app/code/core/Mage/Sales/etc/config.xml
+++ b/app/code/core/Mage/Sales/etc/config.xml
@@ -28,7 +28,7 @@
--Shopping Cart Price Rules -
-
+ getWebsitesReadonly()): ?>disabled="disabled" class="checkbox website-checkbox" id="add_product_website_getId() ?>" type="checkbox" />
@@ -70,7 +70,7 @@
getWebsiteCollection() as $_website): ?>
-
+ getWebsitesReadonly()): ?>disabled="disabled" class="checkbox website-checkbox" id="remove_product_website_getId() ?>" type="checkbox"/>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
index 9d9323aed2..56f36bc534 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
@@ -23,17 +23,23 @@
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
+/* @var $this Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier */
?>
getElement()->getHtmlId() ?>
getElement()->getClass() ?>
getElement()->getName() ?>
getElement()->getReadonly() ?>
-isMultiWebsites(); ?>
+isShowWebsiteColumn(); ?>
+isAllowChangeWebsite(); ?>
+
+
+isShowWebsiteColumn(); ?>
+isMultiWebsites(); ?>
getElement()->getLabel() ?>
-
+
-
-
+
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml
index ea96d0820c..7768569035 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml
@@ -1,3 +1,30 @@
+
+
+getCanLoadTinyMce()): // TinyMCE is broken when loaded through index.php ?>
+
+
+
helper('core/js')->getTranslatorScript() ?>
-getChildHtml('calendar');
\ No newline at end of file
+getChildHtml('calendar'); ?>
+getChildHtml('optional_zip_countries'); ?>
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml
index d6a41cf005..dedb7b548d 100644
--- a/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml
@@ -28,6 +28,4 @@
{{pdf_row_separator}}
__('Credit Card Type: %s', $this->htmlEscape($this->getCcTypeName())) ?>
{{pdf_row_separator}}
-__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?>
- {{pdf_row_separator}}
-__('Expiration Date: %s/%s', $this->htmlEscape($this->getCcExpMonth()), $this->htmlEscape($this->getInfo()->getCcExpYear())) ?>
+__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?>
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml
index d6c761a528..dedb7b548d 100644
--- a/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml
@@ -28,6 +28,4 @@
{{pdf_row_separator}}
__('Credit Card Type: %s', $this->htmlEscape($this->getCcTypeName())) ?>
{{pdf_row_separator}}
-__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?>
- {{pdf_row_separator}}
-__('Expiration Date: %s/%s', $this->htmlEscape($this->getCcExpMonth()), $this->htmlEscape($this->getInfo()->getCcExpYear())) ?>
\ No newline at end of file
+__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?>
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml b/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml
index 0bd5c8b780..38041d6808 100644
--- a/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml
+++ b/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml
@@ -31,8 +31,6 @@
{{pdf_row_separator}}
__('Credit Card Number: xxxx-%s', $this->getInfo()->getCcLast4()) ?>
{{pdf_row_separator}}
- __('Expiration Date: %s/%s', $this->getCcExpMonth(), $this->getInfo()->getCcExpYear()) ?>
- {{pdf_row_separator}}
getInfo()->getCcSsIssue()): ?>
__("Switch/Solo card issue number: %s", $this->getInfo()->getCcSsIssue()) ?>
{{pdf_row_separator}}
diff --git a/app/design/adminhtml/default/default/template/popup.phtml b/app/design/adminhtml/default/default/template/popup.phtml
index 962c23d17f..5ab2a1069c 100644
--- a/app/design/adminhtml/default/default/template/popup.phtml
+++ b/app/design/adminhtml/default/default/template/popup.phtml
@@ -42,7 +42,7 @@
getChildHtml('head') ?>
-
+getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?>>
+ getChildHtml('footer')): ?>
+
getChildHtml('js') ?>
getChildHtml('profiler') ?>
| style="display:none">__('Website') ?> | +style="display:none">__('Website') ?> | __('Customer Group') ?> | __('Qty') ?> | getPriceColumnHeader(Mage::helper('catalog')->__('Price')) ?> | __('Action') ?> |
|---|---|---|---|---|---|
| style="display:none"> - - | -- - | -- __('and above')?> - | -- - | -- | |
| style="display:none"> | +style="display:none"> | getAddButtonHtml() ?> | |||
@@ -64,9 +64,11 @@