From 673d6746cded6b40d22cbf5bb2a1e3b84ccaecdc Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 6 Jun 2023 19:24:59 +0200 Subject: [PATCH] 06/06/23 - 19h --- src/components/Abonnement.js | 25 +++++++++- src/components/CheckOut.js | 92 +++++++++++++++++++++--------------- src/components/Partner.js | 2 +- 3 files changed, 79 insertions(+), 40 deletions(-) diff --git a/src/components/Abonnement.js b/src/components/Abonnement.js index 5aead91..c1f768c 100644 --- a/src/components/Abonnement.js +++ b/src/components/Abonnement.js @@ -1147,7 +1147,7 @@ function Abonnement(props) {
- Code remise : + Code Remise : @@ -1175,9 +1175,30 @@ function Abonnement(props) {
+ {code_promo_text_to_display && String(code_promo_text_to_display) != "" && +
+
+ Montant Remise : +
+ + + {String(handleOnblur_Code_Promo_api) === "true" && +
+ {String(code_promo_type) === "fix" && } + + {String(code_promo_type) === "percent" && } +
} + +
+ } +
- TVA : + TVA (20%):
{String(handleOnblur_Code_Promo_api) !== "true" &&
diff --git a/src/components/CheckOut.js b/src/components/CheckOut.js index 482613f..bc5c9c1 100644 --- a/src/components/CheckOut.js +++ b/src/components/CheckOut.js @@ -511,7 +511,7 @@ function CheckOut(props) { form1.append("discount_code", code_promo_code); form1.append("discount_type", code_promo_type); form1.append("discount_valeur", code_promo_valeur); - + fetch(myurl, { method: 'POST', @@ -1298,13 +1298,41 @@ function CheckOut(props) {
+
+
+ Total HT : +
+ {String(handleOnblur_Code_Promo_api) !== "true" && +
+ {(packprice * nb_formations).toFixed(2)} € +
+ } + + {String(handleOnblur_Code_Promo_api) === "true" && +
+ + {String(code_promo_type) === "fix" && } + + {String(code_promo_type) === "percent" && } + +
+ } + + + +
+
- Code remise : + Code Remise : @@ -1328,60 +1356,50 @@ function CheckOut(props) {
-
-
- Total HT : -
- - {String(handleOnblur_Code_Promo_api) !== "true" && -
- {(packprice * nb_formations).toFixed(2) } € + {code_promo_text_to_display && String(code_promo_text_to_display) != "" && +
+
+ Montant Remise :
- } - - {String(handleOnblur_Code_Promo_api) === "true" && -
- - {String(code_promo_type) === "fix" && } - - {String(code_promo_type) === "percent" && } - -
- } -
  + {String(handleOnblur_Code_Promo_api) === "true" && +
+ {String(code_promo_type) === "fix" && } + + {String(code_promo_type) === "percent" && } +
} +
-
- + }
- TVA : + TVA (20%):
{String(handleOnblur_Code_Promo_api) !== "true" && -
- {(packprice * nb_formations * 0.2).toFixed(2)} € -
} +
+ {(packprice * nb_formations * 0.2).toFixed(2)} € +
} {String(handleOnblur_Code_Promo_api) === "true" && -
- {String(code_promo_type) === "fix" &&
}
- +
Total TTC : diff --git a/src/components/Partner.js b/src/components/Partner.js index b8acd0a..d01af95 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -564,7 +564,7 @@ const Partner = (props) => { my_lms_url = (JSON.parse(res.data.message).lms_virtualhost_url) + "user_portal.php?recid=" + encodeURIComponent(JSON.parse(res.data.message).lms_part_recid) + "&mysytoken=" + encodeURIComponent(JSON.parse(res.data.message).lms_pwd_mask); - //console.log(" ### LMS url = ", my_lms_url); + console.log(" ### LMS url = ", my_lms_url); setpartner_lms_url(my_lms_url); }