add regulations in english (#53)

tpay-com · Jun 5, 2024 · dfabe43 · dfabe43
1 parent becca17
commit dfabe43
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 23 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.0.6
+2.0.7
diff --git a/Model/ApiFacade/CardTransaction/CardApiFacade.php b/Model/ApiFacade/CardTransaction/CardApiFacade.php
@@ -46,9 +46,7 @@ public function makeCardTransaction(string $orderId, ?array $customerToken = nul
 
     public function payTransaction(string $orderId, array $additionalPaymentInformation, ?string $transactionId = null, ?array $customerToken = null): string
     {
-        $this->connectApi();
-
-        return $this->useOpenCard ? $this->cardOpen->payTransaction($orderId, $additionalPaymentInformation, $transactionId, $customerToken) : 'error';
+        return $this->isOpenApiUse() ? $this->cardOpen->payTransaction($orderId, $additionalPaymentInformation, $transactionId, $customerToken) : 'error';
     }
 
     public function isOpenApiUse(): bool
@@ -68,29 +66,40 @@ private function getCurrent()
     private function connectApi()
     {
         if (null == $this->cardOpen && null === $this->cardOrigin) {
-            $this->createCardOriginApiInstance($this->tpay, $this->tpayConfig, $this->tokensService, $this->tpayService);
+            $originAuthorization = $this->createCardOriginApiInstance($this->tpay, $this->tpayConfig, $this->tokensService, $this->tpayService);
+
+            if (isset($originAuthorization['content']) && 'correct' == $originAuthorization['content']) {
+                $this->useOpenCard = false;
+
+                return;
+            }
+
             $this->createOpenApiInstance($this->tpay, $this->tpayConfig, $this->tokensService, $this->tpayService);
         }
     }
 
-    private function createCardOriginApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, TpayTokensService $tokensService, TpayService $tpayService)
+    private function createCardOriginApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, TpayTokensService $tokensService, TpayService $tpayService): array
     {
         if (!$tpayConfig->isCardEnabled()) {
             $this->cardOrigin = null;
 
-            return;
+            return [];
         }
 
         try {
             $this->cardOrigin = new CardOrigin($tpay, $tpayConfig, $tokensService, $tpayService);
+
+            return $this->cardOrigin->requests($this->cardOrigin->cardsApiURL.$this->tpayConfig->getCardApiKey(), ['api_password' => $this->tpayConfig->getCardApiPassword(), 'method' => 'check']);
         } catch (Exception $exception) {
             $this->cardOrigin = null;
+
+            return [];
         }
     }
 
     private function createOpenApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, TpayTokensService $tokensService, TpayService $tpayService)
     {
-        if (!$tpayConfig->isPlnPayment() || !$tpayConfig->isCardEnabled()) {
+        if (!$tpayConfig->isOpenApiEnabled() || !$tpayConfig->isPlnPayment() || !$tpayConfig->isCardEnabled()) {
             $this->cardOpen = null;
             $this->useOpenCard = false;
 

diff --git a/Model/ApiFacade/TpayConfig/CardConfigFacade.php b/Model/ApiFacade/TpayConfig/CardConfigFacade.php
@@ -60,30 +60,41 @@ private function getCurrentApi()
     private function connectApi()
     {
         if (null == $this->openApi && null === $this->originApi) {
-            $this->createOriginApiInstance($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService, $this->tpayService);
+            $originAuthorization = $this->createOriginApiInstance($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService, $this->tpayService);
+
+            if (isset($originAuthorization['content']) && 'correct' == $originAuthorization['content']) {
+                $this->useOpenApi = false;
+
+                return;
+            }
+
             $this->createOpenApiInstance($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService);
         }
     }
 
-    private function createOriginApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService, TpayService $tpayService)
+    private function createOriginApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService, TpayService $tpayService): array
     {
         if (!$tpayConfig->isCardEnabled()) {
             $this->originApi = null;
 
-            return;
+            return [];
         }
 
         try {
-            new CardOrigin($tpay, $tpayConfig, $tokensService, $tpayService);
+            $cardOrigin = new CardOrigin($tpay, $tpayConfig, $tokensService, $tpayService);
             $this->originApi = new ConfigOrigin($tpay, $tpayConfig, $assetRepository, $tokensService);
+
+            return $cardOrigin->requests($cardOrigin->cardsApiURL.$this->tpayConfig->getCardApiKey(), ['api_password' => $this->tpayConfig->getCardApiPassword(), 'method' => 'check']);
         } catch (Exception $exception) {
             $this->originApi = null;
+
+            return [];
         }
     }
 
     private function createOpenApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService)
     {
-        if (!$tpayConfig->isPlnPayment()) {
+        if (!$tpayConfig->isOpenApiEnabled() || !$tpayConfig->isPlnPayment()) {
             $this->openApi = null;
             $this->useOpenApi = false;
 

diff --git a/Model/ApiFacade/TpayConfig/ConfigOpen.php b/Model/ApiFacade/TpayConfig/ConfigOpen.php
@@ -78,7 +78,7 @@ public function createScript(string $script): string
 
     public function getTerms(): ?string
     {
-        return $this->tpay->getTermsURL();
+        return $this->tpayConfig->getTermsURL();
     }
 
     public function createCSS(string $css): string

diff --git a/Model/ApiFacade/TpayConfig/ConfigOrigin.php b/Model/ApiFacade/TpayConfig/ConfigOrigin.php
@@ -79,7 +79,7 @@ public function createScript(string $script): string
 
     public function getTerms(): ?string
     {
-        return $this->tpay->getTermsURL();
+        return $this->tpayConfig->getTermsURL();
     }
 
     public function createCSS(string $css): string

diff --git a/Model/TpayPayment.php b/Model/TpayPayment.php
@@ -43,7 +43,6 @@ class TpayPayment extends Adapter implements TpayInterface
     protected $_canRefund = true;
     protected $_canRefundInvoicePartial = true;
     protected $redirectURL = 'https://secure.tpay.com';
-    protected $termsURL = 'https://secure.tpay.com/regulamin.pdf';
 
     /** @var float */
     protected $minAmountBlik = 0.01;
@@ -179,11 +178,6 @@ public function checkBlikLevel0Settings(): bool
         return $this->configurationProvider->getBlikLevelZeroStatus() && $this->checkBlikAmount();
     }
 
-    public function getTermsURL(): string
-    {
-        return $this->termsURL;
-    }
-
     public function getTpayFormData(?string $orderId = null): array
     {
         $order = $this->getOrder($orderId);

diff --git a/Provider/ConfigurationProvider.php b/Provider/ConfigurationProvider.php
@@ -6,6 +6,7 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\Locale\Resolver;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Tpay\Magento2\Api\TpayConfigInterface;
@@ -15,6 +16,7 @@ class ConfigurationProvider implements TpayConfigInterface
     private const BASE_CONFIG_PATH = 'payment/tpaycom_magento2basic/';
 
     protected $termsURL = 'https://secure.tpay.com/regulamin.pdf';
+    protected $termsEnURL = 'https://tpay.com/user/assets/files_for_download/payment-terms-and-conditions.pdf';
 
     /** @var ScopeConfigInterface */
     protected $scopeConfig;
@@ -25,11 +27,15 @@ class ConfigurationProvider implements TpayConfigInterface
     /** @var StoreManagerInterface */
     private $storeManager;
 
-    public function __construct(ScopeConfigInterface $scopeConfig, ProductMetadataInterface $productMetadataInterface, StoreManagerInterface $storeManager)
+    /** @var Resolver */
+    private $localeResolver;
+
+    public function __construct(ScopeConfigInterface $scopeConfig, ProductMetadataInterface $productMetadataInterface, StoreManagerInterface $storeManager, Resolver $localeResolver)
     {
         $this->scopeConfig = $scopeConfig;
         $this->productMetadataInterface = $productMetadataInterface;
         $this->storeManager = $storeManager;
+        $this->localeResolver = $localeResolver;
     }
 
     public function isTpayActive(): bool
@@ -74,7 +80,11 @@ public function getInvoiceSendMail(): string
 
     public function getTermsURL(): string
     {
-        return $this->termsURL;
+        if ('pl' == substr($this->localeResolver->getLocale(), 0, 2)) {
+            return $this->termsURL;
+        }
+
+        return $this->termsEnURL;
     }
 
     public function getOpenApiPassword(): ?string