@@ -28,7 +28,7 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function setValue($value) |
| 30 | 30 | { |
| 31 | - if($value instanceof \DateTime){ |
|
| 31 | + if ($value instanceof \DateTime) { |
|
| 32 | 32 | return parent::setValue($value->format('Y-m-d')); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * @param array $options |
| 28 | 28 | * @param \User $user |
| 29 | 29 | */ |
| 30 | - public function __construct(\ValidatorInterface $validator, $baseObject, \DoliDB $db, $options,\User $user) |
|
| 30 | + public function __construct(\ValidatorInterface $validator, $baseObject, \DoliDB $db, $options, \User $user) |
|
| 31 | 31 | { |
| 32 | 32 | |
| 33 | 33 | parent::__construct('flight_form', FormInterface::METHOD_POST, $this->buildOptionsfromConfiguration($options)); |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | $flight = $object; |
| 84 | 84 | |
| 85 | 85 | // Quick fix - Fixme by a factory on this form. |
| 86 | - if($this->user->rights->flightlog->vol->advanced){ |
|
| 86 | + if ($this->user->rights->flightlog->vol->advanced) { |
|
| 87 | 87 | return parent::bind($object); |
| 88 | 88 | } |
| 89 | 89 | |
@@ -272,7 +272,7 @@ |
||
| 272 | 272 | $expenseNoteUser = new User($this->db); |
| 273 | 273 | $expenseNoteUser->id = $currentMissionUserId; |
| 274 | 274 | $id = $expenseNote->create($expenseNoteUser); |
| 275 | - if($id < 0){ |
|
| 275 | + if ($id < 0) { |
|
| 276 | 276 | return null; |
| 277 | 277 | } |
| 278 | 278 | |
@@ -52,9 +52,9 @@ discard block |
||
| 52 | 52 | $pilotLastname = $obj->lastname; |
| 53 | 53 | $pilotFirstname = $obj->firstname; |
| 54 | 54 | |
| 55 | - if($query->isPilotsOnly()){ |
|
| 55 | + if ($query->isPilotsOnly()) { |
|
| 56 | 56 | $result->addPilot($pilotId, $pilotFirstname, $pilotLastname); |
| 57 | - }else{ |
|
| 57 | + } else { |
|
| 58 | 58 | $result->addMission($obj->quartil, $pilotId, $pilotFirstname, $pilotLastname, |
| 59 | 59 | $obj->number_flights, $obj->total_kilometers); |
| 60 | 60 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | $sql .= " , SUM(VOL.kilometers) as total_kilometers "; |
| 80 | 80 | $sql .= " , COUNT(VOL.idBBC_vols) as number_flights"; |
| 81 | 81 | |
| 82 | - if(!$query->isPilotsOnly()){ |
|
| 82 | + if (!$query->isPilotsOnly()) { |
|
| 83 | 83 | $sql .= " , QUARTER(VOL.date) as quartil "; |
| 84 | 84 | } |
| 85 | 85 | |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | |
| 55 | 55 | if($query->isPilotsOnly()){ |
| 56 | 56 | $result->addPilot($pilotId, $pilotFirstname, $pilotLastname); |
| 57 | - }else{ |
|
| 57 | + } else{ |
|
| 58 | 58 | $result->addMission($obj->quartil, $pilotId, $pilotFirstname, $pilotLastname, |
| 59 | 59 | $obj->number_flights, $obj->total_kilometers); |
| 60 | 60 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | $id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int'); |
| 45 | 45 | $action = GETPOST('action', 'alpha'); |
| 46 | -$permissiondellink=$user->rights->flightlog->vol->financial; |
|
| 46 | +$permissiondellink = $user->rights->flightlog->vol->financial; |
|
| 47 | 47 | |
| 48 | 48 | $object = new Bbcvols($db); |
| 49 | 49 | $extrafields = new ExtraFields($db); |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
| 63 | 63 | |
| 64 | 64 | // Load object |
| 65 | -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
| 66 | -include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; |
|
| 65 | +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
| 66 | +include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; |
|
| 67 | 67 | |
| 68 | 68 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
| 69 | 69 | $hookmanager->initHooks(array('bbcvols')); |
@@ -93,18 +93,18 @@ discard block |
||
| 93 | 93 | print '<tr><td class="fieldrequired">' . $langs->trans("Fielddate") . '</td><td>' . dol_print_date($object->date) . '</td></tr>'; |
| 94 | 94 | |
| 95 | 95 | if ($user->rights->flightlog->vol->financial) { |
| 96 | - print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5). '</td></tr>'; |
|
| 96 | + print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5) . '</td></tr>'; |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldkilometers") . '</td><td>' . $object->kilometers . ' KM</td></tr>'; |
| 100 | 100 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldjustif_kilometers") . '</td><td>' . $object->justif_kilometers . '</td></tr>'; |
| 101 | -if(!$object->isLinkedToOrder()){ |
|
| 101 | +if (!$object->isLinkedToOrder()) { |
|
| 102 | 102 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost . " " . $langs->getCurrencySymbol($conf->currency) . '</td></tr>'; |
| 103 | 103 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_receiver") . '</td><td>' . $receiver->getNomUrl(1) . '</td></tr>'; |
| 104 | -}else{ |
|
| 104 | +} else { |
|
| 105 | 105 | print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td><ul>'; |
| 106 | - foreach($object->getOrders() as $currentOrder){ |
|
| 107 | - print '<li>'.$currentOrder->getNomUrl(1).'</li>'; |
|
| 106 | + foreach ($object->getOrders() as $currentOrder) { |
|
| 107 | + print '<li>' . $currentOrder->getNomUrl(1) . '</li>'; |
|
| 108 | 108 | } |
| 109 | 109 | print '</ul></td></tr>'; |
| 110 | 110 | } |
@@ -115,13 +115,13 @@ discard block |
||
| 115 | 115 | // Buttons |
| 116 | 116 | print '<div class="tabsAction">' . "\n"; |
| 117 | 117 | |
| 118 | -if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){ |
|
| 119 | - print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id.'">' . $langs->trans("Facturer") . '</a></div>' . "\n"; |
|
| 118 | +if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) { |
|
| 119 | + print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id . '">' . $langs->trans("Facturer") . '</a></div>' . "\n"; |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | print '</div>' . "\n"; |
| 123 | 123 | |
| 124 | -if($user->rights->flightlog->vol->financial){ |
|
| 124 | +if ($user->rights->flightlog->vol->financial) { |
|
| 125 | 125 | print '<div class="fichecenter"><div class="fichehalfleft">'; |
| 126 | 126 | $form->showLinkedObjectBlock($object); |
| 127 | 127 | print '</div></div>'; |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | if(!$object->isLinkedToOrder()){ |
| 102 | 102 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost . " " . $langs->getCurrencySymbol($conf->currency) . '</td></tr>'; |
| 103 | 103 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_receiver") . '</td><td>' . $receiver->getNomUrl(1) . '</td></tr>'; |
| 104 | -}else{ |
|
| 104 | +} else{ |
|
| 105 | 105 | print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td><ul>'; |
| 106 | 106 | foreach($object->getOrders() as $currentOrder){ |
| 107 | 107 | print '<li>'.$currentOrder->getNomUrl(1).'</li>'; |
@@ -397,7 +397,7 @@ |
||
| 397 | 397 | /** |
| 398 | 398 | * @return bool |
| 399 | 399 | */ |
| 400 | - public function hasOrderId(){ |
|
| 400 | + public function hasOrderId() { |
|
| 401 | 401 | return count($this->orderIds) > 0; |
| 402 | 402 | } |
| 403 | 403 | } |
| 404 | 404 | \ No newline at end of file |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | $vol = new Bbcvols($this->db); |
| 66 | 66 | $vol->date = $command->getDate(); |
| 67 | 67 | $vol->lieuD = $command->getLieuD(); |
| 68 | - $vol->lieuA =$command->getLieuA(); |
|
| 68 | + $vol->lieuA = $command->getLieuA(); |
|
| 69 | 69 | $vol->heureD = $command->getHeureD(); |
| 70 | 70 | $vol->heureA = $command->getHeureA(); |
| 71 | 71 | $vol->BBC_ballons_idBBC_ballons = $command->getBBCBallonsIdBBCBallons(); |
@@ -73,14 +73,14 @@ discard block |
||
| 73 | 73 | $vol->remarque = $command->getRemarque(); |
| 74 | 74 | $vol->incidents = $command->getIncidents(); |
| 75 | 75 | $vol->fk_type = $command->getFkType(); |
| 76 | - $vol->fk_pilot =$command->getFkPilot(); |
|
| 76 | + $vol->fk_pilot = $command->getFkPilot(); |
|
| 77 | 77 | $vol->fk_organisateur = $command->getFkOrganisateur(); |
| 78 | 78 | $vol->kilometers = $command->getKilometers(); |
| 79 | 79 | $vol->cost = $command->getCost(); |
| 80 | 80 | $vol->fk_receiver = $command->getFkReceiver(); |
| 81 | 81 | $vol->justif_kilometers = $command->getJustifKilometers(); |
| 82 | 82 | $vol->setPassengerNames($command->getPassengerNames()); |
| 83 | - foreach($command->getOrderIds() as $orderId => $nbrPassengers){ |
|
| 83 | + foreach ($command->getOrderIds() as $orderId => $nbrPassengers) { |
|
| 84 | 84 | $vol->addOrderId($orderId, $nbrPassengers); |
| 85 | 85 | } |
| 86 | 86 | |
@@ -88,12 +88,12 @@ discard block |
||
| 88 | 88 | throw new Exception(); |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - if(!$vol->getFlightType()->isBillingRequired() || $vol->isLinkedToOrder()){ |
|
| 91 | + if (!$vol->getFlightType()->isBillingRequired() || $vol->isLinkedToOrder()) { |
|
| 92 | 92 | $vol->is_facture = true; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | $result = $vol->create($this->user); |
| 96 | - if($result <= 0){ |
|
| 96 | + if ($result <= 0) { |
|
| 97 | 97 | throw new Exception(); |
| 98 | 98 | } |
| 99 | 99 | |
@@ -113,27 +113,27 @@ discard block |
||
| 113 | 113 | { |
| 114 | 114 | $flight->fetch($flight->id); |
| 115 | 115 | |
| 116 | - if(!$flight->isLinkedToOrder()){ |
|
| 116 | + if (!$flight->isLinkedToOrder()) { |
|
| 117 | 117 | return; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - foreach($flight->getOrders() as $currentOrder){ |
|
| 120 | + foreach ($flight->getOrders() as $currentOrder) { |
|
| 121 | 121 | $currentOrder->add_object_linked('flightlog_bbcvols', $flight->getId()); |
| 122 | 122 | $currentOrder->fetch_lines(); |
| 123 | 123 | |
| 124 | 124 | $qtyOrder = 0; |
| 125 | 125 | /** @var OrderLine $currentOrderLine */ |
| 126 | - foreach($currentOrder->lines as $currentOrderLine){ |
|
| 127 | - $qtyOrder += (int)$currentOrderLine->qty; |
|
| 126 | + foreach ($currentOrder->lines as $currentOrderLine) { |
|
| 127 | + $qtyOrder += (int) $currentOrderLine->qty; |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | $passangersCount = $this->numberOfPassengersLinkedToOrder($currentOrder->id); |
| 131 | 131 | |
| 132 | - if($passangersCount < $qtyOrder){ |
|
| 132 | + if ($passangersCount < $qtyOrder) { |
|
| 133 | 133 | continue; |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - if($currentOrder->statut == Commande::STATUS_VALIDATED){ |
|
| 136 | + if ($currentOrder->statut == Commande::STATUS_VALIDATED) { |
|
| 137 | 137 | $currentOrder->cloture($this->user); |
| 138 | 138 | } |
| 139 | 139 | } |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | ->setGroupedFlight($isGroupedFlight) |
| 62 | 62 | ->setOrderIds($orderPassengersCount); |
| 63 | 63 | |
| 64 | - try{ |
|
| 64 | + try { |
|
| 65 | 65 | $vol = $createFlightHandler->handle($volCommand); |
| 66 | 66 | |
| 67 | 67 | include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; |
@@ -70,8 +70,8 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | $msg = '<div class="ok">L\'ajout du vol du : ' . $_POST["reday"] . '/' . $_POST["remonth"] . '/' . $_POST["reyear"] . ' s\'est correctement effectue ! </div>'; |
| 72 | 72 | Header("Location: card.php?id=" . $vol->id); |
| 73 | - }catch (\Exception $e){ |
|
| 74 | - $msg = '<div class="error">Erreur lors de l\'ajout du vol : ' . ($vol->error?:$e->getMessage()) . '! </div>'; |
|
| 73 | + } catch (\Exception $e) { |
|
| 74 | + $msg = '<div class="error">Erreur lors de l\'ajout du vol : ' . ($vol->error ?: $e->getMessage()) . '! </div>'; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | } |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | //Pilote |
| 151 | 151 | print "<tr>"; |
| 152 | 152 | print '<td class="fieldrequired"> Pilote </td><td >'; |
| 153 | - print $html->select_dolusers($_POST["pilot"] ? $_POST["pilot"] : $user->id, 'pilot', 0, null, 0, '', '', 0,0,0,'',0,'','', true); |
|
| 153 | + print $html->select_dolusers($_POST["pilot"] ? $_POST["pilot"] : $user->id, 'pilot', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', true); |
|
| 154 | 154 | print '</td></tr>'; |
| 155 | 155 | |
| 156 | 156 | //Ballon |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | <td> |
| 197 | 197 | <?php |
| 198 | 198 | //organisateur |
| 199 | - print $html->select_dolusers($_POST["orga"] ? $_POST["orga"] : $user->id, 'orga', 0, null, 0, '', '', 0,0,0,'',0,'','', true); |
|
| 199 | + print $html->select_dolusers($_POST["orga"] ? $_POST["orga"] : $user->id, 'orga', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', true); |
|
| 200 | 200 | ?> |
| 201 | 201 | </td> |
| 202 | 202 | </tr> |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | <input type="number" |
| 237 | 237 | name="nbrPax" |
| 238 | 238 | class="flat <?php echo $validator->hasError('nbrPax') ? 'error' : '' ?>" |
| 239 | - value="<?php echo $_POST['nbrPax']?: 0 ?>"/> |
|
| 239 | + value="<?php echo $_POST['nbrPax'] ?: 0 ?>"/> |
|
| 240 | 240 | </td> |
| 241 | 241 | </tr> |
| 242 | 242 | |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | <td class="js-order"> |
| 262 | 262 | <p class="text-muted">Pour retirer une commande merci de la retirer de la liste ci-dessous.</p> |
| 263 | 263 | <?php |
| 264 | - echo $html::multiselectarray('order_id', $commande->liste_array(2),$_POST['order_id'],0,0, $validator->hasError('order_id') ? 'error' : '',0,'100%'); |
|
| 264 | + echo $html::multiselectarray('order_id', $commande->liste_array(2), $_POST['order_id'], 0, 0, $validator->hasError('order_id') ? 'error' : '', 0, '100%'); |
|
| 265 | 265 | ?> |
| 266 | 266 | </td> |
| 267 | 267 | </tr> |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | <tr class="js-hide-order js-billable-field"> |
| 271 | 271 | <td class="fieldrequired"><?php echo $langs->trans('Qui a perçu l\'argent')?></td><td> |
| 272 | 272 | <?php print $html->select_dolusers($_POST["fk_receiver"] ? $_POST["fk_receiver"] : $user->id, |
| 273 | - 'fk_receiver', true, null, 0, '', '', 0,0,0,'',0,'','', true); ?> |
|
| 273 | + 'fk_receiver', true, null, 0, '', '', 0, 0, 0, '', 0, '', '', true); ?> |
|
| 274 | 274 | </td> |
| 275 | 275 | </tr> |
| 276 | 276 | |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | <tr class="js-hide-order js-billable-field"> |
| 279 | 279 | <td class="fieldrequired">Montant perçu</td> |
| 280 | 280 | <td> |
| 281 | - <input type="text" name="cost" class="flat <?php echo $validator->hasError('cost') ? 'error' : '' ?>" value="<?php echo $_POST['cost']?:0 ?> "/> |
|
| 281 | + <input type="text" name="cost" class="flat <?php echo $validator->hasError('cost') ? 'error' : '' ?>" value="<?php echo $_POST['cost'] ?: 0 ?> "/> |
|
| 282 | 282 | € |
| 283 | 283 | </td> |
| 284 | 284 | </tr> |
@@ -325,9 +325,9 @@ discard block |
||
| 325 | 325 | |
| 326 | 326 | <script type="application/javascript"> |
| 327 | 327 | |
| 328 | - <?php if(!empty(GETPOST('order_passengers_count', 'array', 2))): ?> |
|
| 328 | + <?php if (!empty(GETPOST('order_passengers_count', 'array', 2))): ?> |
|
| 329 | 329 | var orders = {}; |
| 330 | - <?php foreach( GETPOST('order_passengers_count', 'array', 2) as $currentOrderId=>$nbrPaxForOrder): ?> |
|
| 330 | + <?php foreach (GETPOST('order_passengers_count', 'array', 2) as $currentOrderId=>$nbrPaxForOrder): ?> |
|
| 331 | 331 | orders[<?php echo $currentOrderId; ?>] = <?php echo $nbrPaxForOrder; ?>; |
| 332 | 332 | <?php endforeach; ?> |
| 333 | 333 | <?php endif; ?> |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | |
| 71 | 71 | $msg = '<div class="ok">L\'ajout du vol du : ' . $_POST["reday"] . '/' . $_POST["remonth"] . '/' . $_POST["reyear"] . ' s\'est correctement effectue ! </div>'; |
| 72 | 72 | Header("Location: card.php?id=" . $vol->id); |
| 73 | - }catch (\Exception $e){ |
|
| 73 | + } catch (\Exception $e){ |
|
| 74 | 74 | $msg = '<div class="error">Erreur lors de l\'ajout du vol : ' . ($vol->error?:$e->getMessage()) . '! </div>'; |
| 75 | 75 | } |
| 76 | 76 | |
@@ -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 | /** |