diff --git a/app/Http/Controllers/StatistiqueController.php b/app/Http/Controllers/StatistiqueController.php index afc1319..2d2224e 100644 --- a/app/Http/Controllers/StatistiqueController.php +++ b/app/Http/Controllers/StatistiqueController.php @@ -43,6 +43,7 @@ class StatistiqueController extends Controller foreach ($coupons as $coupon) { $coupon->quantity = $this->getFullQuantity($coupon); $coupon->remain = $this->getFullQuantity($coupon) - $this->getUsedQuantity($coupon); + $coupon->diffused = $this->getDiffusedQuantity($coupon); $coupon->isPrintable = $this->isAvailableToPrint($coupon, $campagne); $coupon->isPaused = $this->isPausedToPrint($coupon, $campagne); } @@ -79,6 +80,7 @@ class StatistiqueController extends Controller foreach ($coupons as $coupon) { $coupon->quantity = $this->getFullQuantity($coupon); $coupon->remain = $this->getFullQuantity($coupon) - $this->getUsedQuantity($coupon); + $coupon->diffused = $this->getDiffusedQuantity($coupon); $coupon->isPrintable = $this->isAvailableToPrint($coupon, $campagne); $coupon->isPaused = $this->isPausedToPrint($coupon, $campagne); $coupon->color = $colors[$count]; diff --git a/app/Traits/CouponTrait.php b/app/Traits/CouponTrait.php index 83750e5..19f064b 100644 --- a/app/Traits/CouponTrait.php +++ b/app/Traits/CouponTrait.php @@ -283,6 +283,26 @@ trait CouponTrait { return $countPrinted; } + public function getDiffusedQuantity(Coupon $coupon) { + $countPrinted = 0; + $campagnes = $coupon->campagnes()->get(); + foreach ($campagnes as $campagne) { + if($campagne->camp_type == 0 || $campagne->camp_type == 2) { // Murs + $murs = Mur::where(['mur_campid' => $campagne->camp_id, 'mur_couponId' => $coupon->coupon_id])->get(); + $countPrinted = $countPrinted + count($murs); + + } else { // Paniers + $paniers = Panier::where(['panier_campId' => $campagne->camp_id])->get(); + foreach ($paniers as $key => $panier) { + $panierContentCountPrinted = $panier->panierContents->sum('panier_content_printed'); + $panierContentCountDiffused = $panier->panierContents->sum('panier_content_quantity'); + $countPrinted = $countPrinted + $panierContentCountPrinted + $panierContentCountDiffused; + } + } + } + return $countPrinted; + } + public function getUsedQuantityOnPeriod(Coupon $coupon, $startdate, $enddate) { $countPrinted = 0; $startdate = date('Y-m-d H:i:s', strtotime($startdate)); diff --git a/resources/views/stats/detail.blade.php b/resources/views/stats/detail.blade.php index c50dc4f..7059113 100644 --- a/resources/views/stats/detail.blade.php +++ b/resources/views/stats/detail.blade.php @@ -83,7 +83,8 @@

Valeur : {{ str_replace('.', ',', number_format($coupon->coupon_value, 2))}} €

Quantité Totale : {{$coupon->quantity}}

Quantité Restante : {{$coupon->remain}}

-

Quantité Diffusé : {{$coupon->quantity - $coupon->remain}}

+

Quantité Diffusé : {{$coupon->diffused}}

+

Quantité Imprimé : {{$coupon->quantity - $coupon->remain}}

@if($coupon->coupon_mindatediffusion != null)

Date de début de diffusion : {{ date('d/m/Y', strtotime($coupon->coupon_mindatediffusion)) }}

@else diff --git a/resources/views/stats/index.blade.php b/resources/views/stats/index.blade.php index 8e70360..195ce15 100644 --- a/resources/views/stats/index.blade.php +++ b/resources/views/stats/index.blade.php @@ -37,6 +37,7 @@ Qté Totale Qté Restante Qté Diffusé + Qté Imp Fin de diffusion Statut @@ -47,6 +48,7 @@ {{ str_replace('.', ',', number_format($coupon->coupon_value, 2))}} € {{$coupon->quantity}} {{$coupon->remain}} + {{$coupon->diffused}} {{$coupon->quantity - $coupon->remain}} @if($coupon->coupon_maxdatediffusion != null) {{ date('d/m/Y', strtotime($coupon->coupon_maxdatediffusion)) }}