Merge pull request #34 from dondominio/Version-2.2.20

Version 2.2.20
dondominio · May 6, 2024 · a646c0e · a646c0e
2 parents f872943 + 66d30e9
commit a646c0e
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 9 deletions.
diff --git a/CHANGELOG-en.md b/CHANGELOG-en.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.2.20] - 2024-05-03
+### Changed
+- Use `Tax ID` as `Vat Number` registrar option.
+
 ## [2.2.19] - 2024-03-11
 ### fixed
 - `adminContactType` in dondominiossl

diff --git a/CHANGELOG-es.md b/CHANGELOG-es.md
@@ -7,6 +7,10 @@ y este proyecto se adhiere a [Semantic Versioning](https://semver.org/spec/v2.0.
 
 ## [Pendiente por lanzar]
 
+## [2.2.20] - 2024-05-03
+### Changed
+- Opción para utilizar `Tax ID` como `Vat Number` en opciones del registrador.
+
 ## [2.2.19] - 2024-03-11
 ### fixed
 - `adminContactType` en dondominiossl

diff --git a/README-en.md b/README-en.md
@@ -8,7 +8,7 @@ This project has all the developed integrations between MrDomain and WHMCS.
 ## Status
 | Version |
 |:--------|
-| 2.2.19   |
+| 2.2.20   |
 
 ## Requirements
 | Name      | Version   |

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Este proyecto contiene todos los módulos desarrollados entre DonDominio y WHMCS
 ## Estado
 | Version |
 |:--------|
-| 2.2.19   |
+| 2.2.20   |
 
 ## Requerimientos
 | Name      | Version       |

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "dondominio/whmcs",
     "description": "DonDominio - WHCMCS Modules Integration",
-    "version": "2.2.19",
+    "version": "2.2.20",
     "license": "LGPL-3.0-only",
     "type": "project",
     "minimum-stability": "dev",

diff --git a/src/modules/addons/dondominio/lib/Services/WHMCS_Service.php b/src/modules/addons/dondominio/lib/Services/WHMCS_Service.php
@@ -299,6 +299,20 @@ public function getDomainExtendedById($id)
         if (!empty($extDomain->vatnumber)) {
             return $extDomain;
         }
+
+        $useTaxID = Capsule::selectOne('
+            SELECT * FROM `tblregistrars`
+            WHERE `tblregistrars`.`registrar` = "dondominio"
+            AND `tblregistrars`.`setting` = "useTaxID"
+        ')->value;
+
+        if (!empty($useTaxID) && function_exists('decrypt')) {
+            $useTaxIDMode = decrypt($useTaxID);
+            if ($useTaxIDMode === 'on' && $extDomain->tax_id !== '') {
+                $extDomain->vatnumber = $extDomain->tax_id;
+                return $extDomain;
+            }
+        }
 
         $registrarFileName = Capsule::selectOne('
             SELECT * FROM `tblregistrars`

diff --git a/src/modules/addons/dondominio/version.json b/src/modules/addons/dondominio/version.json
@@ -1,4 +1,4 @@
 {
-	"version": "2.2.19",
-	"releaseDate": "2024-03-11"
+	"version": "2.2.20",
+	"releaseDate": "2024-05-03"
 }
diff --git a/src/modules/registrars/dondominio/lib/Actions/Action.php b/src/modules/registrars/dondominio/lib/Actions/Action.php
@@ -296,6 +296,10 @@ protected function getVATNumber()
         // Search by Custom Field
 
         if (empty($vatNumber) && !empty($this->params['vat'])) {
+            if ($this->params['useTaxID'] && array_key_exists('tax_id', $this->params) && is_string($this->params['tax_id']) && $this->params['tax_id'] !== '' ) {
+                return $this->params['tax_id'];
+            }
+
             $vatNumberCustomField = $this->app->getService('whmcs')->getCustomFieldByFieldName($this->params['vat']);
 
             // Try to find custom field through old select version

diff --git a/src/modules/registrars/dondominio/lib/Actions/getConfigArray.php b/src/modules/registrars/dondominio/lib/Actions/getConfigArray.php
@@ -55,6 +55,11 @@ public function __invoke()
                 "Options" => "," . implode(",", $customFields),
                 "Description" => "Custom field containing the VAT Number for your customers"
             ],
+            'useTaxID' => [
+                'FriendlyName' => 'Use tax ID',
+                'Type' => 'yesno',
+                'Description' => 'Use Tax ID as VAT Number'
+            ],
             //FOACONTACT	
             "foacontact" => [	
                 "FriendlyName" => "FOA Contact",	

diff --git a/src/modules/registrars/dondominio/version.json b/src/modules/registrars/dondominio/version.json
@@ -1,4 +1,4 @@
 {
-	"version": "2.2.19",
-	"releaseDate": "2024-03-11"
+	"version": "2.2.20",
+	"releaseDate": "2024-05-03"
 }
diff --git a/src/modules/servers/dondominiossl/version.json b/src/modules/servers/dondominiossl/version.json
@@ -1,4 +1,4 @@
 {
-	"version": "2.2.19",
-	"releaseDate": "2024-03-11"
+	"version": "2.2.20",
+	"releaseDate": "2024-05-03"
 }