diff --git a/app/Domains/Real/Repositories/OrderCardPartitionRepository.php b/app/Domains/Real/Repositories/OrderCardPartitionRepository.php index d6714922..e2afb3ab 100644 --- a/app/Domains/Real/Repositories/OrderCardPartitionRepository.php +++ b/app/Domains/Real/Repositories/OrderCardPartitionRepository.php @@ -63,7 +63,10 @@ class OrderCardPartitionRepository extends Repository $this->model = $this->model->selectRaw($select); - $this->model = $this->model->leftJoin('virtual_order_cards_partition', 'virtual_order_cards_partition.sim', '=', 'real_order_cards_partition.sim'); + $this->model = $this->model->leftJoin('virtual_order_cards_partition', function($join){ + $join->on('virtual_order_cards_partition.sim', '=', 'real_order_cards_partition.sim') + ->whereNull('virtual_order_cards_partition.deleted_at'); + }); $this->model= $this->model ->orderBy('real_order_cards_partition.id') diff --git a/app/Domains/Real/Services/OrderService.php b/app/Domains/Real/Services/OrderService.php index 8e7d787e..32a19d82 100644 --- a/app/Domains/Real/Services/OrderService.php +++ b/app/Domains/Real/Services/OrderService.php @@ -94,7 +94,7 @@ class OrderService extends Service $key = array_search(0, $orderIds); - if (!is_null($key)) { + if ($key !== false) { unset($orderIds[$key]); } @@ -104,7 +104,7 @@ class OrderService extends Service $virtualOrders = app(VirtualOrderRepository::class)->withConditions(['id' => $orderIds])->get()->keyBy('id'); } - $cards->map(function ($item) use ($virtualOrders, $virtualOrderCards) { + $cards->map(function ($item) use ($virtualOrders) { $item->sim = (string)$item->sim; $item->company_id = $item->company_id ?? 0; $item->package_id = $item->package_id ?? 0;