Skip to content

Commit

Permalink
Import Magento Release 1.5.0.0-beta2
Browse files Browse the repository at this point in the history
  • Loading branch information
LeeSaferite committed Feb 9, 2011
1 parent 598ebd8 commit 52e6ef6
Show file tree
Hide file tree
Showing 408 changed files with 15,363 additions and 5,447 deletions.
189 changes: 189 additions & 0 deletions RELEASE_NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,192 @@
==== 1.5.0.0-beta2 =====

=== Improvements ===
Implemented Environment emulation in core email class
- Added Emulation model.
- Added Email Info and Email Template Mailer models.
- Re-factored sendEmail() and sendUpdateEmail() methods of order, credit memo, invoice and shipment models.
Added App Previewer for Android and iPad in XmlConenect

=== Fixes ===
Fixed Labels for composite products (backend) are shown incorrect
Fixed Ability to Refund the already refunded item in Patial Invoice
- added qty`s limits into creating creditmemo functionality
Fixed Performance issue with big amount of tax rates
Fixed Notice error in system.xml after saving PayPal configuration
Fixed No Qty column in the Wishlist sideblock
Fixed Export functionality doesn't work
Fixed Maestro International CC number has no validation
- use "Switch/Maestro" instead of "Maestro (International)"
Fixed No transactions is created, no ability to perform Invoice, when Order, which contains Gift Options, is placed from backend with Authorize.net Direct Post payment method
Fixed Moving Grouped product from Order and Shopping cart to the Wishlist does not work
Fixed Added advice block hiding on synchronize process
Fixed Database as cache backend
- fix for MySQL 4. Shorten field lengthes
Fixed Improvemets for MCM and Magento Extension Packager after MCMUP
Fixed PayPal Standard with specific tax settings for shop cart item with qty >= 2
Fixed Wrong tax calculation for bundle products
Fixed Export Filters are not working correctly during export of customers
Fixed Unable to complete several partial online refunds with Authorize.net Direct Post
Fixed Disable Mage_Checkout did not remove My Cart & Checkout links in the Top Link
Fixed An error occurs with using Payflo Link payment method and IE8
- just small fixture of strange for user popup in IE - "Do you want to see only secure content?"
Fixed Price for composite products in a products grid on Order creation page
Fixed No error message appears if execute synchronization with non-existing DB
Fixed "Configure" link in Product grid (backend) does not work (only IE)
Fixed "Void" button must not be active on the invoice with amount captured on-line
- redefined methods canVoid for Express and Direct Paypal models - hiding button void for invoice and creditmemo
- redefined methods cancel for Express and Direct Paypal models - no checking for invoices for order to decide void it or not at cancel.
Fixed Dropdown for Amount is absent (only IE)
- create new JS method that preserves visibility states of selects in pop-up block
Fixed Status of Order is now doesn't ignore the setting in Config.
Fixed Incorrect behavior of AJAX-popup for Gift Options (Individual Item) in IE8
Fixed to show full review for the iPad device
- added checking the current app's device type is not iPad and in this case the text of the review is truncated;
- replaced TABs on spaces in helper's class
- Re-factored XmlConnect helperfor unknown device type
Fixed xmlconnect/catalog/product action returns invalid html for product's description
- added an "xml" tag before DOCTYPE definition
Fixed wrong using of translation in method getElementHtml()
Fixed update Preview Area for iPad
Fixed Missed active/Inactive tabs logic added for a preview
Fixed Selecting catalog as a price rule condition redirects you on dashboard
- check if post array values are integers > 0
Fixed "Go to notifications" link works improperly
Fixed Unable to complete several partial online refunds with Authorize.net Direct Post
Fixed "Set Products as New to Date" is not working in Catalog New Products List widget
Fixed Mage_Adminhtml_Block_Media_Uploader::getUploaderUrl() generates incorrect path if magento is installed in a sub-directory within the root one
Fixed Now in Admin in System->TransactionalEmails all filters are saved to session.
Fixed Tax discrepancy between Tax Report and Order Report
Fixed PayPal Standard with specific tax settings for shop cart item with qty >= 2
Fixed Incorrect hint for non-configured product in Order on backend
Fixed Flush Cache Storage alert text is now changed to: "Cache storage may contain additional data. Are you sure that you want flush it?"
Fixed "Read Details" link is present in the message about synchronization status
- removed read details link from rows which have not url
Fixed Mage_Catalog_Model_Product::setFinalPrice() doesn't return its class instance for chaining purposes.
- fixed interface erroneously changed in 1.4.1.0
- fixed erroneous phpDoc
Fixed First Checkout by registered Customer: First Name and Last name fields are empty
Fixed Error with addlisttype.phtml in system log
- Removed not deleted layout block that was forgotten after rev 90337 with fix for MAGE-1955
Fixed Changes in UI for Order Status Management
Fixed Catalog Price Rule is not applied
- Added Mage_CatalogRule_Model_Rule::applyAllRulesToProduct()
Fixed Admin order creation - Unable to delete product from the cart
- fixed showing giftmessage options template, when no grid items are present
- fixed updating quote items and giftmessage items when backend receives wrong item id - now it doesn't fail with exception, but process it gracefully
Fixed With IE6 impossible to configure a Composite product in Backend
Fixed Message for non-configured composite product is changed after pressing "Update Items and Qty's"
Fixed Option "Order" on Payment Action dropdown must be available only for Express Checkout method
- Removed extra spaces in system.xml.
Fixed With IE8 an error occurs after applying the second time Credit Card in Admin panel with 3D Secure and patrial authorization (Authorize.net)
- moved embedded gift options FORM tag out of other main FORM tag (such invalid layout broke DOM in IE)
- refactored JS-scripts, moved static to static files
- removed not used old js-file
Fixed Products are erased from "Product Ordered" report after deleting them
Fixed Incorrect behavior of ReOrder action applied to Order, that contains Gift Options
Fixed When adding several configurable products at one time to Items Ordered from product grid, only last remains specified configuration (admin Order creation)
- restored JS-initing for controls on each popup show (was erroneously removed at rev 86017)
- fixed Configurable javascript so it won't interfere with other products controls on page
Fixed Incorrect transaction and Partial Refunds behavior with WPP Hosted Solution, when Order is partially invoiced
Fixed Hint for "View Details" in the Wishlist is located incorrectly
Fixed Onepage checkout - Shipping address issues
Fixed Tax Rate = 0% displayed in Cart
- display (0%) in rate title
Fixed Magento Backend performance optimization
Fixed Creating Purchase orders from backend works incorrect (IE)
Fixed Moving simple products (part of grouped) from shopping cart to order does not work
Fixed Payment Applicable From = "Specific Countries" option does not work for Express Checkout (Payflow Edition)
Fixed Cannot place Order in backend with Authorize.net Direct Post, when settings for payment method is applied on a Website scope level
Fixed SOAP don't use store for select products collection
- Change setting the store into filter
Fixed "Synchronize" button is disabled if select native database twice
- modified storage full name generation and button state check
Fixed Wrong algorithm to determine whether product can be configured (Composite Products feature)
- removed used method isComposite() from canConfigure() method
Fixed Missing nobr around date in Customer Product Reviews table
Fixed Status of Order, which is paced with Authorize.net Direct Post (Payment Action = Authorization) is incorrect
Fixed Added base_total_refunded field to invoice table
Fixed "Flush External Page Cache" does not work
Fixed Database as cache backend
Fixed Selecting products in Wishlist (backend) redirects you on dashboard
- Fixed searching by product names and days in wishlist
- Removed 'Visible In' column, because it showed same values as 'Added from'
- Fixed 'Added from' column to show real values, not some erroneous 'All Visible Stores'
- Fixed sorting by product name and days in wishlist


==== 1.5.x-devel-92027 ====

=== Fixes ===
Fixed Selecting catalog as a price rule condition redirects you on dashboard
- check if post array values are integers > 0
Fixed "Go to notifications" link works improperly
Fixed Unable to complete several partial online refunds with Authorize.net Direct Post
Fixed "Set Products as New to Date" is not working in Catalog New Products List widget
Fixed Mage_Adminhtml_Block_Media_Uploader::getUploaderUrl() generates incorrect path if magento is installed in a sub-directory within the root one
Fixed Now in Admin in System->TransactionalEmails all filters are saved to session.
Fixed Tax discrepancy between Tax Report and Order Report
Fixed PayPal Standard with specific tax settings for shop cart item with qty >= 2
Fixed Incorrect hint for non-configured product in Order on backend
Fixed Flush Cache Storage alert text is now changed to: "Cache storage may contain additional data. Are you sure that you want flush it?"
Fixed "Read Details" link is present in the message about synchronization status
- removed read details link from rows which have not url
Fixed Mage_Catalog_Model_Product::setFinalPrice() doesn't return its class instance for chaining purposes.
- fixed interface erroneously changed in 1.4.1.0
- fixed erroneous phpDoc
Fixed First Checkout by registered Customer: First Name and Last name fields are empty
CR Change First Checkout by registered Customer: First Name and Last name fields are empty
- reverted Billing.php to the its previous state
- copied logic of determine customer name from customer address template base/default/template/customer/address/edit.phtml
Fixed CRIT error with addlisttype.phtml in system log
- Removed not deleted layout block that was forgotten after rev 90337 with fix for MAGE-1955
Fixed Changes in UI for Order Status Management
Fixed Catalog Price Rule is not applied
- Added Mage_CatalogRule_Model_Rule::applyAllRulesToProduct()
Fixed Admin order creation - Unable to delete product from the cart
- fixed showing giftmessage options template, when no grid items are present
- fixed updating quote items and giftmessage items when backend receives wrong item id - now it doesn't fail with exception, but process it gracefully
Fixed With IE6 impossible to configure a Composite product in Backend
Fixed Message for non-configured composite product is changed after pressing "Update Items and Qty's"
Fixed Option "Order" on Payment Action dropdown must be available only for Express Checkout method
- Removed extra spaces in system.xml.
Fixed With IE8 an error occurs after applying the second time Credit Card in Admin panel with 3D Secure and patrial authorization (Authorize.net)
- moved embedded gift options FORM tag out of other main FORM tag (such invalid layout broke DOM in IE)
- refactored JS-scripts, moved static to static files
- removed not used old js-file
Fixed Products are erased from "Product Ordered" report after deleting them
Fixed Incorrect behavior of ReOrder action applied to Order, that contains Gift Options
Fixed When adding several configurable products at one time to Items Ordered from product grid, only last remains specified configuration (admin Order creation)
- restored JS-initing for controls on each popup show (was erroneously removed at rev 86017)
- fixed Configurable javascript so it won't interfere with other products controls on page
Fixed Incorrect transaction and Partial Refunds behavior with WPP Hosted Solution, when Order is partially invoiced
Fixed Hint for "View Details" in the Wishlist is located incorrectly
Fixed Onepage checkout - Shipping address issues
Fixed Tax Rate = 0% displayed in Cart
- display (0%) in rate title
Fixed Magento Backend performance optimization
Fixed Creating Purchase orders from backend works incorrect (IE)
Fixed Moving simple products (part of grouped) from shopping cart to order does not work
Fixed Payment Applicable From = "Specific Countries" option does not work for Express Checkout (Payflow Edition)
Fixed Cannot place Order in backend with Authorize.net Direct Post, when settings for payment method is applied on a Website scope level
Fixed SOAP don't use store for select products collection
- Change setting the store into filter
Fixed "Synchronize" button is disabled if select native database twice
- modified storage full name generation and button state check
Fixed Wrong algorithm to determine whether product can be configured (Composite Products feature)
- removed used method isComposite() from canConfigure() method
Fixed Missing nobr around date in Customer Product Reviews table
Fixed Status of Order, which is paced with Authorize.net Direct Post (Payment Action = Authorization) is incorrect
Fixed Added base_total_refunded field to invoice table
Fixed "Flush External Page Cache" does not work
Fixed Database as cache backend
Fixed Selecting products in Wishlist (backend) redirects you on dashboard
- Fixed searching by product names and days in wishlist
- Removed 'Visible In' column, because it showed same values as 'Added from'
- Fixed 'Added from' column to show real values, not some erroneous 'All Visible Stores'
- Fixed sorting by product name and days in wishlist


==== 1.5.0.0-beta1 =====

=== Improvements ===
Expand Down
2 changes: 1 addition & 1 deletion app/Mage.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public static function getVersionInfo()
'revision' => '0',
'patch' => '0',
'stability' => 'beta',
'number' => '1',
'number' => '2',
);
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Mae.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2010 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Mae extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Obt.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2010 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Obt extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Adminhtml/Block/Cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function __construct()
'class' => 'delete',
));

$message = Mage::helper('core')->__('Cache storage may contain another data. Are you sure that you want flush it?');
$message = Mage::helper('core')->__('Cache storage may contain additional data. Are you sure that you want flush it?');
$this->_addButton('flush_system', array(
'label' => Mage::helper('core')->__('Flush Cache Storage'),
'onclick' => 'confirmSetLocation(\''.$message.'\', \'' . $this->getFlushStorageUrl() .'\')',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@ class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Config extends Varien_Dat
*/
public function getElementHtml()
{
$value = $this->getValue();
if ($value == '') {
$this->setValue($this->_getValueFromConfig());
}
$html = parent::getElementHtml();

$htmlId = 'use_config_' . $this->getHtmlId();
$checked = ($this->getValue() == '') ? ' checked="checked"' : '';
$checked = ($value == '') ? ' checked="checked"' : '';
$disabled = ($this->getReadonly()) ? ' disabled="disabled"' : '';

$html .= '<input id="'.$htmlId.'" name="product['.$htmlId.']" '.$disabled.' value="1" ' . $checked;
Expand All @@ -53,4 +57,14 @@ public function getElementHtml()

return $html;
}

/**
* Get config value data
*
* @return mixed
*/
protected function _getValueFromConfig()
{
return '';
}
}
55 changes: 41 additions & 14 deletions app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,17 +127,12 @@ protected function _prepareColumns()
if (!Mage::app()->isSingleStoreMode()) {
$this->addColumn('store', array(
'header' => Mage::helper('wishlist')->__('Added From'),
'index' => 'store_name',
'type' => 'store'
'index' => 'store_id',
'type' => 'store',
'width' => '160px'
));
}

$this->addColumn('visible_in', array(
'header' => Mage::helper('wishlist')->__('Visible In'),
'index' => 'item_store_id',
'type' => 'store'
));

$this->addColumn('added_at', array(
'header' => Mage::helper('wishlist')->__('Date Added'),
'index' => 'added_at',
Expand Down Expand Up @@ -193,15 +188,47 @@ public function getGridUrl()
*/
protected function _addColumnFilterToCollection($column)
{
if($column->getId()=='store') {
$this->getCollection()->addFieldToFilter('item_store_id', $column->getFilter()->getCondition());
return $this;
/* @var $collection Mage_Wishlist_Model_Mysql4_Item_Collection */
$collection = $this->getCollection();
$value = $column->getFilter()->getValue();
if ($collection && $value) {
switch ($column->getId()) {
case 'product_name':
$collection->addProductNameFilter($value);
break;
case 'store':
$collection->addStoreFilter($value);
break;
case 'days':
$collection->addDaysFilter($value);
break;
default:
$collection()->addFieldToFilter($column->getIndex(), $column->getFilter()->getCondition());
break;
}
}
return $this;
}

if ($this->getCollection() && $column->getFilter()->getValue()) {
$this->getCollection()->addFieldToFilter($column->getIndex(), $column->getFilter()->getCondition());
/**
* Sets sorting order by some column
*
* @param Mage_Adminhtml_Block_Widget_Grid_Column $column
* @return Mage_Adminhtml_Block_Customer_Edit_Tab_Wishlist
*/
protected function _setCollectionOrder($column)
{
$collection = $this->getCollection();
if ($collection) {
switch ($column->getId()) {
case 'product_name':
$collection->setOrderByProductName($column->getDir());
break;
default:
parent::_setCollectionOrder($column);
break;
}
}

return $this;
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Adminhtml/Block/Media/Uploader.php
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public function getUploaderUrl($url)
if (empty($url) || !$design->validateFile($url, array('_type' => 'skin', '_theme' => $theme))) {
$theme = $design->getDefaultTheme();
}
return Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB) . 'skin/' .
return Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_SKIN) .
$design->getArea() . '/' . $design->getPackageName() . '/' . $theme . '/' . $url;
}
}
Loading

0 comments on commit 52e6ef6

Please sign in to comment.