piccolo fix per importazione consegne da csv

madbob · Dec 17, 2024 · 7282c3e · 7282c3e
1 parent 16773d6
commit 7282c3e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/code/app/Delivery.php b/code/app/Delivery.php
@@ -75,8 +75,6 @@ private static function sortByPlace($bookings)
 
             return $ret;
         }]);
-
-        return $bookings;
     }
 
     public static function sortBookingsByShippingPlace($bookings, $shipping_place)

diff --git a/code/app/Importers/CSV/Deliveries.php b/code/app/Importers/CSV/Deliveries.php
@@ -160,13 +160,14 @@ public function select($request)
 
                     if ($target_user) {
                         $booking = $service->handleBookingUpdate($datarow, $user, $target_order, $target_user, true);
-
-                        $data[] = $datarow;
-                        $bookings[] = (object) [
-                            'user_id' => $target_user->id,
-                            'user_name' => $target_user->printableName(),
-                            'total' => $booking->getValue('effective', true),
-                        ];
+                        if ($booking) {
+                            $data[] = $datarow;
+                            $bookings[] = (object) [
+                                'user_id' => $target_user->id,
+                                'user_name' => $target_user->printableName(),
+                                'total' => $booking->getValue('effective', true),
+                            ];
+                        }
                     }
                 }
                 catch (\Exception $e) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,8 +75,6 @@ private static function sortByPlace($bookings) @@
                 return $ret;
             }]);
-            return $bookings;
         }
         public static function sortBookingsByShippingPlace($bookings, $shipping_place)
@@ Expand Down @@