Merge branch 'pw-master'

paymentwall · Mar 21, 2019 · e35ca6c · e35ca6c
2 parents fe61ec6 + 6cd7897
commit e35ca6c
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 4 deletions.
diff --git a/src/includes/api/paymentwall_api b/src/includes/api/paymentwall_api
diff --git a/src/includes/hooks/paymentwall.php b/src/includes/hooks/paymentwall.php
@@ -86,6 +86,15 @@ function cancelSubscription($vars)
         if (!$gateway["type"]) {
             die($gateway['name'] . " is not activated");
         }
+
+        if ($invoiceData['paymentmethod'] == 'paymentwall') {
+            return cancellPWInvoice($gateway, $invoiceId, 2);
+        }
+
+        if ($invoiceData['paymentmethod'] != 'brick') {
+            return;
+        }
+
         init_brick_config($gateway);
 
         $result = select_query("tblaccounts", "transid", array("invoiceid" => $invoiceId));
@@ -107,8 +116,14 @@ function refundInvoice($vars) {
         if (empty($gateway["type"])) {
             die($gateway['name'] . " is not activated");
         }
-        if ($gateway['paymentmethod'] != 'brick')
+
+        if ($invoiceData['paymentmethod'] == 'paymentwall') {
+            return cancellPWInvoice($gateway, $invoiceId);
+        }
+
+        if ($invoiceData['paymentmethod'] != 'brick') {
             return;
+        }
 
         init_brick_config($gateway);
 
@@ -168,6 +183,45 @@ function refundInvoice($vars) {
     });
 }
 
+function cancellPWInvoice($gateway, $invoiceId, $type = 1) {
+    $result = select_query("tblaccounts", "transid", array("invoiceid" => $invoiceId));
+    $data = mysql_fetch_assoc($result);
+
+    require_once(ROOTDIR . '/includes/api/paymentwall_api/lib/paymentwall.php');
+    require_once(ROOTDIR . '/modules/gateways/paymentwall/helpers/helper.php');
+    Paymentwall_Config::getInstance()->set(array(
+        'api_base_url' => 'https://api.paymentwall.com/developers/api',
+        'public_key' => $gateway['appKey'], // available in your Paymentwall merchant area
+        'private_key' => $gateway['secretKey'] // available in your Paymentwall merchant area,
+
+    ));
+    $params = array(
+        'key' => $gateway['appKey'],
+        'ref' => $data['transid'],
+        'type' => $type,
+        'message' => 'Please cancel asap',
+        'test_mode' => $gateway['isTest'] == 'on' ? 1 : 0 // pass 1 to perform tests without an actual transaction
+    );
+    $params['sign'] = generateCancellationSignature($params, $gateway['secretKey']);
+
+    $api = new Paymentwall_GenerericApiObject('ticket');
+    return $api->post($params);
+}
+
+function generateCancellationSignature($params, $secret) {
+    // work with sorted data
+    ksort($params);
+
+    // generate the base string
+    $baseString = '';
+    foreach($params as $key => $value) {
+        $baseString .= $key . '=' . $value;
+    }
+    $baseString .= $secret;
+
+    return strtolower(md5($baseString));
+}
+
 
 add_hook("AfterModuleCreate", 1, "afterSetupProductEventListener");
 

diff --git a/src/modules/gateways/brick.php b/src/modules/gateways/brick.php
@@ -4,7 +4,7 @@
  * Plugin Name: Paymentwall for WHMCS
  * Plugin URI: https://docs.paymentwall.com/modules/whmcs
  * Description: Official Paymentwall module for Prestashop.
- * Version: v1.6.1
+ * Version: v1.6.2
  * Author: The Paymentwall Team
  * Author URI: http://www.paymentwall.com/
  * License: The MIT License (MIT)

diff --git a/src/modules/gateways/paymentwall.php b/src/modules/gateways/paymentwall.php
@@ -4,7 +4,7 @@
  * Plugin Name: Paymentwall for WHMCS
  * Plugin URI: https://docs.paymentwall.com/modules/whmcs
  * Description: Official Paymentwall module for Prestashop.
- * Version: v1.6.1
+ * Version: v1.6.2
  * Author: The Paymentwall Team
  * Author URI: http://www.paymentwall.com/
  * License: The MIT License (MIT)
+200 −31		README.md
+8 −2		composer.json
+1 −1		features/charge.feature
+3 −3		features/pingback.feature
+57 −4		lib/Paymentwall/ApiObject.php
+3 −0		lib/Paymentwall/Config.php
+8 −8		lib/Paymentwall/HttpAction.php
+107 −0		lib/Paymentwall/Mobiamo.php
+31 −3		lib/Paymentwall/Pingback.php
+3 −0		lib/Paymentwall/Widget.php
+3 −1		lib/paymentwall.php