Completed
Push — feature/multi_order ( eb7707 )
by Laurent
01:37
created
command/CreateFlightCommandHandler.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
         $vol = new Bbcvols($this->db);
66 66
         $vol->date = $command->getDate();
67 67
         $vol->lieuD = $command->getLieuD();
68
-        $vol->lieuA =$command->getLieuA();
68
+        $vol->lieuA = $command->getLieuA();
69 69
         $vol->heureD = $command->getHeureD();
70 70
         $vol->heureA = $command->getHeureA();
71 71
         $vol->BBC_ballons_idBBC_ballons = $command->getBBCBallonsIdBBCBallons();
@@ -73,14 +73,14 @@  discard block
 block discarded – undo
73 73
         $vol->remarque = $command->getRemarque();
74 74
         $vol->incidents = $command->getIncidents();
75 75
         $vol->fk_type = $command->getFkType();
76
-        $vol->fk_pilot =$command->getFkPilot();
76
+        $vol->fk_pilot = $command->getFkPilot();
77 77
         $vol->fk_organisateur = $command->getFkOrganisateur();
78 78
         $vol->kilometers = $command->getKilometers();
79 79
         $vol->cost = $command->getCost();
80 80
         $vol->fk_receiver = $command->getFkReceiver();
81 81
         $vol->justif_kilometers = $command->getJustifKilometers();
82 82
         $vol->setPassengerNames($command->getPassengerNames());
83
-        foreach($command->getOrderIds() as $orderId => $nbrPassengers){
83
+        foreach ($command->getOrderIds() as $orderId => $nbrPassengers) {
84 84
             $vol->addOrderId($orderId, $nbrPassengers);
85 85
         }
86 86
 
@@ -88,12 +88,12 @@  discard block
 block discarded – undo
88 88
             throw new Exception();
89 89
         }
90 90
 
91
-        if(!$vol->getFlightType()->isBillingRequired() || $vol->isLinkedToOrder()){
91
+        if (!$vol->getFlightType()->isBillingRequired() || $vol->isLinkedToOrder()) {
92 92
             $vol->is_facture = true;
93 93
         }
94 94
 
95 95
         $result = $vol->create($this->user);
96
-        if($result <= 0){
96
+        if ($result <= 0) {
97 97
             throw new Exception();
98 98
         }
99 99
 
@@ -113,27 +113,27 @@  discard block
 block discarded – undo
113 113
     {
114 114
         $flight->fetch($flight->id);
115 115
 
116
-        if(!$flight->isLinkedToOrder()){
116
+        if (!$flight->isLinkedToOrder()) {
117 117
             return;
118 118
         }
119 119
 
120
-        foreach($flight->getOrders() as $currentOrder){
120
+        foreach ($flight->getOrders() as $currentOrder) {
121 121
             $currentOrder->add_object_linked('flightlog_bbcvols', $flight->getId());
122 122
             $currentOrder->fetch_lines();
123 123
 
124 124
             $qtyOrder = 0;
125 125
             /** @var OrderLine $currentOrderLine */
126
-            foreach($currentOrder->lines as $currentOrderLine){
127
-                $qtyOrder += (int)$currentOrderLine->qty;
126
+            foreach ($currentOrder->lines as $currentOrderLine) {
127
+                $qtyOrder += (int) $currentOrderLine->qty;
128 128
             }
129 129
 
130 130
             $passangersCount = $this->numberOfPassengersLinkedToOrder($currentOrder->id);
131 131
 
132
-            if($passangersCount < $qtyOrder){
132
+            if ($passangersCount < $qtyOrder) {
133 133
                 continue;
134 134
             }
135 135
 
136
-            if($currentOrder->statut == Commande::STATUS_VALIDATED){
136
+            if ($currentOrder->statut == Commande::STATUS_VALIDATED) {
137 137
                 $currentOrder->cloture($this->user);
138 138
             }
139 139
         }
Please login to merge, or discard this patch.
class/bbcvols.class.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
         $sql .= ' ' . (!isset($this->justif_kilometers) ? 'NULL' : "'" . $this->db->escape($this->justif_kilometers) . "'") . ',';
256 256
         $sql .= ' ' . "'" . date('Y-m-d H:i:s') . "'" . ',';
257 257
         $sql .= ' ' . "'" . date('Y-m-d H:i:s') . "'" . ',';
258
-        $sql .= ' ' . "'" . $this->passengerNames . "'" ;
258
+        $sql .= ' ' . "'" . $this->passengerNames . "'";
259 259
         $sql .= ')';
260 260
 
261 261
         $this->db->begin();
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 
270 270
         if (!$error) {
271 271
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
272
-            if(!$this->insertOrders()){
272
+            if (!$this->insertOrders()) {
273 273
                 $error++;
274 274
             }
275 275
 
@@ -295,9 +295,9 @@  discard block
 block discarded – undo
295 295
     /**
296 296
      * Inserts the order linked to the flight
297 297
      */
298
-    private function insertOrders(){
298
+    private function insertOrders() {
299 299
 
300
-        if(empty($this->orderIds)){
300
+        if (empty($this->orderIds)) {
301 301
             return true;
302 302
         }
303 303
 
@@ -312,12 +312,12 @@  discard block
 block discarded – undo
312 312
         
313 313
         $values = [];
314 314
 
315
-        foreach($this->orderIds as $orderId=>$nbrPassengers){
315
+        foreach ($this->orderIds as $orderId=>$nbrPassengers) {
316 316
             $values[] = sprintf(
317 317
                 $valueTemplate,
318 318
                 $orderId,
319 319
                 $this->db->escape($this->id),
320
-                (!isset($nbrPassengers) ? '0' :  $this->db->escape($nbrPassengers))
320
+                (!isset($nbrPassengers) ? '0' : $this->db->escape($nbrPassengers))
321 321
             );
322 322
         }
323 323
 
@@ -335,9 +335,9 @@  discard block
 block discarded – undo
335 335
     /**
336 336
      * Inserts the order linked to the flight
337 337
      */
338
-    private function updateOrders(){
338
+    private function updateOrders() {
339 339
 
340
-        if(empty($this->orderIds)){
340
+        if (empty($this->orderIds)) {
341 341
             return true;
342 342
         }
343 343
 
@@ -348,9 +348,9 @@  discard block
 block discarded – undo
348 348
     /**
349 349
      * Inserts the order linked to the flight
350 350
      */
351
-    private function deleteOrders(){
351
+    private function deleteOrders() {
352 352
 
353
-        if(empty($this->orderIds)){
353
+        if (empty($this->orderIds)) {
354 354
             return true;
355 355
         }
356 356
 
@@ -1015,12 +1015,12 @@  discard block
 block discarded – undo
1015 1015
      * @param int $orderId
1016 1016
      * @param int $nbrPassengers
1017 1017
      */
1018
-    public function addOrderId($orderId, $nbrPassengers){
1019
-        if($nbrPassengers <= 0){
1018
+    public function addOrderId($orderId, $nbrPassengers) {
1019
+        if ($nbrPassengers <= 0) {
1020 1020
             throw new InvalidArgumentException('Nbr of passenger must be positive number');
1021 1021
         }
1022 1022
 
1023
-        if(!isset($this->orderIds)){
1023
+        if (!isset($this->orderIds)) {
1024 1024
             $this->orderIds = [];
1025 1025
         }
1026 1026
 
@@ -1060,7 +1060,7 @@  discard block
 block discarded – undo
1060 1060
         if ($resql) {
1061 1061
             $numrows = $this->db->num_rows($resql);
1062 1062
             if ($numrows) {
1063
-                for($i = 0 ; $i < $numrows ; $i++){
1063
+                for ($i = 0; $i < $numrows; $i++) {
1064 1064
                     $obj = $this->db->fetch_object($resql);
1065 1065
                     $this->orderIds[$obj->order_id] = $obj->nbr_passengers;
1066 1066
 
@@ -1081,7 +1081,7 @@  discard block
 block discarded – undo
1081 1081
      */
1082 1082
     public function getOrders()
1083 1083
     {
1084
-        if(!isset($this->orders) || empty($this->orders)){
1084
+        if (!isset($this->orders) || empty($this->orders)) {
1085 1085
             $this->fetchOrder();
1086 1086
         }
1087 1087
         return $this->orders;
Please login to merge, or discard this patch.
validators/FlightValidator.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -228,16 +228,16 @@
 block discarded – undo
228 228
      */
229 229
     private function checkOrderInformation(Bbcvols $vol)
230 230
     {
231
-        if(!$vol->isLinkedToOrder()){
231
+        if (!$vol->isLinkedToOrder()) {
232 232
             return;
233 233
         }
234 234
 
235 235
         $totalPassenegrs = 0;
236
-        foreach($vol->getOrderIds() as $orderId => $nbrPassengers){
237
-            $totalPassenegrs+=(int)$nbrPassengers;
236
+        foreach ($vol->getOrderIds() as $orderId => $nbrPassengers) {
237
+            $totalPassenegrs += (int) $nbrPassengers;
238 238
         }
239 239
 
240
-        if($totalPassenegrs !== (int)$vol->getNumberOfPassengers()){
240
+        if ($totalPassenegrs !== (int) $vol->getNumberOfPassengers()) {
241 241
             $this->addError('nbrPax', 'Le nombre de passagers ne correspond pas au nombre entré sur les commandes');
242 242
         }
243 243
 
Please login to merge, or discard this patch.