laudeco / bbc-dolibarr-flightlog

command/CreateFlightCommandHandler.php

Spacing +11 added lines, -11 removed lines

@@ -65,7 +65,7 @@ 
         $vol = new Bbcvols($this->db);
         $vol->date = $command->getDate();
         $vol->lieuD = $command->getLieuD();
-        $vol->lieuA =$command->getLieuA();
+        $vol->lieuA = $command->getLieuA();
         $vol->heureD = $command->getHeureD();
         $vol->heureA = $command->getHeureA();
         $vol->BBC_ballons_idBBC_ballons = $command->getBBCBallonsIdBBCBallons();
@@ -73,14 +73,14 @@ 
         $vol->remarque = $command->getRemarque();
         $vol->incidents = $command->getIncidents();
         $vol->fk_type = $command->getFkType();
-        $vol->fk_pilot =$command->getFkPilot();
+        $vol->fk_pilot = $command->getFkPilot();
         $vol->fk_organisateur = $command->getFkOrganisateur();
         $vol->kilometers = $command->getKilometers();
         $vol->cost = $command->getCost();
         $vol->fk_receiver = $command->getFkReceiver();
         $vol->justif_kilometers = $command->getJustifKilometers();
         $vol->setPassengerNames($command->getPassengerNames());
-        foreach($command->getOrderIds() as $orderId => $nbrPassengers){
+        foreach ($command->getOrderIds() as $orderId => $nbrPassengers) {
             $vol->addOrderId($orderId, $nbrPassengers);
         }
 
@@ -88,12 +88,12 @@ 
             throw new Exception();
         }
 
-        if(!$vol->getFlightType()->isBillingRequired() || $vol->isLinkedToOrder()){
+        if (!$vol->getFlightType()->isBillingRequired() || $vol->isLinkedToOrder()) {
             $vol->is_facture = true;
         }
 
         $result = $vol->create($this->user);
-        if($result <= 0){
+        if ($result <= 0) {
             throw new Exception();
         }
 
@@ -113,27 +113,27 @@ 
     {
         $flight->fetch($flight->id);
 
-        if(!$flight->isLinkedToOrder()){
+        if (!$flight->isLinkedToOrder()) {
             return;
         }
 
-        foreach($flight->getOrders() as $currentOrder){
+        foreach ($flight->getOrders() as $currentOrder) {
             $currentOrder->add_object_linked('flightlog_bbcvols', $flight->getId());
             $currentOrder->fetch_lines();
 
             $qtyOrder = 0;
             /** @var OrderLine $currentOrderLine */
-            foreach($currentOrder->lines as $currentOrderLine){
-                $qtyOrder += (int)$currentOrderLine->qty;
+            foreach ($currentOrder->lines as $currentOrderLine) {
+                $qtyOrder += (int) $currentOrderLine->qty;
             }
 
             $passangersCount = $this->numberOfPassengersLinkedToOrder($currentOrder->id);
 
-            if($passangersCount < $qtyOrder){
+            if ($passangersCount < $qtyOrder) {
                 continue;
             }
 
-            if($currentOrder->statut == Commande::STATUS_VALIDATED){
+            if ($currentOrder->statut == Commande::STATUS_VALIDATED) {
                 $currentOrder->cloture($this->user);
             }
         }

addFlight.php

Spacing +11 added lines, -11 removed lines

@@ -61,7 +61,7 @@ 
             ->setGroupedFlight($isGroupedFlight)
             ->setOrderIds($orderPassengersCount);
 
-        try{
+        try {
             $vol = $createFlightHandler->handle($volCommand);
 
             include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
@@ -70,8 +70,8 @@ 
 
             $msg = '<div class="ok">L\'ajout du vol du : ' . $_POST["reday"] . '/' . $_POST["remonth"] . '/' . $_POST["reyear"] . ' s\'est correctement effectue ! </div>';
             Header("Location: card.php?id=" . $vol->id);
-        }catch (\Exception $e){
-            $msg = '<div class="error">Erreur lors de l\'ajout du vol : ' . ($vol->error?:$e->getMessage()) . '! </div>';
+        } catch (\Exception $e) {
+            $msg = '<div class="error">Erreur lors de l\'ajout du vol : ' . ($vol->error ?: $e->getMessage()) . '! </div>';
         }
 
     }
@@ -150,7 +150,7 @@ 
             //Pilote
             print "<tr>";
             print '<td class="fieldrequired"> Pilote </td><td >';
-            print $html->select_dolusers($_POST["pilot"] ? $_POST["pilot"] : $user->id, 'pilot', 0, null, 0, '', '', 0,0,0,'',0,'','', true);
+            print $html->select_dolusers($_POST["pilot"] ? $_POST["pilot"] : $user->id, 'pilot', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', true);
             print '</td></tr>';
 
             //Ballon
@@ -196,7 +196,7 @@ 
                 <td>
                 <?php
                     //organisateur
-                    print $html->select_dolusers($_POST["orga"] ? $_POST["orga"] : $user->id, 'orga', 0, null, 0, '', '', 0,0,0,'',0,'','', true);
+                    print $html->select_dolusers($_POST["orga"] ? $_POST["orga"] : $user->id, 'orga', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', true);
                 ?>
                 </td>
             </tr>
@@ -236,7 +236,7 @@ 
                     <input type="number"
                            name="nbrPax"
                            class="flat <?php echo $validator->hasError('nbrPax') ? 'error' : '' ?>"
-                           value="<?php echo $_POST['nbrPax']?: 0 ?>"/>
+                           value="<?php echo $_POST['nbrPax'] ?: 0 ?>"/>
                 </td>
             </tr>
 
@@ -261,7 +261,7 @@ 
                 <td class="js-order">
                     <p class="text-muted">Pour retirer une commande merci de la retirer de la liste ci-dessous.</p>
                     <?php
-                        echo $html::multiselectarray('order_id', $commande->liste_array(2),$_POST['order_id'],0,0, $validator->hasError('order_id') ? 'error' : '',0,'100%');
+                        echo $html::multiselectarray('order_id', $commande->liste_array(2), $_POST['order_id'], 0, 0, $validator->hasError('order_id') ? 'error' : '', 0, '100%');
                     ?>
                 </td>
             </tr>
@@ -270,7 +270,7 @@ 
             <tr class="js-hide-order js-billable-field">
                 <td class="fieldrequired"><?php echo $langs->trans('Qui a perçu l\'argent')?></td><td>
                     <?php print $html->select_dolusers($_POST["fk_receiver"] ? $_POST["fk_receiver"] : $user->id,
-                        'fk_receiver', true, null, 0, '', '', 0,0,0,'',0,'','', true); ?>
+                        'fk_receiver', true, null, 0, '', '', 0, 0, 0, '', 0, '', '', true); ?>
                 </td>
             </tr>
 
@@ -278,7 +278,7 @@ 
             <tr class="js-hide-order js-billable-field">
                 <td class="fieldrequired">Montant perçu</td>
                 <td>
-                    <input type="text" name="cost" class="flat  <?php echo $validator->hasError('cost') ? 'error' : '' ?>" value="<?php echo $_POST['cost']?:0 ?> "/>
+                    <input type="text" name="cost" class="flat  <?php echo $validator->hasError('cost') ? 'error' : '' ?>" value="<?php echo $_POST['cost'] ?: 0 ?> "/>
                     &euro;
                 </td>
             </tr>
@@ -325,9 +325,9 @@ 
 
 <script type="application/javascript">
 
-    <?php if(!empty(GETPOST('order_passengers_count', 'array', 2))): ?>
+    <?php if (!empty(GETPOST('order_passengers_count', 'array', 2))): ?>
         var orders = {};
-        <?php foreach( GETPOST('order_passengers_count', 'array', 2) as $currentOrderId=>$nbrPaxForOrder): ?>
+        <?php foreach (GETPOST('order_passengers_count', 'array', 2) as $currentOrderId=>$nbrPaxForOrder): ?>
         orders[<?php echo $currentOrderId; ?>] = <?php echo $nbrPaxForOrder; ?>;
         <?php endforeach; ?>
     <?php endif; ?>

Braces +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
             $msg = '<div class="ok">L\'ajout du vol du : ' . $_POST["reday"] . '/' . $_POST["remonth"] . '/' . $_POST["reyear"] . ' s\'est correctement effectue ! </div>';
             Header("Location: card.php?id=" . $vol->id);
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             $msg = '<div class="error">Erreur lors de l\'ajout du vol : ' . ($vol->error?:$e->getMessage()) . '! </div>';
         }
 

class/bbcvols.class.php

Spacing +14 added lines, -14 removed lines

@@ -255,7 +255,7 @@ 
         $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 .= ' ' . "'" . $this->passengerNames . "'";
         $sql .= ')';
 
         $this->db->begin();
@@ -269,7 +269,7 @@ 
 
         if (!$error) {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-            if(!$this->insertOrders()){
+            if (!$this->insertOrders()) {
                 $error++;
             }
 
@@ -295,9 +295,9 @@ 
     /**
      * Inserts the order linked to the flight
      */
-    private function insertOrders(){
+    private function insertOrders() {
 
-        if(empty($this->orderIds)){
+        if (empty($this->orderIds)) {
             return true;
         }
 
@@ -312,12 +312,12 @@ 
         
         $values = [];
 
-        foreach($this->orderIds as $orderId=>$nbrPassengers){
+        foreach ($this->orderIds as $orderId=>$nbrPassengers) {
             $values[] = sprintf(
                 $valueTemplate,
                 $orderId,
                 $this->db->escape($this->id),
-                (!isset($nbrPassengers) ? '0' :  $this->db->escape($nbrPassengers))
+                (!isset($nbrPassengers) ? '0' : $this->db->escape($nbrPassengers))
             );
         }
 
@@ -335,9 +335,9 @@ 
     /**
      * Inserts the order linked to the flight
      */
-    private function updateOrders(){
+    private function updateOrders() {
 
-        if(empty($this->orderIds)){
+        if (empty($this->orderIds)) {
             return true;
         }
 
@@ -348,9 +348,9 @@ 
     /**
      * Inserts the order linked to the flight
      */
-    private function deleteOrders(){
+    private function deleteOrders() {
 
-        if(empty($this->orderIds)){
+        if (empty($this->orderIds)) {
             return true;
         }
 
@@ -1015,8 +1015,8 @@ 
      * @param int $orderId
      * @param int $nbrPassengers
      */
-    public function addOrderId($orderId, $nbrPassengers){
-        if(!isset($this->orderIds)){
+    public function addOrderId($orderId, $nbrPassengers) {
+        if (!isset($this->orderIds)) {
             $this->orderIds = [];
         }
 
@@ -1056,7 +1056,7 @@ 
         if ($resql) {
             $numrows = $this->db->num_rows($resql);
             if ($numrows) {
-                for($i = 0 ; $i < $numrows ; $i++){
+                for ($i = 0; $i < $numrows; $i++) {
                     $obj = $this->db->fetch_object($resql);
                     $this->orderIds[$obj->order_id] = $obj->nbr_passengers;
 
@@ -1077,7 +1077,7 @@ 
      */
     public function getOrders()
     {
-        if(!isset($this->orders) || empty($this->orders)){
+        if (!isset($this->orders) || empty($this->orders)) {
             $this->fetchOrder();
         }
         return $this->orders;

validators/FlightValidator.php

Spacing +5 added lines, -5 removed lines

@@ -229,20 +229,20 @@
      */
     private function checkOrderInformation(Bbcvols $vol)
     {
-        if(!$vol->isLinkedToOrder()){
+        if (!$vol->isLinkedToOrder()) {
             return $this;
         }
 
         $totalPassenegrs = 0;
-        foreach($vol->getOrderIds() as $orderId => $nbrPassengers){
-            if($nbrPassengers <= 0){
+        foreach ($vol->getOrderIds() as $orderId => $nbrPassengers) {
+            if ($nbrPassengers <= 0) {
                 $this->addError('order_id', 'Le nombre de passager par commande doit être >= 0.');
             }
 
-            $totalPassenegrs+=(int)$nbrPassengers;
+            $totalPassenegrs += (int) $nbrPassengers;
         }
 
-        if($totalPassenegrs !== (int)$vol->getNumberOfPassengers()){
+        if ($totalPassenegrs !== (int) $vol->getNumberOfPassengers()) {
             $this->addError('nbrPax', 'Le nombre de passagers ne correspond pas au nombre entré sur les commandes');
         }