Merge pull request #52 from genecommerce/hotfix/lpm-configuration

LPM allowed methods hotfix
genecommerce · Nov 27, 2019 · 73f3c20 · 73f3c20
2 parents 83aefc5 + 1241600
commit 73f3c20
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
@@ -57,6 +57,11 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
         if (version_compare($context->getVersion(), '2.0.1', '<')) {
             $this->convertSerializedDataToJson($setup);
         }
+
+        // Hotfix to remove incorrectly stored LPM config key/values
+        if (version_compare($context->getVersion(), '4.0.1', '<')) {
+            $this->removeNullLpmAllowedMethods($setup);
+        }
     }
 
     /**
@@ -90,4 +95,21 @@ private function convertSerializedDataToJson(ModuleDataSetupInterface $setup)
             $queryModifier
         );
     }
+
+    /**
+     * Hotfix to remove incorrectly stored config value for `payment/braintree_local_paymnet/allowed_methods`
+     *
+     * @param ModuleDataSetupInterface $setup
+     */
+    private function removeNullLpmAllowedMethods(ModuleDataSetupInterface $setup)
+    {
+        $connection = $setup->getConnection();
+        $connection->delete(
+            $setup->getTable('core_config_data'),
+            [
+                '`path`=?' => 'payment/braintree_local_payment/allowed_methods',
+                '`value` IS NULL'
+            ]
+        );
+    }
 }
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": "4.0.0",
+    "version": "4.0.1",
     "type": "magento2-module",
     "license": "proprietary",
     "require": {

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -319,6 +319,7 @@
                         <field id="title" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1">
                             <label>Title</label>
                             <config_path>payment/braintree_local_payment/title</config_path>
+                            <validate>required-entry</validate>
                             <depends>
                                 <field id="active">1</field>
                             </depends>
@@ -330,8 +331,8 @@
                                 valid for that method, regardless of the method being enabled here.
                             </comment>
                             <source_model>Magento\Braintree\Model\Adminhtml\Source\LpmMethods</source_model>
-                            <can_be_empty>1</can_be_empty>
                             <config_path>payment/braintree_local_payment/allowed_methods</config_path>
+                            <validate>required-entry</validate>
                             <depends>
                                 <field id="active">1</field>
                             </depends>

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="4.0.0">
+    <module name="Magento_Braintree" setup_version="4.0.1">
         <sequence>
             <module name="Magento_Customer"/>
             <module name="Magento_Config"/>