Merge pull request #82 from hugofintecture/3.2.0

3.2.0

Author: hugofintecture

Block/System/Config/Button.php

@@ -53,7 +53,7 @@ public function getButtonHtml(): string
         $button = $this->getLayout()->createBlock(WidgetButton::class);
         $button->setData([
             'id' => 'connection-test',
-            'label' => __('Test Connection'),
+            'label' => __('Test connection'),
         ]);
 
         return $button->toHtml();

Controller/Adminhtml/Settings/ConnectionTest.php

@@ -82,7 +82,7 @@ public function execute()
             throw new LocalizedException(__('Some fields are empty'));
         }
 
-        // Handle already saved app secret
+        // Handle already saved APP secret
         if ($jsParams['appSecret'] === '******') {
             $jsParams['appSecret'] = $this->config->getAppSecret($jsParams['environment'], $scopeId);
         }

Gateway/Config/BnplConfig.php

@@ -9,9 +9,15 @@ class BnplConfig extends BaseConfig
     const CODE = 'fintecture_bnpl';
 
     const KEY_ACTIVE = 'active';
+    const KEY_RECOMMEND_BNPL_BADGE = 'recommend_bnpl_badge';
 
     public function isActive(): bool
     {
         return (bool) $this->getValue(self::KEY_ACTIVE);
     }
+
+    public function isRecommendedBnplBadgeActive(): bool
+    {
+        return (bool) $this->getValue(self::KEY_RECOMMEND_BNPL_BADGE);
+    }
 }

Gateway/Config/Config.php

@@ -7,7 +7,7 @@
 class Config extends BaseConfig
 {
     const CODE = 'fintecture';
-    const VERSION = '3.1.0';
+    const VERSION = '3.2.0';
 
     const KEY_SHOP_NAME = 'general/store_information/name';
     const KEY_ACTIVE = 'active';
@@ -30,6 +30,7 @@ class Config extends BaseConfig
     const KEY_CHECKOUT_DESIGN_SELECTION = 'checkout_design_selection';
     const KEY_CUSTOM_RECONCILIATION_FIELD_ACTIVE = 'custom_reconciliation_field_active';
     const KEY_CUSTOM_RECONCILIATION_FIELD = 'custom_reconciliation_field';
+    const KEY_RECOMMEND_IT_BADGE = 'recommend_it_badge';
 
     public function getShopName(): ?string
     {
@@ -153,6 +154,11 @@ public function getCustomReconciliationField(): ?string
         return $this->getValue(self::KEY_CUSTOM_RECONCILIATION_FIELD);
     }
 
+    public function isRecommendedItBadgeActive(): bool
+    {
+        return (bool) $this->getValue(self::KEY_RECOMMEND_IT_BADGE);
+    }
+
     public function getNewOrderStatus(): string
     {
         $status = $this->getValue('payment/fintecture/new_order_status');

Helper/Stats.php

@@ -4,6 +4,7 @@
 
 namespace Fintecture\Payment\Helper;
 
+use Fintecture\Payment\Gateway\Config\BnplConfig;
 use Fintecture\Payment\Gateway\Config\Config;
 use Fintecture\Payment\Logger\Logger as FintectureLogger;
 use Fintecture\Payment\Model\Environment;
@@ -17,6 +18,9 @@ class Stats
     /** @var Config */
     protected $config;
 
+    /** @var BnplConfig */
+    protected $bnplConfig;
+
     /** @var FintectureLogger */
     protected $fintectureLogger;
 
@@ -34,13 +38,15 @@ class Stats
 
     public function __construct(
         Config $config,
+        BnplConfig $bnplConfig,
         FintectureLogger $fintectureLogger,
         ResourceConnection $resourceConnection,
         ProductMetadataInterface $productMetadata,
         PaymentConfig $paymentConfig,
         StoreManagerInterface $storeManager
     ) {
         $this->config = $config;
+        $this->bnplConfig = $bnplConfig;
         $this->fintectureLogger = $fintectureLogger;
         $this->resourceConnection = $resourceConnection;
         $this->productMetadata = $productMetadata;
@@ -99,6 +105,8 @@ public function getConfigurationSummary(): array
             'module_production_app_id' => $this->config->getAppId(Environment::ENVIRONMENT_PRODUCTION),
             'module_branding' => $this->config->isShowLogo(),
             'module_checkout_design' => $this->config->getCheckoutDesign(),
+            'module_recommended_it' => $this->config->isRecommendedItBadgeActive(),
+            'module_recommended_bnpl' => $this->bnplConfig->isRecommendedBnplBadgeActive(),
         ];
     }
 }

Model/Banktype.php renamed to Model/BankType.php

@@ -11,12 +11,12 @@ protected function _getDeleteCheckbox()
         $value = $this->getValue();
         if ($value) {
             if (substr_compare($value, '.pem', -strlen('.pem')) === 0) {
-                return '<div><br>' . __('Please re-upload Private Key file') . '</div>';
+                return '<div><br>' . __('Please re-upload private key file') . '</div>';
             } else {
-                return '<div><br>' . __('Private Key file already saved') . '</div>';
+                return '<div><br>' . __('Private key file already saved') . '</div>';
             }
         } else {
-            return '<div><br>' . __('Please upload Private Key file') . '</div>';
+            return '<div><br>' . __('Please upload private key file') . '</div>';
         }
     }
 }

Model/Config/File/PemFile.php

@@ -9,8 +9,8 @@ public function toOptionArray()
         return [
             ['value' => 'it', 'label' => __('Immediate Transfer')],
             ['value' => 'ist', 'label' => __('Immediate Transfer & Smart Transfer')],
-            ['value' => 'ist_long', 'label' => __('Long Version')],
-            ['value' => 'ist_short', 'label' => __('Short Version')],
+            ['value' => 'ist_long', 'label' => __('Long version')],
+            ['value' => 'ist_short', 'label' => __('Short version')],
         ];
     }
 }

Model/Config/Options/CheckoutDesignSelectionOptions.php

@@ -37,6 +37,7 @@ public function getConfig()
                     'active' => $this->gatewayConfig->isActive(),
                     'todayDate' => $this->beautifulDate->formatDatetime($today),
                     'laterDate' => $this->beautifulDate->formatDatetime($later),
+                    'recommendBnplBadge' => $this->gatewayConfig->isRecommendedBnplBadgeActive(),
                 ],
             ],
         ];

Model/Ui/BnplConfigProvider.php

@@ -24,6 +24,7 @@ public function getConfig()
                 Config::CODE => [
                     'active' => $this->gatewayConfig->isActive(),
                     'checkoutDesign' => $this->gatewayConfig->getCheckoutDesign(),
+                    'recommendItBadge' => $this->gatewayConfig->isRecommendedItBadgeActive(),
                 ],
             ],
         ];