[Administration] Statistiques : rapport paiements

backend/controllers/ReportController.php

         $resArray[] = [
             'name' => '',
             'quantity' => '',
-            'total' => '<strong>' . Price::format(round($totalGlobal, 2)) . '</strong>',
+            'total' => '<strong>' . Price::format(round($totalGlobal, 2)) . ' HT</strong>',
         ];
 
         return $resArray;
     public function actionPayments(string $dateStart, string $dateEnd)
     {
         $orderModule = $this->getOrderModule();
-        $paymentModule = $this->getPaymentModule();
         $ordersArray = $orderModule->getRepository()
             ->findOrdersByPeriod(
                 new \DateTime($dateStart),
             ]
         ];
 
+        $sumAmountTotalSpentByCredit = 0;
+        $sumAmountTotalSpentByMoney = 0;
+        $sumAmountTotalSpentByCheque = 0;
+        $sumAmountTotalSpentByTransfer = 0;
+        $sumAmountTotalSpentByCreditCard = 0;
+
         foreach($ordersArray as $order) {
             $orderModule->getBuilder()->initOrder($order);
 
-            $strPayment = '';
-            foreach($order->payment as $payment) {
-                $strPayment .= $paymentModule->getSolver()->getStrMeanPayment($payment).', ';
+            $hasInvoice = false;
+            $referenceInvoice = 'Non';
+            if($order->invoice) {
+                $hasInvoice = true;
+                $referenceInvoice = $order->invoice->reference."";
             }
 
+            $amountTotalSpentByCredit = $orderModule->getSolver()->getAmountTotalSpentByMeanPayment($order, MeanPayment::CREDIT);
+            $sumAmountTotalSpentByCredit += $amountTotalSpentByCredit;
+            $amountTotalSpentByMoney = $orderModule->getSolver()->getAmountTotalSpentByMeanPayment($order, MeanPayment::MONEY);
+            $sumAmountTotalSpentByMoney += $amountTotalSpentByMoney;
+            $amountTotalSpentByCheque = $orderModule->getSolver()->getAmountTotalSpentByMeanPayment($order, MeanPayment::CHEQUE);
+            $sumAmountTotalSpentByCheque += $amountTotalSpentByCheque;
+            $amountTotalSpentByTransfer = $orderModule->getSolver()->getAmountTotalSpentByMeanPayment($order, MeanPayment::TRANSFER);
+            $sumAmountTotalSpentByTransfer += $amountTotalSpentByTransfer;
+            $amountTotalSpentByCreditCard = $orderModule->getSolver()->getAmountTotalSpentByMeanPayment($order, MeanPayment::CREDIT_CARD);
+            $sumAmountTotalSpentByCreditCard += $amountTotalSpentByCreditCard;
+
             $datas[] = [
                 $order->distribution->date,
                 $orderModule->getSolver()->getOrderUsername($order),
-                $orderModule->getSolver()->getOrderAmountWithTax($order),
-                $order->invoice ? $order->invoice->reference : 'Non',
-                $orderModule->getSolver()->getAmountTotalByMeanPayment($order, MeanPayment::CREDIT),
-                $orderModule->getSolver()->getAmountTotalByMeanPayment($order, MeanPayment::MONEY),
-                $orderModule->getSolver()->getAmountTotalByMeanPayment($order, MeanPayment::CHEQUE),
-                $orderModule->getSolver()->getAmountTotalByMeanPayment($order, MeanPayment::TRANSFER),
-                $orderModule->getSolver()->getAmountTotalByMeanPayment($order, MeanPayment::CREDIT_CARD),
-                count($order->payment) . ' : '.$strPayment
+                CSV::formatNumber($orderModule->getSolver()->getOrderAmountWithTax($order)),
+                $referenceInvoice,
+                $hasInvoice ? '' : CSV::formatNumber($amountTotalSpentByCredit),
+                $hasInvoice ? '' : CSV::formatNumber($amountTotalSpentByMoney),
+                $hasInvoice ? '' : CSV::formatNumber($amountTotalSpentByCheque),
+                $hasInvoice ? '' : CSV::formatNumber($amountTotalSpentByTransfer),
+                $hasInvoice ? '' : CSV::formatNumber($amountTotalSpentByCreditCard)
             ];
-
-            //print_r($order->payment);
-            //die();
         }
 
+        $datas[] = [
+            '',
+            '',
+            '',
+            'Totaux paiements',
+            CSV::formatNumber($sumAmountTotalSpentByCredit),
+            CSV::formatNumber($sumAmountTotalSpentByMoney),
+            CSV::formatNumber($sumAmountTotalSpentByCheque),
+            CSV::formatNumber($sumAmountTotalSpentByTransfer),
+            CSV::formatNumber($sumAmountTotalSpentByCreditCard),
+            CSV::formatNumber($sumAmountTotalSpentByCredit + $sumAmountTotalSpentByMoney + $sumAmountTotalSpentByCheque +
+                $sumAmountTotalSpentByTransfer + $sumAmountTotalSpentByCreditCard)
+        ];
+
         CSV::send('commandes.csv', $datas);
     }
 

domain/Document/Invoice/InvoiceSolver.php

     {
         return $this->getInvoiceAmountPaid($invoice) >= Price::numberTwoDecimals($this->getAmountWithTax($invoice, Order::INVOICE_AMOUNT_TOTAL));
     }
-
 }

domain/Order/Order/OrderSolver.php

         return '';
     }
 
-    public function getAmountTotalByMeanPayment(Order $order, string $meanPayment)
+    public function getAmountTotalSpentByMeanPayment(Order $order, string $meanPayment)
     {
         $amount = 0;
 
         foreach($order->payment as $payment) {
             if($this->paymentSolver->isMeanPayment($payment, $meanPayment)) {
-                $amount += $payment->getAmount();
+                if($this->paymentSolver->isTypeDebit($payment)) {
+                    $amount += $payment->getAmount();
+                }
+                else {
+                    $amount -= $payment->getAmount();
+                }
             }
         }
 

domain/Payment/PaymentSolver.php

 
     public function isMeanPayment(Payment $payment, string $meanPayment): bool
     {
-        return $payment->mean_payment == $payment;
+        return $payment->mean_payment == $meanPayment;
     }
 
     public function getStrMeanPayment(Payment $payment): string