laudeco / bbc-dolibarr-flightlog

validators/FlightValidator.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
      */
     private function checkBillingInformation($vol, $context)
     {
-        if($vol->isLinkedToOrder()){
+        if ($vol->isLinkedToOrder()) {
             return $this;
         }
 

card_tab_financial.php

Spacing +10 added lines, -10 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,16 +93,16 @@ 
 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{
-    print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td>' . $object->getOrder()->getNomUrl(1). '</td></tr>';
+} else {
+    print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td>' . $object->getOrder()->getNomUrl(1) . '</td></tr>';
 }
 print '</table>';
 
@@ -111,13 +111,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/CreateOrderCommandHandler.php

Spacing +1 added lines, -1 removed lines

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

command/CreateOrderCommand.php

Spacing +2 added lines, -2 removed lines

@@ -228,7 +228,7 @@ 
     /**
      * @return boolean
      */
-    public function hasTVA(){
+    public function hasTVA() {
         return !empty($this->tva);
     }
 
@@ -259,7 +259,7 @@ 
     /**
      * @return bool
      */
-    public function isCommentPublic(){
+    public function isCommentPublic() {
         return $this->publicComment;
     }
 

command/CreateFlightCommand.php

Spacing +1 added lines, -1 removed lines

@@ -393,7 +393,7 @@
     /**
      * @return bool
      */
-    public function hasOrderId(){
+    public function hasOrderId() {
         return $this->orderId !== null;
     }
 }
\ No newline at end of file

list.php

Spacing +91 added lines, -91 removed lines

@@ -50,8 +50,8 @@ 
 $search_fk_type = GETPOST('search_fk_type', 'int');
 $search_fk_pilot = GETPOST('search_fk_pilot', 'int') ?: ($user->admin ? '' : $user->id);
 $search_fk_organisateur = GETPOST('search_fk_organisateur', 'int');
-$search_is_facture = GETPOST('search_is_facture', 'int') === ''? -1 : (int)GETPOST('search_is_facture', 'int');
-if($search_is_facture === 0){
+$search_is_facture = GETPOST('search_is_facture', 'int') === '' ? -1 : (int) GETPOST('search_is_facture', 'int');
+if ($search_is_facture === 0) {
     $search_is_facture = '<=0';
 }
 $search_kilometers = GETPOST('search_kilometers', 'alpha');
@@ -181,7 +181,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');
 }
@@ -278,7 +278,7 @@ 
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM " . MAIN_DB_PREFIX . "bbc_vols as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
@@ -292,8 +292,8 @@ 
 
 $sql .= " WHERE 1 = 1";
 
-if($search_all){
-    $sql .= natural_search(["idBBC_vols",  "lieuD", "lieuA", "pilot.lastname", "pilot.firstname", "balloon.immat"], $search_all);
+if ($search_all) {
+    $sql .= natural_search(["idBBC_vols", "lieuD", "lieuA", "pilot.lastname", "pilot.firstname", "balloon.immat"], $search_all);
 }
 
 if ($search_idBBC_vols) {
@@ -337,7 +337,7 @@ 
 }
 
 if ($search_is_facture != -1) {
-    $sql .= natural_search("is_facture", $search_is_facture,1);
+    $sql .= natural_search("is_facture", $search_is_facture, 1);
 }
 if ($search_kilometers) {
     $sql .= natural_search("kilometers", $search_kilometers, 1);
@@ -372,7 +372,7 @@ 
 // Add where from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= $db->order($sortfield, $sortorder);
 //$sql.= $db->plimit($conf->liste_limit+1, $offset);
@@ -414,58 +414,58 @@ 
 if ($limit > 0 && $limit != $conf->liste_limit) {
     $param .= '&limit=' . $limit;
 }
-if ($search_idBBC_vols  != '') {
+if ($search_idBBC_vols != '') {
     $param .= '&amp;search_idBBC_vols=' . urlencode($search_idBBC_vols);
 }
-if ($search_date  != '') {
+if ($search_date != '') {
     $param .= '&amp;search_date=' . urlencode($search_date);
 }
-if ($search_lieuD  != '') {
+if ($search_lieuD != '') {
     $param .= '&amp;search_lieuD=' . urlencode($search_lieuD);
 }
-if ($search_lieuA  != '') {
+if ($search_lieuA != '') {
     $param .= '&amp;search_lieuA=' . urlencode($search_lieuA);
 }
-if ($search_heureD  != '') {
+if ($search_heureD != '') {
     $param .= '&amp;search_heureD=' . urlencode($search_heureD);
 }
-if ($search_heureA  != '') {
+if ($search_heureA != '') {
     $param .= '&amp;search_heureA=' . urlencode($search_heureA);
 }
-if ($search_BBC_ballons_idBBC_ballons  != '') {
+if ($search_BBC_ballons_idBBC_ballons != '') {
     $param .= '&amp;search_BBC_ballons_idBBC_ballons=' . urlencode($search_BBC_ballons_idBBC_ballons);
 }
-if ($search_nbrPax  != '') {
+if ($search_nbrPax != '') {
     $param .= '&amp;search_nbrPax=' . urlencode($search_nbrPax);
 }
-if ($search_remarque  != '') {
+if ($search_remarque != '') {
     $param .= '&amp;search_remarque=' . urlencode($search_remarque);
 }
-if ($search_incidents  != '') {
+if ($search_incidents != '') {
     $param .= '&amp;search_incidents=' . urlencode($search_incidents);
 }
-if ($search_fk_type  != '') {
+if ($search_fk_type != '') {
     $param .= '&amp;search_fk_type=' . urlencode($search_fk_type);
 }
 if ($search_fk_pilot != '') {
     $param .= '&amp;search_fk_pilot=' . urlencode($search_fk_pilot);
 }
-if ($search_fk_organisateur  != '') {
+if ($search_fk_organisateur != '') {
     $param .= '&amp;search_fk_organisateur=' . urlencode($search_fk_organisateur);
 }
-if ($search_is_facture  != -1) {
+if ($search_is_facture != -1) {
     $param .= '&amp;search_is_facture=' . urlencode($search_is_facture);
 }
-if ($search_kilometers  != '') {
+if ($search_kilometers != '') {
     $param .= '&amp;search_kilometers=' . urlencode($search_kilometers);
 }
-if ($search_cost  != '') {
+if ($search_cost != '') {
     $param .= '&amp;search_cost=' . urlencode($search_cost);
 }
-if ($search_fk_receiver  != '') {
+if ($search_fk_receiver != '') {
     $param .= '&amp;search_fk_receiver=' . urlencode($search_fk_receiver);
 }
-if ($search_justif_kilometers  != '') {
+if ($search_justif_kilometers != '') {
     $param .= '&amp;search_justif_kilometers=' . urlencode($search_justif_kilometers);
 }
 if ($search_all != '') {
@@ -509,8 +509,8 @@ 
 
 
 $moreHtml = "";
-if($search_all !== ""){
-    $moreHtml = "<p>".$langs->trans(sprintf("La liste est en recherche globale sur : l'identifiant du vol, le nom du pilote, l'immat du ballon, le lieu de Décollage et le lieu d'atterissage : %s", $search_all))."</p>";
+if ($search_all !== "") {
+    $moreHtml = "<p>" . $langs->trans(sprintf("La liste est en recherche globale sur : l'identifiant du vol, le nom du pilote, l'immat du ballon, le lieu de Décollage et le lieu d'atterissage : %s", $search_all)) . "</p>";
 }
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,
@@ -530,7 +530,7 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
     $moreforfilter .= $hookmanager->resPrint;
 } else {
@@ -545,7 +545,7 @@ 
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields,
-    $varpage);    // This also change content of $arrayfields
+    $varpage); // This also change content of $arrayfields
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
@@ -641,7 +641,7 @@ 
 // Hook fields
 $parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListTitle',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.datec']['checked'])) {
     print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param,
@@ -710,7 +710,7 @@ 
 
 if (!empty($arrayfields['t.is_facture']['checked'])) {
     print '<td class="liste_titre">';
-    print '<select name="search_is_facture"><option value="-1" '.($search_is_facture != 1 && $search_is_facture != 0 && $search_is_facture != '<=0'? 'selected' : '' ).'></option><option value="1" '.($search_is_facture == 1 ? 'selected' : '' ).'>Facturé</option><option value="0" '.($search_is_facture == 0 || $search_is_facture == '<=0' ? 'selected' : '' ).'>Ouvert</option></select>';
+    print '<select name="search_is_facture"><option value="-1" ' . ($search_is_facture != 1 && $search_is_facture != 0 && $search_is_facture != '<=0' ? 'selected' : '') . '></option><option value="1" ' . ($search_is_facture == 1 ? 'selected' : '') . '>Facturé</option><option value="0" ' . ($search_is_facture == 0 || $search_is_facture == '<=0' ? 'selected' : '') . '>Ouvert</option></select>';
     print '</td>';
 }
 
@@ -755,7 +755,7 @@ 
 // Fields from hook
 $parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.datec']['checked'])) {
     // Date creation
@@ -797,124 +797,124 @@ 
         // Show here line of result
         print '<tr ' . $bc[$var] . '>';
 
-        if (! empty($arrayfields['t.idBBC_vols']['checked']))
+        if (!empty($arrayfields['t.idBBC_vols']['checked']))
         {
-            print '<td>'.$flight->getNomUrl(0).'</td>';
+            print '<td>' . $flight->getNomUrl(0) . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.date']['checked']))
+        if (!empty($arrayfields['t.date']['checked']))
         {
             print '<td>';
                 print dol_print_date($db->jdate($obj->date), '%d-%m-%y');
             print '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.lieuD']['checked']))
+        if (!empty($arrayfields['t.lieuD']['checked']))
         {
-            print '<td>'.$obj->lieuD.'</td>';
+            print '<td>' . $obj->lieuD . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.lieuA']['checked']))
+        if (!empty($arrayfields['t.lieuA']['checked']))
         {
-            print '<td>'.$obj->lieuA.'</td>';
+            print '<td>' . $obj->lieuA . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.heureD']['checked']))
+        if (!empty($arrayfields['t.heureD']['checked']))
         {
-            print '<td>'.$obj->heureD.'</td>';
+            print '<td>' . $obj->heureD . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.heureA']['checked']))
+        if (!empty($arrayfields['t.heureA']['checked']))
         {
-            print '<td>'.$obj->heureA.'</td>';
+            print '<td>' . $obj->heureA . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked']))
+        if (!empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked']))
         {
-            print '<td>'.$obj->bal.'</td>';
+            print '<td>' . $obj->bal . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.nbrPax']['checked']))
+        if (!empty($arrayfields['t.nbrPax']['checked']))
         {
-            print '<td>'.$obj->nbrPax.'</td>';
+            print '<td>' . $obj->nbrPax . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.remarque']['checked']))
+        if (!empty($arrayfields['t.remarque']['checked']))
         {
-            print '<td>'.$obj->remarque.'</td>';
+            print '<td>' . $obj->remarque . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.incidents']['checked']))
+        if (!empty($arrayfields['t.incidents']['checked']))
         {
-            print '<td>'.$obj->incidents.'</td>';
+            print '<td>' . $obj->incidents . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_type']['checked']))
+        if (!empty($arrayfields['t.fk_type']['checked']))
         {
-            print '<td>'.$obj->flight_type.'</td>';
+            print '<td>' . $obj->flight_type . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_pilot']['checked']))
+        if (!empty($arrayfields['t.fk_pilot']['checked']))
         {
-            print '<td>'.$obj->pilot.'</td>';
+            print '<td>' . $obj->pilot . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_organisateur']['checked']))
+        if (!empty($arrayfields['t.fk_organisateur']['checked']))
         {
-            print '<td>'.$obj->organisator.'</td>';
+            print '<td>' . $obj->organisator . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.is_facture']['checked']))
+        if (!empty($arrayfields['t.is_facture']['checked']))
         {
             $flight->is_facture = $obj->is_facture;
-            print '<td>'.$flight->getLibStatut(3).'</td>';
+            print '<td>' . $flight->getLibStatut(3) . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.kilometers']['checked']))
+        if (!empty($arrayfields['t.kilometers']['checked']))
         {
-            if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){
-                print '<td>'.$obj->kilometers.' KM</td>';
-            }else{
+            if ($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) {
+                print '<td>' . $obj->kilometers . ' KM</td>';
+            } else {
                 print '<td> - Km</td>';
             }
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.cost']['checked']))
+        if (!empty($arrayfields['t.cost']['checked']))
         {
-            if(($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) && $obj->cost > 0){
-                print sprintf('<td>%s - (%s/pax)</td>', price($obj->cost, 0, $langs, 0, 0, -1, $conf->currency), price($obj->cost/$obj->nbrPax, 0, $langs, -1, -1, -1, $conf->currency));
-            }else{
+            if (($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) && $obj->cost > 0) {
+                print sprintf('<td>%s - (%s/pax)</td>', price($obj->cost, 0, $langs, 0, 0, -1, $conf->currency), price($obj->cost / $obj->nbrPax, 0, $langs, -1, -1, -1, $conf->currency));
+            } else {
                 print '<td> - €</td>';
             }
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_receiver']['checked']))
+        if (!empty($arrayfields['t.fk_receiver']['checked']))
         {
-            print '<td>'.$obj->receiver.'</td>';
+            print '<td>' . $obj->receiver . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.justif_kilometers']['checked']))
+        if (!empty($arrayfields['t.justif_kilometers']['checked']))
         {
-            print '<td>'.$obj->justif_kilometers.'</td>';
+            print '<td>' . $obj->justif_kilometers . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
 
         // Extra fields
@@ -939,7 +939,7 @@ 
         // Fields from hook
         $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj);
         $reshook = $hookmanager->executeHooks('printFieldListValue',
-            $parameters);    // Note that $action and $object may have been modified by hook
+            $parameters); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
         // Date creation
         if (!empty($arrayfields['t.datec']['checked'])) {
@@ -1009,7 +1009,7 @@ 
 
 $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>' . "\n";

card.php

Spacing +10 added lines, -10 removed lines

@@ -69,7 +69,7 @@ 
 
 $isAllowedEdit = ($user->rights->flightlog->vol->edit || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id));
 $isAllowedDelete = ($user->rights->flightlog->vol->delete || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id && !$object->is_facture));
-$permissiondellink=$user->rights->flightlog->vol->financial;
+$permissiondellink = $user->rights->flightlog->vol->financial;
 
 $search_idBBC_vols = GETPOST('search_idBBC_vols', 'int');
 $search_lieuD = GETPOST('search_lieuD', 'alpha');
@@ -116,8 +116,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. 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. 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'));
@@ -142,7 +142,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');
 }
@@ -376,7 +376,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');
     }
@@ -389,14 +389,14 @@ 
         print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete">' . $langs->trans('Delete') . '</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";
+    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";
     }
     ?>
 
-    <?php if($user->rights->flightlog->vol->financial && !$object->isBilled() ): ?>
+    <?php if ($user->rights->flightlog->vol->financial && !$object->isBilled()): ?>
         <div class="inline-block divButAction">
-               <a class="butAction" href="<?php echo sprintf('%s?id=%s&action=%s' , $_SERVER["PHP_SELF"], $object->id, ACTION_FLAG_BILLED);?>">
+               <a class="butAction" href="<?php echo sprintf('%s?id=%s&action=%s', $_SERVER["PHP_SELF"], $object->id, ACTION_FLAG_BILLED); ?>">
                    <?php echo $langs->trans("Marqué comme facturé ") ?>
                </a>
         </div>
@@ -404,7 +404,7 @@ 
 
     </div>
 <?php
-    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>';

addOrder.php

Spacing +31 added lines, -31 removed lines

@@ -12,32 +12,32 @@ 
 dol_include_once("/flightlog/lib/flightLog.lib.php");
 dol_include_once("/flightlog/validators/SimpleOrderValidator.php");
 dol_include_once("/flightlog/command/CreateOrderCommandHandler.php");
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';
 
 // Load object modCodeTiers
-$module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
 if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
 {
-    $module = substr($module, 0, dol_strlen($module)-4);
+    $module = substr($module, 0, dol_strlen($module) - 4);
 }
-$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 foreach ($dirsociete as $dirroot)
 {
-    $res=dol_include_once($dirroot.$module.'.php');
+    $res = dol_include_once($dirroot . $module . '.php');
     if ($res) break;
 }
 $modCodeClient = new $module;
 // Load object modCodeFournisseur
-$module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
 if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
 {
-    $module = substr($module, 0, dol_strlen($module)-4);
+    $module = substr($module, 0, dol_strlen($module) - 4);
 }
-$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 foreach ($dirsociete as $dirroot)
 {
-    $res=dol_include_once($dirroot.$module.'.php');
+    $res = dol_include_once($dirroot . $module . '.php');
     if ($res) break;
 }
 $modCodeFournisseur = new $module;
@@ -58,9 +58,9 @@ 
     if (!$_POST["cancel"]) {
 
         $formObject = new stdClass();
-        $formObject->name = GETPOST('name','alpha');
-        $formObject->firstname = GETPOST('firstname','alpha');
-        $formObject->zip = GETPOST('zipcode','alpha');
+        $formObject->name = GETPOST('name', 'alpha');
+        $formObject->firstname = GETPOST('firstname', 'alpha');
+        $formObject->zip = GETPOST('zipcode', 'alpha');
         $formObject->town = GETPOST('town', 'alpha');
         $formObject->state = GETPOST('state_id', 'int');
         $formObject->phone = GETPOST('phone', 'alpha');
@@ -77,8 +77,8 @@ 
 
         if ($validator->isValid($formObject, $_REQUEST)) {
             $createOrderCommand = new CreateOrderCommand($formObject, $user->id);
-            try{
-                $handler = new CreateOrderCommandHandler($db, $conf,$user,$langs,$modCodeClient, $modCodeFournisseur);
+            try {
+                $handler = new CreateOrderCommandHandler($db, $conf, $user, $langs, $modCodeClient, $modCodeFournisseur);
                 $handler->handle($createOrderCommand);
 
                 $msg = '<div class="success ok">Commande et tiers créés. </div>';
@@ -113,18 +113,18 @@ 
 ?>
 
     <!-- Success message with reference -->
-    <?php if($successMessage): ?>
+    <?php if ($successMessage): ?>
         <div class="bbc-style">
             <p class="cadre_msg1">
                 Vous avez généré la facture et créé un tiers.<br/>
                 Merci,
             </p>
 
-            <?php if(count($validator->getWarningMessages()) > 0):?>
+            <?php if (count($validator->getWarningMessages()) > 0):?>
                 <div class="box box-warning">
                     <p>Ceci sont des messages d'attention mais qui ne bloquent pas la création de la commande</p>
                     <ul>
-                        <?php foreach($validator->getWarningMessages() as $warningMessage): ?>
+                        <?php foreach ($validator->getWarningMessages() as $warningMessage): ?>
                             <li class="warning"><?php echo $warningMessage; ?></li>
                         <?php endforeach; ?>
                     </ul>
@@ -183,7 +183,7 @@ 
         <p>
             Cette page vous permettra de créer une commande. La commande est <b>obligatoire</b> si vous désirez faire payer les passagers directement sur le compte du club.<br>
             Si vous avre un doute sur la manière d'encoder la commande, veuillez me contacter.<br/>
-            Si vous avez <b>déjà</b> encodé une commande, et que vous voulez la retrouver veuillez vous rendre sur : <a href="<?php echo sprintf(DOL_URL_ROOT.'/commande/list.php?search_sale=%s', $user->id); ?>">mes commandes.</a>
+            Si vous avez <b>déjà</b> encodé une commande, et que vous voulez la retrouver veuillez vous rendre sur : <a href="<?php echo sprintf(DOL_URL_ROOT . '/commande/list.php?search_sale=%s', $user->id); ?>">mes commandes.</a>
         </p>
     </div>
     <form class="flight-form" name='add' method="post">
@@ -262,7 +262,7 @@ 
                     <?php echo $langs->trans('DefaultLang'); ?>
                 </td>
                 <td>
-                    <?php echo $formAdmin->select_language($conf->global->MAIN_LANG_DEFAULT,'default_lang',0,0,1,0,0,'maxwidth200onsmartphone'); ?>
+                    <?php echo $formAdmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone'); ?>
                 </td>
             </tr>
 
@@ -272,16 +272,16 @@ 
                     <?php echo $langs->trans('Region'); ?>
                 </td>
                 <td>
-                    <?php print $formcompany->select_state($formObject->state,'BE'); ?>
+                    <?php print $formcompany->select_state($formObject->state, 'BE'); ?>
                 </td>
             </tr>
 
             <?php
             // Zip / Town
-            print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
-                    print $formcompany->select_ziptown($formObject->town,'zipcode',array('town','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
-                    print '</td><td>'.fieldLabel('Town','town').'</td><td>';
-                    print $formcompany->select_ziptown($formObject->zip,'town',array('zipcode','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+            print '<tr><td>' . fieldLabel('Zip', 'zipcode') . '</td><td>';
+                    print $formcompany->select_ziptown($formObject->town, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+                    print '</td><td>' . fieldLabel('Town', 'town') . '</td><td>';
+                    print $formcompany->select_ziptown($formObject->zip, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
                     print '</td></tr>';
             ?>
 
@@ -305,16 +305,16 @@ 
                     <?php
                     if (empty($conf->global->MAIN_DISABLEVATCHECK)): ?>
 
-                        <?php if (! empty($conf->use_javascript_ajax)): ?>
+                        <?php if (!empty($conf->use_javascript_ajax)): ?>
                             <script language="JavaScript" type="text/javascript">
                             function CheckVAT(a) {
-                                <?php print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,300);"; ?>
+                                <?php print "newpopup('" . DOL_URL_ROOT . "/societe/checkvat/checkVatPopup.php?vatNumber='+a,'" . dol_escape_js($langs->trans("VATIntraCheckableOnEUSite")) . "',500,300);"; ?>
                             }
                             </script>
                             <a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.add.tva_intra.value);"><?php echo $langs->trans("VATIntraCheck"); ?></a>
-                            <?php echo $html->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); ?>
+                            <?php echo $html->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1); ?>
                         <?php else: ?>
-                            <a href="<?php echo $langs->transcountry("VATIntraCheckURL",$object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help'); ?></a>
+                            <a href="<?php echo $langs->transcountry("VATIntraCheckURL", $object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help'); ?></a>
                         <?php endif; ?>
                    <?php endif; ?>
                 </td>
@@ -367,10 +367,10 @@ 
             <tr>
                 <td><?php echo $langs->trans('Le commentaire doit-il figurer sur la commande') ?></td>
                 <td>
-                    <input type="radio" id="public_comment" name="public_comment" value="1" <?php echo ($formObject->isCommentPublic == 1)?'checked="checked"' : ''; ?>/>
+                    <input type="radio" id="public_comment" name="public_comment" value="1" <?php echo ($formObject->isCommentPublic == 1) ? 'checked="checked"' : ''; ?>/>
                     <label for="public_comment">Oui</label>
                     -
-                    <input type="radio" id="private_comment" name="public_comment" value="0" <?php echo ($formObject == null || $formObject->isCommentPublic === null || $formObject->isCommentPublic === 0)?'checked="checked"' : ''; ?>/>
+                    <input type="radio" id="private_comment" name="public_comment" value="0" <?php echo ($formObject == null || $formObject->isCommentPublic === null || $formObject->isCommentPublic === 0) ? 'checked="checked"' : ''; ?>/>
                     <label for="private_comment">Non</label>
                 </td>
             </tr>

command/CreateFlightCommandHandler.php

Spacing +9 added lines, -9 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,7 +73,7 @@ 
         $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();
@@ -86,12 +86,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();
         }
 
@@ -111,7 +111,7 @@ 
     {
         $flight->fetch($flight->id);
 
-        if(!$flight->isLinkedToOrder()){
+        if (!$flight->isLinkedToOrder()) {
             return;
         }
 
@@ -122,17 +122,17 @@ 
 
         $qtyOrder = 0;
         /** @var OrderLine $currentOrderLine */
-        foreach($order->lines as $currentOrderLine){
-            $qtyOrder += (int)$currentOrderLine->qty;
+        foreach ($order->lines as $currentOrderLine) {
+            $qtyOrder += (int) $currentOrderLine->qty;
         }
 
         $passangersCount = $this->numberOfPassengersLinkedToOrder($order->id);
 
-        if($passangersCount != $qtyOrder){
+        if ($passangersCount != $qtyOrder) {
             return;
         }
 
-        if($order->statut == Commande::STATUS_VALIDATED){
+        if ($order->statut == Commande::STATUS_VALIDATED) {
             $order->cloture($this->user);
         }
     }