Merge pull request #46 from SynergyWholesale/bugfix/contact-updates

Fixed #45: Admin and billing contacts may now be updated

Author: Cameron Hall

CHANGELOG.md

@@ -15,6 +15,14 @@ Synergy Wholesale WHMCS Domains Module
 ### Removed
 -
 
+## 2.1.11 [Updated 29/10/2020]
+### Fixed
+- Fixed admin and billing contacts not being updatable. Fixes [#45](https://github.com/SynergyWholesale/WHMCS-Domains-Module/issues/45)
+
+## 2.1.10 [Updated 09/10/2020]
+### Fixed
+- Fixed transfer domain conditions incorrectly testing against the SLD and not the TLD.
+
 ## 2.1.9 [Updated 25/08/2020]
 ### Fixed
 - Fixed internal transfers not being renewed upon transfer-in. Fixes [#33](https://github.com/SynergyWholesale/WHMCS-Domains-Module/issues/33)

modules/registrars/synergywholesaledomains/synergywholesaledomains.php

@@ -632,7 +632,7 @@ function synergywholesaledomains_RegisterDomain(array $params)
  */
 function synergywholesaledomains_TransferDomain(array $params)
 {
-    if (preg_match('/\.uk$/', $params['sld'])) {
+    if (preg_match('/\.uk$/', $params['tld'])) {
         return synergywholesaledomains_apiRequest('transferDomain', $params);
     }
 
@@ -641,7 +641,7 @@ function synergywholesaledomains_TransferDomain(array $params)
         'doRenewal' => 1,
     ];
 
-    if (preg_match('/\.au$/', $params['sld'])) {
+    if (preg_match('/\.au$/', $params['tld'])) {
         $canRenew = synergywholesaledomains_apiRequest('domainRenewRequired', $params, $request, false);
         $request['doRenewal'] = (int) ('on' === $params['doRenewal'] && 'OK_RENEWAL' === $canRenew['status']);
     }
@@ -1118,7 +1118,6 @@ function synergywholesaledomains_GetContactDetails(array $params)
     $idProtectStatus = synergywholesaledomains_apiRequest('domainInfo', $params, [], false);
     $command = ('Enabled' === $idProtectStatus['idProtect'] ? 'listProtectedContacts' : 'listContacts');
     $contacts = synergywholesaledomains_apiRequest($command, $params, [], false);
-
     $response = [];
 
     $map = [
@@ -1135,7 +1134,14 @@ function synergywholesaledomains_GetContactDetails(array $params)
         'email' => 'Email',
     ];
 
-    foreach (['registrant', 'tech', 'billing', 'admin'] as $contact) {
+    $contactTypes = ['registrant'];
+    foreach (['admin', 'billing', 'tech'] as $otherTypes) {
+        if (isset($contacts[$otherTypes])) {
+            $contactTypes[] = $otherTypes;
+        }
+    }
+
+    foreach ($contactTypes as $contact) {
         $whmcs_contact = ucfirst($contact);
         $response[$whmcs_contact] = [];
         foreach ($map as $from => $to) {