Import Magento Release 1.6.1.0-beta1

URL: http://www.magentocommerce.com/getmagento/1.6.1.0-beta1/magento-1.6.1.0-beta1.tar.bz2
SHA1: 25ee015f44e4deea6c63b566f29771fb40efd7ed

RELEASE_NOTES.txt

@@ -1,3 +1,148 @@
+==== 1.6.1.0-beta1 ====
+
+=== Major Highlights ===
+Added two-step password reset flow
+
+=== Improvements ===
+Added support for using Shift-Click to select a range of grid rows when clicking check boxes
+Added ability to register during checkout when using PayPal Express
+Updated PayflowLink HSS user interface in checkout
+"Add to Wishlist", "Add to Compare" were added on the Product Details Page for configurable, bundled and downloadable products
+
+=== Changes ===
+TheFind integration was removed
+Google Optimizer was removed (it will be supported as a core extension)
+Improved how discounts are applied to sub products 
+
+=== Fixes ===
+Fixed Saved CC form is not displayed, when there are no other available payment methods except Saved CC
+Fixed It's impossible to create Catalog Price Rule
+Fixed Fatal error on Multiple Addresses Checkout
+Fixed Package Types that not available for current Shipping Method displayed in Create Packages pop-up
+Fixed Stock item product getter not correspond to product setter
+- added method getProduct()
+Fixed Admin user interface: mistakes in labels names
+Fixed Typo in Mage_Eav_Model_Resource_Entity_Attribute_Option model
+Fixed Billing Agreement error
+Fixed Payflow Link UI Changes
+Fixed 'Website Payments Pro' impossible to place order during onepage checkout
+Fixed Table rates works incorrect with asterisk
+Fixed Typo in Category Resource Model
+Fixed 3D secure with Saved CC works incorrectly
+- removed unrelated message which told validation failed (even if it has actually succeeded) when trying to re-validate a card
+Fixed Bug in Role Permission
+Fixed Orders placed via Google Checkout were not created on the Magento side
+Fixed When using direct Export, the _super_product_sku and _super_product_option on the configurable product does not match
+Fixed Composite product price in grid is displayed incorrectly with some currencies due to JS regexp problem
+Fixed No error message on Payflow link iframe
+Fixed Flex uploader elements overlaps hovering menu items in backend
+Fixed Unable to upload images in Magento installed on local server
+Fixed Configurable Products - Use Default (attribute name) does not work correctly on IE9
+Fixed Capture failed when Verification Authorization Amount is set to Zero
+Fixed Attribute is sorted like a string even when Input Validation for Store Owner is an Integer Number
+Fixed Void and Cancel Order doesn't work (PayflowLink HSS)
+Fixed Grand Total (Excl Tax) with negative value displays in the printed Credit Memo
+Fixed Resource model of Media module is wrongly declared
+Fixed Constraint violation with core_cache_tag table
+Fixed Misprint in \downloader\lib\Mage\Connect\Validator.php
+Fixed XMLRPC API attribute status changing
+Fixed Typo in Mage_Rss_Block_Catalog_Category::_toHtml() method
+Fixed Incorrect tax summary for partial credit memos/invoices
+Fixed SSL is not used for links in email templates when admin area is configured to use HTTPS
+Fixed Incorrect style on product page
+Fixed Error is displayed by editing product or by creating product on back-end in IE8
+Fixed Catalog price rules for composite products changes
+Fixed Moving modules to the correct place
+Fixed Wishlist shows items per store scope, not website
+Fixed Products in Wishlist disappears, when Store View is changed
+Fixed Wrong Comments History in notification of order creation/cancellation 
+Fixed In AJAX popup fields "From" and "To" have behavior as mandatory fields
+Fixed Filter by Allow Countries not working for Customer Address Form in the Backend
+Fixed Product price lower than 0 (after catalog price rule applying)
+Fixed Google Checkout throws error if Zip Range is used for Tax Rate
+- changed part of XML request to Google responsible for postal codes
+- made changes to correctly fetch tax rules for postal code ranges
+Fixed Website config object is not being cached
+Fixed Select groups in grid view doesn't work under IE7
+Fixed No products name in Popular tags report file .csv
+Fixed Qty Increments should work when it was defined in the default scope configuration
+Fixed Products in catalog displays as "out of stock"
+Fixed "Get help for this page" in each tab under System->Configuration links to the same help page
+Fixed Unable to translate submenu
+Fixed Redirect to main page of front-end during deleting Product Tax Class which is used in Tax Rule
+Fixed Redirect to base URL should consider full request URI string
+Fixed Incorrect transparency of PNG image in indexed non-alpha mode
+Fixed Problem of generation URL between different domains
+Fixed There are no server side validation of first character of Attribute Code (it should be letter)
+Fixed Edit Order without creating new one functionality saves invalid changes in non-default customer address attributes
+Fixed Frontend: If second customer logs in and does not select the "Remember Me" then the previous long-term cookie does not removes
+Fixed Admin can Reorder order with status On Hold
+Fixed Frontend: After new customer registration with "Remember Me" and pressing "Logout" the long-term cookie session doesn't apply if in configuration on backend ""Remember Me" Default Value" - No
+Fixed Tax not displaying on PayPal side for Express orders
+Fixed Wishlist: Not configured grouped product has unneeded link "Show Details"
+Fixed Removed the ability to work with customise admin url through the parameter base_url
+Fixed Roles not displaying selected resources
+Fixed Unable to use Import when compiler is enabled
+Fixed Missing Translation Capability in Transactional Email Variable
+Fixed productConfigure is undefined error is occurred during creation Order in Backend in IE8 browser
+Fixed Zend Full Page Cache. Lifetime of the cookie is not equal to specified on "Cookie Lifetime" field
+Fixed Incorrect price values for Bundle Product
+Fixed Link does not pass validation if ends with .html
+Fixed Incorrect Customs Value in Create Packages in case when price value contains decimals
+Fixed Incorrect reports with updated_at filter
+Fixed paypal_payment_transaction_clean job takes credentials form default config instead of website for Payflow Link
+Fixed Wrong schedule time setup for paypal_payment_transaction_clean job for Payflow Link
+Fixed Backend Error message "SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry 'qwe' for key 2" appears after saving new Email Template with existing name
+Fixed Rule Conditions logic
+Fixed Error appears after Customer Group saving with name length more than 32
+Fixed Category product index run time
+Fixed Sidebar cart is missing composite product options on category page
+Fixed Missed validation for space character at the begin of unique fields
+- improved validation of Attribute Set Name and validation of unique fields in Mage_Core_Model_Resource_Db_Abstract class
+Fixed Ability to input uppercase, space, specials symbols in Order Status Code
+Fixed Filter by Allow Countries not working for Customer Address Form in the Backend
+Fixed No ability to create Shipping Label with "plus-four codes" Zip Code (in case with USPS Domestic)
+Fixed Changing language twice -> Error 404
+Fixed The sort order in products page doesn't work
+Fixed When a grouped product with configured price=0 is added to the wishlist and shared, adding the product to the cart leads to 404 error
+Fixed Media Saves Incorrect Cached Config
+- added options that disallow saving cache
+Fixed Bundle Product items shows randomly instead of according to option
+Fixed Unable to place order with Payflow Link if store credit or reward point applied
+Fixed Ajax loader does not appears after click on Verify Card on Payflow Link
+Fixed "Google Checkout - Carrier" in Magento backend as shipping method rather than the actual shipping method chosen
+Fixed JavaScript error appears in checkout because of PSC after press 'Proceed to Checkout'
+Fixed Admin user interface: mistakes in labels names
+Fixed Problems with grid sorting on edit customer backend page
+Fixed It is possible to change the price of the Bundle product from fixed to the dynamic at my store
+Fixed Set special price via Catalog Product API is not working
+Fixed Price is wrong calculated for bundle product with a zero price for its items on product details page
+- subitem price calculation were fixed
+Fixed Layout issue appears in IE9 on the grids (example Customers)
+Fixed Impossible to press 'Continue' button to place in onepage
+Fixed "Add to Wishlist", "Add to Compare" aren't presented for Configurable, bundle, downloadable, simple products on Product Details Page
+Fixed Register during checkout with PayPal Express Checkout
+Fixed Extension Packager does not read recursive directory if include expression use file mask
+Fixed Newsletter Subscription Confirmation Message
+Fixed Discount is wrong calculated for Shopping Cart Price Rules when some of them created with Coupon and another without Coupon
+Fixed Subtotal (Incl.Tax) on invoices must not include tax applied to shipping amount
+- shippingTax amount were excluded from subTotal value
+Fixed "Maximum shipping amount allowed to refund" message shows amount excl. tax if Display Shipping Amount set to Including Tax
+- adjusted function to include tax into allowed amount for shipping refund
+Fixed Display Out of Stock Products must not be considered during admin order creation
+Fixed Check box is not working correctly under "prices" of the Bundle products.
+Fixed CSS class missing
+Fixed Frontend: JavaScript error appears if user registered on Checkout Page
+Fixed Website config object is not being cached
+- added functionality for memcache backend to split down data that is larger than slab size into chunks
+Fixed Removed the ability to work with base_url
+Fixed Custom design should be updated via import functionality
+Fixed JS error during onepage checkout
+Fixed Unable to translate "First name" and "Last name" fields on "Create an Account" page
+Fixed After upgrading  dashboard "Top 5 Search Terms" grid doesn't show search terms
+
+
+
 ==== 1.6.1.0-alpha1 ====
 
 === Major Highlights ===

app/Mage.php

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

app/code/core/Mage/Api/Model/Server/Handler/Abstract.php

@@ -539,4 +539,4 @@ public function globalFaults($sessionId)
         $this->_startSession($sessionId);
         return array_values($this->_getConfig()->getFaults());
     }
-} // Class Mage_Api_Model_Server_Handler_Abstract End
+} // Class Mage_Api_Model_Server_Handler_Abstract End

app/code/core/Mage/Catalog/Model/Resource/Category.php

@@ -881,7 +881,7 @@ protected function _processPositions($category, $newParent, $afterCategoryId)
             $select = $adapter->select()
                 ->from($table,array('position' => new Zend_Db_Expr('MIN(' . $positionField. ')')))
                 ->where('parent_id = :parent_id');
-            $position = $adapter->fetchOne($select, array('patent_id' => $newParent->getId()));
+            $position = $adapter->fetchOne($select, array('parent_id' => $newParent->getId()));
         }
         $position += 1;
 

app/code/core/Mage/Catalog/etc/system.xml

@@ -243,7 +243,7 @@
                             <show_in_store>1</show_in_store>
                         </product_use_categories>
                         <save_rewrites_history translate="label">
-                            <label>Create Permanent Redirect for old URLs if Url Key Changed</label>
+                            <label>Create Permanent Redirect for URLs if URL Key Changed</label>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_yesno</source_model>
                             <sort_order>5</sort_order>

app/code/core/Mage/CatalogInventory/Model/Stock/Item.php

@@ -840,6 +840,16 @@ public function setProduct($product)
         return $this;
     }
 
+    /**
+     * Returns product instance
+     *
+     * @return Mage_Catalog_Model_Product|null
+     */
+    public function getProduct()
+    {
+        return $this->_productInstance ? $this->_productInstance : $this->_getData('product');
+    }
+
     /**
      * Retrieve stock qty whether product is composite or no
      *

app/code/core/Mage/Centinel/Model/State/Visa.php

@@ -95,7 +95,7 @@ public function isAuthenticateSuccessful()
             }
 
             //Test case 11
-            if ($paResStatus == '' && $signatureVerification == '' && $eciFlag == '07' &&
+            if ($paResStatus == 'U' && $signatureVerification == '' && $eciFlag == '07' &&
                 $xid == '' && $cavv == '' && $errorNo == '1050') {
                 if ($this->getIsModeStrict()) {
                     return false;

app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php

@@ -27,6 +27,9 @@
 /**
  * Centinel Index Controller
  *
+ * @category Mage
+ * @package  Mage_Centinel
+ * @author   Magento Core Team <[email protected]>
  */
 class Mage_Centinel_Adminhtml_Centinel_IndexController extends Mage_Adminhtml_Controller_Action
 {
@@ -43,12 +46,9 @@ public function validatePaymentDataAction()
             if (!$validator) {
                 throw new Exception('This payment method does not have centinel validation.');
             }
+            $validator->reset();
             $this->_getPayment()->importData($paymentData);
-            if ($validator->shouldAuthenticate()) {
-                $result['authenticationUrl'] = $validator->getAuthenticationStartUrl();
-            } else {
-                Mage::throwException(Mage::helper('centinel')->__('This card has failed validation, but it is possible to place the order.'));
-            }
+            $result['authenticationUrl'] = $validator->getAuthenticationStartUrl();
         } catch (Mage_Core_Exception $e) {
             $result['message'] = $e->getMessage();
         } catch (Exception $e) {

app/code/core/Mage/Checkout/Model/Type/Multishipping.php

@@ -241,7 +241,10 @@ public function setShippingItemsInformation($info)
              * MultishippingQty should be defined for each quote item when it processed with _addShippingItem
              */
             foreach ($quote->getAllItems() as $_item) {
-                if (!$_item->getProduct()->getIsVirtual() && !$_item->getParentItem() && !$_item->getMultishippingQty()) {
+                if (!$_item->getProduct()->getIsVirtual() &&
+                    !$_item->getParentItem() &&
+                    !$_item->getMultishippingQty()
+                ) {
                     $_item->delete();
                 }
             }
@@ -419,6 +422,7 @@ protected function _prepareOrder(Mage_Sales_Model_Quote_Address $address)
 
         $convertQuote = Mage::getSingleton('sales/convert_quote');
         $order = $convertQuote->addressToOrder($address);
+        $order->setQuote($quote);
         $order->setBillingAddress(
             $convertQuote->addressToOrderAddress($quote->getBillingAddress())
         );
@@ -435,11 +439,14 @@ protected function _prepareOrder(Mage_Sales_Model_Quote_Address $address)
         }
 
         foreach ($address->getAllItems() as $item) {
-            if (! $item->getQuoteItem()) {
+            $_quoteItem = $item->getQuoteItem();
+            if (!$_quoteItem) {
                 throw new Mage_Checkout_Exception(Mage::helper('checkout')->__('Item not found or already ordered'));
             }
-            $item->setProductType($item->getQuoteItem()->getProductType())
-                ->setProductOptions($item->getQuoteItem()->getProduct()->getTypeInstance(true)->getOrderOptions($item->getQuoteItem()->getProduct()));
+            $item->setProductType($_quoteItem->getProductType())
+                ->setProductOptions(
+                    $_quoteItem->getProduct()->getTypeInstance(true)->getOrderOptions($_quoteItem->getProduct())
+                );
             $orderItem = $convertQuote->itemToOrderItem($item);
             if ($item->getParentItem()) {
                 $orderItem->setParentItem($order->getItemByQuoteItemId($item->getParentItem()->getId()));

app/code/core/Mage/Core/Model/Resource/Store/Group/Collection.php

@@ -98,7 +98,7 @@ public function _beforeLoad()
             $this->setWithoutDefaultFilter();
         }
         $this->addOrder('main_table.name',  self::SORT_ORDER_ASC);
-        return $this;
+        return parent::_beforeLoad();
     }
 
     /**

app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php

@@ -94,38 +94,31 @@ public function getFlatUpdateSelect(Mage_Eav_Model_Entity_Attribute_Abstract $at
         $attributeCode  = $attribute->getAttributeCode();
 
         $joinConditionTemplate = "%s.entity_id = %s.entity_id"
-            ." AND %s.entity_type_id = ".$attribute->getEntityTypeId()
-            ." AND %s.attribute_id = ".$attribute->getId()
-            ." AND %s.store_id = %d";
-        $joinCondition = sprintf($joinConditionTemplate,
-            'e', 't1', 't1', 't1', 't1',
+            . " AND %s.entity_type_id = " . $attribute->getEntityTypeId()
+            . " AND %s.attribute_id = " . $attribute->getId()
+            . " AND %s.store_id = %d";
+        $joinCondition = sprintf($joinConditionTemplate, 'e', 't1', 't1', 't1', 't1',
             Mage_Core_Model_App::ADMIN_STORE_ID);
         if ($attribute->getFlatAddChildData()) {
             $joinCondition .= ' AND e.child_id = t1.entity_id';
         }
 
-        $valueExpr  = $adapter->getCheckSql('t2.value_id > 0', 't2.value', 't1.value');
+        $valueExpr = $adapter->getCheckSql('t2.value_id > 0', 't2.value', 't1.value');
         /** @var $select Varien_Db_Select */
-        $select     = $adapter->select()
-            ->joinLeft(
-                array('t1' => $attributeTable),
-                $joinCondition,
-                array())
-            ->joinLeft(
-                array('t2' => $attributeTable),
+        $select = $adapter->select()
+            ->joinLeft(array('t1' => $attributeTable), $joinCondition, array())
+            ->joinLeft(array('t2' => $attributeTable),
                 sprintf($joinConditionTemplate, 't1', 't2', 't2', 't2', 't2', $store),
                 array($attributeCode => $valueExpr));
+
         if (($attribute->getFrontend()->getInputType() != 'multiselect') && $hasValueField) {
-            $valueIdExpr  = $adapter->getCheckSql('to2.value_id > 0', 'to1.value', 'to2.value');
-            $select->joinLeft(
-                array('to1' => $this->getTable('eav/attribute_option_value')),
-                "to1.option_id = {$valueExpr} AND to1.store_id = 0",
-                array())
-            ->joinLeft(
-                array('to2' => $this->getTable('eav/attribute_option_value')),
-                $adapter->quoteInto("to2.option_id = {$valueExpr} AND to2.store_id = ?", $store),
-                array($attributeCode . '_value' => $valueIdExpr)
-            );
+            $valueIdExpr = $adapter->getCheckSql('to2.value_id > 0', 'to2.value', 'to1.value');
+            $select
+                ->joinLeft(array('to1' => $this->getTable('eav/attribute_option_value')),
+                    "to1.option_id = {$valueExpr} AND to1.store_id = 0", array())
+                ->joinLeft(array('to2' => $this->getTable('eav/attribute_option_value')),
+                    $adapter->quoteInto("to2.option_id = {$valueExpr} AND to2.store_id = ?", $store),
+                    array($attributeCode . '_value' => $valueIdExpr));
         }
 
         if ($attribute->getFlatAddChildData()) {