Merge pull request #99 from AbdullahAldakheel/master

Fix methods value

Author: AbdullahAldakheel

Helper/MoyasarHelper.php

@@ -21,7 +21,7 @@
 
 class MoyasarHelper extends AbstractHelper
 {
-    const VERSION = '5.0.5';
+    const VERSION = '5.0.6';
 
     const XML_PATH_CREDIT_CARD_IS_ACTIVE = 'payment/moyasar_payments/active';
     const XML_PATH_APPLE_PAY_IS_ACTIVE = 'payment/moyasar_payments_apple_pay/active';

Model/Config/PaymentConfigProvider.php

@@ -9,6 +9,8 @@
 use Moyasar\Magento2\Helper\CurrencyHelper;
 use Moyasar\Magento2\Helper\MoyasarHelper;
 use Moyasar\Magento2\Model\Payment\MoyasarPayments;
+use Moyasar\Magento2\Model\Payment\MoyasarPaymentsApplePay;
+use Moyasar\Magento2\Model\Payment\MoyasarPaymentsStcPay;
 
 class PaymentConfigProvider implements ConfigProviderInterface
 {
@@ -56,15 +58,31 @@ public function getConfig()
     {
         $storeUrl = $this->storeManager->getStore()->getBaseUrl();
         preg_match('/^.+:\/\/([A-Za-z0-9\-\.]+)\/?.*$/', $storeUrl, $matches);
+        $enabled_method = [];
+        // Credit Card
+        if ($this->scopeConfig->getValue('payment/moyasar_payments/active')) {
+            $enabled_method[] = 'creditcard';
+        }
+        // Apple Pay
+        if ($this->scopeConfig->getValue('payment/moyasar_payments_apple_pay/active')) {
+            $enabled_method[] = 'applepay';
+        }
+        // Stc Pay
+        if ($this->scopeConfig->getValue('payment/moyasar_payments_stc_pay/active')) {
+            $enabled_method[] = 'stcpay';
+        }
+
+        $supported_networks = $this->scopeConfig->getValue('payment/moyasar_payments/schemes');
+
 
         $config = [
             'api_key' => $this->moyasarHelper->publishableApiKey(),
             'base_url' => $this->moyasarHelper->apiBaseUrl(),
             'country' => $this->scopeConfig->getValue('general/country/default'),
             'store_name' => $this->getStoreName(),
             'domain_name' => $matches[1],
-            'supported_networks' => explode(',', $this->scopeConfig->getValue('payment/moyasar_payments/schemes')),
-            'methods' => explode(',', $this->scopeConfig->getValue('payment/moyasar_payments/methods')),
+            'supported_networks' => explode(',', $supported_networks ? $supported_networks : []),
+            'methods' => $enabled_method,
             'version' => 'Moyasar Http; Magento Plugin v' . MoyasarHelper::VERSION
         ];
 

composer.json

@@ -2,7 +2,7 @@
     "name": "moyasar-fintech/magento2",
     "description": "Magento 2 payment module that integrate with https:\\\\moyasar.com Gateway",
     "type": "magento2-module",
-    "version": "5.0.5",
+    "version": "5.0.6",
     "authors": [
         {
             "email": "[email protected]",