#147 [Core] add: error returns

Evarisk · Apr 6, 2023 · 29f2fef · 29f2fef
1 parent 4188c9a
commit 29f2fef
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 22 deletions.
diff --git a/class/actions_dolicar.class.php b/class/actions_dolicar.class.php
@@ -667,8 +667,9 @@ public function quickCreationAction(&$parameters, &$object, &$action, $hookmanag
 			if (dol_strlen($backtopage) > 0){
 				$this->resprints = $backtopage;
 			}
-
-			return 1;
+			if (!$error) {
+				return 1;
+			}
 		}
 	}
 }
diff --git a/core/modules/modDoliCar.class.php b/core/modules/modDoliCar.class.php
@@ -284,6 +284,21 @@ public function __construct($db)
             // 0=Menu for internal users, 1=external users, 2=both
             'user'=>2,
         );
+		$this->menu[$r++] = [
+			'fk_menu'  => 'fk_mainmenu=dolicar', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'     => 'left', // This is a Top menu entry
+			'titre'    => $langs->transnoentities('QuickCreation'),
+			'prefix'   => '<i class="fas fa-plus-circle pictofixedwidth"></i>',
+			'mainmenu' => 'dolicar',
+			'leftmenu' => 'quickcreation',
+			'url'      => '/dolicar/view/registrationcertificatefr/quickcreation.php', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'    => 'dolicar@dolicar',
+			'position' => 1000 + $r,
+			'enabled'  => '$conf->dolicar->enabled', // Define condition to show or hide menu entry. Use '$conf->easycrm->enabled' if entry must be visible if module is enabled.
+			'perms'    => '$user->rights->dolicar->read', // Use 'perms'=>'$user->rights->easycrm->myobject->read' if you want your menu with a permission rules
+			'target'   => '',
+			'user'     => 0, // 0=Menu for internal users, 1=external users, 2=both
+		];
 		$this->menu[$r++]=array(
 			'fk_menu' => 'fk_mainmenu=dolicar',
 			'type' => 'left',
@@ -374,21 +389,6 @@ public function __construct($db)
 			'target'=>'',
 			'user'=>2
 		);
-		$this->menu[$r++] = [
-			'fk_menu'  => 'fk_mainmenu=dolicar', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'     => 'left', // This is a Top menu entry
-			'titre'    => $langs->transnoentities('QuickCreation'),
-			'prefix'   => '<i class="fas fa-plus-circle pictofixedwidth"></i>',
-			'mainmenu' => 'dolicar',
-			'leftmenu' => 'quickcreation',
-			'url'      => '/dolicar/view/registrationcertificatefr/quickcreation.php', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'    => 'dolicar@dolicar',
-			'position' => 1000 + $r,
-			'enabled'  => '$conf->dolicar->enabled', // Define condition to show or hide menu entry. Use '$conf->easycrm->enabled' if entry must be visible if module is enabled.
-			'perms'    => '$user->rights->dolicar->read', // Use 'perms'=>'$user->rights->easycrm->myobject->read' if you want your menu with a permission rules
-			'target'   => '',
-			'user'     => 0, // 0=Menu for internal users, 1=external users, 2=both
-		];
 		/* END MODULEBUILDER LEFTMENU REGISTRATIONCERTIFICATEFR */
 	}
 

diff --git a/core/tpl/dolicar_registrationcertificatefr_immatriculation_api_fetch_action.tpl.php b/core/tpl/dolicar_registrationcertificatefr_immatriculation_api_fetch_action.tpl.php
@@ -14,7 +14,10 @@
 
 		if (empty($xmlData)) {
 			$usernameConfigUrl = DOL_URL_ROOT . '/custom/dolicar/admin/registrationcertificate.php';
-			setEventMessage($langs->trans('BadAPIUsername', $usernameConfigUrl), 'errors');
+
+			setEventMessage($langs->trans('BadAPIUsernameOrBadLicencePlateFormat', $usernameConfigUrl), 'errors');
+			$error++;
+			$action = $createRegistrationCertificate ? '' : 'create';
 		} else {
 			$xml = simplexml_load_string($xmlData);
 			$strJson = $xml->vehicleJson;
@@ -23,9 +26,13 @@
 		}
 	} else {
 		setEventMessage($langs->trans('BadLicencePlateFormat'), 'errors');
+		$error++;
+		$action = $createRegistrationCertificate ? '' : 'create';
 	}
 } else {
 	setEventMessage($langs->trans('BadAPIUsername'), 'errors');
+	$error++;
+	$action = $createRegistrationCertificate ? '' : 'create';
 }
 
 if (is_object($registrationCertificateObject)) {

diff --git a/langs/fr_FR/dolicar.lang b/langs/fr_FR/dolicar.lang
@@ -145,6 +145,7 @@ ImmatriculationAPIConfig = Configuration de l'API immatriculationapi.com
 APIUsername = Nom de l'utilisateur API
 BadLicencePlateFormat = La plaque d'immatriculation n'est pas au bon format. Veuillez utiliser l'un des formats suivants : <br><b> XX-111-XX <br>  XX111XX </b>
 BadAPIUsername = Nom d'utilisateur pour l'API invalide. Vous pouvez configurer le nom d'utilisateur pour la connexion à l'API à l'adresse suivante : <a href="%s" target="_blank">Configuration du nom d'utilisateur API</a>
+BadAPIUsernameOrBadLicencePlateFormat = Mauvais nom d'utilisateur ou format de plaque d'immatriculation. <br> Vous pouvez configurer le nom d'utilisateur pour la connexion à l'API à l'adresse suivante : <a href="%s" target="_blank">Configuration du nom d'utilisateur API</a> <br> Veuillez utiliser l'un des formats suivants pour la plaque d'immatriculation : <br><b> XX-111-XX <br>  XX111XX </b>
 LicencePlateInformationsCharged = Les informations de la carte grise ont bien été récupérées
 QuickCreation = Ajout rapide
 QuickThirdPartyCreation  = Ajout rapide de tiers

diff --git a/view/registrationcertificatefr/quickcreation.php b/view/registrationcertificatefr/quickcreation.php
@@ -114,13 +114,13 @@
 		exit;
 	}
 	require_once __DIR__ . '/../../../easycrm/core/tpl/easycrm_quickcreation_actions.tpl.php';
+
 }
 
 /*
  * View
  */
 
-
 $title    = $langs->trans('QuickCreation');
 $help_url = 'FR:Module_EasyCRM';
 
@@ -138,8 +138,7 @@
 	print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
 }
 
-//ajouter le code carte grise
-
+//Ajouter le code carte grise
 print load_fiche_titre($langs->trans("QuickRegistrationCertificateCreation"), '', 'object_'.$object->picto);
 
 print '<hr>';
@@ -149,7 +148,7 @@
 print $langs->trans('LicencePlate');
 print '</td>';
 print '<td class="valuefieldcreate">';
-print '<input class="flat minwidth400 --success" id="registrationNumber" name="registrationNumber">';
+print '<input class="flat minwidth400 --success" id="registrationNumber" name="registrationNumber" value="'. GETPOST('registrationNumber') .'">';
 print '</td>';
 print '</tr>';
 print '<tr>';

diff --git a/view/registrationcertificatefr/registrationcertificatefr_card.php b/view/registrationcertificatefr/registrationcertificatefr_card.php
@@ -133,6 +133,13 @@
 		$brand_name = get_vehicle_brand($productId);
 	}
 
+	if ($action == 'add') {
+		if ((!preg_match('/^[A-Z]{2}[0-9]{3}[A-Z]{2}$/', GETPOST('registrationNumber')) && !preg_match('/^[A-Z]{2}-[0-9]{3}-[A-Z]{2}$/', GETPOST('registrationNumber')))) {
+			setEventMessage($langs->trans('BadLicencePlateFormat'), 'errors');
+			$action = 'create';
+		}
+	}
+
 	if ($action == 'getRegistrationCertificateData') {
 		require_once __DIR__ . '/../../core/tpl/dolicar_registrationcertificatefr_immatriculation_api_fetch_action.tpl.php';
 	}