From dec7bd13286323f47f8e9f36bfe3fec0debe1887 Mon Sep 17 00:00:00 2001
From: Thibault Richy <thibault.richy@ldc.fr>
Date: Wed, 10 Jul 2019 14:36:55 +0200
Subject: [PATCH] Fix Stats

---
 .../Controllers/StatistiqueController.php     |  2 +-
 app/Panier.php                                |  2 +-
 app/PanierContent.php                         |  2 +-
 app/Traits/CouponTrait.php                    | 36 +++++++------------
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/StatistiqueController.php b/app/Http/Controllers/StatistiqueController.php
index 2d2224e..ab74b0d 100644
--- a/app/Http/Controllers/StatistiqueController.php
+++ b/app/Http/Controllers/StatistiqueController.php
@@ -79,7 +79,7 @@ class StatistiqueController extends Controller
         $coupons = $campagne->coupons;
         foreach ($coupons as $coupon) {
             $coupon->quantity = $this->getFullQuantity($coupon);
-            $coupon->remain = $this->getFullQuantity($coupon) - $this->getUsedQuantity($coupon);
+            $coupon->remain = $coupon->quantity - $this->getUsedQuantity($coupon);
             $coupon->diffused = $this->getDiffusedQuantity($coupon);
             $coupon->isPrintable = $this->isAvailableToPrint($coupon, $campagne);
             $coupon->isPaused = $this->isPausedToPrint($coupon, $campagne);
diff --git a/app/Panier.php b/app/Panier.php
index e26f8a0..685fbee 100644
--- a/app/Panier.php
+++ b/app/Panier.php
@@ -21,7 +21,7 @@ class Panier extends Model
      */
     public $timestamps = false;
 
-    protected $with = ['panierContents'];
+    //protected $with = ['panierContents'];
     /**
      * OneToMany
      * Panier -> PanierContent
diff --git a/app/PanierContent.php b/app/PanierContent.php
index fd668f9..8b7130d 100644
--- a/app/PanierContent.php
+++ b/app/PanierContent.php
@@ -27,7 +27,7 @@ class PanierContent extends Model
      */
     public function panier()
     {
-        return $this->belongsTo('App\Panier', 'panier_content_panierId', 'panier_content_id');
+        return $this->belongsTo('App\Panier', 'panier_content_panierId', 'panier_id');
     }
 
     /**
diff --git a/app/Traits/CouponTrait.php b/app/Traits/CouponTrait.php
index e7541a9..72ed825 100644
--- a/app/Traits/CouponTrait.php
+++ b/app/Traits/CouponTrait.php
@@ -266,6 +266,7 @@ trait CouponTrait {
 
     public function getUsedQuantity(Coupon $coupon) {
         $countPrinted = 0;
+        $couponId = $coupon->coupon_id;
         $campagnes = $coupon->campagnes()->get();
         foreach ($campagnes as $campagne) {
             if($campagne->camp_type == 0 || $campagne->camp_type == 2) { // Murs
@@ -273,16 +274,10 @@ trait CouponTrait {
                 $countPrinted = $countPrinted + count($murs);
                 
             } else { // Paniers
-                $paniers = Panier::where(['panier_campId' => $campagne->camp_id])->get();
-                foreach ($paniers as $key => $panier) {
-                    $panierContentCount = 0;
-                    foreach ($panier->panierContents as $panierContent) {
-                        if($panierContent->panier_content_couponId == $coupon->coupon_id){
-                            $panierContentCount += $panierContent->panier_content_printed;
-                        }
-                    }
-                    $countPrinted = $countPrinted + $panierContentCount;
-                }
+                $campagneId = $campagne->camp_id;
+                $countPrinted = PanierContent::where('panier_content_couponId', $couponId)->whereHas('panier', function($query) use ($campagneId){
+                    $query->where('panier_campId', $campagneId);
+                })->sum('panier_content_printed');
             }
         }
         return $countPrinted;
@@ -290,6 +285,7 @@ trait CouponTrait {
 
     public function getDiffusedQuantity(Coupon $coupon) {
         $countPrinted = 0;
+        $couponId = $coupon->coupon_id;
         $campagnes = $coupon->campagnes()->get();
         foreach ($campagnes as $campagne) {
             if($campagne->camp_type == 0 || $campagne->camp_type == 2) { // Murs
@@ -297,19 +293,13 @@ trait CouponTrait {
                 $countPrinted = $countPrinted + count($murs);
                 
             } else { // Paniers
-                $paniers = Panier::where(['panier_campId' => $campagne->camp_id])->get();
-                foreach ($paniers as $key => $panier) {
-                    $panierContentCountPrinted = 0;
-                    $panierContentCountDiffused = 0;
-                    foreach ($panier->panierContents as $panierContent) {
-                        if($panierContent->panier_content_couponId == $coupon->coupon_id){
-                            $panierContentCountPrinted += $panierContent->panier_content_printed;
-                            $panierContentCountDiffused += $panierContent->panier_content_quantity;
-                        }
-                    }
-                    
-                    $countPrinted = $countPrinted + $panierContentCountPrinted + $panierContentCountDiffused;
-                }
+                $campagneId = $campagne->camp_id;
+                $panierContents = PanierContent::where('panier_content_couponId', $couponId)->whereHas('panier', function($query) use ($campagneId){
+                    $query->where('panier_campId', $campagneId);
+                })->get();
+                $panierContentCountPrinted = $panierContents->sum('panier_content_printed');
+                $panierContentCountDiffused = $panierContents->sum('panier_content_quantity');    
+                $countPrinted = $countPrinted + $panierContentCountPrinted + $panierContentCountDiffused;
             }
         }
         return $countPrinted;