@@ -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 | /** |
@@ -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 | |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | |
290 | 290 | <?php echo $renderer->render($formFlight->getElement('idBBC_vols')); ?> |
291 | 291 | |
292 | - <?php if($formFlight->has('fk_type')): ?> |
|
292 | + <?php if ($formFlight->has('fk_type')): ?> |
|
293 | 293 | <section class="form-section"> |
294 | 294 | <h1 class="form-section-title"><?php echo $langs->trans('Type de vol'); ?></h1> |
295 | 295 | <table class="border" width="50%"> |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | <?php endif; ?> |
304 | 304 | |
305 | 305 | <!-- Date et heures --> |
306 | - <?php if($formFlight->has('date')): ?> |
|
306 | + <?php if ($formFlight->has('date')): ?> |
|
307 | 307 | <section class="form-section"> |
308 | 308 | <h1 class="form-section-title"><?php echo $langs->trans('Date'); ?></h1> |
309 | 309 | <table class="border" width="50%"> |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | </section> |
316 | 316 | <?php endif; ?> |
317 | 317 | |
318 | - <?php if($formFlight->has('heureD') && $formFlight->has('heureA')): ?> |
|
318 | + <?php if ($formFlight->has('heureD') && $formFlight->has('heureA')): ?> |
|
319 | 319 | <section class="form-section"> |
320 | 320 | <h1 class="form-section-title"><?php echo $langs->trans('Heures'); ?></h1> |
321 | 321 | <table class="border" width="50%"> |
@@ -335,14 +335,14 @@ discard block |
||
335 | 335 | <h1 class="form-section-title"><?php echo $langs->trans('Pilote & ballon') ?></h1> |
336 | 336 | <table class="border" width="50%"> |
337 | 337 | |
338 | - <?php if($formFlight->has('fk_pilot')): ?> |
|
338 | + <?php if ($formFlight->has('fk_pilot')): ?> |
|
339 | 339 | <tr> |
340 | 340 | <td class="fieldrequired"> Pilote </td> |
341 | - <td><?php echo $renderer->render($formFlight->getElement('fk_pilot'),['ajax' => true]); ?></td> |
|
341 | + <td><?php echo $renderer->render($formFlight->getElement('fk_pilot'), ['ajax' => true]); ?></td> |
|
342 | 342 | </tr> |
343 | 343 | <?php endif; ?> |
344 | 344 | |
345 | - <?php if($formFlight->has('BBC_ballons_idBBC_ballons')): ?> |
|
345 | + <?php if ($formFlight->has('BBC_ballons_idBBC_ballons')): ?> |
|
346 | 346 | <tr> |
347 | 347 | <td width="25%" class="fieldrequired">Ballon</td> |
348 | 348 | <td><?php echo $renderer->render($formFlight->getElement('BBC_ballons_idBBC_ballons')); ?></td> |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | </table> |
378 | 378 | </section> |
379 | 379 | |
380 | - <?php if($formFlight->has('fk_organisateur')): ?> |
|
380 | + <?php if ($formFlight->has('fk_organisateur')): ?> |
|
381 | 381 | <section class="form-section"> |
382 | 382 | <h1 class="form-section-title"><span class="js-organisator-field">Organisateur</span></h1> |
383 | 383 | <table class="border" width="50%"> |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | <td> |
387 | 387 | <?php |
388 | 388 | //organisateur |
389 | - print $renderer->render($formFlight->getElement('fk_organisateur'),['ajax' => true]); |
|
389 | + print $renderer->render($formFlight->getElement('fk_organisateur'), ['ajax' => true]); |
|
390 | 390 | ?> |
391 | 391 | </td> |
392 | 392 | </tr> |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | <section class="form-section js-expensable-field"> |
399 | 399 | <h1 class="form-section-title"><?php echo $langs->trans('Déplacements') ?></h1> |
400 | 400 | <table class="border" width="50%"> |
401 | - <?php if($formFlight->has('kilometers')): ?> |
|
401 | + <?php if ($formFlight->has('kilometers')): ?> |
|
402 | 402 | <!-- number of kilometers done for the flight --> |
403 | 403 | <tr> |
404 | 404 | <td class="fieldrequired">Nombre de kilometres effectués pour le vol</td> |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | </tr> |
409 | 409 | <?php endif; ?> |
410 | 410 | |
411 | - <?php if($formFlight->has('justif_kilometers')): ?> |
|
411 | + <?php if ($formFlight->has('justif_kilometers')): ?> |
|
412 | 412 | <!-- Justif Kilometers --> |
413 | 413 | <tr> |
414 | 414 | |
@@ -426,7 +426,7 @@ discard block |
||
426 | 426 | <section class="form-section"> |
427 | 427 | <h1 class="form-section-title"><?php echo $langs->trans('Passager') ?></h1> |
428 | 428 | <table class="border" width="50%"> |
429 | - <?php if($formFlight->has('nbrPax')): ?> |
|
429 | + <?php if ($formFlight->has('nbrPax')): ?> |
|
430 | 430 | <tr> |
431 | 431 | <td class="fieldrequired"><?php echo $langs->trans('Nombre de passagers'); ?></td> |
432 | 432 | <td> |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | </tr> |
436 | 436 | <?php endif; ?> |
437 | 437 | |
438 | - <?php if($formFlight->has('passengerNames')): ?> |
|
438 | + <?php if ($formFlight->has('passengerNames')): ?> |
|
439 | 439 | <!-- passenger names --> |
440 | 440 | <tr> |
441 | 441 | <td width="25%" class="fieldrequired"><?php echo $langs->trans('Noms des passagers'); ?><br/>(Séparé |
@@ -445,7 +445,7 @@ discard block |
||
445 | 445 | <?php print $renderer->render($formFlight->getElement('passengerNames')); ?> |
446 | 446 | </td> |
447 | 447 | </tr> |
448 | - <?php endif;?> |
|
448 | + <?php endif; ?> |
|
449 | 449 | </table> |
450 | 450 | </section> |
451 | 451 | |
@@ -454,17 +454,17 @@ discard block |
||
454 | 454 | <h1 class="form-section-title js-billable-field"><?php echo $langs->trans('Facturation') ?></h1> |
455 | 455 | <table class="border" width="50%"> |
456 | 456 | |
457 | - <?php if($formFlight->has('fk_receiver')): ?> |
|
457 | + <?php if ($formFlight->has('fk_receiver')): ?> |
|
458 | 458 | <!-- Money receiver --> |
459 | 459 | <tr class="js-hide-order js-billable-field"> |
460 | 460 | <td class="fieldrequired"><?php echo $langs->trans('Qui a perçu l\'argent') ?></td> |
461 | 461 | <td> |
462 | - <?php print $renderer->render($formFlight->getElement('fk_receiver'),['ajax' => true]); ?> |
|
462 | + <?php print $renderer->render($formFlight->getElement('fk_receiver'), ['ajax' => true]); ?> |
|
463 | 463 | </td> |
464 | 464 | </tr> |
465 | 465 | <?php endif; ?> |
466 | 466 | |
467 | - <?php if($formFlight->has('cost')): ?> |
|
467 | + <?php if ($formFlight->has('cost')): ?> |
|
468 | 468 | <!-- Flight cost --> |
469 | 469 | <tr class="js-hide-order js-billable-field"> |
470 | 470 | <td class="fieldrequired">Montant perçu</td> |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | <h1 class="form-section-title"><?php echo $langs->trans('Commentaires') ?></h1> |
483 | 483 | <table class="border" width="50%"> |
484 | 484 | |
485 | - <?php if($formFlight->has('remarque')): ?> |
|
485 | + <?php if ($formFlight->has('remarque')): ?> |
|
486 | 486 | <!-- commentaires --> |
487 | 487 | <tr class=""> |
488 | 488 | <td class="fieldrequired"> Commentaire</td> |
@@ -492,7 +492,7 @@ discard block |
||
492 | 492 | </tr> |
493 | 493 | <?php endif; ?> |
494 | 494 | |
495 | - <?php if($formFlight->has('incidents')): ?> |
|
495 | + <?php if ($formFlight->has('incidents')): ?> |
|
496 | 496 | <!-- incidents --> |
497 | 497 | <tr class=""> |
498 | 498 | <td class="fieldrequired"> incidents</td> |
@@ -526,7 +526,7 @@ discard block |
||
526 | 526 | $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), |
527 | 527 | $langs->trans('êtes-vous sure de vouloir supprimer ce vol ?'), 'confirm_delete', '', 0, 1); |
528 | 528 | print $formconfirm; |
529 | - } elseif ($user->rights->flightlog->vol->financial && $action == ACTION_FLAG_BILLED) { |
|
529 | + } elseif ($user->rights->flightlog->vol->financial && $action == ACTION_FLAG_BILLED) { |
|
530 | 530 | $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, |
531 | 531 | $langs->trans('Marque comme facturé'), |
532 | 532 | $langs->trans('Ce vol va être marqué comme facturé, est-ce bien le cas ?'), ACTION_CONFIRM_FLAG_BILLED, '', |
@@ -550,29 +550,29 @@ discard block |
||
550 | 550 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_pilot") . '</td><td>' . $pilot->getNomUrl(1) . '</td></tr>'; |
551 | 551 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_organisateur") . '</td><td>' . $organisator->getNomUrl(1) . '</td></tr>'; |
552 | 552 | |
553 | - if (! empty($conf->projet->enabled)) |
|
553 | + if (!empty($conf->projet->enabled)) |
|
554 | 554 | { |
555 | 555 | print '<tr><td class="fieldrequired">' . $langs->trans("Project") . '</td><td>'; |
556 | 556 | $morehtmlref = ''; |
557 | 557 | if ($user->rights->projet->creer) |
558 | 558 | { |
559 | 559 | if ($action !== ACTION_CLASSIFY) { |
560 | - $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action='.ACTION_CLASSIFY.'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> '; |
|
560 | + $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=' . ACTION_CLASSIFY . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> '; |
|
561 | 561 | } |
562 | 562 | if ($action === ACTION_CLASSIFY) { |
563 | - $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">'; |
|
564 | - $morehtmlref.='<input type="hidden" name="action" value="'.ACTION_CLASSIN.'">'; |
|
565 | - $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; |
|
566 | - $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); |
|
567 | - $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">'; |
|
568 | - $morehtmlref.='</form>'; |
|
563 | + $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">'; |
|
564 | + $morehtmlref .= '<input type="hidden" name="action" value="' . ACTION_CLASSIN . '">'; |
|
565 | + $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">'; |
|
566 | + $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); |
|
567 | + $morehtmlref .= '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">'; |
|
568 | + $morehtmlref .= '</form>'; |
|
569 | 569 | } |
570 | 570 | } |
571 | 571 | |
572 | 572 | if ($object->hasProject()) { |
573 | 573 | $proj = new Project($db); |
574 | 574 | $proj->fetch($object->fk_project); |
575 | - $morehtmlref.=$proj->getNomUrl(1); |
|
575 | + $morehtmlref .= $proj->getNomUrl(1); |
|
576 | 576 | } |
577 | 577 | print $morehtmlref . '</td>'; |
578 | 578 | } |
@@ -587,7 +587,7 @@ discard block |
||
587 | 587 | print '<div class="tabsAction">' . "\n"; |
588 | 588 | $parameters = array(); |
589 | 589 | $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, |
590 | - $action); // Note that $action and $object may have been modified by hook |
|
590 | + $action); // Note that $action and $object may have been modified by hook |
|
591 | 591 | if ($reshook < 0) { |
592 | 592 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
593 | 593 | } |
@@ -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 | } |
@@ -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> |