laudeco / bbc-dolibarr-flightlog

command/CreateOrderCommandHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 
     /**
      * @param Product   $flightProduct
-     * @param float|int $pricePerPax
+     * @param integer $pricePerPax
      *
      * @return float|int
      */

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
         $name = $command->getName() . ' ' . $command->getFirstname();
 
         $existingCustomers = $this->societe->searchByName($name);
-        if(count($existingCustomers) > 0){
+        if (count($existingCustomers) > 0) {
             $this->societe = $existingCustomers[0];
             return $this->societe;
         }

addFlight.php

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
             ->setGroupedFlight($isGroupedFlight)
             ->setOrderId($orderId);
 
-        try{
+        try {
             $vol = $createFlightHandler->handle($volCommand);
 
             include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
@@ -69,7 +69,7 @@ 
 
             $msg = '<div class="ok">L\'ajout du vol du : ' . $_POST["reday"] . '/' . $_POST["remonth"] . '/' . $_POST["reyear"] . ' s\'est correctement effectue ! </div>';
             Header("Location: card.php?id=" . $vol->id);
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             $msg = '<div class="error">Erreur lors de l\'ajout du vol : ' . $vol->error . '! </div>';
         }
 
@@ -262,7 +262,7 @@ 
                 <td class="fieldrequired"><?php echo $langs->trans('Commande du vol')?></td>
                 <td class="js-order">
                     <?php
-                     echo $html->selectarray('order_id',$commande->liste_array(2),$_POST['order_id'], 1,0,0,'',0,0,0,'','minwidth200',1);
+                     echo $html->selectarray('order_id', $commande->liste_array(2), $_POST['order_id'], 1, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
                     ?>
                 </td>
             </tr>

addOrder.php

Spacing +29 added lines, -29 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;
@@ -58,9 +58,9 @@ 
     if (!$_POST["cancel"]) {
 
         $formObject = new stdClass();
-        $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');
@@ -77,8 +77,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>';
@@ -113,7 +113,7 @@ 
 ?>
 
     <!-- Success message with reference -->
-    <?php if($successMessage): ?>
+    <?php if ($successMessage): ?>
         <div>
             <p class="cadre_msg1">
                 Vous avez généré la facture et créé un tiers.<br/>
@@ -172,7 +172,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 avre un doute sur la manière d'encoder la commande, veuillez me contacter.<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">
@@ -251,7 +251,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>
 
@@ -261,16 +261,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>';
             ?>
 
@@ -294,16 +294,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>
@@ -359,10 +359,10 @@ 
             <tr>
                 <td><?php echo $langs->trans('Le commentaire doit-il figurer sur la facture') ?></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>

validators/FlightValidator.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
      */
     private function checkBillingInformation($vol, $context)
     {
-        if($vol->isLinkedToOrder()){
+        if ($vol->isLinkedToOrder()) {
             return $this;
         }
 

validators/SimpleOrderValidator.php

Spacing +8 added lines, -8 removed lines

@@ -46,25 +46,25 @@
 
         $this->valid = true;
 
-        if(empty($value->name)){
+        if (empty($value->name)) {
             $this->addError('name', 'Le nom est requis pour créer une commande');
         }
-        if(empty($value->civilityId)){
+        if (empty($value->civilityId)) {
             $this->addError('civility', 'Le titre de civilite est un champ requis.');
         }
-        if(empty($value->email) && empty($value->phone)){
+        if (empty($value->email) && empty($value->phone)) {
             $this->addError('email', 'Soit l\'e-mail soit le téléphone est requis');
         }
-        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(empty($value->region)){
+        if (empty($value->region)) {
             $this->addError('region', 'Le lieu de décollage doit etre configuré');
         }
 
-        if((int)$value->nbrPax > 0){
-            $costPerPax = $value->cost / (int)$value->nbrPax;
-            if($costPerPax < $this->getMinPrice()){
+        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é', $this->getMinPrice()));
             }
         }

card_tab_financial.php

Spacing +10 added lines, -10 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'));
@@ -93,16 +93,16 @@ 
 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->isLinkedToOrder()){
+if (!$object->isLinkedToOrder()) {
     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>';
-}else{
-    print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td>' . $object->getOrder()->getNomUrl(1). '</td></tr>';
+} else {
+    print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td>' . $object->getOrder()->getNomUrl(1) . '</td></tr>';
 }
 print '</table>';
 
@@ -111,13 +111,13 @@ 
 // Buttons
 print '<div class="tabsAction">' . "\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";
+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";
 }
 
 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/CreateOrderCommand.php

Spacing +2 added lines, -2 removed lines

@@ -228,7 +228,7 @@ 
     /**
      * @return boolean
      */
-    public function hasTVA(){
+    public function hasTVA() {
         return !empty($this->tva);
     }
 
@@ -259,7 +259,7 @@ 
     /**
      * @return bool
      */
-    public function isCommentPublic(){
+    public function isCommentPublic() {
         return $this->publicComment;
     }
 

command/CreateFlightCommand.php

Spacing +1 added lines, -1 removed lines

@@ -393,7 +393,7 @@
     /**
      * @return bool
      */
-    public function hasOrderId(){
+    public function hasOrderId() {
         return $this->orderId !== null;
     }
 }
\ No newline at end of file

command/CreateFlightCommandHandler.php

Spacing +8 added lines, -8 removed lines

@@ -65,7 +65,7 @@ 
         $vol = new Bbcvols($this->db);
         $vol->date = $command->getDate();
         $vol->lieuD = $command->getLieuD();
-        $vol->lieuA =$command->getLieuA();
+        $vol->lieuA = $command->getLieuA();
         $vol->heureD = $command->getHeureD();
         $vol->heureA = $command->getHeureA();
         $vol->BBC_ballons_idBBC_ballons = $command->getBBCBallonsIdBBCBallons();
@@ -73,7 +73,7 @@ 
         $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();
@@ -87,7 +87,7 @@ 
         }
 
         $result = $vol->create($this->user);
-        if($result <= 0){
+        if ($result <= 0) {
             throw new Exception();
         }
 
@@ -107,7 +107,7 @@ 
     {
         $flight->fetch($flight->id);
 
-        if(!$flight->isLinkedToOrder()){
+        if (!$flight->isLinkedToOrder()) {
             return;
         }
 
@@ -118,17 +118,17 @@ 
 
         $qtyOrder = 0;
         /** @var OrderLine $currentOrderLine */
-        foreach($order->lines as $currentOrderLine){
-            $qtyOrder += (int)$currentOrderLine->qty;
+        foreach ($order->lines as $currentOrderLine) {
+            $qtyOrder += (int) $currentOrderLine->qty;
         }
 
         $passangersCount = $this->numberOfPassengersLinkedToOrder($order->id);
 
-        if($passangersCount != $qtyOrder){
+        if ($passangersCount != $qtyOrder) {
             return;
         }
 
-        if($order->statut == Commande::STATUS_VALIDATED){
+        if ($order->statut == Commande::STATUS_VALIDATED) {
             $order->cloture($this->user);
         }
     }