Unable to enroll users after successful payments

README.md

@@ -1,10 +1,36 @@
-# Paystack Enrolment Plugin #
+<p align="center"><a href="https://paystack.com/"><img src="./pix/banner.png?raw=true" alt="Payment Forms for Paystack"></a></p>
+
+
+# Paystack Enrolment Plugin
 
 Enrolment in Moodle using the Paystack gateway for paid courses
 
-This plugin helps admins and webmasters use Paystack as the payment gateway. This plugin has all the settings for development as well as for production usage. Its easy to install, set up and effective.
+This plugin helps admins and webmasters use Paystack as the payment gateway. This plugin has all the settings for development as well as for production usage. Its easy to install, set up and effective. 
+
+## Installation
+
+Login to your moodle site as an “admin user” and follow the steps.
+
+1) Upload the zip package from Site administration > Plugins > Install plugins. Choose Plugin type 'Enrolment method (enrol)'. Upload the ZIP package, check the acknowledgement and install.
+
+2) Go to Enrolments > Manage enrol plugins > Enable 'Paystack' from list
+
+3) Click 'Settings' which will lead to the settings page of the plugin
+
+4) Provide merchant credentials for Paystack. Note that, you will get all the details from your merchant account. Now select the checkbox as per requirement. 
+Choose the paystack connection mode, for test mode it uses the test api keys and for live mode uses the live api keys. Save the settings.
+
+5) Select any course from course listing page.
+
+6) Go to Course administration > Users > Enrolment methods > Add method 'Paystack' from the dropdown. Set 'Custom instance name', 'Enrol cost' etc and add the method.
+
+This completes all the steps from the administrator end. Now registered users can login to the Moodle site and view the course after a successful payment.
+
+
+
+## Contribution
 
-TODO Provide more detailed description here.
+Here you can browse the source, look at open issues and keep track of development. 
 
 ## License ##
 

classes/Paystack.php → classes/paystack.php

@@ -22,21 +22,21 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-class paystack {
+class paystack
+{
     public $plugin_name;
     public $public_key;
     public $secret_key;
 
-    public function __construct($plugin, $pk, $sk){
-        //configure plugin name
-        //configure public key
+    public function __construct($plugin, $pk, $sk)
+    {
         $this->base_url = "https://api.paystack.co/";
         $this->plugin_name = $plugin;
         $this->public_key = $pk;
         $this->secret_key = $sk;
     }
 
-     /**
+    /**
      * Verify Payment Transaction
      *
      * @param string $reference
@@ -61,10 +61,13 @@ public function initialize_transaction($data)
         ]);
 
         $request = curl_exec($curl);
+
         $res = json_decode($request, true);
 
+        curl_close($curl);
+
         if (curl_errno($curl)) {
-            throw new moodle_exception(
+            throw new \moodle_exception(
                 'errpaystackconnect',
                 'enrol_paystack',
                 '',
@@ -73,12 +76,10 @@ public function initialize_transaction($data)
             );
         }
 
-        curl_close($curl);
-
         return $res;
     }
-    
-     /**
+
+    /**
      * Verify Payment Transaction
      *
      * @param string $reference
@@ -89,6 +90,7 @@ public function verify_transaction($reference)
         $paystackUrl = $this->base_url . "transaction/verify/" . $reference;
 
         $curl = curl_init();
+
         curl_setopt_array($curl, [
             CURLOPT_URL => $paystackUrl,
             CURLOPT_RETURNTRANSFER => true,
@@ -101,11 +103,13 @@ public function verify_transaction($reference)
         ]);
 
         $request = curl_exec($curl);
-        $res = json_decode($request, true);
         // $code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $res = json_decode($request, true);
+
+        curl_close($curl);
 
         if (curl_errno($curl)) {
-            throw new moodle_exception(
+            throw new \moodle_exception(
                 'errpaystackconnect',
                 'enrol_paystack',
                 '',
@@ -114,8 +118,6 @@ public function verify_transaction($reference)
             );
         }
 
-        curl_close($curl);
-
         return $res;
     }
 
@@ -129,19 +131,31 @@ public function log_transaction_success($reference)
     {
         //send reference to logger along with plugin name and public key
         $url = "https://plugin-tracker.paystackintegrations.com/log/charge_success";
+
         $params = [
+            'public_key' => $this->public_key,
             'plugin_name'  => $this->plugin_name,
             'transaction_reference' => $reference,
-            'public_key' => $this->public_key
         ];
-        $params_string = http_build_query($params);
-        $ch = curl_init();
-        curl_setopt($ch,CURLOPT_URL, $url);
-        curl_setopt($ch,CURLOPT_POST, true);
-        curl_setopt($ch,CURLOPT_POSTFIELDS, $params_string);
-        curl_setopt($ch,CURLOPT_RETURNTRANSFER, true); 
-        //execute post
-        curl_exec($ch);
+
+        $curl = curl_init();
+
+        curl_setopt_array($curl, [
+            CURLOPT_URL => $url,
+            CURLOPT_POST => true,
+            CURLOPT_POSTFIELDS => http_build_query($params),
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_HTTPHEADER => [
+                "content-type: application/json",
+                "cache-control: no-cache"
+            ],
+        ]);
+
+        // execute post
+        curl_exec($curl);
+
+        // close conection
+        curl_close($curl);
     }
 
     /**
@@ -152,6 +166,6 @@ public function log_transaction_success($reference)
      */
     public function validate_webhook($input)
     {
-       return $_SERVER['HTTP_X_PAYSTACK_SIGNATURE'] !== hash_hmac('sha512', $input, $this->secret_key);
+        return $_SERVER['HTTP_X_PAYSTACK_SIGNATURE'] !== hash_hmac('sha512', $input, $this->secret_key);
     }
 }

classes/util.php

@@ -0,0 +1,89 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * PayPal enrolment plugin utility class.
+ *
+ * @package    enrol_paystack
+ * @copyright  2019 Paystack
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace enrol_paystack;
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Paystack enrolment plugin utility class.
+ *
+ * @package   enrol_paystack
+ * @copyright 2019 Paystack
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+final class util {
+
+    /**
+     * Send payment error message to the admin.
+     *
+     * @param string $subject
+     * @param stdClass $data
+     */
+    public static function message_paystack_error_to_admin($subject, $data)
+    {
+        $admin = get_admin();
+        $site = get_site();
+        $message = "$site->fullname:  Transaction failed.\n\n$subject\n\n";
+        foreach ($data as $key => $value) {
+            $message .= s($key) . " => " . s($value) . "\n";
+        }
+        $eventdata = new \core\message\message();
+        $eventdata->modulename        = 'moodle';
+        $eventdata->component         = 'enrol_paystack';
+        $eventdata->name              = 'paystack_enrolment';
+        $eventdata->userfrom          = $admin;
+        $eventdata->userto            = $admin;
+        $eventdata->subject           = "PAYSTACK PAYMENT ERROR: " . $subject;
+        $eventdata->fullmessage       = $message;
+        $eventdata->fullmessageformat = FORMAT_PLAIN;
+        $eventdata->fullmessagehtml   = '';
+        $eventdata->smallmessage      = '';
+        message_send($eventdata);
+    }
+
+    /**
+     * Silent exception handler.
+     *
+     * @return callable exception handler
+     */
+    public static function get_exception_handler() {
+        return function($ex) {
+            $info = get_exception_info($ex);
+
+            $logerrmsg = "enrol_paystack exception handler: ".$info->message;
+            if (debugging('', DEBUG_NORMAL)) {
+                $logerrmsg .= ' Debug: '.$info->debuginfo."\n".format_backtrace($info->backtrace, true);
+            }
+            error_log($logerrmsg);
+
+            if (http_response_code() == 200) {
+                http_response_code(500);
+            }
+
+            exit(0);
+        };
+    }
+
+}

edit.php

@@ -86,8 +86,16 @@
         }
 
     } else {
-        $fields = array('status' => $data->status, 'name' => $data->name, 'cost' => unformat_float($data->cost),
-                        'currency' => $data->currency, 'roleid' => $data->roleid, 'enrolperiod' => $data->enrolperiod, 'customint3' => $data->customint3, 'enrolstartdate' => $data->enrolstartdate, 'enrolenddate' => $data->enrolenddate);
+        $fields = array('status' => $data->status, 
+                        'name' => $data->name, 
+                        'cost' => unformat_float($data->cost),
+                        'currency' => $data->currency, 
+                        'roleid' => $data->roleid, 
+                        'enrolperiod' => $data->enrolperiod, 
+                        'customint3' => $data->customint3, 
+                        'enrolstartdate' => $data->enrolstartdate, 
+                        'enrolenddate' => $data->enrolenddate
+                    );
         $plugin->add_instance($course, $fields);
     }
 

enrol.html

@@ -24,17 +24,28 @@ <h3><?php echo $instancename; ?></h3>
                 "last_name" => s($userlastname),
                 "email" => s($useremail),
                 "reference" => $reference,
+                "custom_fields" => $customfields
             ];
         ?>
         <form method="post" action="<?php echo "$CFG->wwwroot/enrol/paystack/verify.php"?>">
-            <input type="hidden" name="cmd" value="_xclick" />
+            <?php
+                foreach ($data as $key => $value) {
+                    echo '<input type="hidden" name="' . $key . '" value="' . $value . '" />';
+                }
+            ?>
             <input type="hidden" name="charset" value="utf-8" />
             <input type="hidden" name="custom" value="<?php echo "{$USER->id}-{$course->id}-{$instance->id}" ?>" />
 
-            <script src="https://js.paystack.co/v1/inline.js" data-key="<?php echo $publickey; ?>"
-                data-ref="<?php echo $reference; ?>" data-email="<?php p($useremail) ?>"
-                data-currency="<?php p($instance->currency) ?>" data-amount="<?php p($cost * 100) ?>"
-                data-metadata='<?php echo json_encode($data) ?>' data-locale="<?php echo current_language(); ?>">
+            <script src="https://js.paystack.co/v1/inline.js" 
+                data-key="<?php echo $publickey; ?>"
+                data-ref="<?php echo $reference; ?>" 
+                data-firstname="<?php echo s($userfirstname) ?>"
+                data-lastname="<?php echo s($userlastname) ?>"
+                data-email="<?php p($useremail) ?>"
+                data-currency="<?php p($instance->currency) ?>" 
+                data-amount="<?php p($cost * 100) ?>"
+                data-metadata='<?php echo json_encode($data) ?>' 
+                data-locale="<?php echo current_language(); ?>">
             </script>
         </form>
 

lang/en/enrol_paystack.php

@@ -35,6 +35,8 @@
 $string['costerror'] = 'The enrolment cost is not numeric';
 $string['costorkey'] = 'Please choose one of the following methods of enrolment.';
 $string['currency'] = 'Currency';
+$string['customfields'] = 'Profile fields to be used as custom fields';
+$string['customfields_desc'] = 'Which user profile fields can be used during enrolment';
 $string['customwelcomemessage'] = 'Custom welcome message';
 $string['customwelcomemessage_help'] = 'If you enter some text here, it will be shown instead of the standard text "This course requires a payment for entry." on the Enrolment options page that students see when they attempt to access a course they are not enrolled in. If you leave this blank, the standard text will be used.';
 $string['defaultrole'] = 'Default role assignment';

lib.php

@@ -399,6 +399,7 @@ public function enrol_page_hook(stdClass $instance)
                 $userlastname    = $USER->lastname;
                 $useremail       = $USER->email;
                 $instancename    = $this->get_instance_name($instance);
+                $customfields    = $this->get_custom_fields();
 
                 $publickey = $this->get_publickey();
                 $reference = $this->getHashedToken();
@@ -409,14 +410,44 @@ public function enrol_page_hook(stdClass $instance)
         return $OUTPUT->box(ob_get_clean());
     }
 
+    /**
+     * Get all custom fields available for plugin.
+     *
+     * @return $customfields.
+     */
+    public function get_custom_fields()
+    {
+        global $USER, $DB;
+
+        $customfieldrecords = $DB->get_records('user_info_field');
+        $configured_customfields = explode(',', get_config('enrol_paystack', 'customfields'));
+
+        $customfields = [];
+
+        foreach ($customfieldrecords as $cus) {
+            foreach($configured_customfields as $con) {
+                if($con == $cus->shortname){
+                    $customfields[] = [
+                        'display_name' => $cus->name ,
+                        'variable_name' => $cus->shortname,
+                        'value' => $USER->profile[$con]
+                    ];
+                }
+            }
+        }
+
+        return $customfields;
+    }
+
     /**
      * Lists all currencies available for plugin.
      *
      * @return $currencies.
      */
     public function get_currencies()
     {
-        $codes = array('NGN', 'USD', 'GHS');
+        $codes = array('NGN', 'USD', 'GHS', 'KES', 'XOF', 'ZAR','EGP');
+
         $currencies = array();
         foreach ($codes as $c) {
             $currencies[$c] = new lang_string($c, 'core_currencies');