From 3c02deac732b1ad21df718a0ff9bf93a0bf6c64a Mon Sep 17 00:00:00 2001 From: Vincent Boulanger Date: Tue, 29 Sep 2020 12:33:07 +0200 Subject: [PATCH] M1-25 : Fix M1-22 missing code + update version for release + update README for release --- README.md | 9 ++++++++- .../community/RatePAY/Ratepaypayment/Helper/Mapping.php | 7 ++++++- .../RatePAY/Ratepaypayment/Model/Method/Abstract.php | 5 ++++- app/code/community/RatePAY/Ratepaypayment/etc/config.xml | 2 +- app/code/community/RatePAY/Ratepaypayment/etc/system.xml | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3007362..2857505 100755 --- 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 | integration@ratepay.com |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 index fe19de8..4a502e5 100755 --- 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 index 9f2cd32..5bc5bbc 100755 --- 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 index a0f4e16..ca04eba 100755 --- a/app/code/community/RatePAY/Ratepaypayment/etc/config.xml +++ b/app/code/community/RatePAY/Ratepaypayment/etc/config.xml @@ -24,7 +24,7 @@ - 4.1.8 + 4.1.9 diff --git a/app/code/community/RatePAY/Ratepaypayment/etc/system.xml b/app/code/community/RatePAY/Ratepaypayment/etc/system.xml index 5d1f295..9c7ede1 100755 --- a/app/code/community/RatePAY/Ratepaypayment/etc/system.xml +++ b/app/code/community/RatePAY/Ratepaypayment/etc/system.xml @@ -3897,7 +3897,7 @@ - + adminhtml/system_config_form_field_notification label 100