Completed
Push — feature/number_enhancement ( b65f30 )
by Laurent
01:38
created
Http/Web/Form/DamageCreationForm.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
         return $obj;
46 46
     }
47 47
 
48
-    private function addAmount(){
48
+    private function addAmount() {
49 49
         $field = new Number('amount');
50 50
         $field->required();
51 51
         $field->setStep(0.01);
Please login to merge, or discard this patch.
Http/Web/templates/flight_damage/form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
     <?php echo $renderer->render($form->getElement('flight_id')); ?>
25 25
     <?php echo $renderer->render($form->getElement('token')); ?>
26 26
 
27
-    <?php if($form->has('amount')): ?>
27
+    <?php if ($form->has('amount')): ?>
28 28
         <section class="form-section">
29 29
             <h1 class="form-section-title"><?php echo $langs->trans('Ajout de dégâts'); ?></h1>
30 30
             <table class="border" width="50%">
Please login to merge, or discard this patch.
Http/Web/templates/flight_damage/view.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,21 +16,21 @@
 block discarded – undo
16 16
         <td colspan="2">&nbsp;</td>
17 17
     </tr>
18 18
     <?php $total = 0; ?>
19
-    <?php foreach($damages as $currentDamage):?>
19
+    <?php foreach ($damages as $currentDamage):?>
20 20
         <?php $total += $currentDamage->getAmount(); ?>
21 21
         <tr>
22
-            <td><?php echo $currentDamage->getAuthorName();?></td>
23
-            <td><?php echo $currentDamage->getLabel();?></td>
24
-            <td><?php echo $currentDamage->getAmount();?>€</td>
22
+            <td><?php echo $currentDamage->getAuthorName(); ?></td>
23
+            <td><?php echo $currentDamage->getLabel(); ?></td>
24
+            <td><?php echo $currentDamage->getAmount(); ?>€</td>
25 25
             <td>
26
-                <?php if($currentDamage->isInvoiced()): ?>
26
+                <?php if ($currentDamage->isInvoiced()): ?>
27 27
                     <i class="fas fa-check"></i>
28 28
                 <?php else: ?>
29 29
                     <i class="fas fa-times"></i>
30 30
                 <?php endif; ?>
31 31
             </td>
32 32
             <td>
33
-                <a href="<?php print sprintf('%s/flightlog/index.php?r=get_one_damage&id=%s', DOL_URL_ROOT, $currentDamage->getId());?>"><i class="fas fa-link"></i></a>
33
+                <a href="<?php print sprintf('%s/flightlog/index.php?r=get_one_damage&id=%s', DOL_URL_ROOT, $currentDamage->getId()); ?>"><i class="fas fa-link"></i></a>
34 34
             </td>
35 35
         </tr>
36 36
     <?php endforeach; ?>
Please login to merge, or discard this patch.
command/CreatePilotYearBillCommandHandler.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
      */
259 259
     private function addOrderDiscount($order, $pilotFlightCount, $service, $year)
260 260
     {
261
-        $price = $pilotFlightCount->getCost()->getValue()/(1+$service->tva_tx/100);
261
+        $price = $pilotFlightCount->getCost()->getValue() / (1 + $service->tva_tx / 100);
262 262
         $pu_ht = price2num($price, 'MU');
263 263
         $desc = $year . " - " . $service->label . " - (" . $pilotFlightCount->getCount() . " * " . $pilotFlightCount->getFactor() . ")";
264 264
 
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
             return;
290 290
         }
291 291
 
292
-        $pointsHt = $command->getAdditionalBonus()/(1+6/100);
292
+        $pointsHt = $command->getAdditionalBonus() / (1 + 6 / 100);
293 293
         $desc = sprintf("%s - %s", $command->getYear(), $command->getBonusAdditionalMessage());
294 294
 
295 295
         $discountid = $this->getCompany($object->socid)->set_remise_except($pointsHt, $this->user, $desc, 6);
@@ -309,14 +309,14 @@  discard block
 block discarded – undo
309 309
         $totalCost = FlightCost::zero();
310 310
         $description = '';
311 311
 
312
-        foreach ($damages as $damage){
312
+        foreach ($damages as $damage) {
313 313
             $totalCost->addCost($damage->getCost());
314
-            $description .= $damage->getLabel().'; ';
314
+            $description .= $damage->getLabel() . '; ';
315 315
         }
316 316
 
317 317
         $tDamage = new Product($this->db);
318 318
         $tDamage->label = 'Réparations aux ballons';
319
-        $tDamage->description = $description ;
319
+        $tDamage->description = $description;
320 320
         $tDamage->tva_tx = 21;
321 321
         $tDamage->price_ttc = $totalCost->getValue();
322 322
         $tDamage->price = $tDamage->price_ttc / (1 + $tDamage->tva_tx / 100);
Please login to merge, or discard this patch.
readFlights.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
     print '<td>' . $pilot->getCountForType('orga_T6')->getCount() . '</td>';
190 190
     print '<td>' . $pilot->getCountForType('orga_T6')->getCost()->getValue() . '</td>';
191 191
 
192
-    print sprintf('<td class="%s">', $pilot->getFlightBonus()->getValue() === 0?'text-muted':'text-bold'). $pilot->getFlightBonus()->getValue() . ' pts</td>';
192
+    print sprintf('<td class="%s">', $pilot->getFlightBonus()->getValue() === 0 ? 'text-muted' : 'text-bold') . $pilot->getFlightBonus()->getValue() . ' pts</td>';
193 193
 
194 194
     print '<td>' . $pilot->getCountForType('3')->getCount() . '</td>';
195 195
     print '<td>' . price($pilot->getCountForType('3')->getCost()->getValue()) . '€</td>';
@@ -208,8 +208,8 @@  discard block
 block discarded – undo
208 208
     print '<td>' . price($pilot->damageCost()->getValue()) . '€</td>';
209 209
     print '<td>' . price($pilot->invoicedDamageCost()->getValue()) . '€</td>';
210 210
 
211
-    print sprintf('<td class="%s">', $pilot->getFlightsCost()->getValue() === 0?'text-muted':'text-bold'). price($pilot->getFlightsCost()->getValue()) . '€ </td>';
212
-    print sprintf('<td class="%s">', $pilot->isBillable(FlightBonus::zero())?'text-bold':'text-muted'). price($pilot->getTotalBill()->getValue()) . '€</td>';
211
+    print sprintf('<td class="%s">', $pilot->getFlightsCost()->getValue() === 0 ? 'text-muted' : 'text-bold') . price($pilot->getFlightsCost()->getValue()) . '€ </td>';
212
+    print sprintf('<td class="%s">', $pilot->isBillable(FlightBonus::zero()) ? 'text-bold' : 'text-muted') . price($pilot->getTotalBill()->getValue()) . '€</td>';
213 213
     print '</tr>';
214 214
 }
215 215
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 print '<td>' . $totalT3 . '</td>';
235 235
 print '<td></td>';
236 236
 
237
-print '<td>' . $totalT4. '</td>';
237
+print '<td>' . $totalT4 . '</td>';
238 238
 print '<td></td>';
239 239
 
240 240
 print '<td>' . $totalT5 . '</td>';
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
 //table km
264 264
 $tauxRemb = isset($conf->global->BBC_FLIGHT_LOG_TAUX_REMB_KM) ? $conf->global->BBC_FLIGHT_LOG_TAUX_REMB_KM : 0;
265 265
 $year = GETPOST("year", 'int');
266
-if(empty($year)){
266
+if (empty($year)) {
267 267
     $year = date('Y');
268 268
 }
269 269
 
Please login to merge, or discard this patch.
Damage/Query/Repository/GetDamagesForFlightQueryRepository.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,15 +31,15 @@
 block discarded – undo
31 31
     public function __invoke($flightId)
32 32
     {
33 33
         $sql = 'SELECT damage.author_id as author_id, damage.rowid as id, damage.amount, damage.label, CONCAT(author.firstname, " " , author.lastname) as author_name, damage.billed as invoiced';
34
-        $sql.=' FROM '.MAIN_DB_PREFIX.'bbc_flight_damages as damage';
35
-        $sql.=' INNER JOIN '.MAIN_DB_PREFIX.'user as author ON author.rowid = damage.author_id';
36
-        $sql.=' WHERE damage.flight_id = '.$this->db->escape($flightId);
34
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'bbc_flight_damages as damage';
35
+        $sql .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'user as author ON author.rowid = damage.author_id';
36
+        $sql .= ' WHERE damage.flight_id = ' . $this->db->escape($flightId);
37 37
 
38 38
         $resql = $this->db->query($sql);
39 39
         if ($resql) {
40 40
             $num = $this->db->num_rows($resql);
41 41
             if ($num) {
42
-                for($i = 0; $i < $num ; $i++) {
42
+                for ($i = 0; $i < $num; $i++) {
43 43
                     $properties = $this->db->fetch_array($resql);
44 44
                     yield Damage::fromArray($properties);
45 45
                 }
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
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
             'label' => $flightDamage->getLabel()->value(),
38 38
         ];
39 39
 
40
-        if($flightDamage->getId()){
40
+        if ($flightDamage->getId()) {
41 41
             $this->update($flightDamage->getId()->getId(), $fields);
42 42
             return $flightDamage->getId()->getId();
43 43
         }
@@ -52,10 +52,10 @@  discard block
 block discarded – undo
52 52
      *
53 53
      * @throws \Exception
54 54
      */
55
-    public function getById(DamageId $id){
55
+    public function getById(DamageId $id) {
56 56
         $damage = $this->get($id->getId());
57 57
 
58
-        if(null === $damage){
58
+        if (null === $damage) {
59 59
             throw new \Exception('Damage not found');
60 60
         }
61 61
 
Please login to merge, or discard this patch.
Infrastructure/Common/Repository/AbstractDomainRepository.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
     public function __construct(\DoliDB $db, $tableName)
24 24
     {
25 25
         $this->db = $db;
26
-        $this->tableName = strpos($tableName, MAIN_DB_PREFIX) === 0 ? $tableName : MAIN_DB_PREFIX.$tableName;
26
+        $this->tableName = strpos($tableName, MAIN_DB_PREFIX) === 0 ? $tableName : MAIN_DB_PREFIX . $tableName;
27 27
     }
28 28
 
29 29
     /**
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
      *
34 34
      * @throws \Exception
35 35
      */
36
-    protected function write(array $elements){
36
+    protected function write(array $elements) {
37 37
         $columns = join(',', array_keys($elements));
38 38
         $values = join(',', array_map([$this, 'escape'], array_values($elements)));
39 39
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
             $lasterror = $this->db->lasterror();
45 45
             dol_syslog(__METHOD__ . ' ' . $lasterror, LOG_ERR);
46 46
             $this->db->rollback();
47
-            throw new \Exception("Repository error - ".$lasterror);
47
+            throw new \Exception("Repository error - " . $lasterror);
48 48
         }
49 49
 
50 50
         $id = $this->db->last_insert_id($this->tableName);
@@ -57,16 +57,16 @@  discard block
 block discarded – undo
57 57
      *
58 58
      * @return int|string|null
59 59
      */
60
-    private function escape($value){
61
-        if(is_null($value)){
60
+    private function escape($value) {
61
+        if (is_null($value)) {
62 62
             return null;
63 63
         }
64 64
 
65
-        if(is_bool($value)){
66
-            return (int)$value;
65
+        if (is_bool($value)) {
66
+            return (int) $value;
67 67
         }
68 68
 
69
-        return is_string($value) ? "'".$this->db->escape($value)."'" : $value ;
69
+        return is_string($value) ? "'" . $this->db->escape($value) . "'" : $value;
70 70
     }
71 71
 
72 72
     /**
@@ -79,18 +79,18 @@  discard block
 block discarded – undo
79 79
     {
80 80
         $sqlModifications = [];
81 81
 
82
-        foreach($elements as $field => $value){
82
+        foreach ($elements as $field => $value) {
83 83
             $sqlModifications[] = sprintf('%s=%s', $field, $this->escape($value));
84 84
         }
85 85
 
86 86
         $this->db->begin();
87
-        $resql = $this->db->query(sprintf('UPDATE %s SET %s WHERE rowid = %s ', $this->tableName, join(',',$sqlModifications), $id));
87
+        $resql = $this->db->query(sprintf('UPDATE %s SET %s WHERE rowid = %s ', $this->tableName, join(',', $sqlModifications), $id));
88 88
 
89 89
         if (!$resql) {
90 90
             $lasterror = $this->db->lasterror();
91 91
             dol_syslog(__METHOD__ . ' ' . $lasterror, LOG_ERR);
92 92
             $this->db->rollback();
93
-            throw new \Exception("Repository error - ".$lasterror);
93
+            throw new \Exception("Repository error - " . $lasterror);
94 94
         }
95 95
 
96 96
         $this->db->commit();
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
      *
104 104
      * @return array|null
105 105
      */
106
-    protected function get($id){
107
-        $sql = sprintf('SELECT * FROM %s WHERE rowid = %s', $this->tableName, $id );
106
+    protected function get($id) {
107
+        $sql = sprintf('SELECT * FROM %s WHERE rowid = %s', $this->tableName, $id);
108 108
 
109 109
         $resql = $this->db->query($sql);
110 110
         if (!$resql) {
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
             return null;
117 117
         }
118 118
 
119
-        for($i = 0; $i < $num ; $i++) {
119
+        for ($i = 0; $i < $num; $i++) {
120 120
             return $this->db->fetch_array($resql);
121 121
         }
122 122
 
Please login to merge, or discard this patch.
Application/Damage/ViewModel/Damage.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,14 +72,14 @@
 block discarded – undo
72 72
      *
73 73
      * @return Damage
74 74
      */
75
-    public static function fromArray(array $properties){
75
+    public static function fromArray(array $properties) {
76 76
         $authorId = $properties['author_id'];
77 77
         $author = $properties['author_name'];
78 78
         $label = $properties['label'];
79 79
         $amount = $properties['amount'];
80 80
         $id = $properties['id'];
81 81
         $flightId = isset($properties['flight_id']) ? $properties['flight_id'] : null;
82
-        $invoiced = (bool)$properties['invoiced'];
82
+        $invoiced = (bool) $properties['invoiced'];
83 83
 
84 84
         return new self($authorId, $author, $amount, $id, $invoiced, $flightId, $label);
85 85
     }
Please login to merge, or discard this patch.