laudeco / bbc-dolibarr-flightlog

class/card/TabCollection.php

Spacing +3 added lines, -3 removed lines

@@ -45,17 +45,17 @@
      *
      * @return TabCollection
      */
-    public function addTab(Tab $tab){
+    public function addTab(Tab $tab) {
         $this->tabs[] = $tab;
     }
 
     /**
      * @return array
      */
-    public function toArray(){
+    public function toArray() {
         $tabAsArray = [];
 
-        foreach ($this->tabs as $tab){
+        foreach ($this->tabs as $tab) {
             $tabAsArray[] = $tab->toArray();
         }
 

readFlights.php

Spacing +2 added lines, -2 removed lines

@@ -152,7 +152,7 @@ 
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 1 : Sponsor") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 2 : Baptême") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Organisateur (T1/T2)") . '</td>';
-    print '<td class="liste_titre" >'            . $langs->trans("Total bonus") . '</td>';
+    print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 3 : Privé") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 4: Meeting") . '</td>';
     print '<td class="liste_titre" colspan="1">' . $langs->trans("Type 5: Chambley") . '</td>';
@@ -250,7 +250,7 @@ 
     print "<tr>";
     print "<td colspan='18'></td>";
     print "<td>Total à reçevoir</td>";
-    print "<td>".price($total)."€</td>";
+    print "<td>" . price($total) . "€</td>";
     print "</tr>";
 
 

generateBilling.php

Spacing +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
                 $adherent = new Adherent($db);
                 $adherent->fetch($expenseNoteUser->fk_member);
 
-                $addBonus = (int)$additionalBonus[$currentMissionUserId];
+                $addBonus = (int) $additionalBonus[$currentMissionUserId];
                 if ($addBonus < 0) {
                     dol_htmloutput_mesg("Facture ignorée " . $adherent->getFullName($langs), '', 'warning');
                     continue;
@@ -335,7 +335,7 @@ 
                 $object->insert_discount($discountid);
 
                 //Additional bonus
-                if ((int)$addBonus > 0) {
+                if ((int) $addBonus > 0) {
 
                     $pu_ht = price2num($addBonus, 'MU');
 

Braces +5 added lines, -2 removed lines

@@ -613,9 +613,12 @@
 
         <?php if ($year >= $currentYear || !$t1->service || !$t2->service || !$t3->service || !$t4->service || !$t5->service || !$t6->service || !$t7->service) : ?>
             <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;
+}
+?>
 
     </form>
 

bbcvols/tpl/linkedobjectblock.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -51,9 +51,9 @@
     <tr <?php echo $GLOBALS['bc'][$var]; ?> >
         <td><?php echo $langs->trans("Vol"); ?></td>
         <td><?= $flight->getNomUrl()?></td>
-        <td align="center"><?= sprintf("%s à %s ", $flight->lieuD, $flight->lieuA);?></td>
+        <td align="center"><?= sprintf("%s à %s ", $flight->lieuD, $flight->lieuA); ?></td>
         <td align="center"><?= dol_print_date($flight->date, '%d-%m-%Y') ?></td>
-        <td align="right"><?= $flight->cost?:'N/A' ?></td>
+        <td align="right"><?= $flight->cost ?: 'N/A' ?></td>
         <td align="right"><?= $flight->getLibStatut(3)?></td>
         <td align="right"><a
                     href="<?php echo $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=dellink&dellinkid=' . $key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a>

card_tab_financial.php

Spacing +5 added lines, -5 removed lines

@@ -59,7 +59,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  // 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  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('bbcvols'));
@@ -89,7 +89,7 @@ 
 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>';
@@ -103,13 +103,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>';

class/actions_Flightlog.class.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
         $this->results["flightlog"] = [
             'label' => $langs->trans("Search flight"),
             'text'  => $langs->trans("Search flight"),
-            'url'   => DOL_URL_ROOT . '/flightlog/list.php?mainmenu=flightlog&sall='.$searchInfo['search_boxvalue']
+            'url'   => DOL_URL_ROOT . '/flightlog/list.php?mainmenu=flightlog&sall=' . $searchInfo['search_boxvalue']
         ];
     }
 
@@ -38,8 +38,8 @@ 
      * @param $object
      * @param $action
      */
-    public function showLinkToObjectBlock($parameter, $object, $action){
-        $this->results["flightlog_bbcvols"]= array('enabled'=>1, 'perms'=>1, 'label'=>'LinkToFlight', 'sql'=>"SELECT f.idBBC_vols as rowid, CONCAT('(ID : ',f.idBBC_vols, ') -',f.date, '-',f.lieuD, ' ; ', f.lieuA) as ref FROM ".MAIN_DB_PREFIX."bbc_vols as f WHERE YEAR(f.date) = (YEAR(NOW())) ORDER BY date DESC");
+    public function showLinkToObjectBlock($parameter, $object, $action) {
+        $this->results["flightlog_bbcvols"] = array('enabled'=>1, 'perms'=>1, 'label'=>'LinkToFlight', 'sql'=>"SELECT f.idBBC_vols as rowid, CONCAT('(ID : ',f.idBBC_vols, ') -',f.date, '-',f.lieuD, ' ; ', f.lieuA) as ref FROM " . MAIN_DB_PREFIX . "bbc_vols as f WHERE YEAR(f.date) = (YEAR(NOW())) ORDER BY date DESC");
 
     }
 }
\ No newline at end of file

facture.php

Braces +5 added lines, -2 removed lines

@@ -338,9 +338,12 @@
 
         <?php if (!$flightProduct) : ?>
             <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>

card_tab_comments.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,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  // 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  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('bbcvols'));
@@ -95,7 +95,7 @@ 
 print '<div class="tabsAction">' . "\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>';

admin/vol.php

Spacing +5 added lines, -5 removed lines

@@ -25,10 +25,10 @@ 
  * Actions
  */
 // Save
-if($action === ACTION_SAVE){
-    foreach($services as $flightTypeId => $serviceId){
+if ($action === ACTION_SAVE) {
+    foreach ($services as $flightTypeId => $serviceId) {
         $res = $flightType->fetch($flightTypeId);
-        if($res > 0 ){
+        if ($res > 0) {
             $flightType->fkService = $serviceId;
             $flightType->update($user);
         }
@@ -66,7 +66,7 @@ 
                 <tr class="<?= $flightTypeLine->id % 2 == 0 ? "pair" : "impair" ?>">
                     <td>(T<?= $flightTypeLine->numero ?>) - <?= $flightTypeLine->nom ?></td>
                     <td>
-                        <?php $form->select_produits($flightTypeLine->fkService, 'idprod['.$flightTypeLine->id.']', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id); ?>
+                        <?php $form->select_produits($flightTypeLine->fkService, 'idprod[' . $flightTypeLine->id . ']', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id); ?>
                     </td>
                 </tr>
             <?php endforeach; ?>
@@ -77,7 +77,7 @@ 
                     Vol client
                 </td>
                 <td>
-                    <?php $form->select_produits($conf->global->BBC_FLIGHT_TYPE_CUSTOMER, 'customer_product', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id); ?>
+                    <?php $form->select_produits($conf->global->BBC_FLIGHT_TYPE_CUSTOMER, 'customer_product', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id); ?>
                 </td>
             </tr>