Evarisk#268 [Mod] fix: php8 warning

nicolas-eoxia · Sep 27, 2024 · 7c0f07e · 7c0f07e
1 parent 36ce8b6
commit 7c0f07e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/class/registrationcertificatefr.class.php b/class/registrationcertificatefr.class.php
@@ -218,6 +218,7 @@ class RegistrationCertificateFr extends SaturneObject
     public $b_first_registration_date;
     public $c1_owner_fullname;
     public $c3_registration_address;
+    public $c4a_vehicle_owner;
     public $c41_ownerNumber;
     public $c41_second_owner_name;
     public $e_vehicle_serial_number;
@@ -234,7 +235,7 @@ class RegistrationCertificateFr extends SaturneObject
     public $g1_vehicle_empty_weight;
     public $h_validity_period;
     public $i_vehicle_registration_date;
-    public $j_vehicleCategory;
+    public $j_vehicle_category;
     public $j1_national_type;
     public $j2_european_bodywork;
     public $j3_national_bodywork;

diff --git a/core/modules/modDoliCar.class.php b/core/modules/modDoliCar.class.php
@@ -482,8 +482,8 @@ public function init($options = ''): int
 
         foreach ($extraFieldsArrays as $key => $extraField) {
             foreach ($extraField['elementtype'] as $extraFieldElementType) {
-                $extraFields->update($key, $extraField['Label'], $extraField['type'], $extraField['length'], $extraFieldElementType, 0, 0, $this->numero . $extraField['position'], $extraField['params'], $extraField['alwayseditable'], '', $extraField['list'], ($extraField['help'][$extraFieldElementType] ?? $extraField['help']), '', '', $extraField['entity'], $extraField['langfile'], $extraField['enabled'] . ' && isModEnabled("' . $extraFieldElementType . '")', 0, 0, $extraField['css']);
-                $extraFields->addExtraField($key, $extraField['Label'], $extraField['type'], $this->numero . $extraField['position'], $extraField['length'], $extraFieldElementType, 0, 0, '', $extraField['params'], $extraField['alwayseditable'], '', $extraField['list'], $extraField['help'], '', $extraField['entity'], $extraField['langfile'], $extraField['enabled'] . ' && isModEnabled("' . $extraFieldElementType . '")', 0, 0, $extraField['css']);
+                $extraFields->update($key, $extraField['Label'], $extraField['type'], $extraField['length'], $extraFieldElementType, 0, 0, $this->numero . $extraField['position'], $extraField['params'], $extraField['alwayseditable'], '', $extraField['list'], ($extraField['help'][$extraFieldElementType] ?? $extraField['help']), '', '', $extraField['entity'], $extraField['langfile'], $extraField['enabled'] . ' && isModEnabled("' . ($extraFieldElementType != 'actioncomm' ? $extraFieldElementType : 'agenda')  . '")', 0, 0, $extraField['css']);
+                $extraFields->addExtraField($key, $extraField['Label'], $extraField['type'], $this->numero . $extraField['position'], $extraField['length'], $extraFieldElementType, 0, 0, '', $extraField['params'], $extraField['alwayseditable'], '', $extraField['list'], $extraField['help'], '', $extraField['entity'], $extraField['langfile'], $extraField['enabled'] . ' && isModEnabled("' . ($extraFieldElementType != 'actioncomm' ? $extraFieldElementType : 'agenda') . '")', 0, 0, $extraField['css']);
             }
         }
 

diff --git a/core/tpl/dolicar_registrationcertificatefr_immatriculation_api_fetch_action.tpl.php b/core/tpl/dolicar_registrationcertificatefr_immatriculation_api_fetch_action.tpl.php
@@ -113,7 +113,7 @@
     }
 
     if ($productId > 0 && $productLotID > 0) {
-        if ($createRegistrationCertificate > 0) {
+        if (isset($createRegistrationCertificate) && $createRegistrationCertificate > 0) {
             $object->fk_product            = $productId;
             $object->fk_lot                = $productLotID;
             $object->fk_soc                = $parameters['thirdpartyID'];

diff --git a/view/registrationcertificatefr/quickcreation.php b/view/registrationcertificatefr/quickcreation.php
@@ -245,9 +245,8 @@
             $parameters['contactID']    = $contactID;
             $parameters['thirdpartyID'] = $thirdpartyID;
 
-            $reshook = $hookmanager->executeHooks('quickCreationAction', $parameters, $project, $action); // Note that $action and $project may have been modified by some hooks
-
-            if ($reshook > 0) {
+            $resHook = $hookmanager->executeHooks('quickCreationAction', $parameters, $project, $action); // Note that $action and $project may have been modified by some hooks
+            if (empty($resHook)) {
                 $backtopage = $hookmanager->resPrint;
             }