@@ -53,9 +53,9 @@ |
||
53 | 53 | ?> |
54 | 54 | |
55 | 55 | <table class="border centpercent"> |
56 | - <tr><td class="fieldrequired">Auteur</td><td><?php echo $damage->getAuthorName();?></td></tr> |
|
57 | - <tr><td class="fieldrequired">Montant</td><td><?php echo $damage->getAmount();?>€</td></tr> |
|
58 | - <tr><td class="fieldrequired">Facturé</td><td><?php echo $damage->isInvoiced()? 'Oui' : 'Non';?></td></tr> |
|
56 | + <tr><td class="fieldrequired">Auteur</td><td><?php echo $damage->getAuthorName(); ?></td></tr> |
|
57 | + <tr><td class="fieldrequired">Montant</td><td><?php echo $damage->getAmount(); ?>€</td></tr> |
|
58 | + <tr><td class="fieldrequired">Facturé</td><td><?php echo $damage->isInvoiced() ? 'Oui' : 'Non'; ?></td></tr> |
|
59 | 59 | <tr> |
60 | 60 | <td class="fieldrequired">Vol</td> |
61 | 61 | <td> |
@@ -31,7 +31,7 @@ |
||
31 | 31 | 'form' => new Form($this->db), |
32 | 32 | 'flight' => $flight |
33 | 33 | ]); |
34 | - }catch (\Exception $e){ |
|
34 | + } catch (\Exception $e){ |
|
35 | 35 | echo $e->getMessage(); |
36 | 36 | } |
37 | 37 | } |
@@ -13,14 +13,14 @@ discard block |
||
13 | 13 | /** |
14 | 14 | * @return GetDamageQueryRepository |
15 | 15 | */ |
16 | - private function getDamageRepository(){ |
|
16 | + private function getDamageRepository() { |
|
17 | 17 | return new GetDamageQueryRepository($this->db); |
18 | 18 | } |
19 | 19 | |
20 | - public function view(){ |
|
20 | + public function view() { |
|
21 | 21 | $damageId = $this->request->getParam('id'); |
22 | 22 | |
23 | - try{ |
|
23 | + try { |
|
24 | 24 | $damage = $this->getDamageRepository()->query($damageId); |
25 | 25 | |
26 | 26 | $flight = new \Bbcvols($this->db); |
@@ -31,16 +31,16 @@ discard block |
||
31 | 31 | 'form' => new Form($this->db), |
32 | 32 | 'flight' => $flight |
33 | 33 | ]); |
34 | - }catch (\Exception $e){ |
|
34 | + } catch (\Exception $e) { |
|
35 | 35 | echo $e->getMessage(); |
36 | 36 | } |
37 | 37 | } |
38 | 38 | |
39 | - public function invoice(){ |
|
39 | + public function invoice() { |
|
40 | 40 | $damageId = $this->request->getParam('id'); |
41 | 41 | |
42 | 42 | |
43 | 43 | |
44 | - return $this->redirect($_SERVER["PHP_SELF"].'?id='.$damageId); |
|
44 | + return $this->redirect($_SERVER["PHP_SELF"] . '?id=' . $damageId); |
|
45 | 45 | } |
46 | 46 | } |
47 | 47 | \ No newline at end of file |
@@ -37,29 +37,21 @@ discard block |
||
37 | 37 | |
38 | 38 | if ($objectType == 'facture') { |
39 | 39 | $classpath = 'compta/facture/class'; |
40 | - } |
|
41 | - elseif ($objectType == 'facturerec') { |
|
40 | + } elseif ($objectType == 'facturerec') { |
|
42 | 41 | $classpath = 'compta/facture/class'; |
43 | - } |
|
44 | - elseif ($objectType == 'propal') { |
|
42 | + } elseif ($objectType == 'propal') { |
|
45 | 43 | $classpath = 'comm/propal/class'; |
46 | - } |
|
47 | - elseif ($objectType == 'supplier_proposal') { |
|
44 | + } elseif ($objectType == 'supplier_proposal') { |
|
48 | 45 | $classpath = 'supplier_proposal/class'; |
49 | - } |
|
50 | - elseif ($objectType == 'shipping') { |
|
46 | + } elseif ($objectType == 'shipping') { |
|
51 | 47 | $classpath = 'expedition/class'; $subelement = 'expedition'; |
52 | - } |
|
53 | - elseif ($objectType == 'delivery') { |
|
48 | + } elseif ($objectType == 'delivery') { |
|
54 | 49 | $classpath = 'livraison/class'; $subelement = 'livraison'; |
55 | - } |
|
56 | - elseif ($objectType == 'invoice_supplier' || $objectType == 'order_supplier') { |
|
50 | + } elseif ($objectType == 'invoice_supplier' || $objectType == 'order_supplier') { |
|
57 | 51 | $classpath = 'fourn/class'; |
58 | - } |
|
59 | - elseif ($objectType == 'fichinter') { |
|
52 | + } elseif ($objectType == 'fichinter') { |
|
60 | 53 | $classpath = 'fichinter/class'; $subelement = 'fichinter'; |
61 | - } |
|
62 | - elseif ($objectType == 'subscription') { |
|
54 | + } elseif ($objectType == 'subscription') { |
|
63 | 55 | $classpath = 'adherents/class'; |
64 | 56 | } |
65 | 57 | |
@@ -68,20 +60,15 @@ discard block |
||
68 | 60 | |
69 | 61 | if ($objectType == 'order') { |
70 | 62 | $classfile = 'commande'; $classname = 'Commande'; |
71 | - } |
|
72 | - elseif ($objectType == 'invoice_supplier') { |
|
63 | + } elseif ($objectType == 'invoice_supplier') { |
|
73 | 64 | $classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur'; |
74 | - } |
|
75 | - elseif ($objectType == 'order_supplier') { |
|
65 | + } elseif ($objectType == 'order_supplier') { |
|
76 | 66 | $classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur'; |
77 | - } |
|
78 | - elseif ($objectType == 'supplier_proposal') { |
|
67 | + } elseif ($objectType == 'supplier_proposal') { |
|
79 | 68 | $classfile = 'supplier_proposal'; $classname = 'SupplierProposal'; |
80 | - } |
|
81 | - elseif ($objectType == 'facturerec') { |
|
69 | + } elseif ($objectType == 'facturerec') { |
|
82 | 70 | $classfile = 'facture-rec'; $classname = 'FactureRec'; |
83 | - } |
|
84 | - elseif ($objectType == 'subscription') { |
|
71 | + } elseif ($objectType == 'subscription') { |
|
85 | 72 | $classfile = 'subscription'; $classname = 'Subscription'; |
86 | 73 | } |
87 | 74 |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | $this->db = $db; |
23 | 23 | } |
24 | 24 | |
25 | - private function element($objectType, $rowid){ |
|
25 | + private function element($objectType, $rowid) { |
|
26 | 26 | $element = null; |
27 | 27 | $subelement = null; |
28 | 28 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $subelement = $regs[2]; |
34 | 34 | } |
35 | 35 | |
36 | - $classpath = $element.'/class'; |
|
36 | + $classpath = $element . '/class'; |
|
37 | 37 | |
38 | 38 | if ($objectType == 'facture') { |
39 | 39 | $classpath = 'compta/facture/class'; |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $classfile = 'subscription'; $classname = 'Subscription'; |
86 | 86 | } |
87 | 87 | |
88 | - dol_include_once('/'.$classpath.'/'.$classfile.'.class.php'); |
|
88 | + dol_include_once('/' . $classpath . '/' . $classfile . '.class.php'); |
|
89 | 89 | if (!class_exists($classname)) |
90 | 90 | { |
91 | 91 | return null; |
@@ -104,14 +104,14 @@ discard block |
||
104 | 104 | * |
105 | 105 | * @throws \Exception |
106 | 106 | */ |
107 | - public function query($damageId){ |
|
107 | + public function query($damageId) { |
|
108 | 108 | |
109 | 109 | $sql = 'SELECT damage.author_id as author_id, damage.rowid as id, damage.amount, CONCAT(author.firstname, " " , author.lastname) as author_name, damage.billed as invoiced, damage.flight_id as flight_id'; |
110 | - $sql.= ', element.rowid as element_id ,element.fk_target as element_fk_target, element.targettype as element_target_type'; |
|
111 | - $sql.=' FROM '.MAIN_DB_PREFIX.'bbc_flight_damages as damage'; |
|
112 | - $sql.=' INNER JOIN '.MAIN_DB_PREFIX.'user as author ON author.rowid = damage.author_id'; |
|
113 | - $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'element_element as element ON (element.fk_source = damage.rowid AND element.sourcetype = "flightlog_damage")'; |
|
114 | - $sql.=' WHERE damage.rowid = '.$damageId; |
|
110 | + $sql .= ', element.rowid as element_id ,element.fk_target as element_fk_target, element.targettype as element_target_type'; |
|
111 | + $sql .= ' FROM ' . MAIN_DB_PREFIX . 'bbc_flight_damages as damage'; |
|
112 | + $sql .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'user as author ON author.rowid = damage.author_id'; |
|
113 | + $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'element_element as element ON (element.fk_source = damage.rowid AND element.sourcetype = "flightlog_damage")'; |
|
114 | + $sql .= ' WHERE damage.rowid = ' . $damageId; |
|
115 | 115 | |
116 | 116 | $resql = $this->db->query($sql); |
117 | 117 | if (!$resql) { |
@@ -125,13 +125,13 @@ discard block |
||
125 | 125 | |
126 | 126 | /** @var Damage $damage */ |
127 | 127 | $damage = null; |
128 | - for($i = 0; $i < $num ; $i++) { |
|
128 | + for ($i = 0; $i < $num; $i++) { |
|
129 | 129 | $properties = $this->db->fetch_array($resql); |
130 | - if(!$damage){ |
|
130 | + if (!$damage) { |
|
131 | 131 | $damage = Damage::fromArray($properties); |
132 | 132 | } |
133 | 133 | |
134 | - if(!isset($properties['element_id'])){ |
|
134 | + if (!isset($properties['element_id'])) { |
|
135 | 135 | continue; |
136 | 136 | } |
137 | 137 |
@@ -1,9 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use FlightLog\Http\Web\Controller\DamageController; |
|
4 | -use FlightLog\Http\Web\Controller\FlightController; |
|
5 | 3 | use FlightLog\Infrastructure\Common\Routes\Guard; |
6 | -use FlightLog\Infrastructure\Common\Routes\Route; |
|
7 | 4 | |
8 | 5 | global $db; |
9 | 6 |
@@ -8,7 +8,7 @@ |
||
8 | 8 | global $db; |
9 | 9 | |
10 | 10 | return [ |
11 | - new Guard('get_one_damage', function(User $user){ |
|
11 | + new Guard('get_one_damage', function(User $user) { |
|
12 | 12 | return $user->rights->flightlog->vol->financial; |
13 | 13 | }), |
14 | 14 | ]; |
@@ -32,19 +32,19 @@ |
||
32 | 32 | * |
33 | 33 | * @return Response |
34 | 34 | */ |
35 | - protected function render($template, array $variables = []){ |
|
35 | + protected function render($template, array $variables = []) { |
|
36 | 36 | |
37 | - foreach($variables as $variableName => $variableValue){ |
|
37 | + foreach ($variables as $variableName => $variableValue) { |
|
38 | 38 | $GLOBALS[$variableName] = $variableValue; |
39 | 39 | } |
40 | 40 | |
41 | - return new Response(__DIR__.'/../templates/'.$template); |
|
41 | + return new Response(__DIR__ . '/../templates/' . $template); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
45 | 45 | * @param string $html |
46 | 46 | */ |
47 | - protected function renderHtml($html){ |
|
47 | + protected function renderHtml($html) { |
|
48 | 48 | print $html; |
49 | 49 | } |
50 | 50 |
@@ -6,9 +6,9 @@ |
||
6 | 6 | |
7 | 7 | final class FlightController extends WebController |
8 | 8 | { |
9 | - public function view(){ |
|
9 | + public function view() { |
|
10 | 10 | $id = $this->request->getParam('id'); |
11 | - return $this->redirect(DOL_URL_ROOT.'/flightlog/card.php?id='.$id); |
|
11 | + return $this->redirect(DOL_URL_ROOT . '/flightlog/card.php?id=' . $id); |
|
12 | 12 | } |
13 | 13 | |
14 | 14 | } |
15 | 15 | \ No newline at end of file |
@@ -25,7 +25,7 @@ |
||
25 | 25 | * |
26 | 26 | * @return Redirect |
27 | 27 | */ |
28 | - public static function create($url){ |
|
28 | + public static function create($url) { |
|
29 | 29 | return new self($url); |
30 | 30 | } |
31 | 31 |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | |
50 | 50 | $id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int'); |
51 | 51 | $action = GETPOST('action', 'alpha'); |
52 | -$permissiondellink=$user->rights->flightlog->vol->financial; |
|
52 | +$permissiondellink = $user->rights->flightlog->vol->financial; |
|
53 | 53 | |
54 | 54 | $object = new Bbcvols($db); |
55 | 55 | |
@@ -57,8 +57,8 @@ discard block |
||
57 | 57 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
58 | 58 | |
59 | 59 | // Load object |
60 | -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 |
|
61 | -include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; |
|
60 | +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 |
|
61 | +include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; |
|
62 | 62 | |
63 | 63 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
64 | 64 | $hookmanager->initHooks(array('bbcvols')); |
@@ -85,13 +85,13 @@ discard block |
||
85 | 85 | FLIGHTLOG_ACTION_HANDLE_ADD_DAMAGE => [AddFlightDamageController::class, 'view'], |
86 | 86 | ]; |
87 | 87 | |
88 | - if(isset($routes[$action])){ |
|
88 | + if (isset($routes[$action])) { |
|
89 | 89 | $controllerName = $routes[$action][0]; |
90 | 90 | $actionName = $routes[$action][1]; |
91 | 91 | |
92 | 92 | $response = call_user_func([new $controllerName($db), $actionName]); |
93 | 93 | |
94 | - if($response instanceof \FlightLog\Http\Web\Response\Redirect){ |
|
94 | + if ($response instanceof \FlightLog\Http\Web\Response\Redirect) { |
|
95 | 95 | if (headers_sent()) { |
96 | 96 | echo(sprintf("<script>location.href='%s'</script>", $response->getUrl())); |
97 | 97 | exit; |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | } |
103 | 103 | |
104 | 104 | include $response->getTemplate(); |
105 | - }else{ |
|
105 | + } else { |
|
106 | 106 | echo 'Route non trouvée.'; |
107 | 107 | } |
108 | 108 | ?> |
@@ -114,13 +114,13 @@ discard block |
||
114 | 114 | // Buttons |
115 | 115 | print '<div class="tabsAction">' . "\n"; |
116 | 116 | |
117 | -if($user->rights->flightlog->vol->financial){ |
|
118 | - print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/card_tab_damage.php?id=' . $object->id.'&action='.FLIGHTLOG_ACTION_ADD_DAMAGE.'">' . $langs->trans("Ajouter") . '</a></div>' . "\n"; |
|
117 | +if ($user->rights->flightlog->vol->financial) { |
|
118 | + print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/card_tab_damage.php?id=' . $object->id . '&action=' . FLIGHTLOG_ACTION_ADD_DAMAGE . '">' . $langs->trans("Ajouter") . '</a></div>' . "\n"; |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | print '</div>' . "\n"; |
122 | 122 | |
123 | -if($user->rights->flightlog->vol->financial){ |
|
123 | +if ($user->rights->flightlog->vol->financial) { |
|
124 | 124 | print '<div class="fichecenter"><div class="fichehalfleft">'; |
125 | 125 | $form->showLinkedObjectBlock($object); |
126 | 126 | print '</div></div>'; |
@@ -102,7 +102,7 @@ |
||
102 | 102 | } |
103 | 103 | |
104 | 104 | include $response->getTemplate(); |
105 | - }else{ |
|
105 | + } else{ |
|
106 | 106 | echo 'Route non trouvée.'; |
107 | 107 | } |
108 | 108 | ?> |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $routesGuards = require './Infrastructure/Common/Routes/guards.conf.php'; |
54 | 54 | |
55 | 55 | $response = null; |
56 | -try{ |
|
56 | +try { |
|
57 | 57 | $routeName = GETPOST('r'); |
58 | 58 | |
59 | 59 | $routeManager = new \FlightLog\Infrastructure\Common\Routes\RouteManager($db); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | $response = $routeManager->__invoke($routeName, $user); |
64 | 64 | |
65 | - if($response instanceof \FlightLog\Http\Web\Response\Redirect){ |
|
65 | + if ($response instanceof \FlightLog\Http\Web\Response\Redirect) { |
|
66 | 66 | if (headers_sent()) { |
67 | 67 | echo(sprintf("<script>location.href='%s'</script>", $response->getUrl())); |
68 | 68 | exit; |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | exit; |
73 | 73 | } |
74 | 74 | |
75 | -}catch (\Exception $e){ |
|
75 | +} catch (\Exception $e) { |
|
76 | 76 | dol_syslog($e->getMessage(), LOG_ERR); |
77 | 77 | $response = new \FlightLog\Http\Web\Response\Response($e->getMessage()); |
78 | 78 | } |
@@ -72,7 +72,7 @@ |
||
72 | 72 | exit; |
73 | 73 | } |
74 | 74 | |
75 | -}catch (\Exception $e){ |
|
75 | +} catch (\Exception $e){ |
|
76 | 76 | dol_syslog($e->getMessage(), LOG_ERR); |
77 | 77 | $response = new \FlightLog\Http\Web\Response\Response($e->getMessage()); |
78 | 78 | } |