laudeco / bbc-dolibarr-flightlog

Infrastructure/Damage/Query/Repository/GetDamagesForFlightQueryRepository.php

Spacing +4 added lines, -4 removed lines

@@ -31,15 +31,15 @@
     public function __invoke($flightId)
     {
         $sql = 'SELECT damage.author_id as author_id, damage.rowid as id, damage.amount, damage.label, CONCAT(author.firstname, " " , author.lastname) as author_name, damage.billed as invoiced';
-        $sql.=' FROM '.MAIN_DB_PREFIX.'bbc_flight_damages as damage';
-        $sql.=' INNER JOIN '.MAIN_DB_PREFIX.'user as author ON author.rowid = damage.author_id';
-        $sql.=' WHERE damage.flight_id = '.$this->db->escape($flightId);
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'bbc_flight_damages as damage';
+        $sql .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'user as author ON author.rowid = damage.author_id';
+        $sql .= ' WHERE damage.flight_id = ' . $this->db->escape($flightId);
 
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
             if ($num) {
-                for($i = 0; $i < $num ; $i++) {
+                for ($i = 0; $i < $num; $i++) {
                     $properties = $this->db->fetch_array($resql);
                     yield Damage::fromArray($properties);
                 }

Infrastructure/Damage/Repository/FlightDamageRepository.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
             'label' => $flightDamage->getLabel()->value(),
         ];
 
-        if($flightDamage->getId()){
+        if ($flightDamage->getId()) {
             $this->update($flightDamage->getId()->getId(), $fields);
             return $flightDamage->getId()->getId();
         }
@@ -52,10 +52,10 @@ 
      *
      * @throws \Exception
      */
-    public function getById(DamageId $id){
+    public function getById(DamageId $id) {
         $damage = $this->get($id->getId());
 
-        if(null === $damage){
+        if (null === $damage) {
             throw new \Exception('Damage not found');
         }
 

Infrastructure/Common/Repository/AbstractDomainRepository.php

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
     public function __construct(\DoliDB $db, $tableName)
     {
         $this->db = $db;
-        $this->tableName = strpos($tableName, MAIN_DB_PREFIX) === 0 ? $tableName : MAIN_DB_PREFIX.$tableName;
+        $this->tableName = strpos($tableName, MAIN_DB_PREFIX) === 0 ? $tableName : MAIN_DB_PREFIX . $tableName;
     }
 
     /**
@@ -33,7 +33,7 @@ 
      *
      * @throws \Exception
      */
-    protected function write(array $elements){
+    protected function write(array $elements) {
         $columns = join(',', array_keys($elements));
         $values = join(',', array_map([$this, 'escape'], array_values($elements)));
 
@@ -44,7 +44,7 @@ 
             $lasterror = $this->db->lasterror();
             dol_syslog(__METHOD__ . ' ' . $lasterror, LOG_ERR);
             $this->db->rollback();
-            throw new \Exception("Repository error - ".$lasterror);
+            throw new \Exception("Repository error - " . $lasterror);
         }
 
         $id = $this->db->last_insert_id($this->tableName);
@@ -57,16 +57,16 @@ 
      *
      * @return int|string|null
      */
-    private function escape($value){
-        if(is_null($value)){
+    private function escape($value) {
+        if (is_null($value)) {
             return null;
         }
 
-        if(is_bool($value)){
-            return (int)$value;
+        if (is_bool($value)) {
+            return (int) $value;
         }
 
-        return is_string($value) ? "'".$this->db->escape($value)."'" : $value ;
+        return is_string($value) ? "'" . $this->db->escape($value) . "'" : $value;
     }
 
     /**
@@ -79,18 +79,18 @@ 
     {
         $sqlModifications = [];
 
-        foreach($elements as $field => $value){
+        foreach ($elements as $field => $value) {
             $sqlModifications[] = sprintf('%s=%s', $field, $this->escape($value));
         }
 
         $this->db->begin();
-        $resql = $this->db->query(sprintf('UPDATE %s SET %s WHERE rowid = %s ', $this->tableName, join(',',$sqlModifications), $id));
+        $resql = $this->db->query(sprintf('UPDATE %s SET %s WHERE rowid = %s ', $this->tableName, join(',', $sqlModifications), $id));
 
         if (!$resql) {
             $lasterror = $this->db->lasterror();
             dol_syslog(__METHOD__ . ' ' . $lasterror, LOG_ERR);
             $this->db->rollback();
-            throw new \Exception("Repository error - ".$lasterror);
+            throw new \Exception("Repository error - " . $lasterror);
         }
 
         $this->db->commit();
@@ -103,8 +103,8 @@ 
      *
      * @return array|null
      */
-    protected function get($id){
-        $sql = sprintf('SELECT * FROM %s WHERE rowid = %s', $this->tableName, $id );
+    protected function get($id) {
+        $sql = sprintf('SELECT * FROM %s WHERE rowid = %s', $this->tableName, $id);
 
         $resql = $this->db->query($sql);
         if (!$resql) {
@@ -116,7 +116,7 @@ 
             return null;
         }
 
-        for($i = 0; $i < $num ; $i++) {
+        for ($i = 0; $i < $num; $i++) {
             return $this->db->fetch_array($resql);
         }
 

Application/Damage/ViewModel/Damage.php

Spacing +2 added lines, -2 removed lines

@@ -72,14 +72,14 @@
      *
      * @return Damage
      */
-    public static function fromArray(array $properties){
+    public static function fromArray(array $properties) {
         $authorId = $properties['author_id'];
         $author = $properties['author_name'];
         $label = $properties['label'];
         $amount = $properties['amount'];
         $id = $properties['id'];
         $flightId = isset($properties['flight_id']) ? $properties['flight_id'] : null;
-        $invoiced = (bool)$properties['invoiced'];
+        $invoiced = (bool) $properties['invoiced'];
 
         return new self($authorId, $author, $amount, $id, $invoiced, $flightId, $label);
     }

Application/Damage/Command/CreateDamageCommandHandler.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
     public function __invoke(CreateDamageCommand $command)
     {
         $damage = FlightDamage::waiting(new DamageAmount($command->getAmount()), AuthorId::create($command->getAuthorId()), new DamageLabel($command->getLabel()));
-        if(null !== $command->getFlightId()){
+        if (null !== $command->getFlightId()) {
             $damage = FlightDamage::damage(FlightId::create($command->getFlightId()), new DamageLabel($command->getLabel()), new DamageAmount($command->getAmount()), AuthorId::create($command->getAuthorId()));
         }
 
@@ -60,7 +60,7 @@ 
      */
     private function linkSupplierInvoice($damageId, $invoiceId)
     {
-        if($invoiceId <= 0){
+        if ($invoiceId <= 0) {
             return;
         }
 
@@ -81,8 +81,8 @@ 
      * @param int $targetId
      * @param string $targetType
      */
-    private function insertLinks($damageId, $targetId, $targetType){
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+    private function insertLinks($damageId, $targetId, $targetType) {
+        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
         $sql .= "fk_source";
         $sql .= ", sourcetype";
         $sql .= ", fk_target";
@@ -90,8 +90,8 @@ 
         $sql .= ") VALUES (";
         $sql .= $damageId;
         $sql .= ", 'flightlog_damage'";
-        $sql .= ", ".$targetId;
-        $sql .= ", '".$targetType."'";
+        $sql .= ", " . $targetId;
+        $sql .= ", '" . $targetType . "'";
         $sql .= ")";
 
         if ($this->db->query($sql))

class/Damage/ValueObject/DamageLabel.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         $this->label = $label;
     }
 
-    public function value(){
+    public function value() {
         return $this->label;
     }
 

class/flight/Pilot.php

Spacing +11 added lines, -11 removed lines

@@ -106,11 +106,11 @@ 
         return new Pilot($this->name, $this->id, $types);
     }
 
-    public function addDamage(FlightDamageCount $damage){
+    public function addDamage(FlightDamageCount $damage) {
         $this->damages[] = $damage;
     }
 
-    public function addInvoicedDamage(FlightInvoicedDamageCount $damage){
+    public function addInvoicedDamage(FlightInvoicedDamageCount $damage) {
         $this->damages[] = $damage;
     }
 
@@ -161,21 +161,21 @@ 
         return $flightsCost;
     }
 
-    public function totalDamageCost(){
+    public function totalDamageCost() {
         $flightCost = FlightCost::zero();
 
-        foreach($this->damages as $damage){
+        foreach ($this->damages as $damage) {
             $flightCost = $flightCost->addCost($damage->getCost());
         }
 
         return $flightCost;
     }
 
-    public function damageCost(){
+    public function damageCost() {
         $flightCost = FlightCost::zero();
 
-        foreach($this->damages as $damage){
-            if(!$damage instanceof FlightDamageCount){
+        foreach ($this->damages as $damage) {
+            if (!$damage instanceof FlightDamageCount) {
                 continue;
             }
 
@@ -185,11 +185,11 @@ 
         return $flightCost;
     }
 
-    public function invoicedDamageCost(){
+    public function invoicedDamageCost() {
         $flightCost = FlightCost::zero();
 
-        foreach($this->damages as $damage){
-            if(!$damage instanceof FlightInvoicedDamageCount){
+        foreach ($this->damages as $damage) {
+            if (!$damage instanceof FlightInvoicedDamageCount) {
                 continue;
             }
 
@@ -199,7 +199,7 @@ 
         return $flightCost;
     }
 
-    public function damages(){
+    public function damages() {
         return $this->damages;
     }
 

query/BillableFlightQueryHandler.php

Spacing +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
                     $pilots[$obj->pilot] = $pilots[$obj->pilot]->addCount(
                         new FlightTypeCount(
                             $obj->type,
-                            (int)$obj->nbr,
+                            (int) $obj->nbr,
                             $this->getFactorByType($obj->type)
                         )
                     );
@@ -106,7 +106,7 @@ 
                         $pilots[$obj->rowid] = $pilots[$obj->rowid]->addCount(
                             new FlightTypeCount(
                                 'orga',
-                                (int)$obj->total,
+                                (int) $obj->total,
                                 $this->getFactorByType('orga')
                             )
                         );
@@ -136,7 +136,7 @@ 
                         $pilots[$obj->rowid] = $pilots[$obj->rowid]->addCount(
                             new FlightTypeCount(
                                 'orga_T6',
-                                (int)$obj->total,
+                                (int) $obj->total,
                                 $this->getFactorByType('orga_T6')
                             )
                         );
@@ -148,7 +148,7 @@ 
 
         //Total damages
         $damages = $this->pilotDamageQueryRepository->query($query->getFiscalYear());
-        foreach($damages as $currentDamage){
+        foreach ($damages as $currentDamage) {
 
             //Pilot doesn't exist
             if (!isset($pilots[$currentDamage->getAuthorId()])) {
@@ -157,13 +157,13 @@ 
 
             // Add all damage
             $pilots[$currentDamage->getAuthorId()]->addDamage(
-                new FlightDamageCount('',  $currentDamage->getAmount())
+                new FlightDamageCount('', $currentDamage->getAmount())
             );
 
             // The damage is already invoiced. So not take into account.
-            if($currentDamage->isInvoiced()){
+            if ($currentDamage->isInvoiced()) {
                 $pilots[$currentDamage->getAuthorId()]->addInvoicedDamage(
-                    new FlightInvoicedDamageCount('',  $currentDamage->getAmount())
+                    new FlightInvoicedDamageCount('', $currentDamage->getAmount())
                 );
             }
         }

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