From 9fe88862b8abb1f87bd10def41b58f8c8688afb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20Hersan?= Date: Tue, 7 Nov 2023 21:09:05 +0100 Subject: [PATCH] better code when we quit the app MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathéo Hersan --- app | Bin 57536 -> 57536 bytes donnee/client.txt | 4 ++-- src/app/core_logic/client.c | 4 ++-- src/app/interface/interface_client.c | 12 +++++++++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app b/app index d77277aff8f113e51f3c53caa9bab8044022249b..4f20911023c6d09ce57196c15770ddf5dd7a56c7 100755 GIT binary patch delta 7161 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 delta 7016 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 diff --git a/donnee/client.txt b/donnee/client.txt index f5d99d0..3e1fab1 100644 --- a/donnee/client.txt +++ b/donnee/client.txt @@ -1,4 +1,4 @@ -32 36.40 1 -660 5419.20 0 +32 69.00 1 +660 5319.40 0 5079 75.50 0 53 0.00 0 diff --git a/src/app/core_logic/client.c b/src/app/core_logic/client.c index aa64174..40cb08e 100644 --- a/src/app/core_logic/client.c +++ b/src/app/core_logic/client.c @@ -92,8 +92,8 @@ void verifInt(int *var) { void verifFloat(float *var) { - while (scanf("%f", var) != 1 || *var < -0) { - while (getchar() != '\n'); + while (scanf("%f", var) != 1 || *var < 0) { fprintf(stderr, "\x1B[31mERREUR : Veuillez entrer une valeur valide (valeur positive) :\x1B[0m "); + while (getchar() != '\n'); } } diff --git a/src/app/interface/interface_client.c b/src/app/interface/interface_client.c index d300659..1504952 100644 --- a/src/app/interface/interface_client.c +++ b/src/app/interface/interface_client.c @@ -318,6 +318,13 @@ void quitter_application(int tPanier[], int tLogPanier, int tRef[], float tPoid[ if(tSus[clientIndex] == 1 && budget > 0 && montantTotal < budget) { printf("Vous ne pourrez pas utiliser votre cagnotte car votre carte est suspendu.\n"); + printf("Payement effectué.\n"); + return; + } + + if(tSus[clientIndex] == 1) { + printf("Vous ne pourrez pas utiliser votre cagnotte car votre carte est suspendu.\n"); + printf("Payement effectué.\n"); return; } @@ -350,6 +357,7 @@ void quitter_application(int tPanier[], int tLogPanier, int tRef[], float tPoid[ verifFloat(&montantDeduction); } deduire_cagnotte(numClient, montantDeduction, tNumClient, tCagnotte, tLogClient); + printf("Payement effectué.\n"); return; } else { printf("Payement non effectué.\n"); @@ -367,7 +375,9 @@ void quitter_application(int tPanier[], int tLogPanier, int tRef[], float tPoid[ printf("Entrez le montant à déduire de votre cagnotte : "); verifFloat(&montantDeduction); deduire_cagnotte(numClient, montantDeduction, tNumClient, tCagnotte, tLogClient); - } + printf("Payement effectué.\n"); + } else { + printf("Payement effectué.\n"); } void menu_client(int *choix) {