Merge pull request #33 from heidelpay/refactor/review-plenty

Refactor/review plenty
heidelpay · Jul 8, 2020 · 63eb8ea · 63eb8ea
2 parents bfdc32a + 1ab6823
commit 63eb8ea
Show file tree

Hide file tree

Showing 23 changed files with 329 additions and 40 deletions.
diff --git a/src/Controllers/TestController.php b/src/Controllers/TestController.php
@@ -38,10 +38,6 @@ class TestController extends Controller
 {
     use Loggable;
 
-    public function __construct()
-    {
-    }
-
     /**
      * Reset model
      *
@@ -98,6 +94,7 @@ public function show(Request $request, Response $response): BaseResponse
     {
         $model = $request->get('model');
 
-        return $response->json(pluginApp(DataBase::class)->query(PluginConfiguration::PLUGIN_NAME.'\\Models\\'.$model)->get());
+        return $response->json(pluginApp(DataBase::class)
+            ->query(PluginConfiguration::PLUGIN_NAME.'\\Models\\'.$model)->get());
     }
 }
diff --git a/src/Methods/BasePaymentMethod.php b/src/Methods/BasePaymentMethod.php
@@ -2,11 +2,11 @@
 
 namespace HeidelpayMGW\Methods;
 
-use Plenty\Plugin\Application;
+use HeidelpayMGW\Configuration\PluginConfiguration;
 use HeidelpayMGW\Services\BasketService;
+use Plenty\Modules\Payment\Method\Services\PaymentMethodBaseService;
+use Plenty\Plugin\Application;
 use Plenty\Plugin\Translation\Translator;
-use HeidelpayMGW\Configuration\PluginConfiguration;
-use Plenty\Modules\Payment\Method\Contracts\PaymentMethodService;
 
 /**
 * Base payment method class
@@ -31,7 +31,7 @@
 *
 * @package  heidelpayMGW/methods
 */
-class BasePaymentMethod extends PaymentMethodService
+class BasePaymentMethod extends PaymentMethodBaseService
 {
     const AVAILABLE_COUNTRIES = [];
 
@@ -84,9 +84,10 @@ public function isActive(): bool
     /**
      * Get the name of the payment method
      *
+     * @param string $lang
      * @return string  Payment method's name in checkout or PDF document
      */
-    public function getName(): string
+    public function getName(string $lang = ""): string
     {
         return $this->settings->displayName;
     }
@@ -96,32 +97,35 @@ public function getName(): string
      *
      * @return float
      */
-    public function getFee()
+    public function getFee(): float
     {
         return 0.00;
     }
 
     /**
      * Get the path of the icon
      *
+     * @param string $lang
      * @return string  Icon path to display in checkout
      */
-    public function getIcon(): string
+    public function getIcon(string $lang = ""): string
     {
         $app = pluginApp(Application::class);
 
-        return $this->settings->iconURL ?: $app->getUrlPath(PluginConfiguration::PLUGIN_NAME) . '/images/default_payment_icon.png';
+        return $this->settings->iconURL ?: $app->getUrlPath(PluginConfiguration::PLUGIN_NAME) .
+            '/images/default_payment_icon.png';
     }
 
     /**
      * Get the description of the payment method
      * Child class should implement it's own method
      *
+     * @param string $lang
      * @return string
      */
-    public function getDescription(): string
+    public function getDescription(string $lang = ""): string
     {
-        return'';
+        return '';
     }
 
     /**
@@ -138,4 +142,68 @@ private function isCountryRestricted(): bool
 
         return true;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSourceUrl(string $lang = ""): string
+    {
+        return '';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isSwitchableTo(): bool
+    {
+        return false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isSwitchableFrom(): bool
+    {
+        return false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isBackendSearchable(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isBackendActive(): bool
+    {
+        return false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBackendName(string $lang = ""): string
+    {
+        return '';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canHandleSubscriptions(): bool
+    {
+        return false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBackendIcon(): string
+    {
+        return '';
+    }
 }
diff --git a/src/Methods/CardsPaymentMethod.php b/src/Methods/CardsPaymentMethod.php
@@ -44,4 +44,13 @@ public function isActive(): bool
     {
         return parent::isActive();
     }
+
+    /**
+     * @param string $lang
+     * @return string
+     */
+    public function getBackendName(string $lang = ""): string
+    {
+        return 'Heidelpay MGW Cards';
+    }
 }
diff --git a/src/Methods/FlexiPayDirectPaymentMethod.php b/src/Methods/FlexiPayDirectPaymentMethod.php
@@ -48,4 +48,13 @@ public function isActive(): bool
     {
         return parent::isActive();
     }
+
+    /**
+     * @param string $lang
+     * @return string
+     */
+    public function getBackendName(string $lang = ""): string
+    {
+        return 'Heidelpay MGW FlexiPay Direct';
+    }
 }
diff --git a/src/Methods/IdealPaymentMethod.php b/src/Methods/IdealPaymentMethod.php
@@ -58,6 +58,15 @@ public function isActive(): bool
         return parent::isActive();
     }
 
+    /**
+     * @param string $lang
+     * @return string
+     */
+    public function getBackendName(string $lang = ""): string
+    {
+        return 'Heidelpay MGW iDEAL';
+    }
+
     /**
      * Check if country of the address is in available countries list
      *

diff --git a/src/Methods/InvoiceGuaranteedPaymentMethod.php b/src/Methods/InvoiceGuaranteedPaymentMethod.php
@@ -57,4 +57,13 @@ public function isActive(): bool
 
         return parent::isActive();
     }
+
+    /**
+     * @param string $lang
+     * @return string
+     */
+    public function getBackendName(string $lang = ""): string
+    {
+        return 'Heidelpay MGW Invoice Guaranteed';
+    }
 }
diff --git a/src/Methods/InvoiceGuaranteedPaymentMethodB2b.php b/src/Methods/InvoiceGuaranteedPaymentMethodB2b.php
@@ -54,4 +54,13 @@ public function isActive(): bool
 
         return parent::isActive();
     }
+
+    /**
+     * @param string $lang
+     * @return string
+     */
+    public function getBackendName(string $lang = ""): string
+    {
+        return 'Heidelpay MGW Invoice Guaranteed B2B';
+    }
 }
diff --git a/src/Methods/InvoicePaymentMethod.php b/src/Methods/InvoicePaymentMethod.php
@@ -57,4 +57,14 @@ public function isActive(): bool
 
         return parent::isActive();
     }
+
+
+    /**
+     * @param string $lang
+     * @return string
+     */
+    public function getBackendName(string $lang = ""): string
+    {
+        return 'Heidelpay MGW Invoice';
+    }
 }
diff --git a/src/Methods/PaypalPaymentMethod.php b/src/Methods/PaypalPaymentMethod.php
@@ -47,4 +47,13 @@ public function isActive(): bool
     {
         return parent::isActive();
     }
+
+    /**
+     * @param string $lang
+     * @return string
+     */
+    public function getBackendName(string $lang = ""): string
+    {
+        return 'Heidelpay MGW PayPal';
+    }
 }
diff --git a/src/Methods/SepaDirectDebitGuaranteedPaymentMethod.php b/src/Methods/SepaDirectDebitGuaranteedPaymentMethod.php
@@ -44,4 +44,13 @@ public function isActive(): bool
     {
         return parent::isActive();
     }
+
+    /**
+     * @param string $lang
+     * @return string
+     */
+    public function getBackendName(string $lang = ""): string
+    {
+        return 'Heidelpay MGW SEPA Direct Debit Guaranteed';
+    }
 }
diff --git a/src/Methods/SepaDirectDebitPaymentMethod.php b/src/Methods/SepaDirectDebitPaymentMethod.php
@@ -44,4 +44,13 @@ public function isActive(): bool
     {
         return parent::isActive();
     }
+
+    /**
+     * @param string $lang
+     * @return string
+     */
+    public function getBackendName(string $lang = ""): string
+    {
+        return 'Heidelpay MGW SEPA Direct Debit';
+    }
 }
diff --git a/src/Methods/SofortPaymentMethod.php b/src/Methods/SofortPaymentMethod.php
@@ -53,4 +53,13 @@ public function isActive(): bool
     {
         return parent::isActive();
     }
+
+    /**
+     * @param string $lang
+     * @return string
+     */
+    public function getBackendName(string $lang = ""): string
+    {
+        return 'Heidelpay MGW SOFORT';
+    }
 }
diff --git a/src/Migrations/CreateCardsSettingTable.php b/src/Migrations/CreateCardsSettingTable.php
@@ -2,6 +2,9 @@
 
 namespace HeidelpayMGW\Migrations;
 
+use HeidelpayMGW\Configuration\PluginConfiguration;
+use HeidelpayMGW\Helpers\Loggable;
+use HeidelpayMGW\Helpers\PaymentHelper;
 use HeidelpayMGW\Models\CardsSetting;
 use Plenty\Modules\Plugin\DataBase\Contracts\Migrate;
 
@@ -30,6 +33,18 @@
  */
 class CreateCardsSettingTable extends BasePluginMigration
 {
+    use Loggable;
+
+    /**
+     * @var PaymentHelper
+     */
+    private $paymentHelper;
+
+    public function __construct(PaymentHelper $paymentHelper)
+    {
+        $this->paymentHelper = $paymentHelper;
+    }
+
     /**
      * Create CardsSetting model's table
      *
@@ -40,5 +55,6 @@ class CreateCardsSettingTable extends BasePluginMigration
     public function run(Migrate $migrate)
     {
         $this->createTable($migrate, CardsSetting::class);
+        $this->paymentHelper->createMopIfNotExists(PluginConfiguration::PAYMENT_KEY_CARDS);
     }
 }
diff --git a/src/Migrations/CreateFlexiPayDirectSettingTable.php b/src/Migrations/CreateFlexiPayDirectSettingTable.php
@@ -2,6 +2,9 @@
 
 namespace HeidelpayMGW\Migrations;
 
+use HeidelpayMGW\Configuration\PluginConfiguration;
+use HeidelpayMGW\Helpers\Loggable;
+use HeidelpayMGW\Helpers\PaymentHelper;
 use HeidelpayMGW\Models\FlexiPayDirectSetting;
 use Plenty\Modules\Plugin\DataBase\Contracts\Migrate;
 
@@ -30,6 +33,18 @@
  */
 class CreateFlexiPayDirectSettingTable extends BasePluginMigration
 {
+    use Loggable;
+
+    /**
+     * @var PaymentHelper
+     */
+    private $paymentHelper;
+
+    public function __construct(PaymentHelper $paymentHelper)
+    {
+        $this->paymentHelper = $paymentHelper;
+    }
+
     /**
      * Create FlexiPayDirectSetting model's table
      *
@@ -40,5 +55,6 @@ class CreateFlexiPayDirectSettingTable extends BasePluginMigration
     public function run(Migrate $migrate)
     {
         $this->createTable($migrate, FlexiPayDirectSetting::class);
+        $this->paymentHelper->createMopIfNotExists(PluginConfiguration::PAYMENT_KEY_FLEXIPAY_DIRECT);
     }
 }