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

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

class/bbcvols.class.php

Spacing +18 added lines, -18 removed lines

@@ -259,7 +259,7 @@ 
         $sql .= ' ' . (!isset($this->justif_kilometers) ? 'NULL' : "'" . $this->db->escape($this->justif_kilometers) . "'") . ',';
         $sql .= ' ' . "'" . date('Y-m-d H:i:s') . "'" . ',';
         $sql .= ' ' . "'" . date('Y-m-d H:i:s') . "'" . ',';
-        $sql .= ' ' . "'" . $this->passengerNames . "'" ;
+        $sql .= ' ' . "'" . $this->passengerNames . "'";
         $sql .= ')';
 
         $this->db->begin();
@@ -273,7 +273,7 @@ 
 
         if (!$error) {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-            if(!$this->insertOrders()){
+            if (!$this->insertOrders()) {
                 $error++;
             }
 
@@ -299,9 +299,9 @@ 
     /**
      * Inserts the order linked to the flight
      */
-    private function insertOrders(){
+    private function insertOrders() {
 
-        if(empty($this->orderIds)){
+        if (empty($this->orderIds)) {
             return true;
         }
 
@@ -316,12 +316,12 @@ 
         
         $values = [];
 
-        foreach($this->orderIds as $orderId=>$nbrPassengers){
+        foreach ($this->orderIds as $orderId=>$nbrPassengers) {
             $values[] = sprintf(
                 $valueTemplate,
                 $orderId,
                 $this->db->escape($this->id),
-                (!isset($nbrPassengers) ? '0' :  $this->db->escape($nbrPassengers))
+                (!isset($nbrPassengers) ? '0' : $this->db->escape($nbrPassengers))
             );
         }
 
@@ -339,9 +339,9 @@ 
     /**
      * Inserts the order linked to the flight
      */
-    private function updateOrders(){
+    private function updateOrders() {
 
-        if(empty($this->orderIds)){
+        if (empty($this->orderIds)) {
             return true;
         }
 
@@ -352,9 +352,9 @@ 
     /**
      * Inserts the order linked to the flight
      */
-    private function deleteOrders(){
+    private function deleteOrders() {
 
-        if(empty($this->orderIds)){
+        if (empty($this->orderIds)) {
             return true;
         }
 
@@ -559,7 +559,7 @@ 
         $sql .= ' fk_receiver = ' . (isset($this->fk_receiver) && (int) $this->fk_receiver > 0 ? $this->fk_receiver : "null") . ',';
         $sql .= ' justif_kilometers = ' . (isset($this->justif_kilometers) ? "'" . $this->db->escape($this->justif_kilometers) . "'," : "'',");
         $sql .= ' date_update = ' . "'" . date('Y-m-d H:i:s') . "',";
-        $sql .= ' passenger_names = ' . "'" . trim($this->passengerNames)."'";
+        $sql .= ' passenger_names = ' . "'" . trim($this->passengerNames) . "'";
 
         $sql .= ' WHERE idBBC_vols=' . $this->idBBC_vols;
 
@@ -1022,8 +1022,8 @@ 
      * @param int $orderId
      * @param int $nbrPassengers
      */
-    public function addOrderId($orderId, $nbrPassengers){
-        if(!isset($this->orderIds)){
+    public function addOrderId($orderId, $nbrPassengers) {
+        if (!isset($this->orderIds)) {
             $this->orderIds = [];
         }
 
@@ -1063,7 +1063,7 @@ 
         if ($resql) {
             $numrows = $this->db->num_rows($resql);
             if ($numrows) {
-                for($i = 0 ; $i < $numrows ; $i++){
+                for ($i = 0; $i < $numrows; $i++) {
                     $obj = $this->db->fetch_object($resql);
                     $this->orderIds[$obj->order_id] = $obj->nbr_passengers;
 
@@ -1084,7 +1084,7 @@ 
      */
     public function getOrders()
     {
-        if(!isset($this->orders) || empty($this->orders)){
+        if (!isset($this->orders) || empty($this->orders)) {
             $this->fetchOrder();
         }
         return $this->orders;
@@ -1209,7 +1209,7 @@ 
      */
     public function getBBCBallonsIdBBCBallons()
     {
-        return (int)$this->BBC_ballons_idBBC_ballons;
+        return (int) $this->BBC_ballons_idBBC_ballons;
     }
 
     /**
@@ -1285,7 +1285,7 @@ 
      */
     public function getFkType()
     {
-        return (int)$this->fk_type;
+        return (int) $this->fk_type;
     }
 
     /**
@@ -1380,7 +1380,7 @@ 
      */
     public function getFkReceiver()
     {
-        return (int)$this->fk_receiver;
+        return (int) $this->fk_receiver;
     }
 
     /**

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',
     ];