@@ -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 | */ |
@@ -132,7 +132,7 @@ |
||
132 | 132 | $name = $command->getName() . ' ' . $command->getFirstname(); |
133 | 133 | |
134 | 134 | $existingCustomers = $this->societe->searchByName($name); |
135 | - if(count($existingCustomers) > 0){ |
|
135 | + if (count($existingCustomers) > 0) { |
|
136 | 136 | $this->societe = $existingCustomers[0]; |
137 | 137 | return $this->societe; |
138 | 138 | } |
@@ -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,'',0,0,0,'','minwidth200',1); |
|
265 | + echo $html->selectarray('order_id',$commande->liste_array(2),$_POST['order_id'], 1,0,0,'',0,0,0,'','minwidth200',1); |
|
266 | 266 | ?> |
267 | 267 | </td> |
268 | 268 | </tr> |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | ->setGroupedFlight($isGroupedFlight) |
61 | 61 | ->setOrderId($orderId); |
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 | |
@@ -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,'',0,0,0,'','minwidth200',1); |
|
265 | + echo $html->selectarray('order_id', $commande->liste_array(2), $_POST['order_id'], 1, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1); |
|
266 | 266 | ?> |
267 | 267 | </td> |
268 | 268 | </tr> |
@@ -69,7 +69,7 @@ |
||
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 |
@@ -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; |
@@ -58,9 +58,9 @@ discard block |
||
58 | 58 | if (!$_POST["cancel"]) { |
59 | 59 | |
60 | 60 | $formObject = new stdClass(); |
61 | - $formObject->name = GETPOST('name','alpha'); |
|
62 | - $formObject->firstname = GETPOST('firstname','alpha'); |
|
63 | - $formObject->zip = GETPOST('zipcode','alpha'); |
|
61 | + $formObject->name = GETPOST('name', 'alpha'); |
|
62 | + $formObject->firstname = GETPOST('firstname', 'alpha'); |
|
63 | + $formObject->zip = GETPOST('zipcode', 'alpha'); |
|
64 | 64 | $formObject->town = GETPOST('town', 'alpha'); |
65 | 65 | $formObject->state = GETPOST('state_id', 'int'); |
66 | 66 | $formObject->phone = GETPOST('phone', 'alpha'); |
@@ -77,8 +77,8 @@ discard block |
||
77 | 77 | |
78 | 78 | if ($validator->isValid($formObject, $_REQUEST)) { |
79 | 79 | $createOrderCommand = new CreateOrderCommand($formObject, $user->id); |
80 | - try{ |
|
81 | - $handler = new CreateOrderCommandHandler($db, $conf,$user,$langs,$modCodeClient, $modCodeFournisseur); |
|
80 | + try { |
|
81 | + $handler = new CreateOrderCommandHandler($db, $conf, $user, $langs, $modCodeClient, $modCodeFournisseur); |
|
82 | 82 | $handler->handle($createOrderCommand); |
83 | 83 | |
84 | 84 | $msg = '<div class="success ok">Commande et tiers créés. </div>'; |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | ?> |
114 | 114 | |
115 | 115 | <!-- Success message with reference --> |
116 | - <?php if($successMessage): ?> |
|
116 | + <?php if ($successMessage): ?> |
|
117 | 117 | <div> |
118 | 118 | <p class="cadre_msg1"> |
119 | 119 | Vous avez généré la facture et créé un tiers.<br/> |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | <p> |
173 | 173 | 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> |
174 | 174 | Si vous avre un doute sur la manière d'encoder la commande, veuillez me contacter.<br/> |
175 | - 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> |
|
175 | + 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> |
|
176 | 176 | </p> |
177 | 177 | </div> |
178 | 178 | <form class="flight-form" name='add' method="post"> |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | <?php echo $langs->trans('DefaultLang'); ?> |
252 | 252 | </td> |
253 | 253 | <td> |
254 | - <?php echo $formAdmin->select_language($conf->global->MAIN_LANG_DEFAULT,'default_lang',0,0,1,0,0,'maxwidth200onsmartphone'); ?> |
|
254 | + <?php echo $formAdmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone'); ?> |
|
255 | 255 | </td> |
256 | 256 | </tr> |
257 | 257 | |
@@ -261,16 +261,16 @@ discard block |
||
261 | 261 | <?php echo $langs->trans('Region'); ?> |
262 | 262 | </td> |
263 | 263 | <td> |
264 | - <?php print $formcompany->select_state($formObject->state,'BE'); ?> |
|
264 | + <?php print $formcompany->select_state($formObject->state, 'BE'); ?> |
|
265 | 265 | </td> |
266 | 266 | </tr> |
267 | 267 | |
268 | 268 | <?php |
269 | 269 | // Zip / Town |
270 | - print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>'; |
|
271 | - print $formcompany->select_ziptown($formObject->town,'zipcode',array('town','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent'); |
|
272 | - print '</td><td>'.fieldLabel('Town','town').'</td><td>'; |
|
273 | - print $formcompany->select_ziptown($formObject->zip,'town',array('zipcode','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent'); |
|
270 | + print '<tr><td>' . fieldLabel('Zip', 'zipcode') . '</td><td>'; |
|
271 | + print $formcompany->select_ziptown($formObject->town, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent'); |
|
272 | + print '</td><td>' . fieldLabel('Town', 'town') . '</td><td>'; |
|
273 | + print $formcompany->select_ziptown($formObject->zip, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent'); |
|
274 | 274 | print '</td></tr>'; |
275 | 275 | ?> |
276 | 276 | |
@@ -294,16 +294,16 @@ discard block |
||
294 | 294 | <?php |
295 | 295 | if (empty($conf->global->MAIN_DISABLEVATCHECK)): ?> |
296 | 296 | |
297 | - <?php if (! empty($conf->use_javascript_ajax)): ?> |
|
297 | + <?php if (!empty($conf->use_javascript_ajax)): ?> |
|
298 | 298 | <script language="JavaScript" type="text/javascript"> |
299 | 299 | function CheckVAT(a) { |
300 | - <?php print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,300);"; ?> |
|
300 | + <?php print "newpopup('" . DOL_URL_ROOT . "/societe/checkvat/checkVatPopup.php?vatNumber='+a,'" . dol_escape_js($langs->trans("VATIntraCheckableOnEUSite")) . "',500,300);"; ?> |
|
301 | 301 | } |
302 | 302 | </script> |
303 | 303 | <a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.add.tva_intra.value);"><?php echo $langs->trans("VATIntraCheck"); ?></a> |
304 | - <?php echo $html->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); ?> |
|
304 | + <?php echo $html->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1); ?> |
|
305 | 305 | <?php else: ?> |
306 | - <a href="<?php echo $langs->transcountry("VATIntraCheckURL",$object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help'); ?></a> |
|
306 | + <a href="<?php echo $langs->transcountry("VATIntraCheckURL", $object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help'); ?></a> |
|
307 | 307 | <?php endif; ?> |
308 | 308 | <?php endif; ?> |
309 | 309 | </td> |
@@ -359,10 +359,10 @@ discard block |
||
359 | 359 | <tr> |
360 | 360 | <td><?php echo $langs->trans('Le commentaire doit-il figurer sur la facture') ?></td> |
361 | 361 | <td> |
362 | - <input type="radio" id="public_comment" name="public_comment" value="1" <?php echo ($formObject->isCommentPublic == 1)?'checked="checked"' : ''; ?>/> |
|
362 | + <input type="radio" id="public_comment" name="public_comment" value="1" <?php echo ($formObject->isCommentPublic == 1) ? 'checked="checked"' : ''; ?>/> |
|
363 | 363 | <label for="public_comment">Oui</label> |
364 | 364 | - |
365 | - <input type="radio" id="private_comment" name="public_comment" value="0" <?php echo ($formObject == null || $formObject->isCommentPublic === null || $formObject->isCommentPublic === 0)?'checked="checked"' : ''; ?>/> |
|
365 | + <input type="radio" id="private_comment" name="public_comment" value="0" <?php echo ($formObject == null || $formObject->isCommentPublic === null || $formObject->isCommentPublic === 0) ? 'checked="checked"' : ''; ?>/> |
|
366 | 366 | <label for="private_comment">Non</label> |
367 | 367 | </td> |
368 | 368 | </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 |
@@ -302,8 +306,11 @@ discard block |
||
302 | 306 | </script> |
303 | 307 | <a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.add.tva_intra.value);"><?php echo $langs->trans("VATIntraCheck"); ?></a> |
304 | 308 | <?php echo $html->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); ?> |
305 | - <?php else: ?> |
|
306 | - <a href="<?php echo $langs->transcountry("VATIntraCheckURL",$object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help'); ?></a> |
|
309 | + <?php else { |
|
310 | + : ?> |
|
311 | + <a href="<?php echo $langs->transcountry("VATIntraCheckURL",$object->country_id); |
|
312 | +} |
|
313 | +?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help'); ?></a> |
|
307 | 314 | <?php endif; ?> |
308 | 315 | <?php endif; ?> |
309 | 316 | </td> |
@@ -95,7 +95,7 @@ |
||
95 | 95 | */ |
96 | 96 | private function checkBillingInformation($vol, $context) |
97 | 97 | { |
98 | - if($vol->isLinkedToOrder()){ |
|
98 | + if ($vol->isLinkedToOrder()) { |
|
99 | 99 | return $this; |
100 | 100 | } |
101 | 101 |
@@ -46,25 +46,25 @@ |
||
46 | 46 | |
47 | 47 | $this->valid = true; |
48 | 48 | |
49 | - if(empty($value->name)){ |
|
49 | + if (empty($value->name)) { |
|
50 | 50 | $this->addError('name', 'Le nom est requis pour créer une commande'); |
51 | 51 | } |
52 | - if(empty($value->civilityId)){ |
|
52 | + if (empty($value->civilityId)) { |
|
53 | 53 | $this->addError('civility', 'Le titre de civilite est un champ requis.'); |
54 | 54 | } |
55 | - if(empty($value->email) && empty($value->phone)){ |
|
55 | + if (empty($value->email) && empty($value->phone)) { |
|
56 | 56 | $this->addError('email', 'Soit l\'e-mail soit le téléphone est requis'); |
57 | 57 | } |
58 | - if(empty($value->nbrPax) || (int)$value->nbrPax <= 0){ |
|
58 | + if (empty($value->nbrPax) || (int) $value->nbrPax <= 0) { |
|
59 | 59 | $this->addError('nbrPax', 'Le nombre de passagers doit être plus grand que 0.'); |
60 | 60 | } |
61 | - if(empty($value->region)){ |
|
61 | + if (empty($value->region)) { |
|
62 | 62 | $this->addError('region', 'Le lieu de décollage doit etre configuré'); |
63 | 63 | } |
64 | 64 | |
65 | - if((int)$value->nbrPax > 0){ |
|
66 | - $costPerPax = $value->cost / (int)$value->nbrPax; |
|
67 | - if($costPerPax < $this->getMinPrice()){ |
|
65 | + if ((int) $value->nbrPax > 0) { |
|
66 | + $costPerPax = $value->cost / (int) $value->nbrPax; |
|
67 | + if ($costPerPax < $this->getMinPrice()) { |
|
68 | 68 | $this->addError('cost', sprintf('Le prix demandé par passagé est trop peu élevé. Un minimum de %s est demandé', $this->getMinPrice())); |
69 | 69 | } |
70 | 70 | } |
@@ -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,16 +93,16 @@ 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{ |
|
105 | - print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td>' . $object->getOrder()->getNomUrl(1). '</td></tr>'; |
|
104 | +} else { |
|
105 | + print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td>' . $object->getOrder()->getNomUrl(1) . '</td></tr>'; |
|
106 | 106 | } |
107 | 107 | print '</table>'; |
108 | 108 | |
@@ -111,13 +111,13 @@ discard block |
||
111 | 111 | // Buttons |
112 | 112 | print '<div class="tabsAction">' . "\n"; |
113 | 113 | |
114 | -if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){ |
|
115 | - 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"; |
|
114 | +if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) { |
|
115 | + 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"; |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | print '</div>' . "\n"; |
119 | 119 | |
120 | -if($user->rights->flightlog->vol->financial){ |
|
120 | +if ($user->rights->flightlog->vol->financial) { |
|
121 | 121 | print '<div class="fichecenter"><div class="fichehalfleft">'; |
122 | 122 | $form->showLinkedObjectBlock($object); |
123 | 123 | 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>' . $object->getOrder()->getNomUrl(1). '</td></tr>'; |
106 | 106 | } |
107 | 107 | print '</table>'; |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | /** |
229 | 229 | * @return boolean |
230 | 230 | */ |
231 | - public function hasTVA(){ |
|
231 | + public function hasTVA() { |
|
232 | 232 | return !empty($this->tva); |
233 | 233 | } |
234 | 234 | |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | /** |
260 | 260 | * @return bool |
261 | 261 | */ |
262 | - public function isCommentPublic(){ |
|
262 | + public function isCommentPublic() { |
|
263 | 263 | return $this->publicComment; |
264 | 264 | } |
265 | 265 |
@@ -393,7 +393,7 @@ |
||
393 | 393 | /** |
394 | 394 | * @return bool |
395 | 395 | */ |
396 | - public function hasOrderId(){ |
|
396 | + public function hasOrderId() { |
|
397 | 397 | return $this->orderId !== null; |
398 | 398 | } |
399 | 399 | } |
400 | 400 | \ 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,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(); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | $result = $vol->create($this->user); |
90 | - if($result <= 0){ |
|
90 | + if ($result <= 0) { |
|
91 | 91 | throw new Exception(); |
92 | 92 | } |
93 | 93 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | { |
108 | 108 | $flight->fetch($flight->id); |
109 | 109 | |
110 | - if(!$flight->isLinkedToOrder()){ |
|
110 | + if (!$flight->isLinkedToOrder()) { |
|
111 | 111 | return; |
112 | 112 | } |
113 | 113 | |
@@ -118,17 +118,17 @@ discard block |
||
118 | 118 | |
119 | 119 | $qtyOrder = 0; |
120 | 120 | /** @var OrderLine $currentOrderLine */ |
121 | - foreach($order->lines as $currentOrderLine){ |
|
122 | - $qtyOrder += (int)$currentOrderLine->qty; |
|
121 | + foreach ($order->lines as $currentOrderLine) { |
|
122 | + $qtyOrder += (int) $currentOrderLine->qty; |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | $passangersCount = $this->numberOfPassengersLinkedToOrder($order->id); |
126 | 126 | |
127 | - if($passangersCount != $qtyOrder){ |
|
127 | + if ($passangersCount != $qtyOrder) { |
|
128 | 128 | return; |
129 | 129 | } |
130 | 130 | |
131 | - if($order->statut == Commande::STATUS_VALIDATED){ |
|
131 | + if ($order->statut == Commande::STATUS_VALIDATED) { |
|
132 | 132 | $order->cloture($this->user); |
133 | 133 | } |
134 | 134 | } |