laudeco / bbc-dolibarr-flightlog

card.php

Spacing +23 added lines, -23 removed lines

@@ -116,7 +116,7 @@ 
 $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. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // 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
@@ -145,7 +145,7 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object,
-    $action);    // Note that $action and $object may have been modified by some hooks
+    $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -251,7 +251,7 @@ 
 
 
 // Part to edit record
-if (($user->rights->flightlog->vol->edit || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id )) && ($id || $ref) && $action == 'edit'): ?>
+if (($user->rights->flightlog->vol->edit || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id)) && ($id || $ref) && $action == 'edit'): ?>
 
     <?php $renderer = new \flightlog\form\SimpleFormRenderer(); ?>
 
@@ -268,7 +268,7 @@ 
 
         <?php echo $renderer->render($formFlight->getElement('idBBC_vols')); ?>
 
-        <?php if($formFlight->has('fk_type')): ?>
+        <?php if ($formFlight->has('fk_type')): ?>
         <section class="form-section">
             <h1 class="form-section-title"><?php echo $langs->trans('Type de vol'); ?></h1>
             <table class="border" width="50%">
@@ -282,7 +282,7 @@ 
         <?php endif; ?>
 
         <!-- Date et heures -->
-        <?php if($formFlight->has('date')): ?>
+        <?php if ($formFlight->has('date')): ?>
             <section class="form-section">
                 <h1 class="form-section-title"><?php echo $langs->trans('Date'); ?></h1>
                 <table class="border" width="50%">
@@ -294,7 +294,7 @@ 
             </section>
         <?php endif; ?>
 
-        <?php if($formFlight->has('heureD') && $formFlight->has('heureA')): ?>
+        <?php if ($formFlight->has('heureD') && $formFlight->has('heureA')): ?>
             <section class="form-section">
                 <h1 class="form-section-title"><?php echo $langs->trans('Heures'); ?></h1>
                 <table class="border" width="50%">
@@ -314,14 +314,14 @@ 
             <h1 class="form-section-title"><?php echo $langs->trans('Pilote & ballon') ?></h1>
             <table class="border" width="50%">
 
-                <?php if($formFlight->has('fk_pilot')): ?>
+                <?php if ($formFlight->has('fk_pilot')): ?>
                 <tr>
                     <td class="fieldrequired"> Pilote </td>
-                    <td><?php echo $renderer->render($formFlight->getElement('fk_pilot'),['ajax' => true]); ?></td>
+                    <td><?php echo $renderer->render($formFlight->getElement('fk_pilot'), ['ajax' => true]); ?></td>
                 </tr>
                 <?php endif; ?>
 
-                <?php if($formFlight->has('BBC_ballons_idBBC_ballons')): ?>
+                <?php if ($formFlight->has('BBC_ballons_idBBC_ballons')): ?>
                 <tr>
                     <td width="25%" class="fieldrequired">Ballon</td>
                     <td><?php echo $renderer->render($formFlight->getElement('BBC_ballons_idBBC_ballons')); ?></td>
@@ -356,7 +356,7 @@ 
             </table>
         </section>
 
-        <?php if($formFlight->has('fk_organisateur')): ?>
+        <?php if ($formFlight->has('fk_organisateur')): ?>
             <section class="form-section">
                 <h1 class="form-section-title"><span class="js-organisator-field">Organisateur</span></h1>
                 <table class="border" width="50%">
@@ -365,7 +365,7 @@ 
                         <td>
                             <?php
                             //organisateur
-                            print $renderer->render($formFlight->getElement('fk_organisateur'),['ajax' => true]);
+                            print $renderer->render($formFlight->getElement('fk_organisateur'), ['ajax' => true]);
                             ?>
                         </td>
                     </tr>
@@ -377,7 +377,7 @@ 
         <section class="form-section js-expensable-field">
             <h1 class="form-section-title"><?php echo $langs->trans('Déplacements') ?></h1>
             <table class="border" width="50%">
-                <?php if($formFlight->has('kilometers')): ?>
+                <?php if ($formFlight->has('kilometers')): ?>
                     <!-- number of kilometers done for the flight -->
                     <tr>
                         <td class="fieldrequired">Nombre de kilometres effectués pour le vol</td>
@@ -387,7 +387,7 @@ 
                     </tr>
                 <?php endif; ?>
 
-                <?php if($formFlight->has('justif_kilometers')): ?>
+                <?php if ($formFlight->has('justif_kilometers')): ?>
                     <!-- Justif Kilometers -->
                     <tr>
 
@@ -405,7 +405,7 @@ 
         <section class="form-section">
             <h1 class="form-section-title"><?php echo $langs->trans('Passager') ?></h1>
             <table class="border" width="50%">
-                <?php if($formFlight->has('nbrPax')): ?>
+                <?php if ($formFlight->has('nbrPax')): ?>
                     <tr>
                         <td class="fieldrequired"><?php echo $langs->trans('Nombre de passagers'); ?></td>
                         <td>
@@ -414,7 +414,7 @@ 
                     </tr>
                 <?php endif; ?>
 
-                <?php if($formFlight->has('passengerNames')): ?>
+                <?php if ($formFlight->has('passengerNames')): ?>
                     <!-- passenger names -->
                     <tr>
                         <td width="25%" class="fieldrequired"><?php echo $langs->trans('Noms des passagers'); ?><br/>(Séparé
@@ -424,7 +424,7 @@ 
                             <?php print $renderer->render($formFlight->getElement('passengerNames')); ?>
                         </td>
                     </tr>
-                <?php endif;?>
+                <?php endif; ?>
             </table>
         </section>
 
@@ -433,17 +433,17 @@ 
             <h1 class="form-section-title js-billable-field"><?php echo $langs->trans('Facturation') ?></h1>
             <table class="border" width="50%">
 
-                <?php if($formFlight->has('fk_receiver')): ?>
+                <?php if ($formFlight->has('fk_receiver')): ?>
                     <!-- Money receiver -->
                     <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 $renderer->render($formFlight->getElement('fk_receiver'),['ajax' => true]); ?>
+                            <?php print $renderer->render($formFlight->getElement('fk_receiver'), ['ajax' => true]); ?>
                         </td>
                     </tr>
                 <?php endif; ?>
 
-                <?php if($formFlight->has('cost')): ?>
+                <?php if ($formFlight->has('cost')): ?>
                     <!-- Flight cost -->
                     <tr class="js-hide-order js-billable-field">
                         <td class="fieldrequired">Montant perçu</td>
@@ -461,7 +461,7 @@ 
             <h1 class="form-section-title"><?php echo $langs->trans('Commentaires') ?></h1>
             <table class="border" width="50%">
 
-                <?php if($formFlight->has('remarque')): ?>
+                <?php if ($formFlight->has('remarque')): ?>
                     <!-- commentaires -->
                     <tr class="">
                         <td class="fieldrequired"> Commentaire</td>
@@ -471,7 +471,7 @@ 
                     </tr>
                 <?php endif; ?>
 
-                <?php if($formFlight->has('incidents')): ?>
+                <?php if ($formFlight->has('incidents')): ?>
                     <!-- incidents -->
                     <tr class="">
                         <td class="fieldrequired"> incidents</td>
@@ -505,7 +505,7 @@ 
         $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'),
             $langs->trans('êtes-vous sure de vouloir supprimer ce vol ?'), 'confirm_delete', '', 0, 1);
         print $formconfirm;
-    } elseif ($user->rights->flightlog->vol->financial  && $action == ACTION_FLAG_BILLED) {
+    } elseif ($user->rights->flightlog->vol->financial && $action == ACTION_FLAG_BILLED) {
         $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id,
             $langs->trans('Marque comme facturé'),
             $langs->trans('Ce vol va être marqué comme facturé, est-ce bien le cas ?'), ACTION_CONFIRM_FLAG_BILLED, '',
@@ -537,7 +537,7 @@ 
     print '<div class="tabsAction">' . "\n";
     $parameters = array();
     $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object,
-        $action);    // Note that $action and $object may have been modified by hook
+        $action); // Note that $action and $object may have been modified by hook
     if ($reshook < 0) {
         setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
     }

command/CreateOrderCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
         $name = $command->getName() . ' ' . $command->getFirstname();
 
         $existingCustomers = $this->societe->fetch(null, $name);
-        if($existingCustomers > 0){
+        if ($existingCustomers > 0) {
             $this->societe = $existingCustomers[0];
             return $this->societe;
         }

command/CreateExpenseNoteCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -272,7 +272,7 @@
         $expenseNoteUser = new User($this->db);
         $expenseNoteUser->id = $currentMissionUserId;
         $id = $expenseNote->create($expenseNoteUser);
-        if($id < 0){
+        if ($id < 0) {
             return null;
         }
 

class/missions/QuarterPilotMissionCollection.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
     )
     {
         Assert::integerish($pilotId);
-        $pilotId = (int)$pilotId;
+        $pilotId = (int) $pilotId;
 
         if (!isset($this->items[$pilotId])) {
             $this->items[$pilotId] = new PilotMissions($pilotId, $pilotFirstname, $pilotLastname);
@@ -61,7 +61,7 @@ 
     public function addPilot($pilotId, $pilotFirstname, $pilotLastname)
     {
         Assert::integerish($pilotId);
-        $pilotId = (int)$pilotId;
+        $pilotId = (int) $pilotId;
 
         if (isset($this->items[$pilotId])) {
             return;

query/GetPilotsWithMissionsQueryHandler.php

Spacing +3 added lines, -3 removed lines

@@ -52,9 +52,9 @@ 
                         $pilotLastname = $obj->lastname;
                         $pilotFirstname = $obj->firstname;
 
-                        if($query->isPilotsOnly()){
+                        if ($query->isPilotsOnly()) {
                             $result->addPilot($pilotId, $pilotFirstname, $pilotLastname);
-                        }else{
+                        } else {
                             $result->addMission($obj->quartil, $pilotId, $pilotFirstname, $pilotLastname,
                                 $obj->number_flights, $obj->total_kilometers);
                         }
@@ -79,7 +79,7 @@ 
         $sql .= " , SUM(VOL.kilometers) as total_kilometers ";
         $sql .= " , COUNT(VOL.idBBC_vols) as number_flights";
 
-        if(!$query->isPilotsOnly()){
+        if (!$query->isPilotsOnly()) {
             $sql .= " , QUARTER(VOL.date) as quartil ";
         }
 

card_tab_financial.php

Spacing +11 added lines, -11 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'));
@@ -93,18 +93,18 @@ 
 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->isLinkedToOrder()){
+if (!$object->isLinkedToOrder()) {
     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>';
-}else{
+} else {
     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>';
 }
@@ -115,13 +115,13 @@ 
 // Buttons
 print '<div class="tabsAction">' . "\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";
+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";
 }
 
 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>';

command/CreateFlightCommand.php

Spacing +1 added lines, -1 removed lines

@@ -397,7 +397,7 @@
     /**
      * @return bool
      */
-    public function hasOrderId(){
+    public function hasOrderId() {
         return count($this->orderIds) > 0;
     }
 }
\ No newline at end of file

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; ?>