diff --git a/app/Domains/Stats/Exports/OrderDetailExport.php b/app/Domains/Stats/Exports/OrderDetailExport.php index eb25cea3..5243c9d0 100644 --- a/app/Domains/Stats/Exports/OrderDetailExport.php +++ b/app/Domains/Stats/Exports/OrderDetailExport.php @@ -64,7 +64,7 @@ class OrderDetailExport extends AbstractExport implements FromQuery, WithHeading */ public function rows($rows) { - $rows = OrderService::detailTransformer($rows); + $rows = OrderService::detailTransformer(collect($rows)); $array = []; diff --git a/app/Domains/Stats/Services/OrderService.php b/app/Domains/Stats/Services/OrderService.php index ba953a82..fcc868e8 100644 --- a/app/Domains/Stats/Services/OrderService.php +++ b/app/Domains/Stats/Services/OrderService.php @@ -135,7 +135,7 @@ class OrderService extends Service $packages = app(PackageRepository::class)->withTrashed()->get()->keyBy('id')->toArray(); $orders = app(OrderRepository::class)->withTrashed() ->select(['id', 'unit_price', 'pay_channel', 'order_at']) - ->withConditions(['id' => array_unique($cards->pluck('order_id')->toArray())])->get()->keyBy('id')->toArray(); + ->withConditions(['id' => array_unique(array_pluck($cards, 'order_id'))])->get()->keyBy('id')->toArray(); $cards->map(function ($item) use ($companies, $packages, $carrierOperators, $orders) { $package = $packages[$item->package_id]; diff --git a/storage/app/public/templates/add-cards.xls b/storage/app/public/templates/add-cards.xls old mode 100644 new mode 100755