diff --git a/app/Domains/Virtual/Services/CardService.php b/app/Domains/Virtual/Services/CardService.php index 5a18daf8..dc23fbc6 100644 --- a/app/Domains/Virtual/Services/CardService.php +++ b/app/Domains/Virtual/Services/CardService.php @@ -189,11 +189,17 @@ class CardService extends Service }); if (isset($conditions['prop_product']) && isset($conditions['prop_package'])) { - $conditions['company_and_package_id'] = $properties->where('product', $conditions['prop_product'])->where('package', $conditions['prop_package'])->keys()->toArray(); + $conditions['company_and_package_id'] = $properties->filter(function ($item) use ($conditions) { + return strpos($item->product, $conditions['prop_product']) !== false && strpos($item->package, $conditions['prop_package']) !== false; + })->keys()->toArray(); } elseif (isset($conditions['prop_product'])) { - $conditions['company_and_package_id'] = $properties->where('product', $conditions['prop_product'])->keys()->toArray(); + $conditions['company_and_package_id'] = $properties->filter(function ($item) use ($conditions) { + return strpos($item->product, $conditions['prop_product']) !== false; + })->keys()->toArray(); } elseif (isset($conditions['prop_package'])) { - $conditions['company_and_package_id'] = $properties->where('package', $conditions['prop_package'])->keys()->toArray(); + $conditions['company_and_package_id'] = $properties->filter(function ($item) use ($conditions) { + return strpos($item->package, $conditions['prop_package']) !== false; + })->keys()->toArray(); } } }