Merge pull request #49 from PaystackHQ/revert-47-revert-46-master

Reverting commit that reverted the order confirmation email pr and removed the plugin tracker code

Author: lukman-paystack

Controller/Payment/Webhook.php

@@ -26,7 +26,6 @@
 use Magento\Sales\Model\Order;
 use Magento\Framework\App\CsrfAwareActionInterface;
 
-include_once realpath(dirname(__FILE__)) . '/class-paystack-plugin-tracker.php';
 class Webhook extends AbstractPaystackStandard implements CsrfAwareActionInterface
 
 {
@@ -76,9 +75,7 @@ public function execute() {
 
 
                     $reference = $transactionDetails->data->reference;
-                    //PSTK LOGGER HERE
-                    $pstk_logger = new magento_2_paystack_plugin_tracker('magento-2',$this->configProvider->getPublicKey());
-                    $pstk_logger.log_transaction_success($reference);
+                    
                     //------------------------
                     $order = $this->orderInterface->loadByIncrementId($reference);
 
@@ -104,13 +101,23 @@ public function execute() {
                             return $resultFactory;
                         }
                     }
+                }
                     break;
             }
+        }
         } catch (Exception $exc) {
             $finalMessage = $exc->getMessage();
         }
 
         $resultFactory->setContents($finalMessage);
         return $resultFactory;
     }
+
+     public function createCsrfValidationException(\Magento\Framework\App\RequestInterface $request): ?\Magento\Framework\App\Request\InvalidRequestException {
+        return null;
+    }
+
+    public function validateForCsrf(\Magento\Framework\App\RequestInterface $request): ?bool {
+        return true;
+    }
 }

Controller/Payment/class-paystack-plugin-tracker.php

@@ -8,21 +8,14 @@
 class ObserverAfterPaymentVerify implements ObserverInterface
 {
     /**
-     * @var \Magento\Sales\Model\OrderFactory $_orderFactory
+     * @var \Magento\Sales\Model\Order\Email\Sender\OrderSender
      */
-    protected $_orderFactory;
-    
-    /**
-     * @var \Magento\Checkout\Model\Session $_checkoutSession
-     */
-    protected $_checkoutSession;
+    protected $orderSender;
 
     public function __construct(
-        \Magento\Sales\Model\OrderFactory $orderFactory,
-        \Magento\Checkout\Model\Session $checkoutSession
+        \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender
     ) {
-        $this->_checkoutSession = $checkoutSession;
-        $this->_orderFactory = $orderFactory;
+        $this->orderSender = $orderSender;
     }
 
     public function execute(\Magento\Framework\Event\Observer $observer)
@@ -38,6 +31,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                     ->setCanSendNewEmailFlag(true)
                     ->setCustomerNoteNotify(true);
             $order->save();
+            
+            $this->orderSender->send($order, true);
         }
     }
 }

Observer/ObserverAfterPaymentVerify.php

@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="sales_order_place_before">
-      <observer name="ObserverBeforeSalesOrderPlace" instance="Pstk\Paystack\Observer\ObserverBeforeSalesOrderPlace"/>
+      <observer name="PskPaystack_ObserverBeforeSalesOrderPlace" instance="Pstk\Paystack\Observer\ObserverBeforeSalesOrderPlace"/>
    </event>
     <event name="paystack_payment_verify_after">
-        <observer name="ObserverAfterPaymentVerify" instance="Pstk\Paystack\Observer\ObserverAfterPaymentVerify" />
+        <observer name="PskPaystack_ObserverAfterPaymentVerify" instance="Pstk\Paystack\Observer\ObserverAfterPaymentVerify" />
     </event>
 </config>