@@ -26,8 +26,8 @@ |
||
| 26 | 26 | */ |
| 27 | 27 | public function __construct($flightId, $projectId) |
| 28 | 28 | { |
| 29 | - $this->flightId = (int)$flightId; |
|
| 30 | - $this->projectId = (int)$projectId; |
|
| 29 | + $this->flightId = (int) $flightId; |
|
| 30 | + $this->projectId = (int) $projectId; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -239,7 +239,7 @@ |
||
| 239 | 239 | $handler->handle(new \flightlog\command\ClassifyFlight($id, GETPOST('projectid'))); |
| 240 | 240 | $object->fetch($id); |
| 241 | 241 | $action = 'show'; |
| 242 | - }catch(Exception $e){ |
|
| 242 | + } catch(Exception $e){ |
|
| 243 | 243 | setEventMessages($e->getMessage(), null, 'errors'); |
| 244 | 244 | } |
| 245 | 245 | } |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
| 128 | 128 | |
| 129 | 129 | // Load object |
| 130 | -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
| 130 | +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
| 131 | 131 | include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; |
| 132 | 132 | |
| 133 | 133 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | $parameters = array(); |
| 158 | 158 | $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, |
| 159 | - $action); // Note that $action and $object may have been modified by some hooks |
|
| 159 | + $action); // Note that $action and $object may have been modified by some hooks |
|
| 160 | 160 | if ($reshook < 0) { |
| 161 | 161 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
| 162 | 162 | } |
@@ -234,12 +234,12 @@ discard block |
||
| 234 | 234 | |
| 235 | 235 | // Action to classify in a project |
| 236 | 236 | if (!empty($conf->projet->enabled) && $user->rights->projet->creer && $action === ACTION_CLASSIN) { |
| 237 | - try{ |
|
| 237 | + try { |
|
| 238 | 238 | $handler = new \flightlog\command\ClassifyFlightHandler($db, $conf, $langs, $user); |
| 239 | 239 | $handler->handle(new \flightlog\command\ClassifyFlight($id, GETPOST('projectid'))); |
| 240 | 240 | $object->fetch($id); |
| 241 | 241 | $action = 'show'; |
| 242 | - }catch(Exception $e){ |
|
| 242 | + } catch (Exception $e) { |
|
| 243 | 243 | setEventMessages($e->getMessage(), null, 'errors'); |
| 244 | 244 | } |
| 245 | 245 | } |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | |
| 273 | 273 | |
| 274 | 274 | // Part to edit record |
| 275 | -if (($user->rights->flightlog->vol->edit || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id )) && ($id || $ref) && $action == 'edit'): ?> |
|
| 275 | +if (($user->rights->flightlog->vol->edit || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id)) && ($id || $ref) && $action == 'edit'): ?> |
|
| 276 | 276 | |
| 277 | 277 | <?php $renderer = new \flightlog\form\SimpleFormRenderer(); ?> |
| 278 | 278 | |
@@ -286,11 +286,11 @@ discard block |
||
| 286 | 286 | |
| 287 | 287 | <form class="flight-form js-form" name='add' action="card.php?rowid=<?php echo $object->getId(); ?>" method="POST"> |
| 288 | 288 | <input type="hidden" name="action" value="update"/> |
| 289 | - <input type="hidden" name="token" value="<?php echo newToken();?>"/> |
|
| 289 | + <input type="hidden" name="token" value="<?php echo newToken(); ?>"/> |
|
| 290 | 290 | |
| 291 | 291 | <?php echo $renderer->render($formFlight->getElement('idBBC_vols')); ?> |
| 292 | 292 | |
| 293 | - <?php if($formFlight->has('fk_type')): ?> |
|
| 293 | + <?php if ($formFlight->has('fk_type')): ?> |
|
| 294 | 294 | <section class="form-section"> |
| 295 | 295 | <h1 class="form-section-title"><?php echo $langs->trans('Type de vol'); ?></h1> |
| 296 | 296 | <table class="border" width="50%"> |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | <?php endif; ?> |
| 305 | 305 | |
| 306 | 306 | <!-- Date et heures --> |
| 307 | - <?php if($formFlight->has('date')): ?> |
|
| 307 | + <?php if ($formFlight->has('date')): ?> |
|
| 308 | 308 | <section class="form-section"> |
| 309 | 309 | <h1 class="form-section-title"><?php echo $langs->trans('Date'); ?></h1> |
| 310 | 310 | <table class="border" width="50%"> |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | </section> |
| 317 | 317 | <?php endif; ?> |
| 318 | 318 | |
| 319 | - <?php if($formFlight->has('heureD') && $formFlight->has('heureA')): ?> |
|
| 319 | + <?php if ($formFlight->has('heureD') && $formFlight->has('heureA')): ?> |
|
| 320 | 320 | <section class="form-section"> |
| 321 | 321 | <h1 class="form-section-title"><?php echo $langs->trans('Heures'); ?></h1> |
| 322 | 322 | <table class="border" width="50%"> |
@@ -336,14 +336,14 @@ discard block |
||
| 336 | 336 | <h1 class="form-section-title"><?php echo $langs->trans('Pilote & ballon') ?></h1> |
| 337 | 337 | <table class="border" width="50%"> |
| 338 | 338 | |
| 339 | - <?php if($formFlight->has('fk_pilot')): ?> |
|
| 339 | + <?php if ($formFlight->has('fk_pilot')): ?> |
|
| 340 | 340 | <tr> |
| 341 | 341 | <td class="fieldrequired"> Pilote </td> |
| 342 | - <td><?php echo $renderer->render($formFlight->getElement('fk_pilot'),['ajax' => true]); ?></td> |
|
| 342 | + <td><?php echo $renderer->render($formFlight->getElement('fk_pilot'), ['ajax' => true]); ?></td> |
|
| 343 | 343 | </tr> |
| 344 | 344 | <?php endif; ?> |
| 345 | 345 | |
| 346 | - <?php if($formFlight->has('BBC_ballons_idBBC_ballons')): ?> |
|
| 346 | + <?php if ($formFlight->has('BBC_ballons_idBBC_ballons')): ?> |
|
| 347 | 347 | <tr> |
| 348 | 348 | <td width="25%" class="fieldrequired">Ballon</td> |
| 349 | 349 | <td><?php echo $renderer->render($formFlight->getElement('BBC_ballons_idBBC_ballons')); ?></td> |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | </table> |
| 379 | 379 | </section> |
| 380 | 380 | |
| 381 | - <?php if($formFlight->has('fk_organisateur')): ?> |
|
| 381 | + <?php if ($formFlight->has('fk_organisateur')): ?> |
|
| 382 | 382 | <section class="form-section"> |
| 383 | 383 | <h1 class="form-section-title"><span class="js-organisator-field">Organisateur</span></h1> |
| 384 | 384 | <table class="border" width="50%"> |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | <td> |
| 388 | 388 | <?php |
| 389 | 389 | //organisateur |
| 390 | - print $renderer->render($formFlight->getElement('fk_organisateur'),['ajax' => true]); |
|
| 390 | + print $renderer->render($formFlight->getElement('fk_organisateur'), ['ajax' => true]); |
|
| 391 | 391 | ?> |
| 392 | 392 | </td> |
| 393 | 393 | </tr> |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | <section class="form-section js-expensable-field"> |
| 400 | 400 | <h1 class="form-section-title"><?php echo $langs->trans('Déplacements') ?></h1> |
| 401 | 401 | <table class="border" width="50%"> |
| 402 | - <?php if($formFlight->has('kilometers')): ?> |
|
| 402 | + <?php if ($formFlight->has('kilometers')): ?> |
|
| 403 | 403 | <!-- number of kilometers done for the flight --> |
| 404 | 404 | <tr> |
| 405 | 405 | <td class="fieldrequired">Nombre de kilometres effectués pour le vol</td> |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | </tr> |
| 410 | 410 | <?php endif; ?> |
| 411 | 411 | |
| 412 | - <?php if($formFlight->has('justif_kilometers')): ?> |
|
| 412 | + <?php if ($formFlight->has('justif_kilometers')): ?> |
|
| 413 | 413 | <!-- Justif Kilometers --> |
| 414 | 414 | <tr> |
| 415 | 415 | |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | <section class="form-section"> |
| 428 | 428 | <h1 class="form-section-title"><?php echo $langs->trans('Passager') ?></h1> |
| 429 | 429 | <table class="border" width="50%"> |
| 430 | - <?php if($formFlight->has('nbrPax')): ?> |
|
| 430 | + <?php if ($formFlight->has('nbrPax')): ?> |
|
| 431 | 431 | <tr> |
| 432 | 432 | <td class="fieldrequired"><?php echo $langs->trans('Nombre de passagers'); ?></td> |
| 433 | 433 | <td> |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | </tr> |
| 437 | 437 | <?php endif; ?> |
| 438 | 438 | |
| 439 | - <?php if($formFlight->has('passengerNames')): ?> |
|
| 439 | + <?php if ($formFlight->has('passengerNames')): ?> |
|
| 440 | 440 | <!-- passenger names --> |
| 441 | 441 | <tr> |
| 442 | 442 | <td width="25%" class="fieldrequired"><?php echo $langs->trans('Noms des passagers'); ?><br/>(Séparé |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | <?php print $renderer->render($formFlight->getElement('passengerNames')); ?> |
| 447 | 447 | </td> |
| 448 | 448 | </tr> |
| 449 | - <?php endif;?> |
|
| 449 | + <?php endif; ?> |
|
| 450 | 450 | </table> |
| 451 | 451 | </section> |
| 452 | 452 | |
@@ -455,17 +455,17 @@ discard block |
||
| 455 | 455 | <h1 class="form-section-title js-billable-field"><?php echo $langs->trans('Facturation') ?></h1> |
| 456 | 456 | <table class="border" width="50%"> |
| 457 | 457 | |
| 458 | - <?php if($formFlight->has('fk_receiver')): ?> |
|
| 458 | + <?php if ($formFlight->has('fk_receiver')): ?> |
|
| 459 | 459 | <!-- Money receiver --> |
| 460 | 460 | <tr class="js-hide-order js-billable-field"> |
| 461 | 461 | <td class="fieldrequired"><?php echo $langs->trans('Qui a perçu l\'argent') ?></td> |
| 462 | 462 | <td> |
| 463 | - <?php print $renderer->render($formFlight->getElement('fk_receiver'),['ajax' => true]); ?> |
|
| 463 | + <?php print $renderer->render($formFlight->getElement('fk_receiver'), ['ajax' => true]); ?> |
|
| 464 | 464 | </td> |
| 465 | 465 | </tr> |
| 466 | 466 | <?php endif; ?> |
| 467 | 467 | |
| 468 | - <?php if($formFlight->has('cost')): ?> |
|
| 468 | + <?php if ($formFlight->has('cost')): ?> |
|
| 469 | 469 | <!-- Flight cost --> |
| 470 | 470 | <tr class="js-hide-order js-billable-field"> |
| 471 | 471 | <td class="fieldrequired">Montant perçu</td> |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | <h1 class="form-section-title"><?php echo $langs->trans('Commentaires') ?></h1> |
| 487 | 487 | <table class="border" width="50%"> |
| 488 | 488 | |
| 489 | - <?php if($formFlight->has('remarque')): ?> |
|
| 489 | + <?php if ($formFlight->has('remarque')): ?> |
|
| 490 | 490 | <!-- commentaires --> |
| 491 | 491 | <tr class=""> |
| 492 | 492 | <td class="fieldrequired"> Commentaire</td> |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | </tr> |
| 497 | 497 | <?php endif; ?> |
| 498 | 498 | |
| 499 | - <?php if($formFlight->has('incidents')): ?> |
|
| 499 | + <?php if ($formFlight->has('incidents')): ?> |
|
| 500 | 500 | <!-- incidents --> |
| 501 | 501 | <tr class=""> |
| 502 | 502 | <td class="fieldrequired"> incidents</td> |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), |
| 531 | 531 | $langs->trans('êtes-vous sure de vouloir supprimer ce vol ?'), 'confirm_delete', '', 0, 1); |
| 532 | 532 | print $formconfirm; |
| 533 | - } elseif ($user->rights->flightlog->vol->financial && $action == ACTION_FLAG_BILLED) { |
|
| 533 | + } elseif ($user->rights->flightlog->vol->financial && $action == ACTION_FLAG_BILLED) { |
|
| 534 | 534 | $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, |
| 535 | 535 | $langs->trans('Marque comme facturé'), |
| 536 | 536 | $langs->trans('Ce vol va être marqué comme facturé, est-ce bien le cas ?'), ACTION_CONFIRM_FLAG_BILLED, '', |
@@ -554,29 +554,29 @@ discard block |
||
| 554 | 554 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_pilot") . '</td><td>' . $pilot->getNomUrl(1) . '</td></tr>'; |
| 555 | 555 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_organisateur") . '</td><td>' . $organisator->getNomUrl(1) . '</td></tr>'; |
| 556 | 556 | |
| 557 | - if (! empty($conf->projet->enabled)) |
|
| 557 | + if (!empty($conf->projet->enabled)) |
|
| 558 | 558 | { |
| 559 | 559 | print '<tr><td class="fieldrequired">' . $langs->trans("Project") . '</td><td>'; |
| 560 | 560 | $morehtmlref = ''; |
| 561 | 561 | if ($user->rights->projet->creer) |
| 562 | 562 | { |
| 563 | 563 | if ($action !== ACTION_CLASSIFY) { |
| 564 | - $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action='.ACTION_CLASSIFY.'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> '; |
|
| 564 | + $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=' . ACTION_CLASSIFY . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> '; |
|
| 565 | 565 | } |
| 566 | 566 | if ($action === ACTION_CLASSIFY) { |
| 567 | - $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">'; |
|
| 568 | - $morehtmlref.='<input type="hidden" name="action" value="'.ACTION_CLASSIN.'">'; |
|
| 569 | - $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; |
|
| 570 | - $morehtmlref.=$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:-1), $object->fk_project, 'projectid', 80, 0, 1, 0, 1, 0, 0, '', 1); |
|
| 571 | - $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">'; |
|
| 572 | - $morehtmlref.='</form>'; |
|
| 567 | + $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">'; |
|
| 568 | + $morehtmlref .= '<input type="hidden" name="action" value="' . ACTION_CLASSIN . '">'; |
|
| 569 | + $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">'; |
|
| 570 | + $morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', 80, 0, 1, 0, 1, 0, 0, '', 1); |
|
| 571 | + $morehtmlref .= '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">'; |
|
| 572 | + $morehtmlref .= '</form>'; |
|
| 573 | 573 | } |
| 574 | 574 | } |
| 575 | 575 | |
| 576 | 576 | if ($object->hasProject()) { |
| 577 | 577 | $proj = new Project($db); |
| 578 | 578 | $proj->fetch($object->fk_project); |
| 579 | - $morehtmlref.=$proj->getNomUrl(1); |
|
| 579 | + $morehtmlref .= $proj->getNomUrl(1); |
|
| 580 | 580 | } |
| 581 | 581 | print $morehtmlref . '</td>'; |
| 582 | 582 | } |
@@ -591,7 +591,7 @@ discard block |
||
| 591 | 591 | print '<div class="tabsAction">' . "\n"; |
| 592 | 592 | $parameters = array(); |
| 593 | 593 | $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, |
| 594 | - $action); // Note that $action and $object may have been modified by hook |
|
| 594 | + $action); // Note that $action and $object may have been modified by hook |
|
| 595 | 595 | if ($reshook < 0) { |
| 596 | 596 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
| 597 | 597 | } |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | |
| 112 | 112 | /** |
| 113 | 113 | * @param Product $flightProduct |
| 114 | - * @param float|int $pricePerPax |
|
| 114 | + * @param integer $pricePerPax |
|
| 115 | 115 | * |
| 116 | 116 | * @return float|int |
| 117 | 117 | */ |
@@ -124,7 +124,7 @@ |
||
| 124 | 124 | $this->language = $form->language; |
| 125 | 125 | $this->userId = $userId; |
| 126 | 126 | $this->publicComment = $form->isCommentPublic == 1; |
| 127 | - $this->socid = (int)$form->socid; |
|
| 127 | + $this->socid = (int) $form->socid; |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
@@ -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> |
@@ -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> |
@@ -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 |