@@ -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,7 +73,7 @@ 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(); |
@@ -86,12 +86,12 @@ discard block |
||
| 86 | 86 | throw new Exception(); |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | - if(!$vol->getFlightType()->isBillingRequired() || $vol->isLinkedToOrder()){ |
|
| 89 | + if (!$vol->getFlightType()->isBillingRequired() || $vol->isLinkedToOrder()) { |
|
| 90 | 90 | $vol->is_facture = true; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | $result = $vol->create($this->user); |
| 94 | - if($result <= 0){ |
|
| 94 | + if ($result <= 0) { |
|
| 95 | 95 | throw new Exception(); |
| 96 | 96 | } |
| 97 | 97 | |
@@ -111,28 +111,28 @@ discard block |
||
| 111 | 111 | { |
| 112 | 112 | $flight->fetch($flight->id); |
| 113 | 113 | |
| 114 | - if(!$flight->isLinkedToOrder()){ |
|
| 114 | + if (!$flight->isLinkedToOrder()) { |
|
| 115 | 115 | return; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - foreach($this->getOrderFromFlight($flight) as $order){ |
|
| 118 | + foreach ($this->getOrderFromFlight($flight) as $order) { |
|
| 119 | 119 | |
| 120 | 120 | $order->add_object_linked('flightlog_bbcvols', $flight->getId()); |
| 121 | 121 | $order->fetch_lines(); |
| 122 | 122 | |
| 123 | 123 | $qtyOrder = 0; |
| 124 | 124 | /** @var OrderLine $currentOrderLine */ |
| 125 | - foreach($order->lines as $currentOrderLine){ |
|
| 126 | - $qtyOrder += (int)$currentOrderLine->qty; |
|
| 125 | + foreach ($order->lines as $currentOrderLine) { |
|
| 126 | + $qtyOrder += (int) $currentOrderLine->qty; |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | $passangersCount = $this->numberOfPassengersLinkedToOrder($order->id); |
| 130 | 130 | |
| 131 | - if($passangersCount != $qtyOrder){ |
|
| 131 | + if ($passangersCount != $qtyOrder) { |
|
| 132 | 132 | return; |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - if($order->statut == Commande::STATUS_VALIDATED){ |
|
| 135 | + if ($order->statut == Commande::STATUS_VALIDATED) { |
|
| 136 | 136 | $order->cloture($this->user); |
| 137 | 137 | } |
| 138 | 138 | } |
@@ -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,15 +93,15 @@ 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 | |
| 106 | 106 | ?> |
| 107 | 107 | <tr> |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | </td> |
| 111 | 111 | <td> |
| 112 | 112 | <ul> |
| 113 | - <?php foreach($object->getOrders() as $order):?> |
|
| 113 | + <?php foreach ($object->getOrders() as $order):?> |
|
| 114 | 114 | <li><?php echo $order->getNomUrl(1); ?></li> |
| 115 | 115 | <?php endforeach; ?> |
| 116 | 116 | </ul> |
@@ -126,13 +126,13 @@ discard block |
||
| 126 | 126 | // Buttons |
| 127 | 127 | print '<div class="tabsAction">' . "\n"; |
| 128 | 128 | |
| 129 | -if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){ |
|
| 130 | - 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"; |
|
| 129 | +if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) { |
|
| 130 | + 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"; |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | print '</div>' . "\n"; |
| 134 | 134 | |
| 135 | -if($user->rights->flightlog->vol->financial){ |
|
| 135 | +if ($user->rights->flightlog->vol->financial) { |
|
| 136 | 136 | print '<div class="fichecenter"><div class="fichehalfleft">'; |
| 137 | 137 | $form->showLinkedObjectBlock($object); |
| 138 | 138 | 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 | |
| 106 | 106 | ?> |
| 107 | 107 | <tr> |
@@ -262,7 +262,7 @@ |
||
| 262 | 262 | <td class="fieldrequired"><?php echo $langs->trans('Commande du vol')?></td> |
| 263 | 263 | <td class="js-order"> |
| 264 | 264 | <?php |
| 265 | - echo $html->selectarray('order_id',$commande->liste_array(2),$_POST['order_id'], 1,0,0,'multiple style="width:100%"',0,0,0,'','',1); |
|
| 265 | + echo $html->selectarray('order_id',$commande->liste_array(2),$_POST['order_id'], 1,0,0,'multiple style="width:100%"',0,0,0,'','',1); |
|
| 266 | 266 | ?> |
| 267 | 267 | </td> |
| 268 | 268 | </tr> |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | ->setGroupedFlight($isGroupedFlight) |
| 61 | 61 | ->setOrderIds($orderIds); |
| 62 | 62 | |
| 63 | - try{ |
|
| 63 | + try { |
|
| 64 | 64 | $vol = $createFlightHandler->handle($volCommand); |
| 65 | 65 | |
| 66 | 66 | include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | $msg = '<div class="ok">L\'ajout du vol du : ' . $_POST["reday"] . '/' . $_POST["remonth"] . '/' . $_POST["reyear"] . ' s\'est correctement effectue ! </div>'; |
| 71 | 71 | Header("Location: card.php?id=" . $vol->id); |
| 72 | - }catch (\Exception $e){ |
|
| 72 | + } catch (\Exception $e) { |
|
| 73 | 73 | $msg = '<div class="error">Erreur lors de l\'ajout du vol : ' . $vol->error . '! </div>'; |
| 74 | 74 | } |
| 75 | 75 | |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | <input type="number" |
| 239 | 239 | name="nbrPax" |
| 240 | 240 | class="flat <?php echo $validator->hasError('nbrPax') ? 'error' : '' ?>" |
| 241 | - value="<?php echo $_POST['nbrPax']?: 0 ?>"/> |
|
| 241 | + value="<?php echo $_POST['nbrPax'] ?: 0 ?>"/> |
|
| 242 | 242 | </td> |
| 243 | 243 | </tr> |
| 244 | 244 | |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | <td class="fieldrequired"><?php echo $langs->trans('Commande du vol')?></td> |
| 263 | 263 | <td class="js-order"> |
| 264 | 264 | <?php |
| 265 | - echo $html->selectarray('order_id',$commande->liste_array(2),$_POST['order_id'], 1,0,0,'multiple style="width:100%"',0,0,0,'','',1); |
|
| 265 | + echo $html->selectarray('order_id', $commande->liste_array(2), $_POST['order_id'], 1, 0, 0, 'multiple style="width:100%"', 0, 0, 0, '', '', 1); |
|
| 266 | 266 | ?> |
| 267 | 267 | </td> |
| 268 | 268 | </tr> |