Merge pull request #58 from genecommerce/release/3.4.2

Release/3.4.2
genecommerce · Dec 9, 2019 · 2ebfc10 · 2ebfc10
2 parents 0e058ca + b8aa2ca
commit 2ebfc10
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.4.2] - 2019-12-09
+### Fixed
+- Issue where Level 2/3 Processing data builder was using a string where a float was required
+- Issue when trying to use a UK Maestro card to checkout
+
 ## [3.4.1] - 2019-11-20
 ### Fixed
 - Hotfix for bug that stopped stored cards being used when CVV Re-verification is disabled
@@ -119,6 +124,7 @@ a bug in core Magento 2.3.1 means that if the Vault is turned off, cards are alw
 ### Fixed
 - Vaulted cards now work correctly
 
+[3.4.2]: https://github.com/genecommerce/module-braintree-magento2/compare/3.4.1...3.4.2
 [3.4.1]: https://github.com/genecommerce/module-braintree-magento2/compare/3.4.0...3.4.1
 [3.4.0]: https://github.com/genecommerce/module-braintree-magento2/compare/3.3.3...3.4.0
 [3.3.3]: https://github.com/genecommerce/module-braintree-magento2/compare/3.3.2...3.3.3

diff --git a/Gateway/Request/Level23ProcessingDataBuilder.php b/Gateway/Request/Level23ProcessingDataBuilder.php
@@ -115,9 +115,9 @@ public function build(array $buildSubject): array
                     $filteredFields['name'],
                     TransactionLineItem::DEBIT,
                     $this->numberToString($item->getQtyOrdered(), 2),
-                    $this->numberToString($item->getPrice(), 2),
+                    $this->numberToString($item->getBasePrice(), 2),
                     $filteredFields['unit_of_measure'],
-                    $this->numberToString($item->getQtyOrdered() * $item->getPrice(), 2),
+                    $this->numberToString($item->getQtyOrdered() * $item->getBasePrice(), 2),
                     $item->getTaxAmount() === null ? '0.00' : $this->numberToString($item->getTaxAmount(), 2),
                     $item->getTaxAmount() === null ? '0.00' : $this->numberToString($item->getDiscountAmount(), 2),
                     $filteredFields['sku'],

diff --git a/Gateway/Response/CardDetailsHandler.php b/Gateway/Response/CardDetailsHandler.php
@@ -53,7 +53,10 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @param array $handlingSubject
+     * @param array $response
+     * @throws InputException
+     * @throws NoSuchEntityException
      */
     public function handle(array $handlingSubject, array $response)
     {
@@ -67,7 +70,6 @@ public function handle(array $handlingSubject, array $response)
         $payment->setCcLast4($creditCard[self::CARD_LAST4]);
         $payment->setCcExpMonth($creditCard[self::CARD_EXP_MONTH]);
         $payment->setCcExpYear($creditCard[self::CARD_EXP_YEAR]);
-
         $payment->setCcType($this->getCreditCardType($creditCard[self::CARD_TYPE]));
 
         // set card details to additional info
@@ -83,7 +85,7 @@ public function handle(array $handlingSubject, array $response)
      * @throws InputException
      * @throws NoSuchEntityException
      */
-    private function getCreditCardType($type): string
+    private function getCreditCardType(string $type): string
     {
         $replaced = str_replace(' ', '-', strtolower($type));
         $mapper = $this->config->getCcTypesMapper();

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "gene/module-braintree",
     "description": "Fork from the Magento Braintree 2.2.0 module by Gene Commerce for PayPal.",
-    "version": "3.4.1",
+    "version": "3.4.2",
     "type": "magento2-module",
     "license": "proprietary",
     "require": {

diff --git a/etc/config.xml b/etc/config.xml
@@ -30,7 +30,7 @@
                 <can_deny_payment>1</can_deny_payment>
                 <cctypes>AE,VI,MC,DI,JCB,CUP,DN,MI</cctypes>
                 <useccv>1</useccv>
-                <cctypes_braintree_mapper><![CDATA[{"american-express":"AE","discover":"DI","jcb":"JCB","mastercard":"MC","master-card":"MC","visa":"VI","maestro":"MI","diners-club":"DN","unionpay":"CUP"}]]></cctypes_braintree_mapper>
+                <cctypes_braintree_mapper><![CDATA[{"american-express":"AE","discover":"DI","jcb":"JCB","mastercard":"MC","master-card":"MC","visa":"VI","maestro":"MI","uk-maestro":"MI","diners-club":"DN","unionpay":"CUP"}]]></cctypes_braintree_mapper>
                 <order_status>processing</order_status>
                 <environment>sandbox</environment>
                 <allowspecific>0</allowspecific>

diff --git a/etc/module.xml b/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Braintree" setup_version="3.4.1">
+    <module name="Magento_Braintree" setup_version="3.4.2">
         <sequence>
             <module name="Magento_Customer"/>
             <module name="Magento_Config"/>