Fix base grand total (#52)

Api/TpayConfigInterface.php

@@ -70,4 +70,6 @@ public function getMaxOrderTotal(): int;
     public function getMagentoVersion(): string;
 
     public function buildMagentoInfo(): string;
+
+    public function isPlnPayment(): bool;
 }

Model/ApiFacade/CardTransaction/CardApiFacade.php

@@ -3,7 +3,6 @@
 namespace Tpay\Magento2\Model\ApiFacade\CardTransaction;
 
 use Exception;
-use Magento\Store\Model\StoreManagerInterface;
 use Tpay\Magento2\Api\TpayConfigInterface;
 use Tpay\Magento2\Api\TpayInterface;
 use Tpay\Magento2\Service\TpayService;
@@ -29,19 +28,15 @@ class CardApiFacade
     /** @var TpayService */
     private $tpayService;
 
-    /** @var StoreManagerInterface */
-    private $storeManager;
-
     /** @var bool */
     private $useOpenCard;
 
-    public function __construct(TpayInterface $tpay, TpayConfigInterface $tpayConfig, TpayTokensService $tokensService, TpayService $tpayService, StoreManagerInterface $storeManager)
+    public function __construct(TpayInterface $tpay, TpayConfigInterface $tpayConfig, TpayTokensService $tokensService, TpayService $tpayService)
     {
         $this->tpay = $tpay;
         $this->tpayConfig = $tpayConfig;
         $this->tokensService = $tokensService;
         $this->tpayService = $tpayService;
-        $this->storeManager = $storeManager;
     }
 
     public function makeCardTransaction(string $orderId, ?array $customerToken = null): string
@@ -95,7 +90,7 @@ private function createCardOriginApiInstance(TpayInterface $tpay, TpayConfigInte
 
     private function createOpenApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, TpayTokensService $tokensService, TpayService $tpayService)
     {
-        if ('PLN' !== $this->storeManager->getStore()->getCurrentCurrencyCode() || !$tpayConfig->isCardEnabled()) {
+        if (!$tpayConfig->isPlnPayment() || !$tpayConfig->isCardEnabled()) {
             $this->cardOpen = null;
             $this->useOpenCard = false;
 

Model/ApiFacade/TpayConfig/CardConfigFacade.php

@@ -4,7 +4,6 @@
 
 use Exception;
 use Magento\Framework\View\Asset\Repository;
-use Magento\Store\Model\StoreManagerInterface;
 use Tpay\Magento2\Api\TpayConfigInterface;
 use Tpay\Magento2\Api\TpayInterface;
 use Tpay\Magento2\Model\ApiFacade\CardTransaction\CardOrigin;
@@ -31,22 +30,18 @@ class CardConfigFacade
     /** @var TpayTokensService */
     private $tokensService;
 
-    /** @var StoreManagerInterface */
-    private $storeManager;
-
     /** @var TpayService */
     private $tpayService;
 
     /** @var bool */
     private $useOpenApi;
 
-    public function __construct(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService, StoreManagerInterface $storeManager, TpayService $tpayService)
+    public function __construct(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService, TpayService $tpayService)
     {
         $this->tpay = $tpay;
         $this->tpayConfig = $tpayConfig;
         $this->assetRepository = $assetRepository;
         $this->tokensService = $tokensService;
-        $this->storeManager = $storeManager;
         $this->tpayService = $tpayService;
     }
 
@@ -66,7 +61,7 @@ private function connectApi()
     {
         if (null == $this->openApi && null === $this->originApi) {
             $this->createOriginApiInstance($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService, $this->tpayService);
-            $this->createOpenApiInstance($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService, $this->storeManager);
+            $this->createOpenApiInstance($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService);
         }
     }
 
@@ -86,9 +81,9 @@ private function createOriginApiInstance(TpayInterface $tpay, TpayConfigInterfac
         }
     }
 
-    private function createOpenApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService, StoreManagerInterface $storeManager)
+    private function createOpenApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService)
     {
-        if ('PLN' !== $storeManager->getStore()->getCurrentCurrencyCode()) {
+        if (!$tpayConfig->isPlnPayment()) {
             $this->openApi = null;
             $this->useOpenApi = false;
 

Model/ApiFacade/TpayConfig/ConfigFacade.php

@@ -4,7 +4,6 @@
 
 use Exception;
 use Magento\Framework\View\Asset\Repository;
-use Magento\Store\Model\StoreManagerInterface;
 use Tpay\Magento2\Api\TpayConfigInterface;
 use Tpay\Magento2\Api\TpayInterface;
 use Tpay\Magento2\Model\ApiFacade\Transaction\TransactionOriginApi;
@@ -34,22 +33,18 @@ class ConfigFacade
     /** @var TpayTokensService */
     private $tokensService;
 
-    /** @var StoreManagerInterface */
-    private $storeManager;
-
     /** @var TpayService */
     private $tpayService;
 
     /** @var bool */
     private $useOpenApi;
 
-    public function __construct(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService, StoreManagerInterface $storeManager, TpayService $tpayService)
+    public function __construct(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService, TpayService $tpayService)
     {
         $this->tpay = $tpay;
         $this->tpayConfig = $tpayConfig;
         $this->assetRepository = $assetRepository;
         $this->tokensService = $tokensService;
-        $this->storeManager = $storeManager;
         $this->tpayService = $tpayService;
     }
 
@@ -69,8 +64,8 @@ private function connectApi()
     {
         if (null == $this->openApi && null === $this->originConfig) {
             $this->createOriginApiInstance($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService);
-            $this->createOpenApiInstance($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService, $this->storeManager);
-            $this->cardConfig = new CardConfigFacade($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService, $this->storeManager, $this->tpayService);
+            $this->createOpenApiInstance($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService);
+            $this->cardConfig = new CardConfigFacade($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService, $this->tpayService);
         }
     }
 
@@ -90,9 +85,9 @@ private function createOriginApiInstance(TpayInterface $tpay, TpayConfigInterfac
         }
     }
 
-    private function createOpenApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService, StoreManagerInterface $storeManager)
+    private function createOpenApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService)
     {
-        if ('PLN' !== $storeManager->getStore()->getCurrentCurrencyCode() || !$tpayConfig->isOpenApiEnabled()) {
+        if (!$tpayConfig->isPlnPayment() || !$tpayConfig->isOpenApiEnabled()) {
             $this->openApi = null;
             $this->useOpenApi = false;
 

Model/ConstraintValidator.php

@@ -47,11 +47,11 @@ public function isClientCountryValid(bool $isAllowed, string $clientCountry, arr
 
     private function validateMinimalTotal(float $minimal): bool
     {
-        return $this->checkoutSession->getQuote()->getGrandTotal() >= $minimal;
+        return $this->checkoutSession->getQuote()->getBaseGrandTotal() >= $minimal;
     }
 
     private function validateMaximalTotal(float $maximal): bool
     {
-        return $this->checkoutSession->getQuote()->getGrandTotal() <= $maximal;
+        return $this->checkoutSession->getQuote()->getBaseGrandTotal() <= $maximal;
     }
 }

Model/MethodListPlugin.php

@@ -8,7 +8,6 @@
 use Magento\Payment\Model\MethodInterface;
 use Magento\Payment\Model\MethodList;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Tpay\Magento2\Api\TpayConfigInterface;
 use Tpay\Magento2\Api\TpayInterface;
 use Tpay\Magento2\Model\ApiFacade\Transaction\TransactionApiFacade;
@@ -30,9 +29,6 @@ class MethodListPlugin
     /** @var OnsiteChannels */
     private $onsiteChannels;
 
-    /** @var StoreManagerInterface */
-    private $storeManager;
-
     /** @var TpayPayment */
     private $tpay;
 
@@ -52,7 +48,6 @@ public function __construct(
         Data $data,
         ScopeConfigInterface $scopeConfig,
         OnsiteChannels $onsiteChannels,
-        StoreManagerInterface $storeManager,
         TpayPayment $tpay,
         TpayConfigInterface $tpayConfig,
         Session $checkoutSession,
@@ -63,7 +58,6 @@ public function __construct(
         $this->data = $data;
         $this->scopeConfig = $scopeConfig;
         $this->onsiteChannels = $onsiteChannels;
-        $this->storeManager = $storeManager;
         $this->tpay = $tpay;
         $this->tpayConfig = $tpayConfig;
         $this->checkoutSession = $checkoutSession;
@@ -87,14 +81,14 @@ public function afterGetAvailableMethods(MethodList $compiled, $result)
             return [];
         }
 
-        if (!$this->tpay->isCartValid($this->checkoutSession->getQuote()->getGrandTotal())) {
+        if (!$this->tpay->isCartValid($this->checkoutSession->getQuote()->getBaseGrandTotal())) {
             return $result;
         }
 
         $result = $this->addCardMethod($result);
         $result = $this->filterResult($result);
 
-        if (!$this->transactions->isOpenApiUse() || !$this->isPlnPayment()) {
+        if (!$this->transactions->isOpenApiUse() || !$this->tpayConfig->isPlnPayment()) {
             return $result;
         }
 
@@ -139,18 +133,13 @@ private function filterResult(array $result): array
             return $this->filterTransaction($result);
         }
 
-        if ($this->isPlnPayment()) {
+        if ($this->tpayConfig->isPlnPayment()) {
             return $result;
         }
 
         return $this->filterTransaction($result);
     }
 
-    private function isPlnPayment(): bool
-    {
-        return 'PLN' === $this->storeManager->getStore()->getCurrentCurrencyCode();
-    }
-
     private function filterTransaction(array $result): array
     {
         return array_filter($result, function ($method) {

Model/TpayConfigProvider.php

@@ -7,7 +7,6 @@
 use Magento\Checkout\Model\ConfigProviderInterface;
 use Magento\Framework\View\Asset\Repository;
 use Magento\Payment\Helper\Data as PaymentHelper;
-use Magento\Store\Model\StoreManagerInterface;
 use Tpay\Magento2\Api\TpayConfigInterface;
 use Tpay\Magento2\Api\TpayInterface;
 use Tpay\Magento2\Model\ApiFacade\TpayConfig\ConfigFacade;
@@ -32,15 +31,14 @@ class TpayConfigProvider implements ConfigProviderInterface
     public function __construct(
         PaymentHelper $paymentHelper,
         Repository $assetRepository,
-        StoreManagerInterface $storeManager,
         TpayTokensService $tokensService,
         TransactionApiFacade $transactionApiFacade,
         TpayService $tpayService,
         TpayConfigInterface $tpayConfig
     ) {
         $this->paymentHelper = $paymentHelper;
         $this->transactionApi = $transactionApiFacade;
-        $this->configFacade = new ConfigFacade($this->getPaymentMethodInstance(), $tpayConfig, $assetRepository, $tokensService, $storeManager, $tpayService);
+        $this->configFacade = new ConfigFacade($this->getPaymentMethodInstance(), $tpayConfig, $assetRepository, $tokensService, $tpayService);
     }
 
     public function getConfig(): array

Model/TpayPayment.php

@@ -188,7 +188,7 @@ public function getTpayFormData(?string $orderId = null): array
     {
         $order = $this->getOrder($orderId);
         $billingAddress = $order->getBillingAddress();
-        $amount = number_format((float) $order->getGrandTotal(), 2, '.', '');
+        $amount = number_format((float) $order->getBaseGrandTotal(), 2, '.', '');
         $crc = base64_encode($orderId);
         $name = $billingAddress->getData('firstname').' '.$billingAddress->getData('lastname');
         $phone = $billingAddress->getData('telephone');
@@ -210,7 +210,7 @@ public function getTpayFormData(?string $orderId = null): array
             'phone' => $phone,
             'online' => $this->configurationProvider->onlyOnlineChannels() ? 1 : 0,
             'module' => 'Magento '.$this->configurationProvider->getMagentoVersion(),
-            'currency' => $this->getISOCurrencyCode($order->getOrderCurrencyCode()),
+            'currency' => $this->getISOCurrencyCode($order->getBaseCurrencyCode()),
             'language' => $language,
         ];
     }
@@ -288,7 +288,7 @@ public function getCheckoutTotal()
         if (!$amount) {
             $orderId = $this->getCheckout()->getLastRealOrderId();
             $order = $this->orderRepository->getByIncrementId($orderId);
-            $amount = $order->getGrandTotal();
+            $amount = $order->getBaseGrandTotal();
         }
 
         return $amount;

Provider/ConfigurationProvider.php

@@ -7,6 +7,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Tpay\Magento2\Api\TpayConfigInterface;
 
 class ConfigurationProvider implements TpayConfigInterface
@@ -21,10 +22,14 @@ class ConfigurationProvider implements TpayConfigInterface
     /** @var ProductMetadataInterface */
     protected $productMetadataInterface;
 
-    public function __construct(ScopeConfigInterface $scopeConfig, ProductMetadataInterface $productMetadataInterface)
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    public function __construct(ScopeConfigInterface $scopeConfig, ProductMetadataInterface $productMetadataInterface, StoreManagerInterface $storeManager)
     {
         $this->scopeConfig = $scopeConfig;
         $this->productMetadataInterface = $productMetadataInterface;
+        $this->storeManager = $storeManager;
     }
 
     public function isTpayActive(): bool
@@ -214,6 +219,15 @@ public function getConfigData($field, $storeId = null)
         return $this->scopeConfig->getValue(self::BASE_CONFIG_PATH.$field, ScopeInterface::SCOPE_STORE, $storeId);
     }
 
+    public function isPlnPayment(): bool
+    {
+        if ($this->getConfigData('sale_settings/bank_payments_view')) {
+            return 'PLN' == $this->storeManager->getStore()->getBaseCurrencyCode();
+        }
+
+        return 'PLN' == $this->storeManager->getStore()->getBaseCurrencyCode() && 'PLN' == $this->storeManager->getStore()->getCurrentCurrencyCode();
+    }
+
     private function getPackagesVersions(): array
     {
         $dir = __DIR__.'/../composer.json';

Service/TpayService.php

@@ -62,7 +62,7 @@ public function setOrderStatePendingPayment(string $orderId, bool $sendEmail): O
     {
         $order = $this->orderRepository->getByIncrementId($orderId);
         $order
-            ->setTotalDue($order->getGrandTotal())
+            ->setTotalDue($order->getBaseGrandTotal())
             ->setTotalPaid(0.00)
             ->setBaseTotalPaid(0.00)
             ->setBaseTotalDue($order->getBaseGrandTotal())
@@ -105,7 +105,7 @@ public function setOrderStatus(string $orderId, array $validParams, TpayConfigIn
         }
 
         $sendNewInvoiceMail = (bool) $tpayConfig->getInvoiceSendMail();
-        $orderAmount = (float) number_format((float) $order->getGrandTotal(), 2, '.', '');
+        $orderAmount = (float) number_format((float) $order->getBaseGrandTotal(), 2, '.', '');
         $trStatus = $validParams['tr_status'];
         $emailNotify = false;
 
@@ -114,7 +114,7 @@ public function setOrderStatus(string $orderId, array $validParams, TpayConfigIn
                 $emailNotify = true;
             }
             $status = Order::STATE_PROCESSING;
-            $this->registerCaptureNotificationTpay($order->getPayment(), $order->getGrandTotal(), $validParams);
+            $this->registerCaptureNotificationTpay($order->getPayment(), $order->getBaseGrandTotal(), $validParams);
         } elseif ('CHARGEBACK' === $trStatus) {
             $order->addCommentToStatusHistory($this->getTransactionDesc($validParams));
             $this->orderRepository->save($order);
@@ -161,7 +161,7 @@ public function setCardOrderStatus($orderId, array $validParams, TpayConfigInter
 
         $sendNewInvoiceMail = (bool) $tpayConfig->getInvoiceSendMail();
         $transactionDesc = $this->getCardTransactionDesc($validParams);
-        $orderAmount = (float) number_format((float) $order->getGrandTotal(), 2, '.', '');
+        $orderAmount = (float) number_format((float) $order->getBaseGrandTotal(), 2, '.', '');
         $emailNotify = false;
 
         $order = $this->updateTransactionId($order, $validParams);
@@ -174,7 +174,7 @@ public function setCardOrderStatus($orderId, array $validParams, TpayConfigInter
             if (Order::STATE_PROCESSING != $order->getState()) {
                 $emailNotify = true;
             }
-            $this->registerCardCaptureNotificationTpay($order->getPayment(), $order->getGrandTotal(), $validParams);
+            $this->registerCardCaptureNotificationTpay($order->getPayment(), $order->getBaseGrandTotal(), $validParams);
         }
 
         if ($emailNotify) {

etc/adminhtml/system.xml

@@ -173,6 +173,11 @@
                         <comment>Leave empty for no limit</comment>
                         <validate>validate-number</validate>
                     </field>
+                    <field id="bank_payments_view" translate="label" type="select" sortOrder="18" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <label>View bank payments</label>
+                        <comment>If you use other currencies visible on the website and pay in PLN, turn it on/off</comment>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    </field>
                 </group>
             </group>
         </section>

i18n/pl_PL.csv

@@ -29,6 +29,8 @@
 "Minimal amount","Minimalna kwota"
 "Maximal amount for method","Maksymalna kwota"
 "Leave empty for no limit","Puste pole bez ograniczeń"
+"View bank payments","Widok płatności bankowych"
+"If you use other currencies visible on the website and pay in PLN, turn it on/off","W przypadku korzystania z innych walut widocznych na stronie i płatności w PLN należy włączyć/wyłączyć"
 "Type in 6 digit code and press pay to commit blik payment.", "Wpisz 6 cyfrowy kod aby powiązać transakcję blik."
 "Choose a payment method","Wybierz jeden ze sposobów płatności"
 "I accept the regulations of Tpay.","Akceptuje regulamin Tpay."