Import Magento Release 1.5.0.0-alpha2

winman · Feb 9, 2011 · 0663311 · 0663311
1 parent f3e3f62
commit 0663311
Show file tree

Hide file tree

Showing 497 changed files with 3,786 additions and 1,395 deletions.
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
@@ -1,3 +1,89 @@
+=== 1.5.0.0-alpha2 ====
+
+=== Major Highlights ===
+Added Payflow Link using HSS (Hosted Sole Solution)
+
+=== Improvements ===
+Upgraded Zend Framework to 1.11.1
+Phoenix_Moneybookers improvements:
+- updated payment logo images
+- added "Maestro" and "Online Bank Transfer" payment methods into Moneybookers group
+- wrapped Moneybookers payment logo title and alt text on payment selection text into translation calls
+
+=== Fixes ===
+Fixed Price for composite products in a products grid on Order creation page
+Fixed No ability to delete item from Wishlist by specifying Qty = 0 and click on Update Wishlist
+Fixed Do not hide ajax loader on 'Place order' step on onepage checkout when customer selected PayflowLink payment method until PayPal iframe will be loaded
+Fixed Admin reorder with bundle item cause wrong qty of simple products
+Fixed Incorrect bundle product price and bundle items Qty count during the process of Admin Order creation
+Fixed When bundle item is configured in that way, when it cannot have User defined quantity, Qty field remains editable in AJAX-popup
+Fixed "UPS XML" allowed methods bug
+Fixed Mage_Page_Block_Template_Links_Block::$_afterText is never used
+Fixed No configuration popup for Grouped products in admin backend new order creation
+- the problem was in sales.js during parsing currency from price cell. In case when no price was present in cell the JS exeption occurs. So it was needed to determine currency symbol in other way. And it way was in sets this.currencySymbol in AdminOrder class when order obj initialization or when current currency  is switched.
+- small fix in grouped.phtml and giftcatd.phtml: set additioal attributes for price calculation
+- small fix in configure.js: using parameter listType instead of this.current.listType in _requestItemConfiguration method
+- small fix in sales.js: do overall popup cleaning by productConfigure.clean() for each loadArea calling
+Fixed When bundle item is configured in that way, when it cannot have User defined quantity, Qty field remains editable in AJAX-popup
+Fixed Customer data not saved when returning to cart and back to checkout
+Fixed Bad sku value for non-configured bundle in Create New Order at admin backend
+Fixed Integrity Constraint Violation in Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::_prepareWebsiteDateTable
+Fixed URL Rewrite Exeption
+Fixed Menu "Catalog-Manage Products-Gift Options" have incorrect design and wrong position in menu list:
+Fixed Displaying Out of Stock Products on the front-end.
+Fixed Incorrect shipping tax calculation on invoice creditmemos with included tax
+Fixed Cannot login to backend while notify "This is a required field." is present
+- There was JS error, invisible due to try-catch construction. Fixed
+Fixed Authorize.net invoice capture.
+- Do not capture/refund/void transaction if transaction has been captured/voided in authorize.net panel
+Fixed Inadequate URL in Moneybookers eWallet "More Info" Link
+Fixed It is impossible to export products using the new Export module
+Fixed Tax Rate = 0% displayed in Cart
+Fixed Unable to specify quantites for bundle items in AJAX-popup, when selection of bundle items is provided using radiobuttons
+Fixed Incorrect style tables in customer confirmation email. For orders with Authorize.net payment method
+- fixed incorrect styling in customer confirmation email;
+- simplified styling on admin order page
+Fixed Cron job dispatcher incorrectly releases locks
+Fixed Incorrect items number in "MY WISHLIST" after updated quantity in the Wishlist
+- Added new configuration option "Display Wishlist Summary" in System -> Configuration -> Customers -> Wishlist section
+- Removed quantity information from wishlist frontend page
+Fixed Update compare list after delete one item
+Fixed No hint for disabled "Configure" button  
+Fixed In Bundle product's page "Availability" string is not placed well
+Fixed Non-correct headers uses for email return-path.
+Fixed Numerous issued with displaying tax on front-end for bundled items
+Fixed Impossible save empty values for store view scope
+Fixed Non-correct headers uses for email return-path.  
+- Added "-f" parameter to transport instance at Mage_Core_Model_Email_Template::send() like PHP mail() needs
+Fixed Do not hide ajax loader on 'Place order' step on onepage checkout when customer selected PayflowLink payment method until PayPal iframe will be loaded
+Fixed Order can be placed with non-configured composite product in Ordered Items
+Fixed Using "Update Wishlist" adds quantity to existing value even nothing wasn't changed
+
+
+==== 1.5.x-devel-89318 ====
+
+=== Fixes ===
+Fixed Tax Rate = 0% displayed in Cart
+Fixed Unable to specify quantites for bundle items in AJAX-popup, when selection of bundle items is provided using radiobuttons
+Fixed Incorrect style tables in customer confirmation email. For orders with Authorize.net payment method
+- fixed incorrect styling in customer confirmation email;
+- simplified styling on admin order page
+Fixed Cron job dispatcher incorrectly releases locks
+Fixed Incorrect items number in "MY WISHLIST" after updated quantity in the Wishlist
+- Added new configuration option "Display Wishlist Summary" in System -> Configuration -> Customers -> Wishlist section
+- Removed quantity information from wishlist frontend page
+Fixed Update compare list after delete one item
+Fixed No hint for disabled "Configure" button  
+Fixed In Bundle product's page "Availability" string is not placed well
+Fixed Non-correct headers uses for email return-path.
+Fixed Numerous issued with displaying tax on front-end for bundled items
+Fixed Impossible save empty values for store view scope
+Fixed Non-correct headers uses for email return-path.  
+- Added "-f" parameter to transport instance at Mage_Core_Model_Email_Template::send() like PHP mail() needs
+Fixed Do not hide ajax loader on 'Place order' step on onepage checkout when customer selected PayflowLink payment method until PayPal iframe will be loaded
+Fixed Order can be placed with non-configured composite product in Ordered Items
+Fixed Using "Update Wishlist" adds quantity to existing value even nothing wasn't changed
+
 ==== 1.5.0.0-alpha1 ====
 
 === Major Highlights ===

diff --git a/app/Mage.php b/app/Mage.php
@@ -155,7 +155,7 @@ public static function getVersionInfo()
             'revision'  => '0',
             'patch'     => '0',
             'stability' => 'alpha',
-            'number'    => '1',
+            'number'    => '2',
         );
     }
 

diff --git a/app/code/community/Phoenix/Moneybookers/Block/Form.php b/app/code/community/Phoenix/Moneybookers/Block/Form.php
@@ -19,6 +19,20 @@
  */
 class Phoenix_Moneybookers_Block_Form extends Mage_Payment_Block_Form
 {
+    /**
+     * Available locales for content URL generation
+     *
+     * @var array
+     */
+    protected $_supportedInfoLocales = array('de');
+
+    /**
+     * Default locale for content URL generation
+     *
+     * @var string
+     */
+    protected $_defaultInfoLocale = 'en';
+
     /**
      * Constructor. Set template.
      */
@@ -36,6 +50,10 @@ protected function _construct()
      */
     public function getPaymentImageSrc($payment)
     {
+        if ($payment == 'moneybookers_obt') {
+            $payment .= '_'.$this->getInfoLocale();
+        }
+
         $imageFilename = Mage::getDesign()
             ->getFilename('images' . DS . 'moneybookers' . DS . $payment, array('_type' => 'skin'));
 
@@ -47,4 +65,29 @@ public function getPaymentImageSrc($payment)
 
         return false;
     }
+
+    /**
+     * Return supported locale for information text
+     *
+     * @return string
+     */
+    public function getInfoLocale()
+    {
+        $locale = substr(Mage::app()->getLocale()->getLocaleCode(), 0 ,2);
+        if (!in_array($locale, $this->_supportedInfoLocales)) {
+            $locale = $this->_defaultInfoLocale;
+        }
+        return $locale;
+    }
+
+    /**
+     * Return info URL for eWallet payment
+     *
+     * @return string
+     */
+    public function getWltInfoUrl()
+    {
+        $locale = substr(Mage::app()->getLocale()->getLocaleCode(), 0 ,2);
+        return 'http://www.moneybookers.com/app/?l=' . strtoupper($locale);
+    }
 }
diff --git a/app/code/community/Phoenix/Moneybookers/Block/Payment.php b/app/code/community/Phoenix/Moneybookers/Block/Payment.php
@@ -28,12 +28,12 @@ public function getMoneybookersLogoSrc()
     {
         $locale = Mage::getModel('moneybookers/acc')->getLocale();
         $logoFilename = Mage::getDesign()
-            ->getFilename('images' . DS . 'moneybookers' . DS . 'banner_120_' . $locale . '.png', array('_type' => 'skin'));
+            ->getFilename('images' . DS . 'moneybookers' . DS . 'banner_120_' . $locale . '.gif', array('_type' => 'skin'));
 
         if (file_exists($logoFilename)) {
-            return $this->getSkinUrl('images/moneybookers/banner_120_'.$locale.'.png');
+            return $this->getSkinUrl('images/moneybookers/banner_120_'.$locale.'.gif');
         }
 
-        return $this->getSkinUrl('images/moneybookers/banner_120_int.png');
+        return $this->getSkinUrl('images/moneybookers/banner_120_int.gif');
     }
 }
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Mae.php b/app/code/community/Phoenix/Moneybookers/Model/Mae.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category    Phoenix
+ * @package     Phoenix_Moneybookers
+ * @copyright   Copyright (c) 2010 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
+{
+    /**
+     * unique internal payment method identifier
+     */
+    protected $_code          = 'moneybookers_mae';
+    protected $_paymentMethod = 'MAE';
+}
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Obt.php b/app/code/community/Phoenix/Moneybookers/Model/Obt.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category    Phoenix
+ * @package     Phoenix_Moneybookers
+ * @copyright   Copyright (c) 2010 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
+{
+    /**
+     * unique internal payment method identifier
+     */
+    protected $_code          = 'moneybookers_obt';
+    protected $_paymentMethod = 'OBT';
+}
diff --git a/app/code/community/Phoenix/Moneybookers/etc/config.xml b/app/code/community/Phoenix/Moneybookers/etc/config.xml
@@ -225,6 +225,14 @@
                 <allowspecific>1</allowspecific>
                 <specificcountry>IE</specificcountry>
             </moneybookers_lsr>
+            <moneybookers_mae>
+                <group>mbookers</group>
+                <active>0</active>
+                <model>moneybookers/mae</model>
+                <title>Maestro</title>
+                <allowspecific>1</allowspecific>
+                <specificcountry>GB,AT,ES</specificcountry>
+            </moneybookers_mae>
             <moneybookers_npy>
                 <group>mbookers</group>
                 <active>0</active>
@@ -280,6 +288,13 @@
                 <title>Moneybookers eWallet</title>
                 <allowspecific>0</allowspecific>
             </moneybookers_wlt>
+            <moneybookers_obt>
+                <group>mbookers</group>
+                <active>0</active>
+                <model>moneybookers/obt</model>
+                <title>Onlineüberweisung (empfohlen)</title>
+                <allowspecific>0</allowspecific>
+            </moneybookers_obt>
         </payment>
         <moneybookers>
             <settings>

diff --git a/app/code/community/Phoenix/Moneybookers/etc/system.xml b/app/code/community/Phoenix/Moneybookers/etc/system.xml
@@ -664,6 +664,65 @@
                         </specificcountry>
                     </fields>
                 </moneybookers_lsr>
+                <moneybookers_mae translate="label" module="moneybookers">
+                    <label>Maestro (powered by Moneybookers) - United Kingdom, Austria, Spain</label>
+                    <frontend_type>text</frontend_type>
+                    <sort_order>231</sort_order>
+                    <show_in_default>1</show_in_default>
+                    <show_in_website>1</show_in_website>
+                    <show_in_store>1</show_in_store>
+                    <fields>
+                        <active translate="label">
+                            <label>Enabled</label>
+                            <frontend_type>select</frontend_type>
+                            <config_path>payment/moneybookers_mae/active</config_path>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>1</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </active>
+                        <sort_order translate="label">
+                            <label>Sort Order</label>
+                            <frontend_type>text</frontend_type>
+                            <config_path>payment/moneybookers_mae/sort_order</config_path>
+                            <sort_order>3</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </sort_order>
+                        <title translate="label">
+                            <label>Title</label>
+                            <frontend_type>text</frontend_type>
+                            <config_path>payment/moneybookers_mae/title</config_path>
+                            <sort_order>5</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </title>
+                        <allowspecific translate="label">
+                            <label>Payment from Applicable Countries</label>
+                            <frontend_type>allowspecific</frontend_type>
+                            <config_path>payment/moneybookers_mae/allowspecific</config_path>
+                            <sort_order>6</sort_order>
+                            <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </allowspecific>
+                        <specificcountry translate="label">
+                            <label>Payment from Specific Countries</label>
+                            <frontend_type>multiselect</frontend_type>
+                            <config_path>payment/moneybookers_mae/specificcountry</config_path>
+                            <sort_order>7</sort_order>
+                            <source_model>adminhtml/system_config_source_country</source_model>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <can_be_empty>1</can_be_empty>
+                        </specificcountry>
+                    </fields>
+                </moneybookers_mae>
                 <moneybookers_npy translate="label" module="moneybookers">
                     <label>EPS Online-Überweisung (powered by Moneybookers) - Austria</label>
                     <frontend_type>text</frontend_type>
@@ -1077,6 +1136,65 @@
                         </specificcountry>
                     </fields>
                 </moneybookers_wlt>
+                <moneybookers_obt translate="label" module="moneybookers">
+                    <label>Online Bank Transfer (powered by Moneybookers)</label>
+                    <frontend_type>text</frontend_type>
+                    <sort_order>381</sort_order>
+                    <show_in_default>1</show_in_default>
+                    <show_in_website>1</show_in_website>
+                    <show_in_store>1</show_in_store>
+                    <fields>
+                        <active translate="label">
+                            <label>Enabled</label>
+                            <frontend_type>select</frontend_type>
+                            <config_path>payment/moneybookers_obt/active</config_path>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>1</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </active>
+                        <sort_order translate="label">
+                            <label>Sort Order</label>
+                            <frontend_type>text</frontend_type>
+                            <config_path>payment/moneybookers_obt/sort_order</config_path>
+                            <sort_order>3</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </sort_order>
+                        <title translate="label">
+                            <label>Title</label>
+                            <frontend_type>text</frontend_type>
+                            <config_path>payment/moneybookers_obt/title</config_path>
+                            <sort_order>5</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </title>
+                        <allowspecific translate="label">
+                            <label>Payment from Applicable Countries</label>
+                            <frontend_type>allowspecific</frontend_type>
+                            <config_path>payment/moneybookers_obt/allowspecific</config_path>
+                            <sort_order>6</sort_order>
+                            <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </allowspecific>
+                        <specificcountry translate="label">
+                            <label>Payment from Specific Countries</label>
+                            <frontend_type>multiselect</frontend_type>
+                            <config_path>payment/moneybookers_obt/specificcountry</config_path>
+                            <sort_order>7</sort_order>
+                            <source_model>adminhtml/system_config_source_country</source_model>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <can_be_empty>1</can_be_empty>
+                        </specificcountry>
+                    </fields>
+                </moneybookers_obt>
             </groups>
         </moneybookers>
     </sections>