fix Stripe transfer sumary

benjaminpochat · Nov 15, 2024 · caf38f1 · caf38f1
1 parent d4d8d08
commit caf38f1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 **/target/**
 backend/gen/.openapi-generator/**
 backend/gen/src/**
+backend/app/src/main/resources/application-sandbox.properties
 
 frontend/gen/*
 frontend/app/build

diff --git a/backend/app/src/main/java/eu/viandeendirect/domains/payment/StripeBalanceManager.java b/backend/app/src/main/java/eu/viandeendirect/domains/payment/StripeBalanceManager.java
@@ -47,7 +47,7 @@ private PaymentsSummary initPaymentsSummary() {
     }
 
     private void updatePaymentSummary(PaymentsSummary paymentsSummary, BalanceTransaction balanceTransaction, Instant oneDayAgo, Instant oneWeekAgo, Instant oneMonthAgo, Instant oneYearAgo) {
-        if (balanceTransaction.getType().equals("charge") && balanceTransaction.getStatus().equals("available")) {
+        if (balanceTransaction.getType().equals("charge")) {
             if (balanceTransaction.getCreated() > oneDayAgo.getEpochSecond()) {
                 paymentsSummary.setDaylyTotal(paymentsSummary.getDaylyTotal() + balanceTransaction.getAmount() / 100);
             }

diff --git a/backend/app/src/test/java/eu/viandeendirect/domains/payment/TestStripeBalanceManager.java b/backend/app/src/test/java/eu/viandeendirect/domains/payment/TestStripeBalanceManager.java
@@ -26,8 +26,8 @@ void should_return_the_expected_result() throws StripeException {
         // then
         Assertions.assertThat(paymentsSummary.getDaylyTotal()).isEqualTo(1000f);
         Assertions.assertThat(paymentsSummary.getWeeklyTotal()).isEqualTo(1500f);
-        Assertions.assertThat(paymentsSummary.getMonthlyTotal()).isEqualTo(1700f);
-        Assertions.assertThat(paymentsSummary.getYearlyTotal()).isEqualTo(2400f);
+        Assertions.assertThat(paymentsSummary.getMonthlyTotal()).isEqualTo(2450f);
+        Assertions.assertThat(paymentsSummary.getYearlyTotal()).isEqualTo(3150f);
     }
 
     private Iterable<BalanceTransaction> getBalanceTransations() {

diff --git a/frontend/app/src/layouts/producer/AnonymousLayout.tsx b/frontend/app/src/layouts/producer/AnonymousLayout.tsx
@@ -85,7 +85,7 @@ export default function AnonymousLayout() {
                     </Box>
 
                     <Box sx={functionDescriptionStyle}>
-                        <Typography variant='h5'>Gestion du stock simplifié</Typography>
+                        <Typography variant='h5'>Gestion du stock simplifiée</Typography>
                         <i style={{width:'3rem', height:'3rem'}} className="icon stock-availability-icon"></i>
                     </Box>