@@ -52,12 +52,12 @@ |
||
| 52 | 52 | if (!isset($value->socid) && empty($value->email) && empty($value->phone)) { |
| 53 | 53 | $this->addWarning('Soit l\'e-mail soit le téléphone n\'a pas été complété'); |
| 54 | 54 | } |
| 55 | - if (empty($value->nbrPax) || (int)$value->nbrPax <= 0) { |
|
| 55 | + if (empty($value->nbrPax) || (int) $value->nbrPax <= 0) { |
|
| 56 | 56 | $this->addError('nbrPax', 'Le nombre de passagers doit être plus grand que 0.'); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - if ((int)$value->nbrPax > 0) { |
|
| 60 | - $costPerPax = $value->cost / (int)$value->nbrPax; |
|
| 59 | + if ((int) $value->nbrPax > 0) { |
|
| 60 | + $costPerPax = $value->cost / (int) $value->nbrPax; |
|
| 61 | 61 | if ($costPerPax < $this->getMinPrice()) { |
| 62 | 62 | $this->addError('cost', |
| 63 | 63 | sprintf('Le prix demandé par passagé est trop peu élevé. Un minimum de %s est demandé', |
@@ -12,32 +12,32 @@ discard block |
||
| 12 | 12 | dol_include_once("/flightlog/lib/flightLog.lib.php"); |
| 13 | 13 | dol_include_once("/flightlog/validators/SimpleOrderValidator.php"); |
| 14 | 14 | dol_include_once("/flightlog/command/CreateOrderCommandHandler.php"); |
| 15 | -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; |
|
| 16 | -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; |
|
| 15 | +require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php'; |
|
| 16 | +require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php'; |
|
| 17 | 17 | |
| 18 | 18 | // Load object modCodeTiers |
| 19 | -$module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard'); |
|
| 19 | +$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard'); |
|
| 20 | 20 | if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') |
| 21 | 21 | { |
| 22 | - $module = substr($module, 0, dol_strlen($module)-4); |
|
| 22 | + $module = substr($module, 0, dol_strlen($module) - 4); |
|
| 23 | 23 | } |
| 24 | -$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']); |
|
| 24 | +$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']); |
|
| 25 | 25 | foreach ($dirsociete as $dirroot) |
| 26 | 26 | { |
| 27 | - $res=dol_include_once($dirroot.$module.'.php'); |
|
| 27 | + $res = dol_include_once($dirroot . $module . '.php'); |
|
| 28 | 28 | if ($res) break; |
| 29 | 29 | } |
| 30 | 30 | $modCodeClient = new $module; |
| 31 | 31 | // Load object modCodeFournisseur |
| 32 | -$module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard'); |
|
| 32 | +$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard'); |
|
| 33 | 33 | if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') |
| 34 | 34 | { |
| 35 | - $module = substr($module, 0, dol_strlen($module)-4); |
|
| 35 | + $module = substr($module, 0, dol_strlen($module) - 4); |
|
| 36 | 36 | } |
| 37 | -$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']); |
|
| 37 | +$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']); |
|
| 38 | 38 | foreach ($dirsociete as $dirroot) |
| 39 | 39 | { |
| 40 | - $res=dol_include_once($dirroot.$module.'.php'); |
|
| 40 | + $res = dol_include_once($dirroot . $module . '.php'); |
|
| 41 | 41 | if ($res) break; |
| 42 | 42 | } |
| 43 | 43 | $modCodeFournisseur = new $module; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $msg = ''; |
| 60 | 60 | $socid = null; |
| 61 | 61 | |
| 62 | -if (GETPOST('socid', 'int') > 0){ |
|
| 62 | +if (GETPOST('socid', 'int') > 0) { |
|
| 63 | 63 | $socid = GETPOST('socid', 'int'); |
| 64 | 64 | $customer->fetch($socid); |
| 65 | 65 | } |
@@ -70,9 +70,9 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | $formObject = new stdClass(); |
| 72 | 72 | $formObject->socid = $socid; |
| 73 | - $formObject->name = GETPOST('name','alpha'); |
|
| 74 | - $formObject->firstname = GETPOST('firstname','alpha'); |
|
| 75 | - $formObject->zip = GETPOST('zipcode','alpha'); |
|
| 73 | + $formObject->name = GETPOST('name', 'alpha'); |
|
| 74 | + $formObject->firstname = GETPOST('firstname', 'alpha'); |
|
| 75 | + $formObject->zip = GETPOST('zipcode', 'alpha'); |
|
| 76 | 76 | $formObject->town = GETPOST('town', 'alpha'); |
| 77 | 77 | $formObject->state = GETPOST('state_id', 'int'); |
| 78 | 78 | $formObject->phone = GETPOST('phone', 'alpha'); |
@@ -89,8 +89,8 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | if ($validator->isValid($formObject, $_REQUEST)) { |
| 91 | 91 | $createOrderCommand = new CreateOrderCommand($formObject, $user->id); |
| 92 | - try{ |
|
| 93 | - $handler = new CreateOrderCommandHandler($db, $conf,$user,$langs,$modCodeClient, $modCodeFournisseur); |
|
| 92 | + try { |
|
| 93 | + $handler = new CreateOrderCommandHandler($db, $conf, $user, $langs, $modCodeClient, $modCodeFournisseur); |
|
| 94 | 94 | $handler->handle($createOrderCommand); |
| 95 | 95 | |
| 96 | 96 | $msg = '<div class="success ok">Commande et tiers créés. </div>'; |
@@ -125,18 +125,18 @@ discard block |
||
| 125 | 125 | ?> |
| 126 | 126 | |
| 127 | 127 | <!-- Success message with reference --> |
| 128 | - <?php if($successMessage): ?> |
|
| 128 | + <?php if ($successMessage): ?> |
|
| 129 | 129 | <div class="bbc-style"> |
| 130 | 130 | <p class="cadre_msg1"> |
| 131 | 131 | Vous avez généré la facture et créé un tiers.<br/> |
| 132 | 132 | Merci, |
| 133 | 133 | </p> |
| 134 | 134 | |
| 135 | - <?php if(count($validator->getWarningMessages()) > 0):?> |
|
| 135 | + <?php if (count($validator->getWarningMessages()) > 0):?> |
|
| 136 | 136 | <div class="box box-warning"> |
| 137 | 137 | <p>Ceci sont des messages d'attention mais qui ne bloquent pas la création de la commande</p> |
| 138 | 138 | <ul> |
| 139 | - <?php foreach($validator->getWarningMessages() as $warningMessage): ?> |
|
| 139 | + <?php foreach ($validator->getWarningMessages() as $warningMessage): ?> |
|
| 140 | 140 | <li class="warning"><?php echo $warningMessage; ?></li> |
| 141 | 141 | <?php endforeach; ?> |
| 142 | 142 | </ul> |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | <p> |
| 196 | 196 | Cette page vous permettra de créer une commande. La commande est <b>obligatoire</b> si vous désirez faire payer les passagers directement sur le compte du club.<br> |
| 197 | 197 | Si vous avez un doute sur la manière d'encoder la commande, veuillez me contacter AVANT de soumettre le dit formulaire.<br/> |
| 198 | - Si vous avez <b>déjà</b> encodé une commande, et que vous voulez la retrouver veuillez vous rendre sur : <a href="<?php echo sprintf(DOL_URL_ROOT.'/commande/list.php?search_sale=%s', $user->id); ?>">mes commandes.</a> |
|
| 198 | + Si vous avez <b>déjà</b> encodé une commande, et que vous voulez la retrouver veuillez vous rendre sur : <a href="<?php echo sprintf(DOL_URL_ROOT . '/commande/list.php?search_sale=%s', $user->id); ?>">mes commandes.</a> |
|
| 199 | 199 | </p> |
| 200 | 200 | </div> |
| 201 | 201 | <form class="flight-form" name='add' method="post"> |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | $(document).ready(function() { |
| 218 | 218 | $("#socid").change(function() { |
| 219 | 219 | var socid = $(this).val(); |
| 220 | - window.location.href = "<?php echo $_SERVER["PHP_SELF"].'?socid="+socid' ?> |
|
| 220 | + window.location.href = "<?php echo $_SERVER["PHP_SELF"] . '?socid="+socid' ?> |
|
| 221 | 221 | }); |
| 222 | 222 | }); |
| 223 | 223 | </script> |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | </tr> |
| 227 | 227 | |
| 228 | 228 | |
| 229 | - <?php if($socid === null): ?> |
|
| 229 | + <?php if ($socid === null): ?> |
|
| 230 | 230 | <!-- Nom --> |
| 231 | 231 | <tr> |
| 232 | 232 | <td class="fieldrequired"> |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | <?php echo $langs->trans('DefaultLang'); ?> |
| 296 | 296 | </td> |
| 297 | 297 | <td> |
| 298 | - <?php echo $formAdmin->select_language($conf->global->MAIN_LANG_DEFAULT,'default_lang',0,0,1,0,0,'maxwidth200onsmartphone'); ?> |
|
| 298 | + <?php echo $formAdmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone'); ?> |
|
| 299 | 299 | </td> |
| 300 | 300 | </tr> |
| 301 | 301 | |
@@ -305,16 +305,16 @@ discard block |
||
| 305 | 305 | <?php echo $langs->trans('Region'); ?> |
| 306 | 306 | </td> |
| 307 | 307 | <td> |
| 308 | - <?php print $formcompany->select_state($formObject->state,'BE'); ?> |
|
| 308 | + <?php print $formcompany->select_state($formObject->state, 'BE'); ?> |
|
| 309 | 309 | </td> |
| 310 | 310 | </tr> |
| 311 | 311 | |
| 312 | 312 | <?php |
| 313 | 313 | // Zip / Town |
| 314 | - print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>'; |
|
| 315 | - print $formcompany->select_ziptown($formObject->town,'zipcode',array('town','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent'); |
|
| 316 | - print '</td><td>'.fieldLabel('Town','town').'</td><td>'; |
|
| 317 | - print $formcompany->select_ziptown($formObject->zip,'town',array('zipcode','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent'); |
|
| 314 | + print '<tr><td>' . fieldLabel('Zip', 'zipcode') . '</td><td>'; |
|
| 315 | + print $formcompany->select_ziptown($formObject->town, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent'); |
|
| 316 | + print '</td><td>' . fieldLabel('Town', 'town') . '</td><td>'; |
|
| 317 | + print $formcompany->select_ziptown($formObject->zip, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent'); |
|
| 318 | 318 | print '</td></tr>'; |
| 319 | 319 | ?> |
| 320 | 320 | |
@@ -338,16 +338,16 @@ discard block |
||
| 338 | 338 | <?php |
| 339 | 339 | if (empty($conf->global->MAIN_DISABLEVATCHECK)): ?> |
| 340 | 340 | |
| 341 | - <?php if (! empty($conf->use_javascript_ajax)): ?> |
|
| 341 | + <?php if (!empty($conf->use_javascript_ajax)): ?> |
|
| 342 | 342 | <script language="JavaScript" type="text/javascript"> |
| 343 | 343 | function CheckVAT(a) { |
| 344 | - <?php print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,300);"; ?> |
|
| 344 | + <?php print "newpopup('" . DOL_URL_ROOT . "/societe/checkvat/checkVatPopup.php?vatNumber='+a,'" . dol_escape_js($langs->trans("VATIntraCheckableOnEUSite")) . "',500,300);"; ?> |
|
| 345 | 345 | } |
| 346 | 346 | </script> |
| 347 | 347 | <a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.add.tva_intra.value);"><?php echo $langs->trans("VATIntraCheck"); ?></a> |
| 348 | - <?php echo $html->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); ?> |
|
| 348 | + <?php echo $html->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1); ?> |
|
| 349 | 349 | <?php else: ?> |
| 350 | - <a href="<?php echo $langs->transcountry("VATIntraCheckURL",$object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help'); ?></a> |
|
| 350 | + <a href="<?php echo $langs->transcountry("VATIntraCheckURL", $object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help'); ?></a> |
|
| 351 | 351 | <?php endif; ?> |
| 352 | 352 | <?php endif; ?> |
| 353 | 353 | </td> |
@@ -402,10 +402,10 @@ discard block |
||
| 402 | 402 | <tr> |
| 403 | 403 | <td><?php echo $langs->trans('Le commentaire doit-il figurer sur la commande') ?></td> |
| 404 | 404 | <td> |
| 405 | - <input type="radio" id="public_comment" name="public_comment" value="1" <?php echo ($formObject->isCommentPublic == 1)?'checked="checked"' : ''; ?>/> |
|
| 405 | + <input type="radio" id="public_comment" name="public_comment" value="1" <?php echo ($formObject->isCommentPublic == 1) ? 'checked="checked"' : ''; ?>/> |
|
| 406 | 406 | <label for="public_comment">Oui</label> |
| 407 | 407 | - |
| 408 | - <input type="radio" id="private_comment" name="public_comment" value="0" <?php echo ($formObject == null || $formObject->isCommentPublic === null || $formObject->isCommentPublic === 0)?'checked="checked"' : ''; ?>/> |
|
| 408 | + <input type="radio" id="private_comment" name="public_comment" value="0" <?php echo ($formObject == null || $formObject->isCommentPublic === null || $formObject->isCommentPublic === 0) ? 'checked="checked"' : ''; ?>/> |
|
| 409 | 409 | <label for="private_comment">Non</label> |
| 410 | 410 | </td> |
| 411 | 411 | </tr> |
@@ -25,8 +25,10 @@ discard block |
||
| 25 | 25 | foreach ($dirsociete as $dirroot) |
| 26 | 26 | { |
| 27 | 27 | $res=dol_include_once($dirroot.$module.'.php'); |
| 28 | - if ($res) break; |
|
| 29 | -} |
|
| 28 | + if ($res) { |
|
| 29 | + break; |
|
| 30 | + } |
|
| 31 | + } |
|
| 30 | 32 | $modCodeClient = new $module; |
| 31 | 33 | // Load object modCodeFournisseur |
| 32 | 34 | $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard'); |
@@ -38,8 +40,10 @@ discard block |
||
| 38 | 40 | foreach ($dirsociete as $dirroot) |
| 39 | 41 | { |
| 40 | 42 | $res=dol_include_once($dirroot.$module.'.php'); |
| 41 | - if ($res) break; |
|
| 42 | -} |
|
| 43 | + if ($res) { |
|
| 44 | + break; |
|
| 45 | + } |
|
| 46 | + } |
|
| 43 | 47 | $modCodeFournisseur = new $module; |
| 44 | 48 | |
| 45 | 49 | // Load translation files required by the page |
@@ -346,8 +350,11 @@ discard block |
||
| 346 | 350 | </script> |
| 347 | 351 | <a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.add.tva_intra.value);"><?php echo $langs->trans("VATIntraCheck"); ?></a> |
| 348 | 352 | <?php echo $html->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); ?> |
| 349 | - <?php else: ?> |
|
| 350 | - <a href="<?php echo $langs->transcountry("VATIntraCheckURL",$object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help'); ?></a> |
|
| 353 | + <?php else { |
|
| 354 | + : ?> |
|
| 355 | + <a href="<?php echo $langs->transcountry("VATIntraCheckURL",$object->country_id); |
|
| 356 | +} |
|
| 357 | +?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help'); ?></a> |
|
| 351 | 358 | <?php endif; ?> |
| 352 | 359 | <?php endif; ?> |
| 353 | 360 | </td> |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | return $sql; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - public function completeListOfReferent(){ |
|
| 75 | + public function completeListOfReferent() { |
|
| 76 | 76 | dol_include_once('/flightlog/class/bbcvols.class.php'); |
| 77 | 77 | |
| 78 | 78 | $this->results['flightlog'] = [ |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | 18 | |
| 19 | -require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; |
|
| 19 | +require_once DOL_DOCUMENT_ROOT . '/core/triggers/dolibarrtriggers.class.php'; |
|
| 20 | 20 | dol_include_once('/flightlog/class/bbcvols.class.php'); |
| 21 | 21 | dol_include_once('/core/class/CMailFile.class.php'); |
| 22 | 22 | |
@@ -78,23 +78,23 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf) |
| 80 | 80 | { |
| 81 | - if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){ |
|
| 81 | + if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)) { |
|
| 82 | 82 | return 0; |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - if(empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)){ |
|
| 85 | + if (empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)) { |
|
| 86 | 86 | return 0; |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | - if($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT'){ |
|
| 89 | + if ($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT') { |
|
| 90 | 90 | return 0; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - if(!$object->hasIncidents() && !$object->hasComment()){ |
|
| 93 | + if (!$object->hasIncidents() && !$object->hasComment()) { |
|
| 94 | 94 | return 0; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - if(!empty($conf->global->MAIN_DISABLE_ALL_MAILS)){ |
|
| 97 | + if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) { |
|
| 98 | 98 | return 0; |
| 99 | 99 | } |
| 100 | 100 | |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | ); |
| 128 | 128 | |
| 129 | 129 | |
| 130 | - if (! $mailfile->sendfile()) |
|
| 130 | + if (!$mailfile->sendfile()) |
|
| 131 | 131 | { |
| 132 | 132 | dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR); |
| 133 | 133 | } |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | */ |
| 150 | 150 | private function checkPassengersInformation($vol) |
| 151 | 151 | { |
| 152 | - if (!is_numeric($vol->nbrPax) || (int)$vol->nbrPax < 0) { |
|
| 152 | + if (!is_numeric($vol->nbrPax) || (int) $vol->nbrPax < 0) { |
|
| 153 | 153 | $this->addError('nbrPax', 'Erreur le nombre de passager est un nombre négatif.'); |
| 154 | 154 | } |
| 155 | 155 | |
@@ -241,10 +241,10 @@ discard block |
||
| 241 | 241 | $this->addError('order_id', 'Le nombre de passager par commande doit être >= 0.'); |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | - $totalPassenegrs += (int)$nbrPassengers; |
|
| 244 | + $totalPassenegrs += (int) $nbrPassengers; |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | - if ($totalPassenegrs !== (int)$vol->getNumberOfPassengers()) { |
|
| 247 | + if ($totalPassenegrs !== (int) $vol->getNumberOfPassengers()) { |
|
| 248 | 248 | $this->addError('nbrPax', 'Le nombre de passagers ne correspond pas au nombre entré sur les commandes'); |
| 249 | 249 | } |
| 250 | 250 | |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | */ |
| 259 | 259 | private function checkFlightDate(Bbcvols $flight) |
| 260 | 260 | { |
| 261 | - if($flight->getDate() > new DateTimeImmutable()){ |
|
| 261 | + if ($flight->getDate() > new DateTimeImmutable()) { |
|
| 262 | 262 | $this->addError('date', 'La date est plus grande que la date d\'aujourd\'hui'); |
| 263 | 263 | } |
| 264 | 264 | |
@@ -123,11 +123,11 @@ |
||
| 123 | 123 | * Put here all code to do according to value of "action" parameter |
| 124 | 124 | */ |
| 125 | 125 | if ($action == EXPENSE_REPORT_GENERATOR_ACTION_GENERATE) { |
| 126 | - try{ |
|
| 127 | - $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote,$bankAccount, $nbrPax, $customerId); |
|
| 126 | + try { |
|
| 127 | + $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote, $bankAccount, $nbrPax, $customerId); |
|
| 128 | 128 | $handler->handle($command); |
| 129 | - }catch (\Exception $e){ |
|
| 130 | - dol_syslog($e->getMessage(),LOG_ERR); |
|
| 129 | + } catch (\Exception $e) { |
|
| 130 | + dol_syslog($e->getMessage(), LOG_ERR); |
|
| 131 | 131 | dol_htmloutput_mesg("Facture non créée", '', 'error'); |
| 132 | 132 | } |
| 133 | 133 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | try{ |
| 127 | 127 | $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote,$bankAccount, $nbrPax, $customerId); |
| 128 | 128 | $handler->handle($command); |
| 129 | - }catch (\Exception $e){ |
|
| 129 | + } catch (\Exception $e){ |
|
| 130 | 130 | dol_syslog($e->getMessage(),LOG_ERR); |
| 131 | 131 | dol_htmloutput_mesg("Facture non créée", '', 'error'); |
| 132 | 132 | } |
@@ -311,9 +311,12 @@ discard block |
||
| 311 | 311 | |
| 312 | 312 | <?php if (!$flightProduct || !$flight->hasReceiver()) : ?> |
| 313 | 313 | <a class="butActionRefused" href="#">Générer</a> |
| 314 | - <?php else: ?> |
|
| 314 | + <?php else { |
|
| 315 | + : ?> |
|
| 315 | 316 | <button class="butAction" type="submit">Générer</button> |
| 316 | - <?php endif; ?> |
|
| 317 | + <?php endif; |
|
| 318 | +} |
|
| 319 | +?> |
|
| 317 | 320 | |
| 318 | 321 | <a class="butAction" href="<?php echo DOL_URL_ROOT . '/flightlog/card.php?id=' . $flight->id; ?>">Retour au |
| 319 | 322 | vol</a> |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | $sql .= ' ' . (!isset($this->justif_kilometers) ? 'NULL' : "'" . $this->db->escape($this->justif_kilometers) . "'") . ','; |
| 260 | 260 | $sql .= ' ' . "'" . date('Y-m-d H:i:s') . "'" . ','; |
| 261 | 261 | $sql .= ' ' . "'" . date('Y-m-d H:i:s') . "'" . ','; |
| 262 | - $sql .= ' ' . "'" . $this->passengerNames . "'" ; |
|
| 262 | + $sql .= ' ' . "'" . $this->passengerNames . "'"; |
|
| 263 | 263 | $sql .= ')'; |
| 264 | 264 | |
| 265 | 265 | $this->db->begin(); |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | |
| 274 | 274 | if (!$error) { |
| 275 | 275 | $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element); |
| 276 | - if(!$this->insertOrders()){ |
|
| 276 | + if (!$this->insertOrders()) { |
|
| 277 | 277 | $error++; |
| 278 | 278 | } |
| 279 | 279 | |
@@ -299,9 +299,9 @@ discard block |
||
| 299 | 299 | /** |
| 300 | 300 | * Inserts the order linked to the flight |
| 301 | 301 | */ |
| 302 | - private function insertOrders(){ |
|
| 302 | + private function insertOrders() { |
|
| 303 | 303 | |
| 304 | - if(empty($this->orderIds)){ |
|
| 304 | + if (empty($this->orderIds)) { |
|
| 305 | 305 | return true; |
| 306 | 306 | } |
| 307 | 307 | |
@@ -316,12 +316,12 @@ discard block |
||
| 316 | 316 | |
| 317 | 317 | $values = []; |
| 318 | 318 | |
| 319 | - foreach($this->orderIds as $orderId=>$nbrPassengers){ |
|
| 319 | + foreach ($this->orderIds as $orderId=>$nbrPassengers) { |
|
| 320 | 320 | $values[] = sprintf( |
| 321 | 321 | $valueTemplate, |
| 322 | 322 | $orderId, |
| 323 | 323 | $this->db->escape($this->id), |
| 324 | - (!isset($nbrPassengers) ? '0' : $this->db->escape($nbrPassengers)) |
|
| 324 | + (!isset($nbrPassengers) ? '0' : $this->db->escape($nbrPassengers)) |
|
| 325 | 325 | ); |
| 326 | 326 | } |
| 327 | 327 | |
@@ -339,9 +339,9 @@ discard block |
||
| 339 | 339 | /** |
| 340 | 340 | * Inserts the order linked to the flight |
| 341 | 341 | */ |
| 342 | - private function updateOrders(){ |
|
| 342 | + private function updateOrders() { |
|
| 343 | 343 | |
| 344 | - if(empty($this->orderIds)){ |
|
| 344 | + if (empty($this->orderIds)) { |
|
| 345 | 345 | return true; |
| 346 | 346 | } |
| 347 | 347 | |
@@ -352,9 +352,9 @@ discard block |
||
| 352 | 352 | /** |
| 353 | 353 | * Inserts the order linked to the flight |
| 354 | 354 | */ |
| 355 | - private function deleteOrders(){ |
|
| 355 | + private function deleteOrders() { |
|
| 356 | 356 | |
| 357 | - if(empty($this->orderIds)){ |
|
| 357 | + if (empty($this->orderIds)) { |
|
| 358 | 358 | return true; |
| 359 | 359 | } |
| 360 | 360 | |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | $sql .= ' fk_receiver = ' . (isset($this->fk_receiver) && (int) $this->fk_receiver > 0 ? $this->fk_receiver : "null") . ','; |
| 560 | 560 | $sql .= ' justif_kilometers = ' . (isset($this->justif_kilometers) ? "'" . $this->db->escape($this->justif_kilometers) . "'," : "'',"); |
| 561 | 561 | $sql .= ' date_update = ' . "'" . date('Y-m-d H:i:s') . "',"; |
| 562 | - $sql .= ' passenger_names = ' . "'" . trim($this->passengerNames)."'"; |
|
| 562 | + $sql .= ' passenger_names = ' . "'" . trim($this->passengerNames) . "'"; |
|
| 563 | 563 | |
| 564 | 564 | $sql .= ' WHERE idBBC_vols=' . $this->idBBC_vols; |
| 565 | 565 | |
@@ -1022,8 +1022,8 @@ discard block |
||
| 1022 | 1022 | * @param int $orderId |
| 1023 | 1023 | * @param int $nbrPassengers |
| 1024 | 1024 | */ |
| 1025 | - public function addOrderId($orderId, $nbrPassengers){ |
|
| 1026 | - if(!isset($this->orderIds)){ |
|
| 1025 | + public function addOrderId($orderId, $nbrPassengers) { |
|
| 1026 | + if (!isset($this->orderIds)) { |
|
| 1027 | 1027 | $this->orderIds = []; |
| 1028 | 1028 | } |
| 1029 | 1029 | |
@@ -1063,7 +1063,7 @@ discard block |
||
| 1063 | 1063 | if ($resql) { |
| 1064 | 1064 | $numrows = $this->db->num_rows($resql); |
| 1065 | 1065 | if ($numrows) { |
| 1066 | - for($i = 0 ; $i < $numrows ; $i++){ |
|
| 1066 | + for ($i = 0; $i < $numrows; $i++) { |
|
| 1067 | 1067 | $obj = $this->db->fetch_object($resql); |
| 1068 | 1068 | $this->orderIds[$obj->order_id] = $obj->nbr_passengers; |
| 1069 | 1069 | |
@@ -1084,7 +1084,7 @@ discard block |
||
| 1084 | 1084 | */ |
| 1085 | 1085 | public function getOrders() |
| 1086 | 1086 | { |
| 1087 | - if(!isset($this->orders) || empty($this->orders)){ |
|
| 1087 | + if (!isset($this->orders) || empty($this->orders)) { |
|
| 1088 | 1088 | $this->fetchOrder(); |
| 1089 | 1089 | } |
| 1090 | 1090 | return $this->orders; |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | $numberOfKilometers |
| 42 | 42 | ) |
| 43 | 43 | { |
| 44 | - $pilotId = (int)$pilotId; |
|
| 44 | + $pilotId = (int) $pilotId; |
|
| 45 | 45 | |
| 46 | 46 | if (!isset($this->items[$pilotId])) { |
| 47 | 47 | $this->items[$pilotId] = new PilotMissions($pilotId, $pilotFirstname, $pilotLastname); |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | public function addPilot($pilotId, $pilotFirstname, $pilotLastname) |
| 59 | 59 | { |
| 60 | - $pilotId = (int)$pilotId; |
|
| 60 | + $pilotId = (int) $pilotId; |
|
| 61 | 61 | |
| 62 | 62 | if (isset($this->items[$pilotId])) { |
| 63 | 63 | return; |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | public function __construct($pilotId, $pilotFirstname, $pilotLastname) |
| 40 | 40 | { |
| 41 | - $this->pilotId = (int)$pilotId; |
|
| 41 | + $this->pilotId = (int) $pilotId; |
|
| 42 | 42 | $this->pilotFirstname = $pilotFirstname; |
| 43 | 43 | $this->pilotLastname = $pilotLastname; |
| 44 | 44 | |
@@ -51,8 +51,8 @@ discard block |
||
| 51 | 51 | * @param int $numberOfFlights |
| 52 | 52 | * @param int $numberOfKilometers |
| 53 | 53 | */ |
| 54 | - public function addQuarter($quarter, $numberOfFlights, $numberOfKilometers){ |
|
| 55 | - $quarter = (int)$quarter; |
|
| 54 | + public function addQuarter($quarter, $numberOfFlights, $numberOfKilometers) { |
|
| 55 | + $quarter = (int) $quarter; |
|
| 56 | 56 | $this->quarterMissions[$quarter] = new QuarterMission($quarter, $numberOfFlights, $numberOfKilometers); |
| 57 | 57 | } |
| 58 | 58 | |
@@ -107,9 +107,9 @@ discard block |
||
| 107 | 107 | * |
| 108 | 108 | * @return QuarterMission |
| 109 | 109 | */ |
| 110 | - private function getQuarterMission($quarter){ |
|
| 111 | - if(!isset($this->quarterMissions[$quarter])){ |
|
| 112 | - return new QuarterMission($quarter,0,0); |
|
| 110 | + private function getQuarterMission($quarter) { |
|
| 111 | + if (!isset($this->quarterMissions[$quarter])) { |
|
| 112 | + return new QuarterMission($quarter, 0, 0); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | return $this->quarterMissions[$quarter]; |
@@ -120,6 +120,6 @@ discard block |
||
| 120 | 120 | */ |
| 121 | 121 | public function getPilotName() |
| 122 | 122 | { |
| 123 | - return $this->pilotFirstname.' '.$this->pilotLastname; |
|
| 123 | + return $this->pilotFirstname . ' ' . $this->pilotLastname; |
|
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | \ No newline at end of file |