diff --git a/app/Models/SubscriptionModel.php b/app/Models/SubscriptionModel.php index 059f4d66..1cf82fd0 100755 --- a/app/Models/SubscriptionModel.php +++ b/app/Models/SubscriptionModel.php @@ -264,12 +264,15 @@ public function getQueryforSubscriptionDetailsBySchemeName($flag,$condition, $va if ($downloadType === 'active') { $result1 = $this->getQueryforSubscriptionDetailsBySchemeName(1,'s.to_subscription >=', $currentDate,$selectedScheme); $result2 = $this->getQueryforSubscriptionDetailsBySchemeName(1,'s.isactive', 1,$selectedScheme); + $result3 = $this->getQueryforSubscriptionDetailsBySchemeName(1,'s.from_subscription <=', $currentDate,$selectedScheme); // Flatten the arrays for comparison $flattened1 = array_map('serialize', $result1); $flattened2 = array_map('serialize', $result2); + $flattened3 = array_map('serialize', $result3); // Find common elements - $commonElements = array_intersect($flattened1, $flattened2); + $commonElements0 = array_intersect($flattened1, $flattened2); + $commonElements = array_intersect($commonElements0, $flattened3); // Unserialize to get back the original array format $result = array_map('unserialize', $commonElements); @@ -287,7 +290,17 @@ public function getQueryforSubscriptionDetailsBySchemeName($flag,$condition, $va $result = $filteredExpiredResult; } if ($downloadType === 'both') { - $result = $this->getQueryforSubscriptionDetailsBySchemeName(0,'','',$selectedScheme); + $result0 = $this->getQueryforSubscriptionDetailsBySchemeName(0,'','',$selectedScheme); + $result1 = $this->getQueryforSubscriptionDetailsBySchemeName(1,'s.from_subscription <=', $currentDate,$selectedScheme); + + $flattened1 = array_map('serialize', $result0); + $flattened2 = array_map('serialize', $result1); + + $commonElements = array_intersect($flattened1, $flattened2); + + $result = array_map('unserialize', $commonElements); + + } $customerDetails = [];