Merge pull request #3 from nofrixion/PLU16-production-mode-fix

Plu16 production mode fix

Author: james-nofrixion

.gitignore

@@ -1 +1,2 @@
 vendor/
+.vscode/

Controller/Webhook/In.php

@@ -38,14 +38,19 @@ public function execute()
         $resultJson = $this->resultJsonFactory->create();
 
         if ($paymentRequestId) {
+
+            $this->logger->info('Nofrixion_Payments: success callback for payment request ' . $paymentRequestId);
+
             $paymentRequest = $this->nofrixionHelper->getPaymentRequest($paymentRequestId, $storeId);
             $order = $this->nofrixionHelper->processPayment($paymentRequest);
 
             // Send order confirmation email on success.
+            $this->logger->info('Nofrixion_Payments: Sending order email for order #: ' . $order->getIncrementId());
             $this->orderSender->send($order, true);
 
             return $resultJson->setData(['order_id' => (int)$order->getId(), 'order_increment_id' => $order->getIncrementId(), 'order_state' => $order->getState(), 'order_status' => $order->getStatus()]);
         } else {
+            $this->logger->error('Nofrixion_Payments: received success callback with missing payment request Id.');
             $resultJson->setStatusHeader(400);
             return $resultJson->setData(['error_msg' => 'Missing querystring parameter "id"']);
         }

Helper/Data.php

@@ -69,7 +69,12 @@ public function getPaymentRequestClient(?int $storeId = null): PaymentRequest
 
     public function isProductionMode(?int $storeId = null): bool
     {
-        return $this->scopeConfig->isSetFlag('payment/nofrixion/is_production', ScopeInterface::SCOPE_STORE, $storeId);
+        $paymentMode = $this->scopeConfig->getValue('payment/nofrixion/mode', ScopeInterface::SCOPE_STORE, $storeId);
+        if ($paymentMode === '1') {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     public function getApiBaseUrl(): string
@@ -84,7 +89,7 @@ public function getApiBaseUrl(): string
 
     public function createPaymentRequest(Order $order): array
     {
-        $storeId = (int)$order->getStoreId();
+        $storeId = (int) $order->getStoreId();
         $amount = $order->getTotalDue();
         $customerEmail = $order->getCustomerEmail();
         $currency = $order->getOrderCurrencyCode();
@@ -93,9 +98,9 @@ public function createPaymentRequest(Order $order): array
         $originUrl = $this->url->getBaseUrl(['_store' => $storeId]);
         $nofrixionOrderId = $this->encodeOrderId($order);
         $callbackUrl = $this->url->getUrl('nofrixion/redirect/returnAfterPayment', ['_store' => $storeId, '_secure' => true, 'nofrixion_order_id' => $nofrixionOrderId]);
-        $amount = PreciseNumber::parseString((string)$amount);
+        $amount = PreciseNumber::parseString((string) $amount);
         if ($order->getCustomerId()) {
-            $customerId = (string)$order->getCustomerId();
+            $customerId = (string) $order->getCustomerId();
         } else {
             $customerId = null;
         }
@@ -157,7 +162,7 @@ public function processPayment(array $paymentRequest): OrderInterface
 
         if ($isPaid && $newStatus && $order->getTotalDue() > 0) {
 
-            if($newStatus !== $order->getStatus()) {
+            if ($newStatus !== $order->getStatus()) {
                 if ($createInvoice) {
                     $msg = 'Customer paid ' . $paymentRequest['amount'] . ' ' . $paymentRequest['currency'] . ' using the NoFrixion payment request with ID ' . $paymentRequest['id'];
                 } else {
@@ -216,11 +221,11 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
             $paymentRequestId = $invoice->getTransactionId();
 
             $order = $payment->getOrder();
-            $storeId = (int)$order->getStoreId();
+            $storeId = (int) $order->getStoreId();
 
             $client = $this->getPaymentRequestClient($storeId);
             // Magento stores decimals with 4 places, so we do the same
-            if ($amount === null || round((float)$amount, 4) === round((float)$creditmemo->getGrandTotal(), 4)) {
+            if ($amount === null || round((float) $amount, 4) === round((float) $creditmemo->getGrandTotal(), 4)) {
                 $client->voidAllPaymentsForPaymentRequest($paymentRequestId);
             } else {
                 throw new \RuntimeException('Cannot void the payment request with ID ' . $paymentRequestId . ' because only full refunds are supported and not partial ones.');
@@ -261,4 +266,4 @@ private function fixOrderState(OrderInterface $order): void
     }
 
 
-}
+}

README.md

@@ -14,7 +14,7 @@ It is recommended to use the `composer` PHP package manager for production magen
 
 ### Installation ###
 
-- Install the NoFrixion payments module using composer by running the following commands:
+Install the NoFrixion payments module using composer by running the following commands:
 
 ```bash
 composer require nofrixion/magento2-payments-module

etc/module.xml

@@ -1,4 +1,12 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="Nofrixion_Payments" setup_version="1.0.3"/>
+	<module name="Nofrixion_Payments" setup_version="1.0.3">
+        <sequence>
+            <module name="Magento_Sales"/>
+            <module name="Magento_Payment"/>
+            <module name="Magento_Checkout"/>
+            <module name="Magento_Directory" />
+            <module name="Magento_Config" />
+        </sequence>
+    </module>
 </config>

view/frontend/web/template/payment/nofrixion.html

@@ -8,7 +8,7 @@
         <!-- BEGIN Nofrixion tooltip -->
         <span id="spacer"></span>
         <span class="nofrixion-tooltip">
-            <a href="#" class="tooltip-toggle" data-bind="text: 'What is ' + getTitle() + '?'"></a>
+            <a href="javascript:void(0)" class="tooltip-toggle" data-bind="text: 'What is ' + getTitle() + '?'"></a>
             <span class="tooltip-content">
                 <span style="display: inline-block; vertical-align: top; padding: 1em">
                     <p>Pay by bank allows you to make a payment directly from your bank account without using a credit