laudeco / bbc-dolibarr-flightlog

command/CreateOrderCommand.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
         $this->language = $form->language;
         $this->userId = $userId;
         $this->publicComment = $form->isCommentPublic == 1;
-        $this->socid = (int)$form->socid;
+        $this->socid = (int) $form->socid;
     }
 
     /**

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

Spacing +34 added lines, -34 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,8 +89,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>';
@@ -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">
@@ -217,7 +217,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>
@@ -226,7 +226,7 @@ 
             </tr>
 
 
-            <?php if($socid === null): ?>
+            <?php if ($socid === null): ?>
                 <!-- Nom -->
                 <tr>
                     <td class="fieldrequired">
@@ -295,7 +295,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>
 
@@ -305,16 +305,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>';
                 ?>
 
@@ -338,16 +338,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>
@@ -402,10 +402,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>

class/actions_flightlog.class.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         return $sql;
     }
 
-    public function completeListOfReferent(){
+    public function completeListOfReferent() {
         dol_include_once('/flightlog/class/bbcvols.class.php');
 
         $this->results['flightlog'] = [

core/triggers/interface_50001_modFlightLog_mailOnIncident.class.php

Spacing +7 added lines, -7 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;
         }
 
@@ -127,7 +127,7 @@ 
         );
 
 
-        if (! $mailfile->sendfile())
+        if (!$mailfile->sendfile())
         {
             dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR);
         }

validators/FlightValidator.php

Spacing +4 added lines, -4 removed lines

@@ -149,7 +149,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.');
         }
 
@@ -241,10 +241,10 @@ 
                 $this->addError('order_id', 'Le nombre de passager par commande doit être >= 0.');
             }
 
-            $totalPassenegrs += (int)$nbrPassengers;
+            $totalPassenegrs += (int) $nbrPassengers;
         }
 
-        if ($totalPassenegrs !== (int)$vol->getNumberOfPassengers()) {
+        if ($totalPassenegrs !== (int) $vol->getNumberOfPassengers()) {
             $this->addError('nbrPax', 'Le nombre de passagers ne correspond pas au nombre entré sur les commandes');
         }
 
@@ -258,7 +258,7 @@ 
      */
     private function checkFlightDate(Bbcvols $flight)
     {
-        if($flight->getDate() > new DateTimeImmutable()){
+        if ($flight->getDate() > new DateTimeImmutable()) {
             $this->addError('date', 'La date est plus grande que la date d\'aujourd\'hui');
         }
 

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

class/bbcvols.class.php

Spacing +15 added lines, -15 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;

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;