Completed
Push — feature/fixing_cost ( f58af6...414fbf )
by Laurent
01:41
created
card_tab_damage.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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,12 +85,12 @@  discard block
 block discarded – undo
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
         call_user_func([new $controllerName($db), $actionName]);
93
-    }else{
93
+    } else {
94 94
         echo 'Route non trouvée.';
95 95
     }
96 96
 ?>
@@ -102,13 +102,13 @@  discard block
 block discarded – undo
102 102
 // Buttons
103 103
 print '<div class="tabsAction">' . "\n";
104 104
 
105
-if($user->rights->flightlog->vol->financial){
106
-    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";
105
+if ($user->rights->flightlog->vol->financial) {
106
+    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";
107 107
 }
108 108
 
109 109
 print '</div>' . "\n";
110 110
 
111
-if($user->rights->flightlog->vol->financial){
111
+if ($user->rights->flightlog->vol->financial) {
112 112
     print '<div class="fichecenter"><div class="fichehalfleft">';
113 113
     $form->showLinkedObjectBlock($object);
114 114
     print '</div></div>';
Please login to merge, or discard this patch.
Infrastructure/Damage/Query/Repository/GetDamageQueryRepository.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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.rowid as id, damage.amount, author.login 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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -37,29 +37,21 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Infrastructure/Damage/Repository/FlightDamageRepository.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
             'author_id' => $flightDamage->getAuthor()->getId()
36 36
         ];
37 37
 
38
-        if($flightDamage->getId()){
38
+        if ($flightDamage->getId()) {
39 39
             $this->update($flightDamage->getId()->getId(), $fields);
40 40
             return $flightDamage->getId()->getId();
41 41
         }
@@ -50,10 +50,10 @@  discard block
 block discarded – undo
50 50
      *
51 51
      * @throws \Exception
52 52
      */
53
-    public function getById(DamageId $id){
53
+    public function getById(DamageId $id) {
54 54
         $damage = $this->get($id->getId());
55 55
 
56
-        if(null === $damage){
56
+        if (null === $damage) {
57 57
             throw new \Exception('Damage not found');
58 58
         }
59 59
 
Please login to merge, or discard this patch.
Infrastructure/Common/Routes/RouteManager.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
      *
30 30
      * @throws \Exception
31 31
      */
32
-    public function add(Route $route){
33
-        if(isset($this->routes[$route->getName()])){
32
+    public function add(Route $route) {
33
+        if (isset($this->routes[$route->getName()])) {
34 34
             throw new \Exception('Route exists');
35 35
         }
36 36
 
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
      *
43 43
      * @throws \Exception
44 44
      */
45
-    public function load(array $routes){
46
-        foreach($routes as $currentRoute){
45
+    public function load(array $routes) {
46
+        foreach ($routes as $currentRoute) {
47 47
             $this->add($currentRoute);
48 48
         }
49 49
     }
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
      */
56 56
     public function __invoke($name)
57 57
     {
58
-        if(!isset($this->routes[$name])){
58
+        if (!isset($this->routes[$name])) {
59 59
             throw new \Exception('Route not found');
60 60
         }
61 61
 
Please login to merge, or discard this patch.