From 66ca3bdf3166ee139b85f8827c026888a87eab0b Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Wed, 26 Feb 2025 18:53:23 +0100
Subject: [PATCH] display recent sellings of current festival

---
 assets/js/parts/main.js                       | 27 +++++++++++++------
 templates/festival/index.html.twig            | 20 +++++++++++---
 .../logged/angular/loaded-caisse.html.twig    |  5 ----
 templates/logged/angular/recent.html.twig     |  9 +++++--
 templates/product/_delete_form.html.twig      |  5 +++-
 5 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/assets/js/parts/main.js b/assets/js/parts/main.js
index cc8a9a8c..b7548bd4 100755
--- a/assets/js/parts/main.js
+++ b/assets/js/parts/main.js
@@ -56,7 +56,7 @@ angular
          */
         $scope.setRightAmountPaid = function () {
             // debugger;
-            $scope.paidAmount += $scope.sumOfList($scope.activeSelling);
+            $scope.paidAmount = $scope.sumOfList($scope.activeSelling);
         }
         /**
          * deduplicate the active selling items in the view,
@@ -290,11 +290,15 @@ angular
                 $scope.countProductsSoldForActiveFestival = rep.data.activeFestival.sold;
                 $scope.showTemporaryMessage();
                 $scope.clearCurrentSelling();
-                console.log(rep);
+                $scope.sellingComment = '';
+                // Focus sur le champ de commentaire pour la prochaine vente
+                document.querySelector('#sellingComment').focus();
+
+
                 if (!rep.success) {
-                    // if not successful, bind errors to error variables
                     $scope.errors = rep.errors;
                 }
+
             }, function (rep) {
                 console.log('nope! ', rep.data);
                 $scope.showTemporaryErrorMessage();
@@ -304,12 +308,16 @@ angular
 
         $scope.sellingOk = false;
         $scope.sellingError = false;
-        $scope.tempMessage = {};
+        $scope.tempMessage;
         $scope.showTemporaryMessage = function () {
 
             $scope.sellingOk = true;
-            $timeout.cancel($scope.tempMessage);
-            $scope.tempMessage = $timeout(function () {
+
+            if ($scope.tempMessage) {
+                $timeout.cancel($scope.tempMessage);
+            }
+            // $scope.tempMessage = 
+            $timeout(function () {
                 console.log('hide message');
                 $scope.sellingOk = false;
             }, 2000)
@@ -326,8 +334,11 @@ angular
                 return;
             }
             $scope.sellingError = true;
-            $timeout.cancel($scope.tempMessage);
-            $scope.tempMessage = $timeout(function () {
+            if ($scope.tempMessage) {
+                $timeout.cancel($scope.tempMessage);
+            }
+            // $scope.tempMessage = 
+            $timeout(function () {
                 console.log('hide message');
                 $scope.sellingError = false;
             }, 2000)
diff --git a/templates/festival/index.html.twig b/templates/festival/index.html.twig
index f46055a6..3fff983b 100644
--- a/templates/festival/index.html.twig
+++ b/templates/festival/index.html.twig
@@ -12,6 +12,8 @@
                 <th>Name</th>
                 <th>Date_start</th>
                 <th>Date_end</th>
+                <th>Bénéfice</th>
+                <th>ChiffreAffaire</th>
                 <th>FraisInscription</th>
                 <th>FondDeCaisseAvant</th>
                 <th>FondDeCaisseApres</th>
@@ -33,9 +35,17 @@
                 </td>
                 <td>{{ festival.dateStart ? festival.dateStart|date('Y-m-d') : '' }}</td>
                 <td>{{ festival.dateEnd ? festival.dateEnd|date('Y-m-d') : '' }}</td>
-                <td>{{ festival.fraisInscription }}</td>
-                <td>{{ festival.fondDeCaisseAvant }}</td>
-                <td>{{ festival.fondDeCaisseApres }}</td>
+                <td class="text-right">
+                {% if festival.fraisInscription is null %}
+                    {{ festival.chiffreAffaire }} €
+                {% else %}
+                    {{ festival.chiffreAffaire - festival.fraisInscription }} €
+                {% endif %}
+                </td>
+                <td class="text-right">{{ festival.chiffreAffaire }} €</td> 
+                
+                <td class="text-right">{{ festival.fondDeCaisseAvant | default('?') }} €</td>
+                <td class="text-right">{{ festival.fondDeCaisseApres | default('?') }} €</td>
                 <td>{{ festival.dateCreation ? festival.dateCreation|date('Y-m-d') : '' }}</td>
                 <td>
                     <a href="{{ path('app_festival_show', {'id': festival.id}) }}">voir</a>
@@ -45,7 +55,9 @@
                 <td>{{ festival.sellings|length }}</td>
                 
                 <td>
-                    <a href="{{ path('app_set_active_festival', {'id': festival.id}) }}">activer</a> 
+                    <a href="{{ path('app_set_active_festival', {'id': festival.id}) }}">
+                    <i class="fa fa-check"></i>
+                    activer</a> 
                 </td>
             </tr>
         {% else %}
diff --git a/templates/logged/angular/loaded-caisse.html.twig b/templates/logged/angular/loaded-caisse.html.twig
index e7c810d5..015afc04 100755
--- a/templates/logged/angular/loaded-caisse.html.twig
+++ b/templates/logged/angular/loaded-caisse.html.twig
@@ -5,18 +5,14 @@
         <div id="listing-products" class="listing-products">
             {% include 'logged/angular/messages.html.twig' %}
             {% include 'logged/angular/listing-products.html.twig' %}
-
         </div>
         <div id="sellings" class="sellings">
-
             <div class="list-sell" ng-class="{'bg-success text-success': sellingOk }">
-
                 <button class="button btn btn-default">valider</button>
                 {% include 'logged/angular/validate-button.html.twig' %}
                 {% if app.user.products |length %}
                     {% include 'logged/angular/current.html.twig' %}
                 {% endif %}
-
                 {% include 'logged/angular/paused.html.twig' %}
             </div>
         </div>
@@ -30,7 +26,6 @@
         </div>
         <div class="col-xs-12 col-md-6">
             <div id="other_time">
-                ventes récentes
                 {% include 'logged/angular/recent.html.twig' %}
             </div>            
         </div>
diff --git a/templates/logged/angular/recent.html.twig b/templates/logged/angular/recent.html.twig
index 077adc1c..969d0e77 100755
--- a/templates/logged/angular/recent.html.twig
+++ b/templates/logged/angular/recent.html.twig
@@ -1,8 +1,13 @@
 <div class="selling-history">
     {% verbatim %}
-<div ng-repeat="s in recentSelling track by $index">
+    <h2>
+        {{recentSellings.length}} Ventes récentes
+    </h2>
+
+<div ng-repeat="s in recentSellings track by $index">
 {{s.id}} )
-{{s.amount}} €
+{{s.sum}} €
+{{s.note}} 
 </div>
     {% endverbatim %}
 </div>
diff --git a/templates/product/_delete_form.html.twig b/templates/product/_delete_form.html.twig
index 00b9a7ef..43827bc3 100644
--- a/templates/product/_delete_form.html.twig
+++ b/templates/product/_delete_form.html.twig
@@ -1,4 +1,7 @@
 <form method="post" action="{{ path('app_product_delete', {'id': product.id}) }}" onsubmit="return confirm('Are you sure you want to delete this item?');">
     <input type="hidden" name="_token" value="{{ csrf_token('delete' ~ product.id) }}">
-    <button class="btn">Delete</button>
+    <button class="btn btn-danger delete-button">
+        <i class="fas fa-trash"></i>
+        Delete
+    </button>
 </form>