Merge branch 'gitlab-master'

paymentwall · Nov 14, 2019 · 44ef9c5 · 44ef9c5
2 parents e35ca6c + 4129be2
commit 44ef9c5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 Paymentwall module for WHMCS.
 
 ### Requirement
-* Tested on WHMCS v5.3.14, v6.0.1 , v7.1.1, 7.4.1, 7.4.2
+* Tested on WHMCS v5.3.14, v6.0.1 , v7.1.1, 7.4.1, 7.4.2, 7.7.1
 * PHP 5.6 or greater
 
 # Installation

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.2
+ * Version: v1.6.3
  * 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.2
+ * Version: v1.6.3
  * Author: The Paymentwall Team
  * Author URI: http://www.paymentwall.com/
  * License: The MIT License (MIT)

diff --git a/src/modules/gateways/paymentwall/helpers/helper.php b/src/modules/gateways/paymentwall/helpers/helper.php
@@ -46,6 +46,11 @@ function getHostIdFromInvoice($invoiceId) {
 function getRecurringBillingValuesFromInvoice($invoiceid) {
  global $CONFIG;
 
+ if( !function_exists("getBillingCycleMonths") ) 
+ {
+ include_once(ROOTDIR . "/includes/invoicefunctions.php");
+ }
+
  $firstcycleperiod = $firstcycleunits = "";
  $invoiceid = (int)$invoiceid;
  $result = select_query("tblinvoiceitems", "count(tblinvoiceitems.relid) as count_recurring", array("invoiceid" => $invoiceid, "type" => "Hosting", "billingcycle" => array("sqltype" => "NEQ", "value" => "One Time")), "tblinvoiceitems`.`id", "ASC", "", "tblhosting ON tblhosting.id=tblinvoiceitems.relid");
@@ -170,7 +175,7 @@ function getRecurringBillingValuesFromInvoice($invoiceid) {
  require ROOTDIR . "/includes/invoicefunctions.php";
  }
 
- $proratavals = getProrataValues($billingcycle, 0, $proratadate, $proratachargenextmonth, $orderday, $ordermonth, $orderyear);
+ $proratavals = getProrataValues($billingcycle, 0, $proratadate, $proratachargenextmonth, $orderday, $ordermonth, $orderyear, $userid);
  $firstcycleperiod = $proratavals['days'];
  $firstcycleunits = "Days";
  }