laudeco / bbc-dolibarr-flightlog

card_tab_financial.php

Spacing +13 added lines, -13 removed lines

@@ -43,7 +43,7 @@ 
 
 $id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int');
 $action = GETPOST('action', 'alpha');
-$permissiondellink=$user->rights->flightlog->vol->financial;
+$permissiondellink = $user->rights->flightlog->vol->financial;
 
 $object = new Bbcvols($db);
 $extrafields = new ExtraFields($db);
@@ -62,8 +62,8 @@ 
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-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
-include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+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
+include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('bbcvols'));
@@ -99,20 +99,20 @@ 
 print '<tr><td class="fieldrequired">' . $langs->trans("Fielddate") . '</td><td>' . dol_print_date($object->date) . '</td></tr>';
 
 if ($user->rights->flightlog->vol->financial) {
-    print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5). '</td></tr>';
+    print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5) . '</td></tr>';
 }
 
 print '<tr><td class="fieldrequired">' . $langs->trans("Fieldkilometers") . '</td><td>' . $object->kilometers . ' KM</td></tr>';
 print '<tr><td class="fieldrequired">' . $langs->trans("Fieldjustif_kilometers") . '</td><td>' . $object->justif_kilometers . '</td></tr>';
-if($object->hasReceiver()){
+if ($object->hasReceiver()) {
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost . " " . $langs->getCurrencySymbol($conf->currency) . '</td></tr>';
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_receiver") . '</td><td>' . $receiver->getNomUrl(1) . '</td></tr>';
 }
 
-if($object->isLinkedToOrder()){
+if ($object->isLinkedToOrder()) {
     print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td><ul>';
-    foreach($object->getOrders() as $currentOrder){
-        print '<li>'.$currentOrder->getNomUrl(1).'</li>';
+    foreach ($object->getOrders() as $currentOrder) {
+        print '<li>' . $currentOrder->getNomUrl(1) . '</li>';
     }
     print '</ul></td></tr>';
 }
@@ -124,18 +124,18 @@ 
 print '<div class="tabsAction">' . "\n";
 
 // Make invoice
-if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){
-    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id.'">' . $langs->trans("Facturer") . '</a></div>' . "\n";
+if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) {
+    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id . '">' . $langs->trans("Facturer") . '</a></div>' . "\n";
 }
 
 // Open
-if($object->isBilled() && $object->isBillingRequired()){
-    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/card_tab_financial.php?action=open&id=' . $object->id.'">' . $langs->trans("Ouvrir") . '</a></div>' . "\n";
+if ($object->isBilled() && $object->isBillingRequired()) {
+    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/card_tab_financial.php?action=open&id=' . $object->id . '">' . $langs->trans("Ouvrir") . '</a></div>' . "\n";
 }
 
 print '</div>' . "\n";
 
-if($user->rights->flightlog->vol->financial){
+if ($user->rights->flightlog->vol->financial) {
     print '<div class="fichecenter"><div class="fichehalfleft">';
     $form->showLinkedObjectBlock($object);
     print '</div></div>';

lib/flightLog.lib.php

Spacing +5 added lines, -5 removed lines

@@ -90,11 +90,11 @@ 
         if ($num) {
             while ($i < $num) {
                 $obj = $db->fetch_object($resql);
-                $currentValue = substr($obj->immat, 0,2);
+                $currentValue = substr($obj->immat, 0, 2);
 
                 if ($obj) {
-                    if(true === $group && $currentValue !== $lastValue){
-                        print '<optgroup label="'.$currentValue.'">';
+                    if (true === $group && $currentValue !== $lastValue) {
+                        print '<optgroup label="' . $currentValue . '">';
                     }
 
                     $lastValue = $currentValue;
@@ -111,8 +111,8 @@ 
                     echo strtoupper($obj->immat);
                     print "</option>";
 
-                    if(true === $group && $currentValue !== $lastValue){
-                        print '<optgroup label="'.$currentValue.'">';
+                    if (true === $group && $currentValue !== $lastValue) {
+                        print '<optgroup label="' . $currentValue . '">';
                     }
 
 

command/CreateFlightCommandHandler.php

Spacing +11 added lines, -11 removed lines

@@ -65,7 +65,7 @@ 
         $vol = new Bbcvols($this->db);
         $vol->date = $command->getDate()->getTimestamp();
         $vol->lieuD = $command->getLieuD();
-        $vol->lieuA =$command->getLieuA();
+        $vol->lieuA = $command->getLieuA();
         $vol->heureD = $command->getHeureD()->format('Hi');
         $vol->heureA = $command->getHeureA()->format('Hi');
         $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->isBillingRequired() || ($vol->isLinkedToOrder() && $vol->hasReceiver())){
+        if (!$vol->isBillingRequired() || ($vol->isLinkedToOrder() && $vol->hasReceiver())) {
             $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);
             }
         }

validators/FlightValidator.php

Spacing +6 added lines, -6 removed lines

@@ -151,7 +151,7 @@ 
      */
     private function checkPassengersInformation($vol)
     {
-        if (!is_numeric($vol->nbrPax) || (int)$vol->nbrPax < 0) {
+        if (!is_numeric($vol->nbrPax) || (int) $vol->nbrPax < 0) {
             $this->addError('nbrPax', 'Erreur le nombre de passager est un nombre négatif.');
         }
 
@@ -203,13 +203,13 @@ 
      */
     private function checkFlightInformation($vol)
     {
-        if(empty($vol->getHeureD()) || $vol->getHeureD() === '0000'){
+        if (empty($vol->getHeureD()) || $vol->getHeureD() === '0000') {
             $this->addError('heureD', "L'heure depart est vide");
         }
         if (!$this->isHourValid($vol->heureD)) {
             $this->addError('heureD', "L'heure depart n'est pas correcte");
         }
-        if(empty($vol->getHeureA()) || $vol->getHeureA() === '0000'){
+        if (empty($vol->getHeureA()) || $vol->getHeureA() === '0000') {
             $this->addError('heureD', "L'heure d'arrivée est vide");
         }
 
@@ -249,10 +249,10 @@ 
                 $this->addError('order_id', 'Le nombre de passager par commande doit être >= 0.');
             }
 
-            $totalPassenegrs += (int)$nbrPassengers;
+            $totalPassenegrs += (int) $nbrPassengers;
         }
 
-        if (!$vol->hasReceiver() && $totalPassenegrs !== (int)$vol->getNumberOfPassengers()) {
+        if (!$vol->hasReceiver() && $totalPassenegrs !== (int) $vol->getNumberOfPassengers()) {
             $this->addError('nbrPax', 'Le nombre de passagers ne correspond pas au nombre entré sur les commandes');
         }
 
@@ -278,7 +278,7 @@ 
 
     private function checkBalloon(Bbcvols $flight)
     {
-        if($flight->getBBCBallonsIdBBCBallons() > 0){
+        if ($flight->getBBCBallonsIdBBCBallons() > 0) {
             return $this;
         }
 

lib/card.lib.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         'Vol',
         'Finances',
         'Dégâts',
-        'Remarques '.($flight->hasComment() ? ' - <span class="fa fa-comment" title="'.$flight->getComment().'"></span>' : '').($flight->hasIncidents() ? ' - <span class="fa fa-exclamation" title="'.$flight->getIncident().'"></span>' : ''),
+        'Remarques ' . ($flight->hasComment() ? ' - <span class="fa fa-comment" title="' . $flight->getComment() . '"></span>' : '') . ($flight->hasIncidents() ? ' - <span class="fa fa-exclamation" title="' . $flight->getIncident() . '"></span>' : ''),
         'Suivis',
     ];
 

Infrastructure/Flight/Query/Repository/TakeOffQueryRepository.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
             WHERE 
               fk_type IN (1,2)
               AND YEAR(NOW())-1 <= YEAR(llx_bbc_vols.date)
-              AND llx_bbc_vols.fk_pilot = '.$pilot.'
+              AND llx_bbc_vols.fk_pilot = '.$pilot . '
             
             GROUP BY
               llx_bbc_vols.lieuD
@@ -57,7 +57,7 @@ 
 
         $places = [];
 
-        for($i = 0; $i < $num ; $i++) {
+        for ($i = 0; $i < $num; $i++) {
             $properties = $this->db->fetch_array($resql);
             $stat = new TakeOffPlace($properties['place']);
             $places[] = $stat;

Infrastructure/Flight/Query/Repository/BalloonQueryRepository.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
         $this->db = $db;
     }
 
-    public function query($params = []){
+    public function query($params = []) {
         $sql = '
             SELECT 
               balloon.rowid as id,
@@ -33,7 +33,7 @@ 
             
             WHERE 
               balloon.is_disable = false
-              AND llx_bbc_vols.fk_pilot = '.$params['pilot'].'
+              AND llx_bbc_vols.fk_pilot = '.$params['pilot'] . '
               
             GROUP BY balloon.rowid
             ORDER  BY counter DESC
@@ -50,7 +50,7 @@ 
             return new Balloon(0);
         }
 
-        for($i = 0; $i < $num ; $i++) {
+        for ($i = 0; $i < $num; $i++) {
             $properties = $this->db->fetch_array($resql);
             return Balloon::fromArray($properties);
         }

addFlight.php

Spacing +15 added lines, -15 removed lines

@@ -43,8 +43,8 @@ 
                 ->setDate(new DateTimeImmutable($_POST['flight_date']))
                 ->setLieuD($_POST['lieuD'])
                 ->setLieuA($_POST['lieuA'])
-                ->setHeureD(new DateTimeImmutable($_POST['flight_date'].' '.$_POST['heureD']))
-                ->setHeureA(new DateTimeImmutable($_POST['flight_date'].' '.$_POST['heureA']))
+                ->setHeureD(new DateTimeImmutable($_POST['flight_date'] . ' ' . $_POST['heureD']))
+                ->setHeureA(new DateTimeImmutable($_POST['flight_date'] . ' ' . $_POST['heureA']))
                 ->setBBCBallonsIdBBCBallons($_POST['ballon'])
                 ->setNbrPax($_POST['nbrPax'])
                 ->setRemarque($_POST['comm'])
@@ -68,8 +68,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>';
         }
 
     }
@@ -103,7 +103,7 @@ 
 
 <section class="bbc-style">
 
-    <?php if(!empty($takeOffPlaces)): ?>
+    <?php if (!empty($takeOffPlaces)): ?>
         <datalist id="take_off_places_id">
             <?php foreach ($takeOffPlaces as $takeOffPlace): ?>
                 <option value="<?php echo $takeOffPlace->getPlace(); ?>"></option>
@@ -121,7 +121,7 @@ 
     <form class="flight-form js-form" name='add' action="addFlight.php" method="post">
         <input type="hidden" name="action" value="add"/>
         <input type="hidden" name="user_id" value="<?php echo $user->id; ?>"/>
-        <input type="hidden" name="token" value="<?php echo newToken();?>"/>
+        <input type="hidden" name="token" value="<?php echo newToken(); ?>"/>
 
         <!-- Date et heures -->
         <section class="form-section">
@@ -182,7 +182,7 @@ 
             <div >
                 <div class="form-group">
                     <label class="fieldrequired"> Pilote</label>
-                    <?php print $html->select_dolusers($_POST["pilot"] ? $_POST["pilot"] : $user->id, 'pilot', 0, null, 0, '', '', 0,0,0,'',0,'','', true); ?>
+                    <?php print $html->select_dolusers($_POST["pilot"] ? $_POST["pilot"] : $user->id, 'pilot', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', true); ?>
                 </div>
 
                 <div class="form-group ">
@@ -192,7 +192,7 @@ 
                     </label>
                     <?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);
                     ?>
                 </div>
 
@@ -208,7 +208,7 @@ 
 
                 <div class="form-group">
                     <label class="fieldrequired">Ballon</label>
-                    <?php select_balloons($_POST['ballon']?: ($mostUsedBalloon ? $mostUsedBalloon->getId() : ''), 'ballon', 0, false, true); ?>
+                    <?php select_balloons($_POST['ballon'] ?: ($mostUsedBalloon ? $mostUsedBalloon->getId() : ''), 'ballon', 0, false, true); ?>
                 </div>
 
                 <div class="form-group">
@@ -248,7 +248,7 @@ 
                            min="0"
                            max="5"
                            class="flat <?php echo $validator->hasError('nbrPax') ? 'error' : '' ?>"
-                           value="<?php echo $_POST['nbrPax']?: 0 ?>"/>
+                           value="<?php echo $_POST['nbrPax'] ?: 0 ?>"/>
                 </div>
 
                 <!-- passenger names -->
@@ -285,16 +285,16 @@ 
                         </tr>
 
                         <tr>
-                            <td class="js-receiver" data-user-id="<?php echo $user->id;?>">
+                            <td class="js-receiver" data-user-id="<?php echo $user->id; ?>">
                                 <label class=""><?php echo $langs->trans('Membre ayant perçu l\'argent')?>?</label>
                                 <?php print $html->select_dolusers(
                                         $_POST["fk_receiver"] ? $_POST["fk_receiver"] : -1,
-                                    'fk_receiver', true, null, 0, '', '', 0,0,0,'',0,'','', true); ?>
+                                    'fk_receiver', true, null, 0, '', '', 0, 0, 0, '', 0, '', '', true); ?>
                             </td>
                             <td>
                                 <label>&nbsp;</label>
                                 <div class="input-group">
-                                    <input type="number" name="cost"  step="1" min="0" class="flat js-cost" disabled value="<?php echo $_POST['cost']?:0 ?>"/>
+                                    <input type="number" name="cost"  step="1" min="0" class="flat js-cost" disabled value="<?php echo $_POST['cost'] ?: 0 ?>"/>
                                     <span class="input-symbol">&euro;</span>
                                 </div>
                             </td>
@@ -305,8 +305,8 @@ 
                             <th>B. Commande(s)</th>
                             <th>Nombre de passagers.</th>
                         </tr>
-                        <?php if(is_array($_POST['order_passengers_count']) && !empty($_POST['order_passengers_count'])): ?>
-                            <?php foreach($_POST['order_passengers_count'] as $order => $orderQuantity): ?>
+                        <?php if (is_array($_POST['order_passengers_count']) && !empty($_POST['order_passengers_count'])): ?>
+                            <?php foreach ($_POST['order_passengers_count'] as $order => $orderQuantity): ?>
                                 <tr class="order-row">
                                     <td>
                                         <span class="fa fa-trash remove js-remove" data-order-id="<?php echo $order; ?>"></span>

command/CreatePilotYearBillCommandHandler.php

Spacing +11 added lines, -11 removed lines

@@ -147,22 +147,22 @@ 
 
         $remainingPoints = $command->getPilot()->getFlightBonus()->addPoints(FlightPoints::create($command->getAdditionalBonus()));
 
-        foreach ($amountPerRate as $rate => $cost){
-            if($cost->getValue() <= 0){
+        foreach ($amountPerRate as $rate => $cost) {
+            if ($cost->getValue() <= 0) {
                 continue;
             }
 
-            if($cost->getValue() <= $remainingPoints->getValue()){
+            if ($cost->getValue() <= $remainingPoints->getValue()) {
                 $remainingPoints = $remainingPoints->minCosts($cost);
                 continue;
             }
 
             $subject = 'vols';
-            if((int)$rate === 21){
+            if ((int) $rate === 21) {
                 $subject = 'réparations';
             }
 
-            $this->addOrderLine($object, 'Cloture d\'année concernant les ' . $subject, $cost->minBonus($remainingPoints)->getValue(), (int)$rate, 1, $startYearTimestamp, $endYearTimestamp );
+            $this->addOrderLine($object, 'Cloture d\'année concernant les ' . $subject, $cost->minBonus($remainingPoints)->getValue(), (int) $rate, 1, $startYearTimestamp, $endYearTimestamp);
             $remainingPoints = FlightBonus::zero();
 
         }
@@ -208,7 +208,7 @@ 
      */
     private function addOrderLine($object, $title, $priceTtc, $rate, $qty, $startDate, $endDate)
     {
-        if($qty <= 0){
+        if ($qty <= 0) {
             return;
         }
 
@@ -264,35 +264,35 @@ 
 
         //T3
         $rate = $this->t3->getService()->tva_tx;
-        if(!isset($costs[$rate])){
+        if (!isset($costs[$rate])) {
             $costs[$rate] = FlightCost::zero();
         }
         $costs[$rate] = $costs[$rate]->addCost($pilot->getCountForType('3')->getCost());
 
         //T4
         $rate = $this->t4->getService()->tva_tx;
-        if(!isset($costs[$rate])){
+        if (!isset($costs[$rate])) {
             $costs[$rate] = FlightCost::zero();
         }
         $costs[$rate] = $costs[$rate]->addCost($pilot->getCountForType('4')->getCost());
 
         //T6
         $rate = $this->t6->getService()->tva_tx;
-        if(!isset($costs[$rate])){
+        if (!isset($costs[$rate])) {
             $costs[$rate] = FlightCost::zero();
         }
         $costs[$rate] = $costs[$rate]->addCost($pilot->getCountForType('6')->getCost());
 
         //T7
         $rate = $this->t7->getService()->tva_tx;
-        if(!isset($costs[$rate])){
+        if (!isset($costs[$rate])) {
             $costs[$rate] = FlightCost::zero();
         }
         $costs[$rate] = $costs[$rate]->addCost($pilot->getCountForType('7')->getCost());
 
         //Damages
         $rate = 21;
-        if(!isset($costs[$rate])){
+        if (!isset($costs[$rate])) {
             $costs[$rate] = FlightCost::zero();
         }
         $costs[$rate] = $costs[$rate]->addCost($pilot->damageCost()->minCost($pilot->invoicedDamageCost()->multiply(-1)));