@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $this->results["flightlog"] = [ |
30 | 30 | 'label' => $langs->trans("Search flight"), |
31 | 31 | 'text' => $langs->trans("Search flight"), |
32 | - 'url' => DOL_URL_ROOT . '/flightlog/list.php?mainmenu=flightlog&sall='.$searchInfo['search_boxvalue'] |
|
32 | + 'url' => DOL_URL_ROOT . '/flightlog/list.php?mainmenu=flightlog&sall=' . $searchInfo['search_boxvalue'] |
|
33 | 33 | ]; |
34 | 34 | } |
35 | 35 | |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | * @param $object |
39 | 39 | * @param $action |
40 | 40 | */ |
41 | - public function showLinkToObjectBlock($parameter, $object, $action){ |
|
42 | - $this->results["flightlog_bbcvols"]= array('enabled'=>1, 'perms'=>1, 'label'=>'LinkToFlight', 'sql'=>"SELECT f.idBBC_vols as rowid, CONCAT('(ID : ',f.idBBC_vols, ') -',f.date, '-',f.lieuD, ' ; ', f.lieuA) as ref FROM ".MAIN_DB_PREFIX."bbc_vols as f WHERE YEAR(f.date) = (YEAR(NOW())) ORDER BY date DESC"); |
|
41 | + public function showLinkToObjectBlock($parameter, $object, $action) { |
|
42 | + $this->results["flightlog_bbcvols"] = array('enabled'=>1, 'perms'=>1, 'label'=>'LinkToFlight', 'sql'=>"SELECT f.idBBC_vols as rowid, CONCAT('(ID : ',f.idBBC_vols, ') -',f.date, '-',f.lieuD, ' ; ', f.lieuA) as ref FROM " . MAIN_DB_PREFIX . "bbc_vols as f WHERE YEAR(f.date) = (YEAR(NOW())) ORDER BY date DESC"); |
|
43 | 43 | |
44 | 44 | } |
45 | 45 | } |
46 | 46 | \ No newline at end of file |
@@ -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')); |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | print '<div class="tabsAction">' . "\n"; |
100 | 100 | print '</div>' . "\n"; |
101 | 101 | |
102 | -if($user->rights->flightlog->vol->financial){ |
|
102 | +if ($user->rights->flightlog->vol->financial) { |
|
103 | 103 | print '<div class="fichecenter"><div class="fichehalfleft">'; |
104 | 104 | $form->showLinkedObjectBlock($object); |
105 | 105 | print '</div></div>'; |
@@ -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')); |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | print '<div class="tabsAction">' . "\n"; |
100 | 100 | print '</div>' . "\n"; |
101 | 101 | |
102 | -if($user->rights->flightlog->vol->financial){ |
|
102 | +if ($user->rights->flightlog->vol->financial) { |
|
103 | 103 | print '<div class="fichecenter"><div class="fichehalfleft">'; |
104 | 104 | $form->showLinkedObjectBlock($object); |
105 | 105 | print '</div></div>'; |
@@ -26,58 +26,58 @@ discard block |
||
26 | 26 | */ |
27 | 27 | class InterfaceMailOnIncident extends DolibarrTriggers |
28 | 28 | { |
29 | - /** |
|
30 | - * @var DoliDB Database handler |
|
31 | - */ |
|
32 | - protected $db; |
|
33 | - |
|
34 | - /** |
|
35 | - * Constructor |
|
36 | - * |
|
37 | - * @param DoliDB $db Database handler |
|
38 | - */ |
|
39 | - public function __construct($db) |
|
40 | - { |
|
41 | - $this->db = $db; |
|
42 | - |
|
43 | - $this->name = preg_replace('/^Interface/i', '', get_class($this)); |
|
44 | - $this->family = "Belgian balloon club"; |
|
45 | - $this->description = "Trigger that send an e-mail on flight incident."; |
|
46 | - $this->version = '1.0'; |
|
47 | - $this->picto = 'flightlog@flightlog'; |
|
48 | - } |
|
49 | - |
|
50 | - /** |
|
51 | - * Trigger name |
|
52 | - * |
|
53 | - * @return string Name of trigger file |
|
54 | - */ |
|
55 | - public function getName() |
|
56 | - { |
|
57 | - return $this->name; |
|
58 | - } |
|
59 | - |
|
60 | - /** |
|
61 | - * Trigger description |
|
62 | - * |
|
63 | - * @return string Description of trigger file |
|
64 | - */ |
|
65 | - public function getDesc() |
|
66 | - { |
|
67 | - return $this->description; |
|
68 | - } |
|
69 | - |
|
70 | - |
|
71 | - /** |
|
72 | - * @param string $action Event action code |
|
73 | - * @param Bbcvols $object Object |
|
74 | - * @param User $user Object user |
|
75 | - * @param Translate $langs Object langs |
|
76 | - * @param Conf $conf Object conf |
|
77 | - * @return int <0 if KO, 0 if no triggered ran, >0 if OK |
|
78 | - */ |
|
79 | - public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf) |
|
80 | - { |
|
29 | + /** |
|
30 | + * @var DoliDB Database handler |
|
31 | + */ |
|
32 | + protected $db; |
|
33 | + |
|
34 | + /** |
|
35 | + * Constructor |
|
36 | + * |
|
37 | + * @param DoliDB $db Database handler |
|
38 | + */ |
|
39 | + public function __construct($db) |
|
40 | + { |
|
41 | + $this->db = $db; |
|
42 | + |
|
43 | + $this->name = preg_replace('/^Interface/i', '', get_class($this)); |
|
44 | + $this->family = "Belgian balloon club"; |
|
45 | + $this->description = "Trigger that send an e-mail on flight incident."; |
|
46 | + $this->version = '1.0'; |
|
47 | + $this->picto = 'flightlog@flightlog'; |
|
48 | + } |
|
49 | + |
|
50 | + /** |
|
51 | + * Trigger name |
|
52 | + * |
|
53 | + * @return string Name of trigger file |
|
54 | + */ |
|
55 | + public function getName() |
|
56 | + { |
|
57 | + return $this->name; |
|
58 | + } |
|
59 | + |
|
60 | + /** |
|
61 | + * Trigger description |
|
62 | + * |
|
63 | + * @return string Description of trigger file |
|
64 | + */ |
|
65 | + public function getDesc() |
|
66 | + { |
|
67 | + return $this->description; |
|
68 | + } |
|
69 | + |
|
70 | + |
|
71 | + /** |
|
72 | + * @param string $action Event action code |
|
73 | + * @param Bbcvols $object Object |
|
74 | + * @param User $user Object user |
|
75 | + * @param Translate $langs Object langs |
|
76 | + * @param Conf $conf Object conf |
|
77 | + * @return int <0 if KO, 0 if no triggered ran, >0 if OK |
|
78 | + */ |
|
79 | + public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf) |
|
80 | + { |
|
81 | 81 | if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){ |
82 | 82 | return 0; |
83 | 83 | } |
@@ -132,6 +132,6 @@ discard block |
||
132 | 132 | dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR); |
133 | 133 | } |
134 | 134 | |
135 | - return 0; |
|
136 | - } |
|
135 | + return 0; |
|
136 | + } |
|
137 | 137 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | |
18 | 18 | |
19 | -require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; |
|
19 | +require_once DOL_DOCUMENT_ROOT . '/core/triggers/dolibarrtriggers.class.php'; |
|
20 | 20 | dol_include_once('/flightlog/class/bbcvols.class.php'); |
21 | 21 | dol_include_once('/core/class/CMailFile.class.php'); |
22 | 22 | |
@@ -78,23 +78,23 @@ discard block |
||
78 | 78 | */ |
79 | 79 | public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf) |
80 | 80 | { |
81 | - if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){ |
|
81 | + if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)) { |
|
82 | 82 | return 0; |
83 | 83 | } |
84 | 84 | |
85 | - if(empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)){ |
|
85 | + if (empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)) { |
|
86 | 86 | return 0; |
87 | 87 | } |
88 | 88 | |
89 | - if($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT'){ |
|
89 | + if ($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT') { |
|
90 | 90 | return 0; |
91 | 91 | } |
92 | 92 | |
93 | - if(empty(trim($object->incidents)) && empty(trim($object->remarque))){ |
|
93 | + if (empty(trim($object->incidents)) && empty(trim($object->remarque))) { |
|
94 | 94 | return 0; |
95 | 95 | } |
96 | 96 | |
97 | - if(!empty($conf->global->MAIN_DISABLE_ALL_MAILS)){ |
|
97 | + if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) { |
|
98 | 98 | return 0; |
99 | 99 | } |
100 | 100 | |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | ); |
128 | 128 | |
129 | 129 | |
130 | - if (! $mailfile->sendfile()) |
|
130 | + if (!$mailfile->sendfile()) |
|
131 | 131 | { |
132 | 132 | dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR); |
133 | 133 | } |
@@ -341,7 +341,7 @@ |
||
341 | 341 | */ |
342 | 342 | private function initPermissions() |
343 | 343 | { |
344 | - $this->rights = array(); // Permission array used by this module |
|
344 | + $this->rights = array(); // Permission array used by this module |
|
345 | 345 | $r = 0; |
346 | 346 | |
347 | 347 | $this->rights[$r][0] = 9993; |
@@ -25,15 +25,15 @@ discard block |
||
25 | 25 | * Actions |
26 | 26 | */ |
27 | 27 | // Save |
28 | -if($action === ACTION_SAVE){ |
|
29 | - foreach($services as $flightTypeId => $serviceId){ |
|
28 | +if ($action === ACTION_SAVE) { |
|
29 | + foreach ($services as $flightTypeId => $serviceId) { |
|
30 | 30 | $res = $flightType->fetch($flightTypeId); |
31 | - if($res > 0 ){ |
|
31 | + if ($res > 0) { |
|
32 | 32 | $flightType->fkService = $serviceId; |
33 | 33 | $flightType->update($user); |
34 | 34 | } |
35 | 35 | |
36 | - dolibarr_set_const($db, 'BBC_POINTS_BONUS_'.$flightTypeId, GETPOST('points_bonus_'.$flightTypeId), 'chaine', 0, 'Points pour le vol T'.$flightTypeId, $conf->entity); |
|
36 | + dolibarr_set_const($db, 'BBC_POINTS_BONUS_' . $flightTypeId, GETPOST('points_bonus_' . $flightTypeId), 'chaine', 0, 'Points pour le vol T' . $flightTypeId, $conf->entity); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | dolibarr_set_const($db, 'BBC_FLIGHT_TYPE_CUSTOMER', GETPOST('customer_product'), 'chaine', 0, '', $conf->entity); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | <tr class="<?= $flightTypeLine->id % 2 == 0 ? "pair" : "impair" ?>"> |
72 | 72 | <td>(T<?= $flightTypeLine->numero ?>) - <?= $flightTypeLine->nom ?></td> |
73 | 73 | <td> |
74 | - <?php $form->select_produits($flightTypeLine->fkService, 'idprod['.$flightTypeLine->id.']', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id); ?> |
|
74 | + <?php $form->select_produits($flightTypeLine->fkService, 'idprod[' . $flightTypeLine->id . ']', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id); ?> |
|
75 | 75 | </td> |
76 | 76 | </tr> |
77 | 77 | <?php endforeach; ?> |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | </td> |
84 | 84 | <td> |
85 | 85 | <?php $form->select_produits($conf->global->BBC_FLIGHT_TYPE_CUSTOMER, 'customer_product', |
86 | - $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id); ?> |
|
86 | + $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id); ?> |
|
87 | 87 | </td> |
88 | 88 | </tr> |
89 | 89 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | <label for="points_bonus_<?php echo $flightTypeLine->numero; ?>"> |
107 | 107 | (T<?php echo $flightTypeLine->numero ?>) - <?php echo $flightTypeLine->nom ?> |
108 | 108 | </label> |
109 | - <?php $prop = 'BBC_POINTS_BONUS_'.$flightTypeLine->numero; ?> |
|
109 | + <?php $prop = 'BBC_POINTS_BONUS_' . $flightTypeLine->numero; ?> |
|
110 | 110 | <input type="number" id="points_bonus_<?php echo $flightTypeLine->numero; ?>" name="points_bonus_<?php echo $flightTypeLine->numero; ?>" value="<?php echo $conf->global->$prop?>" /> |
111 | 111 | <br/> |
112 | 112 | <?php endforeach; ?> |
@@ -127,12 +127,12 @@ |
||
127 | 127 | * Put here all code to do according to value of "action" parameter |
128 | 128 | */ |
129 | 129 | if ($action == EXPENSE_REPORT_GENERATOR_ACTION_GENERATE) { |
130 | - try{ |
|
131 | - $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote,$bankAccount); |
|
130 | + try { |
|
131 | + $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote, $bankAccount); |
|
132 | 132 | $handler->handle($command); |
133 | 133 | Header("Location: card.php?id=" . $flight->getId()); |
134 | - }catch (\Exception $e){ |
|
135 | - dol_syslog($e->getMessage(),LOG_ERR); |
|
134 | + } catch (\Exception $e) { |
|
135 | + dol_syslog($e->getMessage(), LOG_ERR); |
|
136 | 136 | dol_htmloutput_mesg("Facture non créée", '', 'error'); |
137 | 137 | } |
138 | 138 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote,$bankAccount); |
132 | 132 | $handler->handle($command); |
133 | 133 | Header("Location: card.php?id=" . $flight->getId()); |
134 | - }catch (\Exception $e){ |
|
134 | + } catch (\Exception $e){ |
|
135 | 135 | dol_syslog($e->getMessage(),LOG_ERR); |
136 | 136 | dol_htmloutput_mesg("Facture non créée", '', 'error'); |
137 | 137 | } |
@@ -267,9 +267,12 @@ discard block |
||
267 | 267 | |
268 | 268 | <?php if (!$flightProduct) : ?> |
269 | 269 | <a class="butActionRefused" href="#">Générer</a> |
270 | - <?php else: ?> |
|
270 | + <?php else { |
|
271 | + : ?> |
|
271 | 272 | <button class="butAction" type="submit">Générer</button> |
272 | - <?php endif; ?> |
|
273 | + <?php endif; |
|
274 | +} |
|
275 | +?> |
|
273 | 276 | |
274 | 277 | <a class="butAction" href="<?php echo DOL_URL_ROOT . '/flightlog/card.php?id=' . $flight->id; ?>">Retour au |
275 | 278 | vol</a> |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once __DIR__.'/CreateFlightBillCommandHandler.php'; |
|
4 | -require_once __DIR__.'/CreateFlightBillTransactionalCommandHandler.php'; |
|
3 | +require_once __DIR__ . '/CreateFlightBillCommandHandler.php'; |
|
4 | +require_once __DIR__ . '/CreateFlightBillTransactionalCommandHandler.php'; |
|
5 | 5 | |
6 | 6 | /** |
7 | 7 | * @author Laurent De Coninck <[email protected]> |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | /** |
12 | 12 | * @return CreateFlightBillCommandHandler |
13 | 13 | */ |
14 | - public static function factory($db, $conf, $user, $langs){ |
|
14 | + public static function factory($db, $conf, $user, $langs) { |
|
15 | 15 | return new CreateFlightBillTransactionalCommandHandler($db, $conf, $user, $langs); |
16 | 16 | } |
17 | 17 |
@@ -239,9 +239,12 @@ |
||
239 | 239 | <?php echo $langs->trans('La periode demandée n\'est pas cloturée.') ?> |
240 | 240 | </p> |
241 | 241 | <a class="butActionRefused" href="#">Générer</a> |
242 | - <?php else: ?> |
|
242 | + <?php else { |
|
243 | + : ?> |
|
243 | 244 | <button class="butAction" type="submit">Générer</button> |
244 | - <?php endif; ?> |
|
245 | + <?php endif; |
|
246 | +} |
|
247 | +?> |
|
245 | 248 | |
246 | 249 | </form> |
247 | 250 | </section> |
@@ -95,7 +95,7 @@ |
||
95 | 95 | if ($action == EXPENSE_REPORT_GENERATOR_ACTION_GENERATE) { |
96 | 96 | try { |
97 | 97 | |
98 | - $command = new CreateMonthBillCommand( $type, $publicNote, $privateNote, $year, $month); |
|
98 | + $command = new CreateMonthBillCommand($type, $publicNote, $privateNote, $year, $month); |
|
99 | 99 | $handler->handle($command); |
100 | 100 | dol_htmloutput_mesg('Génération : OK'); |
101 | 101 | } catch (Exception $e) { |