Import Magento Release 1.5.0.0-beta1

RELEASE_NOTES.txt

@@ -1,3 +1,96 @@
+==== 1.5.0.0-beta1 =====
+
+=== Improvements ===
+Fixed several memory leaks in product model. Added tool method clear() to clean object data and references to this object
+Implemented Order payment action for PayPal
+Implemented SOAP Api calls for shopping cart
+
+=== Fixes ===
+Fixed Only "Library Mail" works for USPS
+Fixed The "MY WISHLIST" link always shows quantity of line items in the Wishlist and never the real quantity of items
+- fix for case when out of stock products are not shown on frontend
+Fixed Wrong behavior of Varien_Data_Collection_Db::_getConditionSql
+Fixed Incorrect shipping tax calculation on invoice creditmemos with included tax
+- Rounding of shipment taxes was added
+Fixed Impossible save empty values for store view scope
+- Remove store_id from EAV module and move all store functionality into catalog module.
+Fixed Wrong tax calculation for bundle products
+Fixed File configuration dialog is not closed when pressing 'Ok' button
+- additional fix of backend Customer functionality for IE8 to eliminate JS errors
+Fixed Product creation -> Necessary validation for SKU field
+Fixed Link "Gift Options" is not shown in Items Ordered grid of create Order page, when "Allow Gift Messages for Order Items" is set to "No"
+- considering design html at right place
+- removed useless variable from observer
+Fixed Price for composite products in a products grid on Order creation page
+Fixed Tax from orders in status pending presents in Tax Report
+Fixed Catalog Price Rule is not applied
+Fixed Incorrect tax summary for partial credit memos/invoices
+Fixed Order success page is not displayed after placing Order using Website Payments Pro Hosted Solution method
+- now, return and cancel urls can be secure (https)
+Fixed Problems with newsletter template preview on newsletter queue edit page
+Fixed Link "configure" is inactive for downloadable products in product grid on Order creation page in backend
+Fixed A system error message is missing for cases when media storage synchronization is complete or an error occurred
+- output messages for notifications edited
+Fixed Incorrect price calculation for bundle product during backend order creation(Tax is doubles in Total)
+Fixed Gift Options tab is present on product page for virtual product types
+Fixed Magento Backend performance optimization
+Fixed Gift Message for Individual Item prompt is shown in AJAX-popup, although "Allow Gift Messages for Order Items" is disabled
+Fixed Unable to change customer password when email confirmation is enabled
+Fixed Incorrect tax calculation for Tax Calculation Method Based On = Unit Price and Catalog Prices = Including Tax
+Fixed "Preferred State" for extensions is not working
+Fixed Total amount is not recounted, when customer cancels the Gift Options during OnePageCheckout
+Fixed In "Gift options" AJAX popup "OK" button written incorrectly
+Fixed No address autocomplete while admin order create with single store
+- fixes due to unnecessary AJAX calls
+Fixed Information about Gift Options is not stored, when admin user performs Edit Order action in backend
+Fixed Gift column should be removed from product grid
+Fixed SKU validation error on creating products
+Fixed Shipped order has status "Processing" if invoice has been posted with "Not Capture" and amount was later captured on paypal side.
+- considering online and offline capture amout when checking if capture is final
+- trailing white spaces removed
+Fixed Link to file from downloadable product is not available after authorize and capture payment action via Authorize.net
+- Link management observer call methods are moved to save_commit_after events (for order and its item respectively) instead of save_after events
+Fixed Price for product with file custom options in Wishlist is calculated incorrect
+- Added ability to use special price templates for displaying wishlist items (as they can be partially/fully configured and catalog price template doesn't support it)
+- Added default template, that shows configured price in addition to default clean product price
+Fixed Cross-sells products disappears after adding another products to shopping cart
+
+
+==== 1.5.x-devel-90295 ====
+
+=== Fixes ===
+Fixed Configurable Product:Associated Product tab - Rounding issue
+Fixed Wrong usage of @see tag in phpdocs
+- replaced @see into @link phpdocs in cases where the value is a link
+Fixed A system error message is missing for cases when media storage synchronization is complete or an error occurred
+Fixed Order success page is not displayed after placing Order using Website Payments Pro Hosted Solution method
+Fixed Order contains information about used card type with Payflow Link (for USA and Canada) payment using
+Fixed Product export have no Entity Attributes
+Fixed Authorize.net Directpost payment method doesn't work when secure urls in frontend are being used
+Fixed The options in the action dropdown for export are incorrectly labeled in the Sales section
+- Rename XML and MSXML to Excel XML
+Fixed Round up to 0.01 of amount with tax in cart
+Fixed Shipped order has status "Processing" if invoice has been posted with "Not Capture" and amount was later captured on paypal side.
+- Return invoice model for transaction, if it didn't return by transaction_id
+Fixed File configuration dialog is not closed when pressing 'Ok' button
+- also made better logic to disable/enable file controls, so that file is not uploaded (and just thrown away by server) when there's no need in it
+Fixed Deleting attached files do not work
+Fixed Price for composite products in a products grid on Order creation page
+- it was also fixed converting to current currency rates
+Fixed Firefox iframe issue
+Fixed Can not add product to order from backend (IE8)
+Fixed Moving product with file custom options to Wishlist works incorrect
+Fixed Displaying Out of Stock Products on the front-end
+Fixed Price for composite products in a products grid on Order creation page
+- forgot to add parent::_afterLoad(); in Mage_Bundle_Model_Mysql4_Selection_Collection::_afterLoad() method witch leads to exception
+Fixed Fix for HSS amount is sent to PayPal. But need to test includeTax/excludeTax settings.
+Fixed A system error message is missing for cases when media storage synchronization is complete or an error occurred
+- fixed ability to save storage witch last sync was made on
+- removed link "read details" for local messages at notice bar
+- messages correction
+Fixed Authorize.net Directpost payment method. Can't create capture and refund transaction
+
+
 === 1.5.0.0-alpha2 ====
 
 === Major Highlights ===

app/Mage.php

@@ -154,8 +154,8 @@ public static function getVersionInfo()
             'minor'     => '5',
             'revision'  => '0',
             'patch'     => '0',
-            'stability' => 'alpha',
-            'number'    => '2',
+            'stability' => 'beta',
+            'number'    => '1',
         );
     }
 

app/code/community/Find/Feed/etc/system.xml

@@ -36,7 +36,7 @@
          <feed translate="label" module="find_feed">
             <label>Feed</label>
             <tab>find</tab>
-            <sort_order>10</sort_order>
+            <sort_order>100</sort_order>
             <show_in_default>1</show_in_default>
             <show_in_website>1</show_in_website>
             <show_in_store>1</show_in_store>

app/code/core/Mage/AdminNotification/Model/Inbox.php

@@ -98,6 +98,6 @@ public function getNoticeStatus()
      */
     public function parse(array $data)
     {
-        return $this->getResource()->parse($this, $data);;
+        return $this->getResource()->parse($this, $data);
     }
 }

app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php

@@ -82,7 +82,13 @@ public function parse(Mage_AdminNotification_Model_Inbox $object, array $data)
             $select = $write->select()
                 ->from($this->getMainTable())
                 ->where('url=?', $item['url']);
-            $row = $write->fetchRow($select);
+
+            if (isset($item['internal'])) {
+                $row = false;
+                unset($item['internal']);
+            } else {
+                $row = $write->fetchRow($select);
+            }
 
             if (!$row) {
                 $write->insert($this->getMainTable(), $item);

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php

@@ -131,4 +131,16 @@ public function getIsLastFieldset()
         }
         return $isLast;
     }
+
+    /**
+     * Returns price converted to current currency rate
+     *
+     * @param float $price
+     * @return float
+     */
+    public function getCurrencyPrice($price)
+    {
+        $store = $this->getProduct()->getStore();
+        return $this->helper('core')->currencyByStore($price, $store, false);
+    }
 }

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php

@@ -110,7 +110,7 @@ protected function _prepareColumns()
             ->setColumnFilter('name');
 
         $this->addExportType('*/*/exportCsv', Mage::helper('customer')->__('CSV'));
-        $this->addExportType('*/*/exportXml', Mage::helper('customer')->__('XML'));
+        $this->addExportType('*/*/exportXml', Mage::helper('customer')->__('Excel XML'));
         return parent::_prepareColumns();
     }
 

app/code/core/Mage/Adminhtml/Block/Customer/Grid.php

@@ -164,7 +164,7 @@ protected function _prepareColumns()
         ));
 
         $this->addExportType('*/*/exportCsv', Mage::helper('customer')->__('CSV'));
-        $this->addExportType('*/*/exportXml', Mage::helper('customer')->__('XML'));
+        $this->addExportType('*/*/exportXml', Mage::helper('customer')->__('Excel XML'));
         return parent::_prepareColumns();
     }
 

app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php

@@ -76,13 +76,11 @@ protected function _toLinkHtml($action, Varien_Object $row)
         $product = $row->getProduct();
 
         if (isset($action['process']) && $action['process'] == 'configurable') {
-            $hasConfigurableOptions = (bool)($product->isComposite() || $product->getOptions()
-                || in_array($product->getTypeId(), array('giftcard', 'downloadable')));
-            if ($hasConfigurableOptions) {
+            if ($product->canConfigure()) {
                 $style = '';
                 $onClick = sprintf('onclick="return %s.configureItem(%s)"', $action['control_object'], $row->getId());
             } else {
-                $style = 'style="color: #CCC"';
+                $style = 'style="color: #CCC;"';
                 $onClick = '';
             }
 

app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php

@@ -139,7 +139,7 @@ protected function _prepareColumns()
         ));
 
         $this->addExportType('*/*/exportCsv', Mage::helper('customer')->__('CSV'));
-        $this->addExportType('*/*/exportXml', Mage::helper('customer')->__('XML'));
+        $this->addExportType('*/*/exportXml', Mage::helper('customer')->__('Excel XML'));
         return parent::_prepareColumns();
     }
 

app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php

@@ -64,9 +64,12 @@ public function isShow()
         if ($this->getRequest()->getControllerName() == 'notification') {
             return false;
         }
-        if ($this->getCriticalCount() == 0 && $this->getMajorCount() == 0 && $this->getMinorCount() == 0 && $this->getNoticeCount() == 0) {
+        if ($this->getCriticalCount() == 0 && $this->getMajorCount() == 0 && $this->getMinorCount() == 0
+            && $this->getNoticeCount() == 0
+        ) {
             return false;
         }
+
         return true;
     }
 

app/code/core/Mage/Adminhtml/Block/Page/Footer.php

@@ -34,11 +34,19 @@
  */
 class Mage_Adminhtml_Block_Page_Footer extends Mage_Adminhtml_Block_Template
 {
+    const CACHE_LIFETIME = 7200;
+    const CACHE_KEY      = 'footer';
+    const CACHE_TAG      = 'adminhtml';
 
     protected function _construct()
     {
         $this->setTemplate('page/footer.phtml');
         $this->setShowProfiler(true);
+        $this->addData(array(
+            'cache_lifetime' => self::CACHE_LIFETIME,
+            'cache_tags'     => array(self::CACHE_TAG),
+            'cache_key'      => self::CACHE_KEY
+        ));
     }
 
     public function getChangeLocaleUrl()
@@ -66,7 +74,7 @@ public function getLanguageSelect()
             ->setValue(Mage::app()->getLocale()->getLocaleCode())
             ->setOptions(Mage::app()->getLocale()->getTranslatedOptionLocales())
             ->getHtml();
+
         return $html;
     }
-
 }

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php

@@ -49,9 +49,7 @@ public function getAvailableCurrencies()
             );
             foreach ($dirtyCodes as $code) {
                 if (isset($rates[$code]) || $code == Mage::app()->getStore()->getBaseCurrencyCode()) {
-                    $currency = Mage::app()->getLocale()->currency($code);
-                    $symbol = $currency->getSymbol() ? $currency->getSymbol() : $currency->getShortName();
-                    $codes[$symbol] = $code;
+                    $codes[] = $code;
                 }
             }
         }
@@ -69,6 +67,18 @@ public function getCurrencyName($code)
         return Mage::app()->getLocale()->currency($code)->getName();
     }
 
+    /**
+     * Retrieve curency name by code
+     *
+     * @param   string $code
+     * @return  string
+     */
+    public function getCurrencySymbol($code)
+    {
+        $currency = Mage::app()->getLocale()->currency($code);
+        return $currency->getSymbol() ? $currency->getSymbol() : $currency->getShortName();
+    }
+
     /**
      * Retrieve current order currency code
      *

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php

@@ -257,10 +257,12 @@ public function getMoveToCustomerStorage()
 
     public function displaySubtotalInclTax($item)
     {
-        $tax = ($item->getTaxBeforeDiscount())
-            ? $item->getTaxBeforeDiscount()
-            : ($item->getTaxAmount() ? $item->getTaxAmount() : 0);
-        return $this->formatPrice($item->getRowTotal()+$tax);
+        if ($item->getTaxBeforeDiscount()) {
+            $tax = $item->getTaxBeforeDiscount();
+        } else {
+            $tax = $item->getTaxAmount() ? $item->getTaxAmount() : 0;
+        }
+        return $this->formatPrice($item->getRowTotal() + $tax);
     }
 
     public function displayOriginalPriceInclTax($item)
@@ -301,14 +303,12 @@ public function getStore()
     public function getConfigureButtonHtml($item)
     {
         $product = $item->getProduct();
-        $isConfigurable = $product->isComposite() || $product->getOptions()
-            || in_array($product->getTypeId(), array('downloadable', 'giftcard'));
 
         $options = array(
             'label' => Mage::helper('sales')->__('Configure'),
             'title' => Mage::helper('sales')->__('This product does not have any configurable options.')
         );
-        if ($isConfigurable) {
+        if ($product->canConfigure()) {
             $options['onclick'] = sprintf('order.showQuoteItemConfiguration(%s)', $item->getId());
         } else {
             $options['class'] = ' disabled';

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php

@@ -89,11 +89,11 @@ protected function _addColumnFilterToCollection($column)
 
     protected function _prepareCollection()
     {
+        $attributes = Mage::getSingleton('catalog/config')->getProductAttributes();
         $collection = Mage::getModel('catalog/product')->getCollection()
             ->setStore($this->getStore())
-            ->addAttributeToSelect('name')
+            ->addAttributeToSelect($attributes)
             ->addAttributeToSelect('sku')
-            ->addAttributeToSelect('price')
             ->addMinimalPrice()
             ->addStoreFilter()
             ->addAttributeToFilter('type_id', array_keys(
@@ -147,20 +147,6 @@ protected function _prepareColumns()
             'sortable'  => false,
         ));
 
-        $this->addColumn('giftmessage', array(
-            'filter'    => false,
-            'sortable'  => false,
-            'header'    => Mage::helper('sales')->__('Gift'),
-            'renderer'  => 'adminhtml/sales_order_create_search_grid_renderer_giftmessage',
-            'field_name'=> 'giftmessage',
-            'inline_css'=> 'checkbox input-text',
-            'align'     => 'center',
-            'index'     => 'entity_id',
-            'values'    => $this->_getGiftmessageSaveModel()->getAllowQuoteItemsProducts(),
-            'width'     => '1',
-        ));
-
-
         $this->addColumn('qty', array(
             'filter'    => false,
             'sortable'  => false,
@@ -193,6 +179,7 @@ protected function _getSelectedProducts()
     /**
      * Retrieve gift message save model
      *
+     * @deprecated after 1.4.2.0
      * @return Mage_Adminhtml_Model_Giftmessage_Save
      */
     protected function _getGiftmessageSaveModel()
@@ -209,6 +196,4 @@ protected function _afterLoadCollection() {
         $this->getCollection()->addOptionsToResult();
         return parent::_afterLoadCollection();
     }
-
 }
-

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php

@@ -27,9 +27,11 @@
 /**
  * Adminhtml sales create order product search grid giftmessage column renderer
  *
+ * @deprecated after 1.4.2.0 - gift column has been removed from search grid
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
+ * @author     Magento Core Team <[email protected]>
  */
 class Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid_Renderer_Giftmessage extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Checkbox
 {

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php

@@ -42,8 +42,7 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid_Renderer_Product exten
     public function render(Varien_Object $row)
     {
         $rendered       =  parent::render($row);
-        $isConfigurable = ($row->isComposite() || $row->getOptions() || $row->getTypeId() == 'giftcard'
-            || $row->getTypeId() == 'downloadable') ? true : false;
+        $isConfigurable = $row->canConfigure();
         $style          = $isConfigurable ? '' : 'style="color: #CCC;"';
         $prodAttributes = $isConfigurable ? sprintf('list_type = "product_to_add" product_id = %s', $row->getId()) : 'disabled="disabled"';
         return sprintf('<a href="javascript:void(0)" %s class="f-right" %s>%s</a>',