Yvon Kerdoncuff · @Yvon · Damien Moulard · Damien Moulard · Damien Moulard · Damien Moulard
--- a/src/Command/SendCcasTransactionsExportToPrestatairesCommand.php 0 → 100644
+++ b/src/Command/SendCcasTransactionsExportToPrestatairesCommand.php 0 → 100644
+            if ($data) {
+                list($path, $prestaTotal) = $this->createExportFile($year, $month, $p, $dir, $data, $nf);
+            }
+            //Send mail as soon as there are data or prestataire is CCAS OK
+            //If there is no data, just inform there is nothing to do
+            if ($data || $p->getCcasOk()) {
+                $mail = $this->prepareMail($p, $month, $year, $prestaTotal);
+                if ($path) {
+                    $mail->attach(\Swift_Attachment::fromPath($path));
+                    //see below why not used $filesToDelete[] = $path;
+                }
+                $this->mailer->send($mail);
+            }
+        }
+
+        //TODO : if we really want to delete files, we need to find another way
--- a/src/Repository/FluxRepository.php
+++ b/src/Repository/FluxRepository.php
+        $to->setDate($Y,$m+1,0)->setTime(23,59,59);
+        $statement->bindValue(':to', $to->format("Y-m-d H:i:s"));
+
+        $statement->bindValue(":is_ccas", true);
+        $statement->bindValue(":type", Transaction::TYPE_TRANSACTION_ADHERENT_PRESTATAIRE);
+
+        $statement->execute();
+        return $statement->fetchAll();
+    }
+
+    /**
+     * @param Prestataire $presta     [description]
+     * @param integer $m From 1 to 12
+     * @param integer $Y Format YYYY
+     */
+    public function getSumOfValidCcasTransactionsByPrestaAndMonth(Prestataire $presta, $m, $Y)
--- a/src/Utils/OperationUtils.php
+++ b/src/Utils/OperationUtils.php
                    );
                    // $account->addOperation($operation);
                    $account->addAmount($operation->getMontant());
-                    if(
-                        $flux instanceof Transaction //only process $flux with getIsCcas method
-                        && $flux->getIsCcas() //check if this flux should increment ccas balance
-                        && $account instanceof AccountPrestataire //only process the prestataire side of the flux
-                    ) {
+                    $updateBalanceCcas =
+                        //only process isCcas or reconversionCcas $flux
+                        ( $flux instanceof Transaction && $flux->getIsCcas() || $flux instanceof Reconversion && $flux->getReconversionCcas() )
+                        //only process the prestataire side of the flux
+                        && $account instanceof AccountPrestataire;
+                    if ($updateBalanceCcas) {
                        $account->addAmountCcas($operation->getMontant());
--- a/src/Command/SendCcasTransactionsExportToPrestatairesCommand.php 0 → 100644
+++ b/src/Command/SendCcasTransactionsExportToPrestatairesCommand.php 0 → 100644
+use NumberFormatter;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Error\RuntimeError;
+use Twig\Error\SyntaxError;
+
+/**
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ */
+class SendCcasTransactionsExportToPrestatairesCommand extends Command
--- a/.gitignore
+++ b/.gitignore
 #INTELLIJ
 .idea/

-#dir containg exported reconversions xml
+#dir containing exported reconversions xml
 reconversions/*
 !reconversions/.versionme
+
+#dir containing ccas transactions csv
+ccastransactions/*
+!ccastransactions/.versionme