Merge branch 'master' of github.com:PaystackHQ/plugin-magento-2 into master

Author: lukman-paystack

.env.sample

@@ -0,0 +1,18 @@
+MYSQL_HOST=mysql
+MYSQL_ROOT_PASSWORD=somemagento
+MYSQL_DATABASE=magento
+MYSQL_USER=magento
+MYSQL_PASSWORD=magento
+
+MAGENTO_URL=http://localhost:8000
+MAGENTO_BACKEND_FRONTNAME=****************
+MAGENTO_USE_SECURE=0
+MAGENTO_BASE_URL_SECURE=0
+MAGENTO_USE_SECURE_ADMIN=0
+MAGENTO_ADMIN_FIRSTNAME=Admin
+MAGENTO_ADMIN_LASTNAME=MyStore
+MAGENTO_ADMIN_EMAIL=****************
+MAGENTO_ADMIN_USERNAME=****************
+MAGENTO_ADMIN_PASSWORD=****************
+magento_username=****************
+magento_password=****************

.gitignore

@@ -11,4 +11,6 @@ composer.phar
 # Random files
 *~
 \#*
-/nbproject/
+/nbproject/
+
+.env

Controller/Payment/Webhook.php

@@ -24,11 +24,8 @@
 
 
 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
 
+class Webhook extends AbstractPaystackStandard
 {
 
     public function execute() {
@@ -76,9 +73,8 @@ 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);
+                    //PSTK_LOGGER HERE
+                    log_transaction_success($reference);
                     //------------------------
                     $order = $this->orderInterface->loadByIncrementId($reference);
 
@@ -104,13 +100,42 @@ public function execute() {
                             return $resultFactory;
                         }
                     }
+                }
                     break;
             }
+        }
         } catch (Exception $exc) {
             $finalMessage = $exc->getMessage();
         }
 
         $resultFactory->setContents($finalMessage);
         return $resultFactory;
     }
+
+    function log_transaction_success($trx_ref){
+        //send reference to logger along with plugin name and public key
+        $url = "https://plugin-tracker.paystackintegrations.com/log/charge_success";
+        $plugin_name = 'magento-2';
+        $public_key = $this->configProvider->getPublicKey();
+
+        $fields = [
+            'plugin_name'  => $plugin_name,
+            'transaction_reference' => $trx_ref,
+            'public_key' => $public_key
+        ];
+
+        $fields_string = http_build_query($fields);
+
+        $ch = curl_init();
+
+        curl_setopt($ch,CURLOPT_URL, $url);
+        curl_setopt($ch,CURLOPT_POST, true);
+        curl_setopt($ch,CURLOPT_POSTFIELDS, $fields_string);
+
+        curl_setopt($ch,CURLOPT_RETURNTRANSFER, true); 
+
+        //execute post
+        $result = curl_exec($ch);
+        //  echo $result;
+    }
 }

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

@@ -0,0 +1,28 @@
+FROM alexcheng/magento2
+
+WORKDIR /var/www/html/ 
+
+COPY ./setup_magento /usr/local/bin/setup_magento
+
+RUN chmod +x /usr/local/bin/setup_magento
+
+ARG magento_username
+
+ARG magento_password
+
+# setting up authentication credentials for magento
+COPY ./auth.json var/composer_home/auth.json
+
+RUN sed -i -e "s/user_placeholder/$magento_username/g" var/composer_home/auth.json && sed -i -e "s/pass_placeholder/$magento_password/g" var/composer_home/auth.json
+
+RUN chown -R www-data:www-data /var/www/html/var/composer_home
+
+# We change to the www-data user who is the magento file system owner. 
+# Visit https://devdocs.magento.com/guides/v2.3/install-gde/prereq/file-sys-perms-over.html for more information
+USER www-data
+     
+RUN /var/www/html/bin/magento sampledata:deploy
+
+USER root
+
+ENTRYPOINT [ "setup_magento" ]

Dockerfile

@@ -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

@@ -66,6 +66,19 @@ composer require yabacon/paystack-php
 [link-downloads]: https://packagist.org/packages/pstk/paystack-magento2-module
 
 
+## Running the magento2 on docker
+Contained within this repo, is a dockerfile and a docker-compose file to quickly spin up a magento2 and mysql container with the paystack plugin installed.
+
+### Prerequisites
+- Install [Docker](https://www.docker.com/)
+
+### Quick Steps
+- Create a `.env` file off the `.env.sample` in the root directory. Replace the `*******` with the right values
+- Run `docker-compose up` from the root directory to build and start the mysql and magento2 containers.
+- Visit `localhost:8000` on your browser to access the magento store. For the admin backend, visit `localhost:8000/<MAGENTO_BACKEND_FRONTNAME>` where `MAGENTO_BACKEND_FRONTNAME` is the value you specified in your `.env` file
+- Run `docker-compose down` from the root directory to stop the containers.
+
+
 ## Documentation
 
 * [Paystack Documentation](https://developers.paystack.co/v2.0/docs/)

README.md

@@ -0,0 +1,8 @@
+{
+    "http-basic": {
+      "repo.magento.com": {
+        "username": "user_placeholder",
+        "password": "pass_placeholder"
+      }
+    }
+}

auth.json

@@ -1,7 +1,7 @@
 {
     "name": "pstk/paystack-magento2-module",
     "description": "Paystack Magento2 Module using \\Magento\\Payment\\Model\\Method\\AbstractMethod",
-    "version": "2.3.5",
+    "version": "2.4.1",
     "require": {
         "yabacon/paystack-php": "2.*"
     },
@@ -24,4 +24,4 @@
             "Pstk\\Paystack\\": ""
         }
     }
-}
+}

composer.json

@@ -0,0 +1,26 @@
+version: '3.7'
+
+services:
+  mysql:
+    image: mysql:5
+    volumes:
+      - db_data:/var/lib/mysql
+    restart: always
+    env_file: .env
+  
+  magento2:
+    depends_on:
+      - mysql
+    build: 
+      context: .
+      args: 
+        - magento_username=$magento_username
+        - magento_password=$magento_password
+    image: paystack-magento2
+    ports:
+      - "8000:80"
+    links:
+      - mysql
+    env_file: .env
+volumes:
+  db_data: {}