renewed_counts
This commit is contained in:
parent
a77a5ac97f
commit
3dcfce36ea
@ -69,10 +69,12 @@ class CompanyCountService extends Service
|
|||||||
$orderRenewalCard = $this->orderRenewalCardRepository->select($select)->withConditions($conditions)->groupBy($groupBy)
|
$orderRenewalCard = $this->orderRenewalCardRepository->select($select)->withConditions($conditions)->groupBy($groupBy)
|
||||||
->get()->pluck('counts', 'company_id')->toArray();
|
->get()->pluck('counts', 'company_id')->toArray();
|
||||||
|
|
||||||
$orderRenewalPackage = $this->orderRenewalPackageCardRepository->select($select)->withConditions($conditions)->groupBy($groupBy)
|
// $orderRenewalPackage = $this->orderRenewalPackageCardRepository->select($select)->withConditions($conditions)->groupBy($groupBy)
|
||||||
->get()->pluck('counts', 'company_id')->toArray();
|
// ->get()->pluck('counts', 'company_id')->toArray();
|
||||||
|
|
||||||
$renewed_counts = array_merge_sum($orderRenewalCard, $orderRenewalPackage);
|
// $renewed_counts = array_merge_sum($orderRenewalCard, $orderRenewalPackage);
|
||||||
|
|
||||||
|
$renewed_counts = $orderRenewalCard;
|
||||||
|
|
||||||
$valid_counts = $this->orderCardRepository->select($select)->whereHas('card', function ($query) {
|
$valid_counts = $this->orderCardRepository->select($select)->whereHas('card', function ($query) {
|
||||||
return $query->whereNotNull('virtual_activated_at')->whereNull('cancelled_at');
|
return $query->whereNotNull('virtual_activated_at')->whereNull('cancelled_at');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user