laudeco / bbc-dolibarr-flightlog

validators/SimpleOrderValidator.php

Spacing +3 added lines, -3 removed lines

@@ -52,12 +52,12 @@
         if (!isset($value->socid) && empty($value->email) && empty($value->phone)) {
             $this->addWarning('Soit l\'e-mail soit le téléphone n\'a pas été complété');
         }
-        if (empty($value->nbrPax) || (int)$value->nbrPax <= 0) {
+        if (empty($value->nbrPax) || (int) $value->nbrPax <= 0) {
             $this->addError('nbrPax', 'Le nombre de passagers doit être plus grand que 0.');
         }
 
-        if ((int)$value->nbrPax > 0) {
-            $costPerPax = $value->cost / (int)$value->nbrPax;
+        if ((int) $value->nbrPax > 0) {
+            $costPerPax = $value->cost / (int) $value->nbrPax;
             if ($costPerPax < $this->getMinPrice()) {
                 $this->addError('cost',
                     sprintf('Le prix demandé par passagé est trop peu élevé. Un minimum de %s est demandé',

addOrder.php

Braces +13 added lines, -6 removed lines

@@ -25,8 +25,10 @@ 
 foreach ($dirsociete as $dirroot)
 {
     $res=dol_include_once($dirroot.$module.'.php');
-    if ($res) break;
-}
+    if ($res) {
+        break;
+    }
+    }
 $modCodeClient = new $module;
 // Load object modCodeFournisseur
 $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
@@ -38,8 +40,10 @@ 
 foreach ($dirsociete as $dirroot)
 {
     $res=dol_include_once($dirroot.$module.'.php');
-    if ($res) break;
-}
+    if ($res) {
+        break;
+    }
+    }
 $modCodeFournisseur = new $module;
 
 // Load translation files required by the page
@@ -346,8 +350,11 @@ 
                                 </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 else: ?>
-                                <a href="<?php echo $langs->transcountry("VATIntraCheckURL",$object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help'); ?></a>
+                            <?php else {
+    : ?>
+                                <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>

Spacing +35 added lines, -35 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;
@@ -59,7 +59,7 @@ 
 $msg = '';
 $socid = null;
 
-if (GETPOST('socid', 'int') > 0){
+if (GETPOST('socid', 'int') > 0) {
     $socid = GETPOST('socid', 'int');
     $customer->fetch($socid);
 }
@@ -70,9 +70,9 @@ 
 
         $formObject = new stdClass();
         $formObject->socid = $socid;
-        $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');
@@ -89,15 +89,15 @@ 
 
         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>';
                 $successMessage = true;
             } catch (\Exception $e) {
                 // Creation KO
-                $msg = '<div class="error">Erreur lors de l\'ajout de la commande '.$e->getMessage().'</div>';
+                $msg = '<div class="error">Erreur lors de l\'ajout de la commande ' . $e->getMessage() . '</div>';
             }
         }
     }
@@ -125,18 +125,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>
@@ -195,7 +195,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 avez un doute sur la manière d'encoder la commande, veuillez me contacter AVANT de soumettre le dit formulaire.<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">
@@ -218,7 +218,7 @@ 
                         $(document).ready(function() {
                             $("#socid").change(function() {
                                 var socid = $(this).val();
-                                window.location.href = "<?php echo $_SERVER["PHP_SELF"].'?socid="+socid' ?>
+                                window.location.href = "<?php echo $_SERVER["PHP_SELF"] . '?socid="+socid' ?>
                             });
                         });
                     </script>
@@ -227,7 +227,7 @@ 
             </tr>
 
 
-            <?php if($socid === null): ?>
+            <?php if ($socid === null): ?>
                 <!-- Nom -->
                 <tr>
                     <td class="fieldrequired">
@@ -296,7 +296,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>
 
@@ -306,16 +306,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>';
                 ?>
 
@@ -339,16 +339,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>
@@ -403,10 +403,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>

facture.php

Spacing +4 added lines, -4 removed lines

@@ -123,11 +123,11 @@
  * Put here all code to do according to value of "action" parameter
  */
 if ($action == EXPENSE_REPORT_GENERATOR_ACTION_GENERATE) {
-    try{
-        $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote,$bankAccount, $nbrPax, $customerId);
+    try {
+        $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote, $bankAccount, $nbrPax, $customerId);
         $handler->handle($command);
-    }catch (\Exception $e){
-        dol_syslog($e->getMessage(),LOG_ERR);
+    } catch (\Exception $e) {
+        dol_syslog($e->getMessage(), LOG_ERR);
         dol_htmloutput_mesg("Facture non créée", '', 'error');
     }
 }

Braces +6 added lines, -3 removed lines

@@ -126,7 +126,7 @@ 
     try{
         $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote,$bankAccount, $nbrPax, $customerId);
         $handler->handle($command);
-    }catch (\Exception $e){
+    } catch (\Exception $e){
         dol_syslog($e->getMessage(),LOG_ERR);
         dol_htmloutput_mesg("Facture non créée", '', 'error');
     }
@@ -311,9 +311,12 @@ 
 
         <?php if (!$flightProduct || !$flight->hasReceiver()) : ?>
             <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>

class/missions/QuarterPilotMissionCollection.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
         $numberOfKilometers
     )
     {
-        $pilotId = (int)$pilotId;
+        $pilotId = (int) $pilotId;
 
         if (!isset($this->items[$pilotId])) {
             $this->items[$pilotId] = new PilotMissions($pilotId, $pilotFirstname, $pilotLastname);
@@ -57,7 +57,7 @@ 
      */
     public function addPilot($pilotId, $pilotFirstname, $pilotLastname)
     {
-        $pilotId = (int)$pilotId;
+        $pilotId = (int) $pilotId;
 
         if (isset($this->items[$pilotId])) {
             return;

class/missions/PilotMissions.php

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function __construct($pilotId, $pilotFirstname, $pilotLastname)
     {
-        $this->pilotId = (int)$pilotId;
+        $this->pilotId = (int) $pilotId;
         $this->pilotFirstname = $pilotFirstname;
         $this->pilotLastname = $pilotLastname;
 
@@ -51,8 +51,8 @@ 
      * @param int $numberOfFlights
      * @param int $numberOfKilometers
      */
-    public function addQuarter($quarter, $numberOfFlights, $numberOfKilometers){
-        $quarter = (int)$quarter;
+    public function addQuarter($quarter, $numberOfFlights, $numberOfKilometers) {
+        $quarter = (int) $quarter;
         $this->quarterMissions[$quarter] = new QuarterMission($quarter, $numberOfFlights, $numberOfKilometers);
     }
 
@@ -107,9 +107,9 @@ 
      *
      * @return QuarterMission
      */
-    private function getQuarterMission($quarter){
-        if(!isset($this->quarterMissions[$quarter])){
-            return new QuarterMission($quarter,0,0);
+    private function getQuarterMission($quarter) {
+        if (!isset($this->quarterMissions[$quarter])) {
+            return new QuarterMission($quarter, 0, 0);
         }
 
         return $this->quarterMissions[$quarter];
@@ -120,6 +120,6 @@ 
      */
     public function getPilotName()
     {
-        return $this->pilotFirstname.' '.$this->pilotLastname;
+        return $this->pilotFirstname . ' ' . $this->pilotLastname;
     }
 }
\ No newline at end of file

class/missions/FlightMission.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
      */
     public function __construct($id, $startPoint, $endPoint, $kilometersComment, $numberOfKilometers, DateTime $date)
     {
-        $this->id = (int)$id;
+        $this->id = (int) $id;
         $this->startPoint = $startPoint;
         $this->endPoint = $endPoint;
         $this->kilometersComment = $kilometersComment;

Http/Web/Requests/Request.php

Spacing +5 added lines, -5 removed lines

@@ -13,12 +13,12 @@ 
      *
      * @return mixed
      */
-    public function getParam($name, $defaultValue = null){
-        if($_POST[$name]){
+    public function getParam($name, $defaultValue = null) {
+        if ($_POST[$name]) {
             return $_POST[$name];
         }
 
-        if($_GET[$name]){
+        if ($_GET[$name]) {
             return $_GET[$name];
         }
 
@@ -28,14 +28,14 @@ 
     /**
      * @return bool
      */
-    public function isPost(){
+    public function isPost() {
         return strtoupper($_SERVER['REQUEST_METHOD']) === 'POST';
     }
 
     /**
      * @return array
      */
-    public function getPostParameters(){
+    public function getPostParameters() {
         return $_POST;
     }
 }
\ No newline at end of file

Http/Web/Form/SupplierBillSelect.php

Spacing +3 added lines, -3 removed lines

@@ -36,9 +36,9 @@
         }
 
         $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.total_ttc, society.nom';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
-        $sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'societe as society ON society.rowid = f.fk_soc';
-        $sql.= ' ORDER BY f.datec DESC';
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'facture_fourn as f';
+        $sql .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'societe as society ON society.rowid = f.fk_soc';
+        $sql .= ' ORDER BY f.datec DESC';
 
         $resql = $this->db->query($sql);
         if ($resql) {

Http/Web/Controller/AddFlightDamageController.php

Braces +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
             try{
                 $this->handle($form->getObject());
-            }catch(\Exception $e){
+            } catch(\Exception $e){
                 print $e->getMessage();
                 dol_syslog($e->getMessage(), LOG_ERR);
             }

Spacing +10 added lines, -10 removed lines

@@ -19,16 +19,16 @@ 
     /**
      * Display the form.
      */
-    public function view(){
+    public function view() {
         $id = $this->request->getParam('id');
 
-        if($id === null){
+        if ($id === null) {
             print '<p>Paramètre non fournis.</p>';
             return;
         }
 
         $flight = new \Bbcvols($this->db);
-        if($flight->fetch($id) <= 0){
+        if ($flight->fetch($id) <= 0) {
             print '<p>Vol non trouvé</p>';
             return;
         }
@@ -39,24 +39,24 @@ 
         $form = new DamageCreationForm('damage_creation', $this->db);
         $form->bind($command);
 
-        if($this->request->isPost()){
+        if ($this->request->isPost()) {
             $form->setData($this->request->getPostParameters());
 
-            if(!$form->validate()){
+            if (!$form->validate()) {
                 return $this->render('flight_damage/form.php', [
                     'form' => $form,
                 ]);
             }
 
-            try{
+            try {
                 $this->handle($form->getObject());
-            }catch(\Exception $e){
+            } catch (\Exception $e) {
                 print $e->getMessage();
                 dol_syslog($e->getMessage(), LOG_ERR);
             }
 
 
-            return $this->redirect($_SERVER["PHP_SELF"].'?id='.$id);
+            return $this->redirect($_SERVER["PHP_SELF"] . '?id=' . $id);
         }
 
         return $this->render('flight_damage/form.php', [
@@ -77,14 +77,14 @@ 
     /**
      * @return CreateDamageCommandHandler
      */
-    private function getHandler(){
+    private function getHandler() {
         return new CreateDamageCommandHandler($this->db, $this->getDamageRepository());
     }
 
     /**
      * @return FlightDamageRepository
      */
-    private function getDamageRepository(){
+    private function getDamageRepository() {
         return new FlightDamageRepository($this->db);
     }