Merge pull request #64 from PaystackHQ/fix/ee-admin-order-create-crash

Fix/ee admin order create crash

Author: jules-paystack

Observer/ObserverBeforeSalesOrderPlace.php

@@ -15,11 +15,12 @@ public function __construct() {
 
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        //Observer execution code...
         /** @var \Magento\Sales\Model\Order $order **/
         $order = $observer->getEvent()->getOrder();
-        
-        if ($order) {
+
+        if ($order && $order->getPayment()
+            && $order->getPayment()->getMethod() === \Pstk\Paystack\Model\Payment\Paystack::CODE
+        ) {
             $order->setCanSendNewEmailFlag(false)
                     ->setCustomerNoteNotify(false);
         }

README.md

@@ -6,7 +6,7 @@
 
 Paystack payment gateway Magento2 extension
 
-**Version:** 3.0.2 (Paystack v2 Inline.js API)
+**Version:** 3.0.3 (Paystack v2 Inline.js API)
 
 ## Requirements
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "pstk/paystack-magento2-module",
     "description": "Paystack Magento2 Module using \\Magento\\Payment\\Model\\Method\\AbstractMethod",
-    "version": "3.0.2",
+    "version": "3.0.3",
     "require": {},
     "type": "magento2-module",
     "license": [

dev/entrypoint.sh

@@ -26,6 +26,7 @@ if [ ! -f /var/www/html/app/etc/env.php ]; then
         --backend-frontname=admin \
         --language=en_US \
         --currency=NGN \
+        --allowed-currencies=NGN \
         --timezone=Africa/Lagos \
         --use-rewrites=1 \
         --cleanup-database

dev/setup.sh

@@ -70,6 +70,7 @@ mage config:set payment/pstk_paystack/integration_type inline
 
 echo ""
 echo "==> Setting store currency to NGN..."
+mage config:set currency/options/allow NGN,USD,ZAR
 mage config:set currency/options/base NGN
 mage config:set currency/options/default NGN
 mage config:set currency/options/allow NGN

etc/di.xml

@@ -4,13 +4,5 @@
     <!-- API -->
     <preference for="Pstk\Paystack\Api\PaymentManagementInterface" type="Pstk\Paystack\Model\PaymentManagement"/>
 
-    <!-- CSP: register Paystack domains via PHP collector (backward-compatible across Magento versions) -->
-    <type name="Magento\Csp\Model\CompositePolicyCollector">
-        <arguments>
-            <argument name="collectors" xsi:type="array">
-                <item name="pstk-paystack-csp" xsi:type="object" sortOrder="10">Pstk\Paystack\Model\CspPolicyCollector</item>
-            </argument>
-        </arguments>
-    </type>
 
 </config>

etc/frontend/di.xml

@@ -10,4 +10,13 @@
     <type name="Magento\Framework\App\Request\CsrfValidator">
         <plugin name="csrf_validator_skip" type="Pstk\Paystack\Plugin\CsrfValidatorSkip" />
     </type>
+
+    <!-- CSP: register Paystack domains via PHP collector (frontend only - Paystack is not used in admin) -->
+    <type name="Magento\Csp\Model\CompositePolicyCollector">
+        <arguments>
+            <argument name="collectors" xsi:type="array">
+                <item name="pstk-paystack-csp" xsi:type="object">Pstk\Paystack\Model\CspPolicyCollector</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

etc/events.xml etc/frontend/events.xmletc/events.xml renamed to etc/frontend/events.xml

@@ -1,6 +1,6 @@
 <?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="Pstk_Paystack" setup_version="3.0.2">
+    <module name="Pstk_Paystack" setup_version="3.0.3">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>