From 6cea6049cb8bf429c429d6067d08b22d0188e90f Mon Sep 17 00:00:00 2001 From: Lee Saferite Date: Fri, 22 Jul 2011 22:18:50 -0400 Subject: [PATCH] Import Magento Release 1.6.0.0-rc2 --- RELEASE_NOTES.txt | 219 ++++++++++++++++++ app/Mage.php | 2 +- .../Catalog/Product/Edit/Tab/Super/Config.php | 3 +- .../Adminhtml/Block/Report/Grid/Abstract.php | 7 + .../Order/Create/Billing/Method/Form.php | 17 +- .../Sales/Order/Create/Shipping/Address.php | 10 + .../Block/Sales/Order/Shipment/Packaging.php | 40 +++- .../Sales/Order/Shipment/Packaging/Grid.php | 31 +++ .../Adminhtml/Block/Widget/Grid/Column.php | 4 +- .../Widget/Grid/Column/Filter/Datetime.php | 9 +- .../Adminhtml/Model/Sales/Order/Create.php | 8 +- .../Adminhtml/controllers/CacheController.php | 2 +- .../Product/Composite/WishlistController.php | 2 - .../Catalog/Product/Edit/Tab/Attributes.php | 29 +-- .../Catalog/Product/View/Type/Bundle.php | 21 +- .../Product/View/Type/Bundle/Option.php | 5 +- .../core/Mage/Bundle/Model/Product/Price.php | 195 +++++++++------- .../core/Mage/Bundle/Model/Product/Type.php | 8 + .../core/Mage/Catalog/Block/Product/View.php | 6 + app/code/core/Mage/Catalog/Helper/Data.php | 6 +- .../Catalog/Model/Product/Compare/Item.php | 2 +- .../Catalog/Model/Product/Indexer/Flat.php | 2 + .../Catalog/Model/Resource/Category/Flat.php | 5 +- .../Model/Resource/Product/Collection.php | 11 + .../Model/Resource/Product/Flat/Indexer.php | 1 + app/code/core/Mage/Catalog/etc/config.xml | 4 +- .../sql/catalog_setup/install-1.6.0.0.php | 4 +- .../mysql4-upgrade-0.7.57-0.7.58.php | 6 - .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 5 +- .../Adminhtml/Form/Field/Customergroup.php | 2 +- .../Mage/CatalogInventory/Helper/Data.php | 6 + .../Mage/CatalogInventory/Model/Observer.php | 89 ++++++- .../CatalogInventory/Model/Resource/Stock.php | 1 - .../Model/Resource/Advanced/Collection.php | 7 + .../controllers/AdvancedController.php | 6 +- .../Checkout/Model/Api/Resource/Customer.php | 4 +- app/code/core/Mage/Checkout/Model/Session.php | 1 + .../core/Mage/Checkout/Model/Type/Onepage.php | 4 +- .../Checkout/controllers/CartController.php | 5 +- .../Core/Model/Resource/Helper/Abstract.php | 2 + .../core/Mage/Core/Model/Session/Abstract.php | 50 ++++ .../controllers/AccountController.php | 14 +- .../sql/customer_setup/install-1.6.0.0.php | 6 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 6 +- .../Eav/Model/Entity/Attribute/Abstract.php | 2 +- app/code/core/Mage/Eav/Model/Entity/Setup.php | 5 +- .../Mage/Eav/Model/Resource/Helper/Mysql4.php | 5 +- .../Eav/sql/eav_setup/install-1.6.0.0.php | 3 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 3 +- .../GoogleCheckout/Model/Api/Xml/Callback.php | 5 + .../core/Mage/ImportExport/Model/Import.php | 1 - .../Model/Resource/Import/Data.php | 4 +- app/code/core/Mage/Paypal/Model/Express.php | 4 + app/code/core/Mage/Paypal/Model/Ipn.php | 2 +- .../core/Mage/Paypal/Model/Payflowlink.php | 2 +- .../core/Mage/Persistent/Model/Observer.php | 4 +- .../controllers/IndexController.php | 1 + .../Mage/Rss/Block/Catalog/NotifyStock.php | 11 +- .../Sales/Model/Mysql4/Order/Abstract.php | 2 +- app/code/core/Mage/Sales/Model/Observer.php | 12 +- app/code/core/Mage/Sales/Model/Quote.php | 172 +++++++++++++- .../Model/Quote/Address/Total/Collector.php | 65 +++++- .../Sales/Model/Quote/Address/Total/Msrp.php | 5 +- app/code/core/Mage/Sales/Model/Quote/Item.php | 107 +++++++++ .../Mage/Sales/Model/Quote/Item/Abstract.php | 35 ++- .../core/Mage/Sales/Model/Resource/Setup.php | 8 +- .../core/Mage/Sales/Model/Service/Quote.php | 5 + .../core/Mage/Sales/Model/Status/List.php | 157 +++++++++++++ .../Sales/sql/sales_setup/install-1.6.0.0.php | 4 +- .../mysql4-upgrade-1.5.9.9-1.6.0.0.php | 4 +- .../Mage/Shipping/Model/Carrier/Abstract.php | 15 +- .../Mage/Tax/Model/Resource/Calculation.php | 29 ++- app/code/core/Mage/Usa/Helper/Data.php | 3 + .../Mage/Usa/Model/Shipping/Carrier/Dhl.php | 17 +- .../Mage/Usa/Model/Shipping/Carrier/Fedex.php | 24 +- .../Mage/Usa/Model/Shipping/Carrier/Ups.php | 81 +++++-- .../Mage/Usa/Model/Shipping/Carrier/Usps.php | 188 ++++++++++++--- .../Mage/Wishlist/Block/Item/Configure.php | 17 ++ app/code/core/Mage/Wishlist/Model/Item.php | 32 +++ .../Model/Resource/Item/Collection.php | 33 +-- .../core/Mage/Wishlist/Model/Wishlist.php | 6 +- .../Wishlist/controllers/IndexController.php | 29 ++- .../controllers/CustomerController.php | 10 +- .../template/catalog/category/edit.phtml | 22 +- .../catalog/product/edit/super/config.phtml | 9 +- .../template/customer/tab/addresses.phtml | 47 ++-- .../sales/order/create/form/address.phtml | 2 +- .../sales/order/shipment/packaging/grid.phtml | 7 + .../order/shipment/packaging/packed.phtml | 5 +- .../order/shipment/packaging/popup.phtml | 46 +++- .../sales/order/shipment/view/tracking.phtml | 2 +- .../default/template/widget/grid.phtml | 3 +- .../base/default/layout/catalog_msrp.xml | 15 +- .../frontend/base/default/layout/paypal.xml | 39 ++++ .../frontend/base/default/layout/paypaluk.xml | 95 ++++++++ .../bundle/catalog/product/price.phtml | 9 +- .../default/template/catalog/msrp/popup.phtml | 1 + .../email/order/items/order/default.phtml | 2 +- .../template/sales/order/shipment/items.phtml | 4 +- app/etc/modules/Find_Feed.xml | 2 +- app/locale/en_US/Mage_CatalogSearch.csv | 1 + app/locale/en_US/Mage_Sales.csv | 2 + app/locale/en_US/Mage_Usa.csv | 8 +- downloader/Maged/Connect.php | 11 +- js/mage/adminhtml/sales/packaging.js | 72 ++++-- js/varien/product.js | 7 +- lib/Varien/Db/Adapter/Pdo/Mysql.php | 4 + lib/Varien/Db/Ddl/Table.php | 50 +++- lib/Varien/Db/Select.php | 2 +- skin/adminhtml/default/default/boxes.css | 1 + skin/frontend/base/default/js/bundle.js | 11 +- skin/frontend/base/default/js/msrp.js | 6 + ...-1.1.0-rc1.xml => Find_Feed-1.1.0-rc2.xml} | 12 +- ...terface_Adminhtml_Default-1.6.0.0-rc2.xml} | 12 +- ...ace_Frontend_Base_Default-1.6.0.0-rc2.xml} | 12 +- ...nterface_Frontend_Default-1.6.0.0-rc2.xml} | 10 +- ...Interface_Install_Default-1.6.0.0-rc2.xml} | 10 +- var/package/Lib_Google_Checkout-1.5.0.0.xml | 4 +- var/package/Lib_Js_Calendar-1.51.1.xml | 4 +- var/package/Lib_Js_Ext-1.5.0.0.xml | 18 -- ...0.0-rc1.xml => Lib_Js_Ext-1.6.0.0-rc2.xml} | 8 +- ....0-rc1.xml => Lib_Js_Mage-1.6.0.0-rc2.xml} | 10 +- var/package/Lib_Js_Prototype-1.7.0.0.1.xml | 18 ++ var/package/Lib_Js_Prototype-1.7.0.0.xml | 18 -- var/package/Lib_Js_TinyMCE-3.3.7.0.xml | 4 +- var/package/Lib_LinLibertineFont-2.8.14.0.xml | 4 +- ...6.0.0-rc1.xml => Lib_Mage-1.6.0.0-rc2.xml} | 8 +- var/package/Lib_Phpseclib-1.5.0.0.xml | 4 +- ...0.0-rc1.xml => Lib_Varien-1.6.0.0-rc2.xml} | 10 +- var/package/Lib_ZF-1.11.1.0.xml | 6 +- var/package/Lib_ZF_Locale-1.11.1.0.xml | 4 +- ...c1.xml => Mage_All_Latest-1.6.0.0-rc2.xml} | 10 +- ...-rc1.xml => Mage_Centinel-1.6.0.0-rc2.xml} | 10 +- ...-rc1.xml => Mage_Compiler-1.6.0.0-rc2.xml} | 10 +- ...ml => Mage_Core_Adminhtml-1.6.0.0-rc2.xml} | 12 +- ....xml => Mage_Core_Modules-1.6.0.0-rc2.xml} | 12 +- ...c1.xml => Mage_Downloader-1.6.0.0-rc2.xml} | 10 +- ....xml => Mage_Locale_en_US-1.6.0.0-rc2.xml} | 10 +- var/package/Magento_Mobile-1.5.0.0.20.xml | 18 -- ...xml => Phoenix_Moneybookers-1.3.0-rc2.xml} | 10 +- 140 files changed, 2193 insertions(+), 549 deletions(-) create mode 100644 app/code/core/Mage/Sales/Model/Status/List.php rename var/package/{Find_Feed-1.1.0-rc1.xml => Find_Feed-1.1.0-rc2.xml} (92%) rename var/package/{Interface_Adminhtml_Default-1.6.0.0-rc1.xml => Interface_Adminhtml_Default-1.6.0.0-rc2.xml} (97%) rename var/package/{Interface_Frontend_Base_Default-1.6.0.0-rc1.xml => Interface_Frontend_Base_Default-1.6.0.0-rc2.xml} (97%) rename var/package/{Interface_Frontend_Default-1.6.0.0-rc1.xml => Interface_Frontend_Default-1.6.0.0-rc2.xml} (98%) rename var/package/{Interface_Install_Default-1.6.0.0-rc1.xml => Interface_Install_Default-1.6.0.0-rc2.xml} (95%) delete mode 100644 var/package/Lib_Js_Ext-1.5.0.0.xml rename var/package/{Lib_Js_Ext-1.6.0.0-rc1.xml => Lib_Js_Ext-1.6.0.0-rc2.xml} (99%) rename var/package/{Lib_Js_Mage-1.6.0.0-rc1.xml => Lib_Js_Mage-1.6.0.0-rc2.xml} (95%) create mode 100644 var/package/Lib_Js_Prototype-1.7.0.0.1.xml delete mode 100644 var/package/Lib_Js_Prototype-1.7.0.0.xml rename var/package/{Lib_Mage-1.6.0.0-rc1.xml => Lib_Mage-1.6.0.0-rc2.xml} (97%) rename var/package/{Lib_Varien-1.6.0.0-rc1.xml => Lib_Varien-1.6.0.0-rc2.xml} (96%) rename var/package/{Mage_All_Latest-1.6.0.0-rc1.xml => Mage_All_Latest-1.6.0.0-rc2.xml} (64%) rename var/package/{Mage_Centinel-1.6.0.0-rc1.xml => Mage_Centinel-1.6.0.0-rc2.xml} (96%) rename var/package/{Mage_Compiler-1.6.0.0-rc1.xml => Mage_Compiler-1.6.0.0-rc2.xml} (91%) rename var/package/{Mage_Core_Adminhtml-1.6.0.0-rc1.xml => Mage_Core_Adminhtml-1.6.0.0-rc2.xml} (98%) rename var/package/{Mage_Core_Modules-1.6.0.0-rc1.xml => Mage_Core_Modules-1.6.0.0-rc2.xml} (81%) rename var/package/{Mage_Downloader-1.6.0.0-rc1.xml => Mage_Downloader-1.6.0.0-rc2.xml} (98%) rename var/package/{Mage_Locale_en_US-1.6.0.0-rc1.xml => Mage_Locale_en_US-1.6.0.0-rc2.xml} (94%) delete mode 100644 var/package/Magento_Mobile-1.5.0.0.20.xml rename var/package/{Phoenix_Moneybookers-1.3.0-rc1.xml => Phoenix_Moneybookers-1.3.0-rc2.xml} (97%) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 92bf8499c9..a072725d9c 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,3 +1,222 @@ +==== 1.6.0.0-rc2 ==== + +=== Major Highlights === +Minimum Advertised Price +Persistent Shopping Cart +Known issues: if you see the Service Temporarily Unavailable page after refreshing the frontend, open the Magento installation +directory on the server and remove the maintenance.flag file. Then go to Magento var directory and remove the cache directory. + +=== Improvements === +XmlConnect package release v21 +Order Payment Action for Express Checkout (PayPal) +- Added settings Authorization Honor Period and Order Valid Period into EC tab in the backend +- Automatically new authorize transaction created after order transaction +- Automatically cancel order after the expiration of Order Valid Period +- Automatically authorize transaction void\create after the expiration of Authorization Honor Period +Implemented Authorize.Net 'hold for review' status shows up as 'declined' in Magento. +Add Dynamic sku option for configurable products +Moneybookers Multistore System Configuration +Moneybookers OBT Defaults +PrototypeJS upgraded to 1.7 + +=== Changes === +Removed deprecation.js because its not compatible with prototype 1.7 +Relations between models and resource models were revised for better support of multiple databases +* Varien_Db_Adapter_Pdo_Mysql revised +* Introduced Varien_Db_Adapter_Interface, Varien_Db_Ddl_Table +* Introduced new classes named resource helpers +* Backwards comatibility and known issues +** Flat attribute definition is not backward compatible +** Old columns names are not fully mapped to new ones +** Error appears after Customer Group saving with name length more than 32 +** Caching config in Database results in endless recursion +** There's no sql upgrade for media storage tables +Deprecated GoogleBase module (http://googlemerchantblog.blogspot.com/2010/12/new-shopping-apis-and-deprecation-of.html) + +=== Fixes === +Fixed Package contents should be specified dynamically while creating shipping labels for the USPS International shipping methods +Fixed Product option with file type input is not being transferred from wishlist to the cart +- add mergeBuyRequest method to Mage_Wishlist_Model_Item +- add checking of custom add to cart url in Mage_Catalog_Block_Product_View +Fixed Import: Imported file is not saved to var/importexport +Fixed Reports for Sales do not work except Paypal Settlement if several order statutes were selected +Fixed No disabling of package type and dimensions fields (in case with USPS Domestic) +Fixed Wrong behavior of composite configurable product during adding to the Shopping Cart via backend +Fixed Package Types that not available for current Shipping Method displayed in Create Packages pop-up +- added/removed several methods/packages for UPS shipping according to SRS +Fixed "Notify for Quantity Below" does not work +Fixed Frontend: Tier price not always applied to Mini Shopping Cart +Fixed Void button is present on Order page, Authorization transaction is not closed when payment action is set to "authorize and charge" - Google Checkout +Fixed MAP is applied to a Bundle product with dynamic price +Fixed No ability to create Shipping Label with package size "Oversize" +Fixed Button "Add to Cart" located in JS-popup (with Display Actual Price = On Gesture) doesn't work +Fixed Incorrect Shipping Label for USPS Library Mail Shipping Methods +Fixed Duplicating customer's addresses through placing order (backend) +Fixed Updating the qty of products from backend does not allow checkout on Frontend +- added ability to Quote and Quote items to track errors and remove them, when fixed, so whole 'error' status from Quote/Quote Item can be removed +- removed duplicating messages on Cart View page +Fixed No ability to create Shipping Label even if "Residential Delivery" set to "Yes" (in case with FedEx Home Delivery) +Fixed Button "Add new address" for customer works incorrect (backend) +Fixed It should be possible to set Minimum Qty Allowed in Shopping Cart setting via backend +Fixed Cart Subtotal is shown incorrect in sidebar shopping cart +Fixed Grid/list view settings do not save +Fixed Cannot assign custom filter to the grid column +Fixed Wishlist - product custom options are lost after customer login +Fixed Saved products will be matched each target rule +Fixed Taxes are not displayed in the catalog from frontend for Bundle products +- re-factored work with taxes for bundle product +Fixed Unable to save year less than 1970 in DOB customer attribute +- added DATETIME type to DDL +- fixed customer attributes to have same as pre-MMDB default values +Fixed "Grand Total" is not displayed for a configurable product that contains product where DAP = display before order confirmation +Fixed 'Click for price' not clickable after pressing 'Review' link in category +Fixed Bundle price display issue with tier pricing +- not considering tier price at bundle product's view page in price range +Fixed Frontend: In the block "Recently Viewed Products" the products of two customers are mixed +Fixed Error with Advanced Search (in case with Date Attribute) +Fixed Tax Rate ignores set values of Post/Zip codes Range From-To and applies it to Address with any Zip codes +Fixed Wishlist - Comment lost on config update +Fixed Import cannot handle UTF-8 characters +Fixed Welcome email template for store view scope is being ignored +Fixed Incorrect behavior of bundle product during creating Shipping Label with Customs value (in case when Price: Fixed, Ship Bundle Items" set to Separately) +Fixed Order status isn't changed when payed via Paypal if registered email differs characters cases (upper and lower) +Fixed Unwanted orders are shown in Sales->Orders list when the date filter affects to the day when DST changes apply +Fixed Payment method "Credit Card (saved)" does not display fields for fill in card information when product price is 0.00 +Fixed Available to create online invoice after performing void for order +Fixed MAP configuration must contain default text for "Default Popup Text Message" and "Default "What's This" Text Message" +Fixed Backwards compatibility loss results in fatal error in Google Shopping module +- added all previous DDL constants to DDL Table, they are deprecated and being converted to new supported types +- added support for 'char' attributes +- fixed several incompatibilities in DDL Table +Fixed No ability to create Shipping Label with package type "Flat-Rate Box" (in case with USPS International) +Fixed Frontend: The block "Compare Products" with product is present on catalog page after adding the product to this block and clicking on "Not..?" +Fixed Fatal error when trying to open configurable product with super attribute not in the appropriate attribute set +Fixed Unable to return full amount on PayPal if partial credit memo is done and customer applied Store Credit +Fixed When creating new order for customer registered on multiple websites, account/website mismatch causes issues +Fixed Import Issue when attribute values not unique +Fixed After upgrading Magento website left in the maintenance mode +Fixed Ability to create more Shipping Labels than products in the order(shipment) +Fixed Street Address and Street Address 2 are mixed up in request to shipping carrier (in case with USPS International) +Fixed PayflowLink doesn't work (error "Payment has been declined. Please try again." is shown, Order is canceled) +Fixed Shopping cart price rule with attribute does not work when "Use Flat Catalog Product" enabled +Fixed Upgrade checking after cache flushed +Fixed Frontend: Tier price not always applied to Mini Shopping Cart +Fixed A message for the case when shipping label is created from the order should be modified +Fixed Spelling mistake in abbreviations unit of mass measurement (lbs, kgs) +Fixed FedEx Ground Shipping Method unavailable (if others FedEx Shipping Methods unavailable) +Fixed Incorrect Signature Confirmation options in the drop-down (in case with UPS) +Fixed Frontend: Catalog Price Rule does not apply to Mini Shopping Cart after login current customer +- add recollect total prices for quote on customer register +Fixed Fatal error when requesting non-existent file from Media directory +Fixed Button "Add to Cart" located in JS-popup (with Display Actual Price = On Gesture) doesn't work. +Fixed Headers sent twice or three times when file downloading +Fixed Shipping method is calculating based on default shipping address instead of 'Same as billing' setting in backend +Fixed No ability to create more that one online Partial Invoice with Google Checkout +- parent transaction will be closed on payment model level; +- fixed exception error in Mage_Tax_Model_Resource_Calculation +Fixed Cross Sell Sorting Not Working +Fixed No ability to create Shipping Label for USPS - First-Class Mail International Package +Fixed Notification remove link in admin redirects to homepage on frontend in IE8 +Fixed Incorrect behavior of image gallery +Fixed 'On Gesture' option is not applied on products' level +Fixed The message that appears instead or totals in the shopping cart and mini shopping cart should be modified +Fixed Void button present when order is fully invoiced +Fixed No ability to create Shipping Label with package type "Flat-Rate Box" (in case with USPS International) +Fixed MAP behavior for RSS feed pages should be changed (only "Click for price" link should be present) +Fixed PayflowLink doesn't work (error "Payment has been declined. Please try again." is shown, Order is canceled) +Fixed Incorrect Online Refund amount in Magento, when Adjustment Fee is specified (Google Checkout) +Fixed Brazil PayPal requirements upgrade +Fixed No ability to create Shipping Label with package type "Flat-Rate Box" (in case with USPS International) +Fixed Issue with add to cart action, possible to add to cart a quantity of N+1 for a product. +Fixed No ability to create Shipping Label if "ship to" in Canada (in case with UPS) +Fixed Wrong content in export file (all export types) +Fixed "Mysql" must be renamed to "MySQL" in installer +Fixed File overwriting during Import/Export. +Fixed Reuse of adapter utilities in helper +Fixed MAP behavior for RSS feed pages should be changed (only "Click for price" link should be present) +Fixed When changing locale that has Unicode characters, the countries are not sorting correctly +Fixed Importing customers via csv +Fixed Two void transactions created when using Payment Action = Order in PayPal Express +Fixed Issue with newsletter subscriptions and logged in customers +Fixed Frontend: Long-term cookie session is not over after click on "(Not..?)" link +Fixed Mismatch counts of products for different scope +Fixed Wrong config setting are implemented for MAP functionality in admin on product's level +Fixed Street Address and Street Address 2 are mixed up in request to shipping carrier (in case with USPS International) +Fixed No ability to create Shipping Label if "ship to" in Canada (in case with UPS) +- fixed MonetaryValue to be whole number +Fixed Package Types that not available for current Shipping Method displayed in Create Packages pop-up +Fixed Add verification into predispatch observers used in persistent shopping cart +Fixed Canceled orders should be excluded from Tax Reports +Fixed No ability to create Shipping Label with package type "Flat-Rate Box" (in case with USPS International) +Fixed Import/Export: Append Complex Data works incorrect with grouped products +- check behavior was added +Fixed Fatal error appears on get shipping rates for UPS if system base currency <> merchant country currency +Fixed Map in the frontend link has "Click to see price" name, but must be "Click for price" +Fixed Taxes are not displayed in the catalog from frontend for Bundle products +Fixed Available to delete dropdown attribute which used in configurable product +Fixed MySQL error with "max_allowed_packet" during check data step for a huge .csv file +- Changed value for constant DB_MAX_PACKET_COEFFICIENT in Mage_ImportExport_Model_Resource_Helper_Mysql4 +Fixed Invalid requests to USPS API +Fixed No ability to input some value in dimensions field in case for package type with non-standard dimensions +Fixed Packages Pop-up looks incorrectly +Fixed Caching config in Database results in endless recursion +Fixed Shipping origin address used instead of the one specified in the RMA setting for Use Store Address = No +Fixed No Signature Confirmation in Packages pop-up +Fixed Package Types that not available for current Shipping Method displayed in Create Packages pop-up +Fixed "NaN" instead of two dashes in Package pop-up (in case with disabled Length, Width and Height fields) +Fixed Prefix and suffix aren't visible in Register Form +- Modified persistent customer templates +Fixed Unable to Checkout with Multiple Addresses with Registration +Fixed Not work shipping methods Fedex & DHL +- Re-factored DHL, Fedex, Ups, Usps +- Fixed minor bugs for frontend(package.phtml, view.phtml) and backend(popup.phtml, shippingmethod.phtml) +Fixed When we do reindex from console, folder var/log changes permissions from 0777 to 0775 +Fixed Package Types that not available for current Shipping Method displayed in Create Packages pop-up +Fixed Orders placed through PayPal marked as "Suspected Fraud" +- Added formatting amount into comparing +Fixed Enable Log Cleaning option is not working properly +Fixed Incorrect transparency of PNG image in indexed non-alpha mode +Fixed Value from Total Weight field is not passed to shipping carrier (in case with DHL and UPS) +Fixed After enabling dashboard chart admin user is unable to login to admin panel +Fixed Sorting on Please Select products to Add doesn't work +Fixed Catalog Price Rules - the rule is saved but not applied +Fixed Package Types that not available for current Shipping Method displayed in Create Packages pop-up +Fixed Cross Sell Sorting Not Working +Fixed Error when obtaining missed file over get.php +Fixed Package Types that not available for current Shipping Method displayed in Create Packages pop-up +Fixed Unable to save Poll for more than one Store. +Fixed Mage_Directory_Helper_Data::getRegionJson doesn't translate region names +Fixed Static block in the Main Content Area overlaps border of the catalog of products +Fixed 3D secure with Saved CC works incorrectly +Fixed Shipping origin address used instead of the one specified in the RMA setting for Use Store Address = No +Fixed Unable add Gift Options for Individual Items +Fixed Customer Reports +- avoid selections group by null customer id. +Fixed Mysql4 install error +Fixed "What's this?" link is absent, "Click for price" link doesn't work for shared Wishlist page. +Fixed Incorrect Row Total Calculation in Refund +- changed tax counting algorithm(now it counts tax for single item) +Fixed Incorrect recipient name of Shipping Label +Fixed Missing "Street Address Line 2" in Shipping Label (in case with DHL) +Fixed After upgrading Magento website left in the maintenance mode +Fixed Frontend: JavaScript error appears if user registered on Checkout Page. +Fixed Added items to the Wishlist in the "Manage Shopping Cart" are not shown +Fixed Information is not saved in DB after placing order during checkout +Fixed Reports data wrong even after refreshing lifetime statistics +Fixed Frontend can be broken by recursion +Fixed Sub items are not displayed for the order for bundles, if user use Return and Orders link +- added renderers for non-simple product types +Fixed Error message for the case when store information is incomplete should be changed +Fixed MAP behavior for RSS feed pages should be changed accordingly to SRS (only "Click for price" link should be present) +Fixed Exception after upgrade Magento via diff files +Fixed Frontend: The block "Compare Products" is empty after relogin +Fixed Frontend: Catalog Price Rule does not apply to Mini Shopping Cart after login current customer +- remove checking if customerGroupId exists because quote is loaded with existed customerGroupId as guest +Fixed Unable to delete product with tag in pending status +Fixed Images not imported using new Import/Export + + + ==== 1.6.0.0-rc1 ==== === Major Highlights === diff --git a/app/Mage.php b/app/Mage.php index d8ee0c2353..856ee9b9a1 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -155,7 +155,7 @@ public static function getVersionInfo() 'revision' => '0', 'patch' => '0', 'stability' => 'rc', - 'number' => '1', + 'number' => '2', ); } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php index bbcf22e320..31a6a229ee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php @@ -92,7 +92,8 @@ protected function _prepareLayout() if ($this->_getProduct()->getId()) { $this->setChild('simple', - $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_super_config_simple') + $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_super_config_simple', + 'catalog.product.edit.tab.super.config.simple') ); $this->setChild('create_from_configurable', diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php index 5abf5fe5f9..e538faa9ac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php @@ -148,6 +148,13 @@ protected function _prepareCollection() $storeIds = $this->_getStoreIds();; + $orderStatuses = $filterData->getData('order_statuses'); + if (is_array($orderStatuses)) { + if (count($orderStatuses) == 1 && strpos($orderStatuses[0],',')!== false) { + $filterData->setData('order_statuses', explode(',',$orderStatuses[0])); + } + } + $resourceCollection = Mage::getResourceModel($this->getResourceCollectionName()) ->setPeriod($filterData->getData('period_type')) ->setDateRange($filterData->getData('from', null), $filterData->getData('to', null)) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php index 2982c55dfa..7dcfa4a23e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php @@ -67,14 +67,21 @@ public function hasMethods() */ public function getSelectedMethodCode() { - if ($currentMethodCode = $this->getQuote()->getPayment()->getMethod()) { - return $currentMethodCode; - } - if (count($this->getMethods()) == 1) { - foreach ($this->getMethods() as $method) { + // One available method. Return this method as selected, because no other variant is possible. + $methods = $this->getMethods(); + if (count($methods) == 1) { + foreach ($methods as $method) { return $method->getCode(); } } + + // Several methods. If user has selected some method - then return it. + $currentMethodCode = $this->getQuote()->getPayment()->getMethod(); + if ($currentMethodCode) { + return $currentMethodCode; + } + + // Several methods, but no preference for one of them. return false; } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php index 944e307d8e..5c8e9998c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php @@ -91,6 +91,16 @@ public function getIsAsBilling() return $this->getCreateOrderModel()->getShippingAddress()->getSameAsBilling(); } + /** + * Saving shipping address must be turned off, when it is the same as billing + * + * @return bool + */ + public function getDontSaveInAddressBook() + { + return $this->getIsAsBilling(); + } + /** * Return Form Elements values * diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php index d7bfe807f7..7390704e0d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php @@ -78,7 +78,7 @@ public function getConfigDataJson() $itemsGridUrl = $this->getUrl('*/sales_order_shipment/getShippingItemsGrid', $urlParams); foreach ($this->getShipment()->getAllItems() as $item) { - $itemsQty[$item->getOrderItemId()] = $item->getOrderItem()->getQtyOrdered()*1; + $itemsQty[$item->getOrderItemId()] = $item->getQty()*1; $itemsPrice[$item->getOrderItemId()] = $item->getPrice(); $itemsName[$item->getOrderItemId()] = $item->getName(); $itemsWeight[$item->getOrderItemId()] = $item->getWeight(); @@ -166,7 +166,8 @@ public function getDeliveryConfirmationTypeByCode($code) $countryId = $this->getShipment()->getOrder()->getShippingAddress()->getCountryId(); $carrier = $this->getShipment()->getOrder()->getShippingCarrier(); if ($carrier) { - $confirmationTypes = $carrier->getDeliveryConfirmationTypes($countryId); + $params = new Varien_Object(array('country_recipient' => $countryId)); + $confirmationTypes = $carrier->getDeliveryConfirmationTypes($params); $confirmationType = !empty($confirmationTypes[$code]) ? $confirmationTypes[$code] : ''; return $confirmationType; } @@ -218,18 +219,13 @@ public function displayCustomsValue() { $storeId = $this->getShipment()->getStoreId(); $order = $this->getShipment()->getOrder(); - $carrierCode = $order->getShippingCarrier()->getCarrierCode(); $address = $order->getShippingAddress(); $shipperAddressCountryCode = Mage::getStoreConfig( Mage_Shipping_Model_Shipping::XML_PATH_STORE_COUNTRY_ID, $storeId ); $recipientAddressCountryCode = $address->getCountryId(); - - if (($carrierCode == Mage_Usa_Model_Shipping_Carrier_Fedex::CODE - || $carrierCode == Mage_Usa_Model_Shipping_Carrier_Dhl::CODE) - && $shipperAddressCountryCode != $recipientAddressCountryCode - ) { + if ($shipperAddressCountryCode != $recipientAddressCountryCode) { return true; } return false; @@ -244,8 +240,9 @@ public function getDeliveryConfirmationTypes() { $countryId = $this->getShipment()->getOrder()->getShippingAddress()->getCountryId(); $carrier = $this->getShipment()->getOrder()->getShippingCarrier(); - if ($carrier && is_array($carrier->getDeliveryConfirmationTypes())) { - return $carrier->getDeliveryConfirmationTypes($countryId); + $params = new Varien_Object(array('country_recipient' => $countryId)); + if ($carrier && is_array($carrier->getDeliveryConfirmationTypes($params))) { + return $carrier->getDeliveryConfirmationTypes($params); } return array(); } @@ -281,4 +278,27 @@ public function isGirthAllowed() ->getShippingCarrier() ->isGirthAllowed($this->getShipment()->getOrder()->getShippingAddress()->getCountryId()); } + + /** + * Return content types of package + * + * @return array + */ + public function getContentTypes() + { + $order = $this->getShipment()->getOrder(); + $storeId = $this->getShipment()->getStoreId(); + $address = $order->getShippingAddress(); + $carrier = $order->getShippingCarrier(); + $countryShipper = Mage::getStoreConfig(Mage_Shipping_Model_Shipping::XML_PATH_STORE_COUNTRY_ID, $storeId); + if ($carrier) { + $params = new Varien_Object(array( + 'method' => $order->getShippingMethod(true)->getMethod(), + 'country_shipper' => $countryShipper, + 'country_recipient' => $address->getCountryId(), + )); + return $carrier->getContentTypes($params); + } + return array(); + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php index 97b38799c1..aecf1da6db 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php @@ -68,4 +68,35 @@ public function getShipment() return Mage::registry('current_shipment'); } + /** + * Can display customs value + * + * @return bool + */ + public function displayCustomsValue() + { + $storeId = $this->getShipment()->getStoreId(); + $order = $this->getShipment()->getOrder(); + $address = $order->getShippingAddress(); + $shipperAddressCountryCode = Mage::getStoreConfig( + Mage_Shipping_Model_Shipping::XML_PATH_STORE_COUNTRY_ID, + $storeId + ); + $recipientAddressCountryCode = $address->getCountryId(); + if ($shipperAddressCountryCode != $recipientAddressCountryCode) { + return true; + } + return false; + } + + /** + * Format price + * + * @param decimal $value + * @return double + */ + public function formatPrice($value) + { + return sprintf('%.2F', $value); + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php index 771f95a9f8..54d4090a1f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php @@ -293,8 +293,10 @@ public function getRenderer() return $this->_renderer; } - public function setFilter($column) + public function setFilter($filterClass) { + $this->_filter = $this->getLayout()->createBlock($filterClass) + ->setColumn($this); } protected function _getFilterByType() diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php index 7bd4db33b3..082c97f50a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php @@ -51,8 +51,13 @@ public function getValue($index=null) } if (!empty($value['to']) && !$this->getColumn()->getFilterTime()) { $datetimeTo = $value['to']; - //set end of the day - $datetimeTo->addSecond(self::END_OF_DAY_IN_SECONDS); + + //calculate end date considering timezone specification + $datetimeTo->setTimezone( + Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE) + ); + $datetimeTo->addDay(1)->subSecond(1); + $datetimeTo->setTimezone(Mage_Core_Model_Locale::DEFAULT_TIMEZONE); } return $value; } diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php index a1cd767a03..8400c80e83 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php @@ -1083,7 +1083,9 @@ public function setShippingAsBilling($flag) $tmpAddress = clone $this->getBillingAddress(); $tmpAddress->unsAddressId() ->unsAddressType(); - $this->getShippingAddress()->addData($tmpAddress->getData()); + $data = $tmpAddress->getData(); + $data['save_in_address_book'] = 0; // Do not duplicate address (billing address will do saving too) + $this->getShippingAddress()->addData($data); } $this->getShippingAddress()->setSameAsBilling($flag); $this->setRecollect(true); @@ -1630,7 +1632,7 @@ protected function _saveCustomerAfterOrder($order) $order->setCustomerId($this->_customer->getId()); $billing->setCustomerId($this->_customer->getId()); $shipping->setCustomerId($this->_customer->getId()); - $this->_customer->sendNewAccountEmail(); + $this->_customer->sendNewAccountEmail('registered', '', $order->getStoreId()); } else { $saveCusstomerAddress = false; @@ -1693,7 +1695,7 @@ protected function _saveCustomer() $this->getBillingAddress()->setCustomerId($customer->getId()); $this->getShippingAddress()->setCustomerId($customer->getId()); - $customer->sendNewAccountEmail(); + $customer->sendNewAccountEmail('registered', '', $customer->getStoreId()); } else { $customer = $this->getSession()->getCustomer(); diff --git a/app/code/core/Mage/Adminhtml/controllers/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/CacheController.php index f054b59eab..3aa90fc10e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CacheController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CacheController.php @@ -53,8 +53,8 @@ public function indexAction() */ public function flushAllAction() { - Mage::app()->getCacheInstance()->flush(); Mage::dispatchEvent('adminhtml_cache_flush_all'); + Mage::app()->getCacheInstance()->flush(); $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__("The cache storage has been flushed.")); $this->_redirect('*/*'); } diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php index f9d2ebf7f8..4098ef4d63 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php @@ -118,11 +118,9 @@ public function updateAction() $this->_initData(); $buyRequest = new Varien_Object($this->getRequest()->getParams()); - $qty = $buyRequest->getQty() ? $buyRequest->getQty() : 0; $this->_wishlist ->updateItem($this->_wishlistItem->getId(), $buyRequest) - ->setQty($qty) ->save(); $updateResult->setOk(true); diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php index fdcdaa6492..47f581f2b9 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php @@ -112,31 +112,26 @@ function changeTaxClassId() { ); } - $map_enabled = $this->getForm()->getElement('msrp_enabled'); - if (Mage::helper('catalog')->isMsrpEnabled() && $map_enabled) { - $map_enabled->setAfterElementHtml( + $mapEnabled = $this->getForm()->getElement('msrp_enabled'); + if ($mapEnabled) { + $mapEnabled->setAfterElementHtml( '