laudeco / bbc-dolibarr-flightlog

command/CreateFlightBillCommand.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
             throw new \InvalidArgumentException('Model document is missing');
         }
 
-        if(!isset($nbrPax) || !is_numeric($nbrPax) || !is_integer($nbrPax)){
+        if (!isset($nbrPax) || !is_numeric($nbrPax) || !is_integer($nbrPax)) {
             throw new \InvalidArgumentException('The number of pax is not correct, an integer is expected');
         }
 

class/bbcvols.class.php

Spacing +19 added lines, -19 removed lines

@@ -247,18 +247,18 @@ 
         $sql .= ' ' . (!isset($this->nbrPax) ? 'NULL' : "'" . $this->db->escape($this->nbrPax) . "'") . ',';
         $sql .= ' ' . (!isset($this->remarque) ? 'NULL' : "'" . $this->db->escape($this->remarque) . "'") . ',';
         $sql .= ' ' . (!isset($this->incidents) ? 'NULL' : "'" . $this->db->escape($this->incidents) . "'") . ',';
-        $sql .= ' ' . (!isset($this->fk_type) || (int)$this->fk_type === -1 ? 'NULL' : $this->fk_type) . ',';
-        $sql .= ' ' . (!isset($this->fk_pilot) || (int)$this->fk_pilot === -1 ? 'NULL' : $this->fk_pilot) . ',';
-        $sql .= ' ' . (!isset($this->fk_organisateur) || (int)$this->fk_organisateur === -1 ? 'NULL' : $this->fk_organisateur) . ',';
+        $sql .= ' ' . (!isset($this->fk_type) || (int) $this->fk_type === -1 ? 'NULL' : $this->fk_type) . ',';
+        $sql .= ' ' . (!isset($this->fk_pilot) || (int) $this->fk_pilot === -1 ? 'NULL' : $this->fk_pilot) . ',';
+        $sql .= ' ' . (!isset($this->fk_organisateur) || (int) $this->fk_organisateur === -1 ? 'NULL' : $this->fk_organisateur) . ',';
         $sql .= ' ' . (!isset($this->is_facture) ? '0' : $this->is_facture) . ',';
         $sql .= ' ' . (!isset($this->kilometers) || empty($this->kilometers) ? '0' : $this->kilometers) . ',';
         $sql .= ' ' . (!isset($this->cost) ? 'NULL' : "'" . $this->db->escape($this->cost) . "'") . ',';
-        $sql .= ' ' . (!isset($this->fk_receiver) || (int)$this->fk_receiver === -1 ? 'NULL' : $this->fk_receiver) . ',';
+        $sql .= ' ' . (!isset($this->fk_receiver) || (int) $this->fk_receiver === -1 ? 'NULL' : $this->fk_receiver) . ',';
         $sql .= ' ' . (!isset($this->justif_kilometers) ? 'NULL' : "'" . $this->db->escape($this->justif_kilometers) . "'") . ',';
         $sql .= ' ' . "'" . date('Y-m-d H:i:s') . "'" . ',';
         $sql .= ' ' . "'" . date('Y-m-d H:i:s') . "'" . ',';
         $sql .= ' ' . "'" . $this->passengerNames . "'" . ',';
-        $sql .= ' ' . (!isset($this->orderId) || (int)$this->orderId === -1 ? 'NULL' : $this->orderId) . '';
+        $sql .= ' ' . (!isset($this->orderId) || (int) $this->orderId === -1 ? 'NULL' : $this->orderId) . '';
 
         $sql .= ')';
 
@@ -346,28 +346,28 @@ 
 
                 $this->id = $obj->idBBC_vols;
 
-                $this->idBBC_vols = (int)$obj->idBBC_vols;
+                $this->idBBC_vols = (int) $obj->idBBC_vols;
                 $this->date = $this->db->jdate($obj->date);
                 $this->lieuD = $obj->lieuD;
                 $this->lieuA = $obj->lieuA;
                 $this->heureD = $obj->heureD;
                 $this->heureA = $obj->heureA;
-                $this->BBC_ballons_idBBC_ballons = (int)$obj->BBC_ballons_idBBC_ballons;
+                $this->BBC_ballons_idBBC_ballons = (int) $obj->BBC_ballons_idBBC_ballons;
                 $this->nbrPax = $obj->nbrPax;
                 $this->remarque = $obj->remarque;
                 $this->incidents = $obj->incidents;
-                $this->fk_type = (int)$obj->fk_type;
-                $this->fk_pilot = (int)$obj->fk_pilot;
-                $this->fk_organisateur = (int)$obj->fk_organisateur;
-                $this->is_facture = (int)$obj->is_facture;
+                $this->fk_type = (int) $obj->fk_type;
+                $this->fk_pilot = (int) $obj->fk_pilot;
+                $this->fk_organisateur = (int) $obj->fk_organisateur;
+                $this->is_facture = (int) $obj->is_facture;
                 $this->kilometers = $obj->kilometers;
                 $this->cost = $obj->cost;
-                $this->fk_receiver = (int)$obj->fk_receiver;
+                $this->fk_receiver = (int) $obj->fk_receiver;
                 $this->justif_kilometers = $obj->justif_kilometers;
                 $this->date_creation = $obj->date_creation;
                 $this->date_update = $obj->date_update;
                 $this->passengerNames = $obj->passenger_names;
-                $this->orderId = (int)$obj->order_id;
+                $this->orderId = (int) $obj->order_id;
 
                 $this->balloon = $this->fetchBalloon();
                 $this->pilot = $this->fetchUser($this->fk_pilot);
@@ -476,17 +476,17 @@ 
         $sql .= ' nbrPax = ' . (isset($this->nbrPax) ? "'" . $this->db->escape($this->nbrPax) . "'" : "null") . ',';
         $sql .= ' remarque = ' . (isset($this->remarque) ? "'" . $this->db->escape($this->remarque) . "'" : "null") . ',';
         $sql .= ' incidents = ' . (isset($this->incidents) ? "'" . $this->db->escape($this->incidents) . "'" : "null") . ',';
-        $sql .= ' fk_type = ' . (isset($this->fk_type) && (int)$this->fk_type > 0 ? $this->fk_type : "null") . ',';
-        $sql .= ' fk_pilot = ' . (isset($this->fk_pilot) && (int)$this->fk_pilot > 0 ? $this->fk_pilot : "null") . ',';
-        $sql .= ' fk_organisateur = ' . (isset($this->fk_organisateur) && (int)$this->fk_organisateur > 0 ? $this->fk_organisateur : "null") . ',';
+        $sql .= ' fk_type = ' . (isset($this->fk_type) && (int) $this->fk_type > 0 ? $this->fk_type : "null") . ',';
+        $sql .= ' fk_pilot = ' . (isset($this->fk_pilot) && (int) $this->fk_pilot > 0 ? $this->fk_pilot : "null") . ',';
+        $sql .= ' fk_organisateur = ' . (isset($this->fk_organisateur) && (int) $this->fk_organisateur > 0 ? $this->fk_organisateur : "null") . ',';
         $sql .= ' is_facture = ' . (isset($this->is_facture) ? $this->is_facture : "0") . ',';
         $sql .= ' kilometers = ' . (!empty($this->kilometers) ? $this->kilometers : "0") . ',';
         $sql .= ' cost = ' . (isset($this->cost) ? "'" . $this->db->escape($this->cost) . "'" : "''") . ',';
-        $sql .= ' fk_receiver = ' . (isset($this->fk_receiver) && (int)$this->fk_receiver > 0 ? $this->fk_receiver : "null") . ',';
+        $sql .= ' fk_receiver = ' . (isset($this->fk_receiver) && (int) $this->fk_receiver > 0 ? $this->fk_receiver : "null") . ',';
         $sql .= ' justif_kilometers = ' . (isset($this->justif_kilometers) ? "'" . $this->db->escape($this->justif_kilometers) . "'," : "'',");
         $sql .= ' date_update = ' . "'" . date('Y-m-d H:i:s') . "',";
         $sql .= ' passenger_names = ' . "'" . trim($this->passengerNames) . "',";
-        $sql .= ' order_id = ' .  (!isset($this->orderId) || (int)$this->orderId === -1 ? 'null' : $this->orderId);
+        $sql .= ' order_id = ' . (!isset($this->orderId) || (int) $this->orderId === -1 ? 'null' : $this->orderId);
 
         $sql .= ' WHERE idBBC_vols=' . $this->idBBC_vols;
 
@@ -853,7 +853,7 @@ 
      */
     public function getAmountPerPassenger()
     {
-        $nbrPax = $this->nbrPax > 0 ? $this->nbrPax : 1 ;
+        $nbrPax = $this->nbrPax > 0 ? $this->nbrPax : 1;
         return $this->cost / $nbrPax;
     }
 

facture.php

Spacing +4 added lines, -4 removed lines

@@ -124,12 +124,12 @@
  * Put here all code to do according to value of "action" parameter
  */
 if ($action == EXPENSE_REPORT_GENERATOR_ACTION_GENERATE) {
-    try{
-        $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote,$bankAccount, $nbrPax);
+    try {
+        $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote, $bankAccount, $nbrPax);
         $handler->handle($command);
         Header("Location: card.php?id=" . $flight->getId());
-    }catch (\Exception $e){
-        dol_syslog($e->getMessage(),LOG_ERR);
+    } catch (\Exception $e) {
+        dol_syslog($e->getMessage(), LOG_ERR);
         dol_htmloutput_mesg("Facture non créée", '', 'error');
     }
 }

Braces +6 added lines, -3 removed lines

@@ -128,7 +128,7 @@ 
         $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote,$bankAccount, $nbrPax);
         $handler->handle($command);
         Header("Location: card.php?id=" . $flight->getId());
-    }catch (\Exception $e){
+    } catch (\Exception $e){
         dol_syslog($e->getMessage(),LOG_ERR);
         dol_htmloutput_mesg("Facture non créée", '', 'error');
     }
@@ -269,9 +269,12 @@ 
 
         <?php if (!$flightProduct || !$flight->hasReceiver()) : ?>
             <a class="butActionRefused" href="#">Générer</a>
-        <?php else: ?>
+        <?php else {
+    : ?>
             <button class="butAction" type="submit">Générer</button>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
 
         <a class="butAction" href="<?php echo DOL_URL_ROOT . '/flightlog/card.php?id=' . $flight->id; ?>">Retour au
             vol</a>