diff --git a/ansible/playbook.yml b/ansible/playbook.yml index 69a052f..2426386 100644 --- a/ansible/playbook.yml +++ b/ansible/playbook.yml @@ -87,7 +87,7 @@ VAULT_TOKEN=hvs.QLpUdiptXtSPo5Qf7i2nn2Xz MAILER_DSN=ses+smtp://AKIAWTT2T22CWBRBBDYN:BBdgb6KxRQ8mNcpWFJsZCJxbSGNdgLhKFiITMErfBlQP@default?region=eu-west-3 PATH_URL=https://intranet.ludikevent.fr - STRIPE_BASEURL=https://payment.ludikevent.fr + STRIPE_BASEURL=https://reservation.ludikevent.fr SIGN_URL=https://reservation.ludikevent.fr CONTRAT_BASEURL=https://reservation.ludikevent.fr DEFAULT_URI=https://reservation.ludikevent.fr diff --git a/templates/reservation/contrat/view.twig b/templates/reservation/contrat/view.twig index b6dce71..8f37ecd 100644 --- a/templates/reservation/contrat/view.twig +++ b/templates/reservation/contrat/view.twig @@ -101,7 +101,7 @@ {% set fPrice = formule.price1j %} {% if days >= 2 and formule.price2j %}{% set fPrice = formule.price2j %}{% endif %} {% if days >= 5 and formule.price5j %}{% set fPrice = formule.price5j %}{% endif %} - + {% if tvaEnabled %} {% set fPriceDisplay = fPrice * 1.20 %} {% else %} @@ -213,7 +213,7 @@ {# --- COLONNE DROITE : FINANCES --- #}
- + {# CALCUL DES TOTAUX AVEC PROMO #} {% set promoPercentage = 0 %} {% if contrat.devis and contrat.devis.orderSession and contrat.devis.orderSession.promotion %} @@ -269,7 +269,7 @@ {% set totalPaid = 0 %} {% for p in paymentList %}{% set totalPaid = totalPaid + p.amount %}{% endfor %} {% for p in paymentCtaList %}{% set totalPaid = totalPaid + p.amount %}{% endfor %} - + {% if tvaEnabled %} {% set newSolde = totalTTC - totalPaid %} {% else %} @@ -341,9 +341,9 @@ {% if not (contrat.devis and 'Chorus' in contrat.devis.paymentMethod) %} {# 2. ACOMPTE #} {% if tvaEnabled %} - {% set arrhes_discounted = totalTTC_Discounted * 0.25 %} + {% set arrhes_discounted = totalHT * 0.25 %} {% else %} - {% set arrhes_discounted = totalHT_Discounted * 0.25 %} + {% set arrhes_discounted = totalHT * 0.25 %} {% endif %} {% if not contratPaymentPay(contrat, 'accompte') %}