Merge pull request #31 from BoulangerV/M1-25_release_4_1_9

M1-25 : Fix M1-22 missing code
ratepay · Sep 29, 2020 · 9057fe7 · 9057fe7
2 parents ae01fae + 3c02dea
commit 9057fe7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 |------|----------
 |Author | Annegret Seufert
 |Shop Version | `CE` `1.7.x` `1.8.x` `1.9.x` `EE` `1.12.x` `1.13.x` `1.14.x`
-|Version | `4.1.8`
+|Version | `4.1.9`
 |Link | https://www.ratepay.com
 |Mail | [email protected]
 |Installation | see separate installation manual
@@ -26,6 +26,13 @@ git submodule update --remote
 
 ## Changelog
 
+### Version 4.1.9 - Released 2020-09-28
+* Update : New SEPA mandate text for Ratepay inhouse installment payment method
+* Update : legal text and links updated
+* Update : VatId field in checkout turned into optional
+* Update : Default phone number transmitted if missing during checkout payment
+* Update : Account holder for SEPA transaction adapted for B2B (choice given between Customer name and Company)
+
 ### Version 4.1.8 - Released 2020-07-02
 * Fix/Clean : remove unnecessary config fields
 * Update/Docs : add license file

diff --git a/app/code/community/RatePAY/Ratepaypayment/Helper/Mapping.php b/app/code/community/RatePAY/Ratepaypayment/Helper/Mapping.php
@@ -362,7 +362,12 @@ public function getRequestCustomer($quoteOrOrder)
 
         // Contacts
         $contacts['Email'] = $quoteOrOrder->getCustomerEmail();
-        $contacts['Phone']['DirectDial'] = $quoteOrOrder->getBillingAddress()->getTelephone();
+        // M1-22 : use default phone number if missing
+        if (empty($quoteOrOrder->getBillingAddress()->getTelephone())) {
+            $contacts['Phone']['DirectDial'] = '03033988560';
+        } else {
+            $contacts['Phone']['DirectDial'] = $quoteOrOrder->getBillingAddress()->getTelephone();
+        }
         if ($quoteOrOrder->getBillingAddress()->getFax() != '') {
             $contacts['Fax']['DirectDial'] = $quoteOrOrder->getBillingAddress()->getFax();
         }

diff --git a/app/code/community/RatePAY/Ratepaypayment/Model/Method/Abstract.php b/app/code/community/RatePAY/Ratepaypayment/Model/Method/Abstract.php
@@ -163,7 +163,10 @@ public function assignData($data)
                 if ($phone && $this->getHelper()->isValidPhone($phone)) {
                     $this->getHelper()->setPhone($quote, $phone);
                 } else {
-                    Mage::throwException($this->_getHelper()->__('Phone Error'));
+                    // M1-22 : use default phone number if missing
+                    if (!empty($phone)) {
+                        Mage::throwException($this->_getHelper()->__('Phone Error'));
+                    }
                 }
             } else {
                 // M1-22 : use default phone number if missing

diff --git a/app/code/community/RatePAY/Ratepaypayment/etc/config.xml b/app/code/community/RatePAY/Ratepaypayment/etc/config.xml
@@ -24,7 +24,7 @@
 
     <modules>
         <RatePAY_Ratepaypayment>
-            <version>4.1.8</version>
+            <version>4.1.9</version>
         </RatePAY_Ratepaypayment>
     </modules>
 

diff --git a/app/code/community/RatePAY/Ratepaypayment/etc/system.xml b/app/code/community/RatePAY/Ratepaypayment/etc/system.xml
@@ -3897,7 +3897,7 @@
                         </ratepay_netherlands>
 
                         <version translate="label">
-                            <label>v4.1.8</label>
+                            <label>v4.1.9</label>
                             <frontend_model>adminhtml/system_config_form_field_notification</frontend_model>
                             <frontend_type>label</frontend_type>
                             <sort_order>100</sort_order>