laudeco / bbc-dolibarr-flightlog

core/triggers/interface_50001_modFlightLog_mailOnIncident.class.php

Spacing +12 added lines, -12 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 
-require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/triggers/dolibarrtriggers.class.php';
 dol_include_once('/flightlog/class/bbcvols.class.php');
 dol_include_once('/core/class/CMailFile.class.php');
 
@@ -78,23 +78,23 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){
+        if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)) {
             return 0;
         }
 
-        if(empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)){
+        if (empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)) {
             return 0;
         }
 
-        if($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT'){
+        if ($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT') {
             return 0;
         }
 
-        if(!$object->hasIncidents() && !$object->hasComment()){
+        if (!$object->hasIncidents() && !$object->hasComment()) {
             return 0;
         }
 
-        if(!empty($conf->global->MAIN_DISABLE_ALL_MAILS)){
+        if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
             return 0;
         }
 
@@ -102,11 +102,11 @@ 
         $message .= sprintf("<p>Vous recevez cet e-mail car un vol a été encodé avec un incident/ une remarque sur le ballon : %s dont vous êtes titulaire ou co-titulaire.</p>", $object->getBalloon()->immat);
         $message .= sprintf("<p><b>Vol id :</b> %d</p>", $object->getId());
         $message .= sprintf("<p><b>Réalisé par :</b> %s </p>", $object->getPilot()->getFullName($langs));
-        if($object->hasComment()){
+        if ($object->hasComment()) {
             $message .= sprintf("<p><b>Commentaire :</b> %s </p>", $object->getComment());
         }
 
-        if($object->hasIncidents()){
+        if ($object->hasIncidents()) {
             $message .= sprintf("<p><b>Incident :</b> %s </p>", $object->getIncident());
         }
 
@@ -118,18 +118,18 @@ 
 
         $responsable = new User($user->db);
         $res = $responsable->fetch($object->getBalloon()->fk_responsable);
-        if($res > 0){
+        if ($res > 0) {
             $to[] = $responsable->email;
         }
 
 
         $backup = new User($user->db);
         $res = $backup->fetch($object->getBalloon()->fk_co_responsable);
-        if($res > 0){
+        if ($res > 0) {
             $to[] = $backup->email;
         }
 
-        if(empty($to)){
+        if (empty($to)) {
             return 0;
         }
 
@@ -149,7 +149,7 @@ 
         );
 
 
-        if (! $mailfile->sendfile())
+        if (!$mailfile->sendfile())
         {
             dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR);
         }

Http/Web/Form/DamageCreationForm.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         return $obj;
     }
 
-    private function addAmount(){
+    private function addAmount() {
         $field = new Number('amount');
         $field->required();
         $field->setStep(0.01);

Http/Web/templates/flight_damage/form.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     <?php echo $renderer->render($form->getElement('flight_id')); ?>
     <?php echo $renderer->render($form->getElement('token')); ?>
 
-    <?php if($form->has('amount')): ?>
+    <?php if ($form->has('amount')): ?>
         <section class="form-section">
             <h1 class="form-section-title"><?php echo $langs->trans('Ajout de dégâts'); ?></h1>
             <table class="border" width="50%">

Http/Web/templates/flight_damage/view.php

Spacing +6 added lines, -6 removed lines

@@ -16,21 +16,21 @@
         <td colspan="2">&nbsp;</td>
     </tr>
     <?php $total = 0; ?>
-    <?php foreach($damages as $currentDamage):?>
+    <?php foreach ($damages as $currentDamage):?>
         <?php $total += $currentDamage->getAmount(); ?>
         <tr>
-            <td><?php echo $currentDamage->getAuthorName();?></td>
-            <td><?php echo $currentDamage->getLabel();?></td>
-            <td><?php echo $currentDamage->getAmount();?>€</td>
+            <td><?php echo $currentDamage->getAuthorName(); ?></td>
+            <td><?php echo $currentDamage->getLabel(); ?></td>
+            <td><?php echo $currentDamage->getAmount(); ?>€</td>
             <td>
-                <?php if($currentDamage->isInvoiced()): ?>
+                <?php if ($currentDamage->isInvoiced()): ?>
                     <i class="fas fa-check"></i>
                 <?php else: ?>
                     <i class="fas fa-times"></i>
                 <?php endif; ?>
             </td>
             <td>
-                <a href="<?php print sprintf('%s/flightlog/index.php?r=get_one_damage&id=%s', DOL_URL_ROOT, $currentDamage->getId());?>"><i class="fas fa-link"></i></a>
+                <a href="<?php print sprintf('%s/flightlog/index.php?r=get_one_damage&id=%s', DOL_URL_ROOT, $currentDamage->getId()); ?>"><i class="fas fa-link"></i></a>
             </td>
         </tr>
     <?php endforeach; ?>

command/CreatePilotYearBillCommandHandler.php

Spacing +5 added lines, -5 removed lines

@@ -258,7 +258,7 @@ 
      */
     private function addOrderDiscount($order, $pilotFlightCount, $service, $year)
     {
-        $price = $pilotFlightCount->getCost()->getValue()/(1+$service->tva_tx/100);
+        $price = $pilotFlightCount->getCost()->getValue() / (1 + $service->tva_tx / 100);
         $pu_ht = price2num($price, 'MU');
         $desc = $year . " - " . $service->label . " - (" . $pilotFlightCount->getCount() . " * " . $pilotFlightCount->getFactor() . ")";
 
@@ -289,7 +289,7 @@ 
             return;
         }
 
-        $pointsHt = $command->getAdditionalBonus()/(1+6/100);
+        $pointsHt = $command->getAdditionalBonus() / (1 + 6 / 100);
         $desc = sprintf("%s - %s", $command->getYear(), $command->getBonusAdditionalMessage());
 
         $discountid = $this->getCompany($object->socid)->set_remise_except($pointsHt, $this->user, $desc, 6);
@@ -309,14 +309,14 @@ 
         $totalCost = FlightCost::zero();
         $description = '';
 
-        foreach ($damages as $damage){
+        foreach ($damages as $damage) {
             $totalCost->addCost($damage->getCost());
-            $description .= $damage->getLabel().'; ';
+            $description .= $damage->getLabel() . '; ';
         }
 
         $tDamage = new Product($this->db);
         $tDamage->label = 'Réparations aux ballons';
-        $tDamage->description = $description ;
+        $tDamage->description = $description;
         $tDamage->tva_tx = 21;
         $tDamage->price_ttc = $totalCost->getValue();
         $tDamage->price = $tDamage->price_ttc / (1 + $tDamage->tva_tx / 100);

readFlights.php

Spacing +5 added lines, -5 removed lines

@@ -189,7 +189,7 @@ 
     print '<td>' . $pilot->getCountForType('orga_T6')->getCount() . '</td>';
     print '<td>' . $pilot->getCountForType('orga_T6')->getCost()->getValue() . '</td>';
 
-    print sprintf('<td class="%s">', $pilot->getFlightBonus()->getValue() === 0?'text-muted':'text-bold'). $pilot->getFlightBonus()->getValue() . ' pts</td>';
+    print sprintf('<td class="%s">', $pilot->getFlightBonus()->getValue() === 0 ? 'text-muted' : 'text-bold') . $pilot->getFlightBonus()->getValue() . ' pts</td>';
 
     print '<td>' . $pilot->getCountForType('3')->getCount() . '</td>';
     print '<td>' . price($pilot->getCountForType('3')->getCost()->getValue()) . '€</td>';
@@ -208,8 +208,8 @@ 
     print '<td>' . price($pilot->damageCost()->getValue()) . '€</td>';
     print '<td>' . price($pilot->invoicedDamageCost()->getValue()) . '€</td>';
 
-    print sprintf('<td class="%s">', $pilot->getFlightsCost()->getValue() === 0?'text-muted':'text-bold'). price($pilot->getFlightsCost()->getValue()) . '€ </td>';
-    print sprintf('<td class="%s">', $pilot->isBillable(FlightBonus::zero())?'text-bold':'text-muted'). price($pilot->getTotalBill()->getValue()) . '€</td>';
+    print sprintf('<td class="%s">', $pilot->getFlightsCost()->getValue() === 0 ? 'text-muted' : 'text-bold') . price($pilot->getFlightsCost()->getValue()) . '€ </td>';
+    print sprintf('<td class="%s">', $pilot->isBillable(FlightBonus::zero()) ? 'text-bold' : 'text-muted') . price($pilot->getTotalBill()->getValue()) . '€</td>';
     print '</tr>';
 }
 
@@ -234,7 +234,7 @@ 
 print '<td>' . $totalT3 . '</td>';
 print '<td></td>';
 
-print '<td>' . $totalT4. '</td>';
+print '<td>' . $totalT4 . '</td>';
 print '<td></td>';
 
 print '<td>' . $totalT5 . '</td>';
@@ -263,7 +263,7 @@ 
 //table km
 $tauxRemb = isset($conf->global->BBC_FLIGHT_LOG_TAUX_REMB_KM) ? $conf->global->BBC_FLIGHT_LOG_TAUX_REMB_KM : 0;
 $year = GETPOST("year", 'int');
-if(empty($year)){
+if (empty($year)) {
     $year = date('Y');
 }
 

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