richie-education 3.2.2-dev52 → 3.2.2-dev58

package/i18n/locales/ar-SA.json

@@ -187,6 +187,10 @@
     "description": "Label for the field asking how the user heard about or was recommended the course",
     "message": "This course was recommended to me by"
   },
+  "batchOrder.reference": {
+    "description": "Reference label displayed with the batch order ID",
+    "message": "Ref. {id}"
+  },
   "batchOrder.role": {
     "description": "Label for the field asking the role/position of the contact person",
     "message": "Role"
@@ -263,6 +267,14 @@
     "description": "Label for the field asking the company VAT number",
     "message": "VAT number"
   },
+  "batchOrder.viewAll": {
+    "description": "Button label to navigate to the list of all batch orders",
+    "message": "View all batch orders"
+  },
+  "batchOrder.viewOne": {
+    "description": "Button label to navigate to a single batch order details",
+    "message": "View details"
+  },
   "batchOrder.withoutOrderForm": {
     "description": "Option label for selecting payment without order form",
     "message": "Without order form"
@@ -1783,6 +1795,14 @@
     "description": "Checkbox label to indicate using alternative billing information",
     "message": "Use different billing information"
   },
+  "components.SaleTunnel.BatchOrderForm.nextButton": {
+    "description": "Label for the button to proceed to the next step in the batch order form",
+    "message": "Next"
+  },
+  "components.SaleTunnel.BatchOrderForm.previousButton": {
+    "description": "Label for the button to go back to the previous step in the batch order form",
+    "message": "Previous"
+  },
   "components.SaleTunnel.BatchOrderForm.stepAdmin": {
     "description": "Step label for administrative follow-up in the batch order form",
     "message": "Follow-up"

package/i18n/locales/es-ES.json

@@ -187,6 +187,10 @@
     "description": "Label for the field asking how the user heard about or was recommended the course",
     "message": "This course was recommended to me by"
   },
+  "batchOrder.reference": {
+    "description": "Reference label displayed with the batch order ID",
+    "message": "Ref. {id}"
+  },
   "batchOrder.role": {
     "description": "Label for the field asking the role/position of the contact person",
     "message": "Role"
@@ -263,6 +267,14 @@
     "description": "Label for the field asking the company VAT number",
     "message": "VAT number"
   },
+  "batchOrder.viewAll": {
+    "description": "Button label to navigate to the list of all batch orders",
+    "message": "View all batch orders"
+  },
+  "batchOrder.viewOne": {
+    "description": "Button label to navigate to a single batch order details",
+    "message": "View details"
+  },
   "batchOrder.withoutOrderForm": {
     "description": "Option label for selecting payment without order form",
     "message": "Without order form"
@@ -1783,6 +1795,14 @@
     "description": "Checkbox label to indicate using alternative billing information",
     "message": "Use different billing information"
   },
+  "components.SaleTunnel.BatchOrderForm.nextButton": {
+    "description": "Label for the button to proceed to the next step in the batch order form",
+    "message": "Next"
+  },
+  "components.SaleTunnel.BatchOrderForm.previousButton": {
+    "description": "Label for the button to go back to the previous step in the batch order form",
+    "message": "Previous"
+  },
   "components.SaleTunnel.BatchOrderForm.stepAdmin": {
     "description": "Step label for administrative follow-up in the batch order form",
     "message": "Follow-up"

package/i18n/locales/fa-IR.json

@@ -187,6 +187,10 @@
     "description": "Label for the field asking how the user heard about or was recommended the course",
     "message": "This course was recommended to me by"
   },
+  "batchOrder.reference": {
+    "description": "Reference label displayed with the batch order ID",
+    "message": "Ref. {id}"
+  },
   "batchOrder.role": {
     "description": "Label for the field asking the role/position of the contact person",
     "message": "Role"
@@ -263,6 +267,14 @@
     "description": "Label for the field asking the company VAT number",
     "message": "VAT number"
   },
+  "batchOrder.viewAll": {
+    "description": "Button label to navigate to the list of all batch orders",
+    "message": "View all batch orders"
+  },
+  "batchOrder.viewOne": {
+    "description": "Button label to navigate to a single batch order details",
+    "message": "View details"
+  },
   "batchOrder.withoutOrderForm": {
     "description": "Option label for selecting payment without order form",
     "message": "Without order form"
@@ -1783,6 +1795,14 @@
     "description": "Checkbox label to indicate using alternative billing information",
     "message": "Use different billing information"
   },
+  "components.SaleTunnel.BatchOrderForm.nextButton": {
+    "description": "Label for the button to proceed to the next step in the batch order form",
+    "message": "Next"
+  },
+  "components.SaleTunnel.BatchOrderForm.previousButton": {
+    "description": "Label for the button to go back to the previous step in the batch order form",
+    "message": "Previous"
+  },
   "components.SaleTunnel.BatchOrderForm.stepAdmin": {
     "description": "Step label for administrative follow-up in the batch order form",
     "message": "Follow-up"

package/i18n/locales/fr-CA.json

@@ -187,6 +187,10 @@
     "description": "Label for the field asking how the user heard about or was recommended the course",
     "message": "This course was recommended to me by"
   },
+  "batchOrder.reference": {
+    "description": "Reference label displayed with the batch order ID",
+    "message": "Ref. {id}"
+  },
   "batchOrder.role": {
     "description": "Label for the field asking the role/position of the contact person",
     "message": "Role"
@@ -263,6 +267,14 @@
     "description": "Label for the field asking the company VAT number",
     "message": "VAT number"
   },
+  "batchOrder.viewAll": {
+    "description": "Button label to navigate to the list of all batch orders",
+    "message": "View all batch orders"
+  },
+  "batchOrder.viewOne": {
+    "description": "Button label to navigate to a single batch order details",
+    "message": "View details"
+  },
   "batchOrder.withoutOrderForm": {
     "description": "Option label for selecting payment without order form",
     "message": "Without order form"
@@ -1783,6 +1795,14 @@
     "description": "Checkbox label to indicate using alternative billing information",
     "message": "Use different billing information"
   },
+  "components.SaleTunnel.BatchOrderForm.nextButton": {
+    "description": "Label for the button to proceed to the next step in the batch order form",
+    "message": "Next"
+  },
+  "components.SaleTunnel.BatchOrderForm.previousButton": {
+    "description": "Label for the button to go back to the previous step in the batch order form",
+    "message": "Previous"
+  },
   "components.SaleTunnel.BatchOrderForm.stepAdmin": {
     "description": "Step label for administrative follow-up in the batch order form",
     "message": "Follow-up"

package/i18n/locales/fr-FR.json

@@ -29,7 +29,7 @@
   },
   "batchOrder.bankTransfer": {
     "description": "Option label for selecting bank transfer payment",
-    "message": "Virement bancaire"
+    "message": "Virement bancaire direct"
   },
   "batchOrder.cardPayment": {
     "description": "Option label for selecting credit card payment",
@@ -157,7 +157,7 @@
   },
   "batchOrder.payment.bank": {
     "description": "Label for bank transfer payment method",
-    "message": "Virement bancaire"
+    "message": "Virement bancaire direct"
   },
   "batchOrder.payment.card": {
     "description": "Label for card payment method",
@@ -187,6 +187,10 @@
     "description": "Label for the field asking how the user heard about or was recommended the course",
     "message": "Cette formation m’a été recommandée par"
   },
+  "batchOrder.reference": {
+    "description": "Reference label displayed with the batch order ID",
+    "message": "Réf. {id}"
+  },
   "batchOrder.role": {
     "description": "Label for the field asking the role/position of the contact person",
     "message": "Fonction"
@@ -263,6 +267,14 @@
     "description": "Label for the field asking the company VAT number",
     "message": "Numéro de TVA"
   },
+  "batchOrder.viewAll": {
+    "description": "Button label to navigate to the list of all batch orders",
+    "message": "Mes commandes groupées"
+  },
+  "batchOrder.viewOne": {
+    "description": "Button label to navigate to a single batch order details",
+    "message": "Voir le détail"
+  },
   "batchOrder.withoutOrderForm": {
     "description": "Option label for selecting payment without order form",
     "message": "Sans formulaire de commande"
@@ -1561,7 +1573,7 @@
   },
   "components.OrganizationQuotesTable.payment.bankTransfer": {
     "description": "Payment method: bank transfer",
-    "message": "Virement bancaire"
+    "message": "Virement bancaire direct"
   },
   "components.OrganizationQuotesTable.payment.card": {
     "description": "Payment method: card payment",
@@ -1573,7 +1585,7 @@
   },
   "components.OrganizationQuotesTable.paymentBankTransfer": {
     "description": "Payment method: bank transfer",
-    "message": "Virement bancaire"
+    "message": "Virement bancaire direct"
   },
   "components.OrganizationQuotesTable.paymentCard": {
     "description": "Payment method: credit card",
@@ -1783,6 +1795,14 @@
     "description": "Checkbox label to indicate using alternative billing information",
     "message": "Utiliser des informations de facturation différentes"
   },
+  "components.SaleTunnel.BatchOrderForm.nextButton": {
+    "description": "Label for the button to proceed to the next step in the batch order form",
+    "message": "Suivant"
+  },
+  "components.SaleTunnel.BatchOrderForm.previousButton": {
+    "description": "Label for the button to go back to the previous step in the batch order form",
+    "message": "Précédent"
+  },
   "components.SaleTunnel.BatchOrderForm.stepAdmin": {
     "description": "Step label for administrative follow-up in the batch order form",
     "message": "Suivi"
@@ -1809,7 +1829,7 @@
   },
   "components.SaleTunnel.BatchOrderForm.stepFinancingTitle": {
     "description": "Title of the section to select the payment plan of the course",
-    "message": "Mode de commande"
+    "message": "Mode de paiement"
   },
   "components.SaleTunnel.BatchOrderForm.stepParticipants": {
     "description": "Step label for participants information in the batch order form",

package/i18n/locales/ko-KR.json

@@ -187,6 +187,10 @@
     "description": "Label for the field asking how the user heard about or was recommended the course",
     "message": "This course was recommended to me by"
   },
+  "batchOrder.reference": {
+    "description": "Reference label displayed with the batch order ID",
+    "message": "Ref. {id}"
+  },
   "batchOrder.role": {
     "description": "Label for the field asking the role/position of the contact person",
     "message": "Role"
@@ -263,6 +267,14 @@
     "description": "Label for the field asking the company VAT number",
     "message": "VAT number"
   },
+  "batchOrder.viewAll": {
+    "description": "Button label to navigate to the list of all batch orders",
+    "message": "View all batch orders"
+  },
+  "batchOrder.viewOne": {
+    "description": "Button label to navigate to a single batch order details",
+    "message": "View details"
+  },
   "batchOrder.withoutOrderForm": {
     "description": "Option label for selecting payment without order form",
     "message": "Without order form"
@@ -1783,6 +1795,14 @@
     "description": "Checkbox label to indicate using alternative billing information",
     "message": "Use different billing information"
   },
+  "components.SaleTunnel.BatchOrderForm.nextButton": {
+    "description": "Label for the button to proceed to the next step in the batch order form",
+    "message": "Next"
+  },
+  "components.SaleTunnel.BatchOrderForm.previousButton": {
+    "description": "Label for the button to go back to the previous step in the batch order form",
+    "message": "Previous"
+  },
   "components.SaleTunnel.BatchOrderForm.stepAdmin": {
     "description": "Step label for administrative follow-up in the batch order form",
     "message": "Follow-up"

package/i18n/locales/pt-PT.json

@@ -187,6 +187,10 @@
     "description": "Label for the field asking how the user heard about or was recommended the course",
     "message": "This course was recommended to me by"
   },
+  "batchOrder.reference": {
+    "description": "Reference label displayed with the batch order ID",
+    "message": "Ref. {id}"
+  },
   "batchOrder.role": {
     "description": "Label for the field asking the role/position of the contact person",
     "message": "Role"
@@ -263,6 +267,14 @@
     "description": "Label for the field asking the company VAT number",
     "message": "VAT number"
   },
+  "batchOrder.viewAll": {
+    "description": "Button label to navigate to the list of all batch orders",
+    "message": "View all batch orders"
+  },
+  "batchOrder.viewOne": {
+    "description": "Button label to navigate to a single batch order details",
+    "message": "View details"
+  },
   "batchOrder.withoutOrderForm": {
     "description": "Option label for selecting payment without order form",
     "message": "Without order form"
@@ -1783,6 +1795,14 @@
     "description": "Checkbox label to indicate using alternative billing information",
     "message": "Use different billing information"
   },
+  "components.SaleTunnel.BatchOrderForm.nextButton": {
+    "description": "Label for the button to proceed to the next step in the batch order form",
+    "message": "Next"
+  },
+  "components.SaleTunnel.BatchOrderForm.previousButton": {
+    "description": "Label for the button to go back to the previous step in the batch order form",
+    "message": "Previous"
+  },
   "components.SaleTunnel.BatchOrderForm.stepAdmin": {
     "description": "Step label for administrative follow-up in the batch order form",
     "message": "Follow-up"

package/i18n/locales/ru-RU.json

@@ -187,6 +187,10 @@
     "description": "Label for the field asking how the user heard about or was recommended the course",
     "message": "This course was recommended to me by"
   },
+  "batchOrder.reference": {
+    "description": "Reference label displayed with the batch order ID",
+    "message": "Ref. {id}"
+  },
   "batchOrder.role": {
     "description": "Label for the field asking the role/position of the contact person",
     "message": "Role"
@@ -263,6 +267,14 @@
     "description": "Label for the field asking the company VAT number",
     "message": "VAT number"
   },
+  "batchOrder.viewAll": {
+    "description": "Button label to navigate to the list of all batch orders",
+    "message": "View all batch orders"
+  },
+  "batchOrder.viewOne": {
+    "description": "Button label to navigate to a single batch order details",
+    "message": "View details"
+  },
   "batchOrder.withoutOrderForm": {
     "description": "Option label for selecting payment without order form",
     "message": "Without order form"
@@ -1783,6 +1795,14 @@
     "description": "Checkbox label to indicate using alternative billing information",
     "message": "Use different billing information"
   },
+  "components.SaleTunnel.BatchOrderForm.nextButton": {
+    "description": "Label for the button to proceed to the next step in the batch order form",
+    "message": "Next"
+  },
+  "components.SaleTunnel.BatchOrderForm.previousButton": {
+    "description": "Label for the button to go back to the previous step in the batch order form",
+    "message": "Previous"
+  },
   "components.SaleTunnel.BatchOrderForm.stepAdmin": {
     "description": "Step label for administrative follow-up in the batch order form",
     "message": "Follow-up"

package/i18n/locales/vi-VN.json

@@ -187,6 +187,10 @@
     "description": "Label for the field asking how the user heard about or was recommended the course",
     "message": "This course was recommended to me by"
   },
+  "batchOrder.reference": {
+    "description": "Reference label displayed with the batch order ID",
+    "message": "Ref. {id}"
+  },
   "batchOrder.role": {
     "description": "Label for the field asking the role/position of the contact person",
     "message": "Role"
@@ -263,6 +267,14 @@
     "description": "Label for the field asking the company VAT number",
     "message": "VAT number"
   },
+  "batchOrder.viewAll": {
+    "description": "Button label to navigate to the list of all batch orders",
+    "message": "View all batch orders"
+  },
+  "batchOrder.viewOne": {
+    "description": "Button label to navigate to a single batch order details",
+    "message": "View details"
+  },
   "batchOrder.withoutOrderForm": {
     "description": "Option label for selecting payment without order form",
     "message": "Without order form"
@@ -1783,6 +1795,14 @@
     "description": "Checkbox label to indicate using alternative billing information",
     "message": "Use different billing information"
   },
+  "components.SaleTunnel.BatchOrderForm.nextButton": {
+    "description": "Label for the button to proceed to the next step in the batch order form",
+    "message": "Next"
+  },
+  "components.SaleTunnel.BatchOrderForm.previousButton": {
+    "description": "Label for the button to go back to the previous step in the batch order form",
+    "message": "Previous"
+  },
   "components.SaleTunnel.BatchOrderForm.stepAdmin": {
     "description": "Step label for administrative follow-up in the batch order form",
     "message": "Follow-up"

package/js/components/SaleTunnel/SaleTunnelInformation/SaleTunnelInformationGroup.tsx

@@ -132,7 +132,9 @@ export const validationSchema = Yup.object().shape({
   nb_seats: Yup.number().required().min(1),
   payment_method: Yup.mixed<PaymentMethod>().oneOf(Object.values(PaymentMethod)).required(),
   funding_entity: Yup.string().optional(),
-  funding_amount: Yup.number().optional(),
+  funding_amount: Yup.number()
+    .transform((value, originalValue) => (originalValue === '' ? undefined : value))
+    .optional(),
   organization_id: Yup.string().optional(),
 });
 
@@ -266,7 +268,7 @@ const BatchOrderForm = () => {
             }
           }}
           hidden={activeStep === 0}
-          color="secondary"
+          color="tertiary"
         >
           <FormattedMessage {...messages.previousButton} />
         </Button>

package/js/components/SaleTunnel/SaleTunnelInformation/StepContent.tsx

@@ -216,7 +216,9 @@ export const StepContent = ({
   return (
     <div className="step-content">
       <div className="step organization" hidden={activeStep !== 0}>
-        <FormattedMessage {...messages.stepCompanyTitle} />
+        <h4 className="title">
+          <FormattedMessage {...messages.stepCompanyTitle} />
+        </h4>
         <Input
           className="field"
           label={intl.formatMessage(messages.companyName)}
@@ -294,7 +296,9 @@ export const StepContent = ({
       </div>
       {otherBillingAddress && (
         <div className="step billing" hidden={activeStep !== 0}>
-          <FormattedMessage {...messages.stepBillingTitle} />
+          <h4 className="title">
+            <FormattedMessage {...messages.stepBillingTitle} />
+          </h4>
           <Input
             className="field"
             {...register('billing_address.contact_name')}
@@ -347,7 +351,9 @@ export const StepContent = ({
         </div>
       )}
       <div className="step admin" hidden={activeStep !== 1}>
-        <FormattedMessage {...messages.stepAdminTitle} />
+        <h4 className="title">
+          <FormattedMessage {...messages.stepAdminTitle} />
+        </h4>
         <Input
           className="field"
           {...register('administrative_lastname')}
@@ -411,7 +417,9 @@ export const StepContent = ({
         />
       </div>
       <div className="step signatory" hidden={activeStep !== 2}>
-        <FormattedMessage {...messages.stepSignatoryTitle} />
+        <h4 className="title">
+          <FormattedMessage {...messages.stepSignatoryTitle} />
+        </h4>
         <Input
           className="field"
           {...register('signatory_lastname')}
@@ -467,7 +475,9 @@ export const StepContent = ({
         />
       </div>
       <div className="step seats" hidden={activeStep !== 3}>
-        <FormattedMessage {...messages.stepParticipantsTitle} />
+        <h4 className="title">
+          <FormattedMessage {...messages.stepParticipantsTitle} />
+        </h4>
         <Input
           className="field"
           type="number"
@@ -479,7 +489,9 @@ export const StepContent = ({
         />
       </div>
       <div className="step financing" hidden={activeStep !== 4}>
-        <FormattedMessage {...messages.stepFinancingTitle} />
+        <h4 className="title">
+          <FormattedMessage {...messages.stepFinancingTitle} />
+        </h4>
         <RadioGroup fullWidth={true} className="payment-block">
           <Radio
             {...register('payment_method')}
@@ -512,7 +524,10 @@ export const StepContent = ({
             }
           />
         </RadioGroup>
-        <FormattedMessage {...messages.fundingEntity} />
+
+        <h4 className="title">
+          <FormattedMessage {...messages.fundingEntity} />
+        </h4>
         <div className="organism-block">
           <Input
             {...register('funding_entity')}
@@ -524,7 +539,10 @@ export const StepContent = ({
             label={intl.formatMessage(messages.fundingEntityAmount)}
           />
         </div>
-        <FormattedMessage {...messages.recommandation} />
+
+        <h4 className="title">
+          <FormattedMessage {...messages.recommandation} />
+        </h4>
         <Select
           label={intl.formatMessage(messages.participatingOrganisations)}
           clearable

package/js/components/SaleTunnel/SaleTunnelInformation/index.tsx

@@ -4,6 +4,7 @@ import { Select } from '@openfun/cunningham-react';
 import { useSaleTunnelContext } from 'components/SaleTunnel/GenericSaleTunnel';
 import { SaleTunnelInformationSingular } from 'components/SaleTunnel/SaleTunnelInformation/SaleTunnelInformationSingular';
 import { SaleTunnelInformationGroup } from 'components/SaleTunnel/SaleTunnelInformation/SaleTunnelInformationGroup';
+import { ProductType } from 'types/Joanie';
 
 const messages = defineMessages({
   purchaseTypeTitle: {
@@ -35,7 +36,8 @@ export enum FormType {
 
 export const SaleTunnelInformation = () => {
   const intl = useIntl();
-  const { setBatchOrder, setSchedule } = useSaleTunnelContext();
+  const { setBatchOrder, setSchedule, product } = useSaleTunnelContext();
+  const productType = product.type;
   const options = [
     { label: intl.formatMessage(messages.purchaseTypeOptionSingle), value: FormType.SINGULAR },
     { label: intl.formatMessage(messages.purchaseTypeOptionGroup), value: FormType.GROUP },
@@ -44,25 +46,29 @@ export const SaleTunnelInformation = () => {
 
   return (
     <div className="sale-tunnel__main__column sale-tunnel__information">
-      <div>
-        <h3 className="block-title mb-t">
-          <FormattedMessage {...messages.purchaseTypeTitle} />
-        </h3>
-        <Select
-          label={intl.formatMessage(messages.purchaseTypeSelect)}
-          options={options}
-          fullWidth
-          value={purchaseType}
-          clearable={false}
-          onChange={(e) => {
-            setPurchaseType(e.target.value as FormType);
-            setBatchOrder(undefined);
-            setSchedule(undefined);
-          }}
-        />
-      </div>
-      {purchaseType === FormType.SINGULAR && <SaleTunnelInformationSingular />}
-      {purchaseType === FormType.GROUP && <SaleTunnelInformationGroup />}
+      {productType === ProductType.CERTIFICATE ? (
+        <SaleTunnelInformationSingular />
+      ) : (
+        <div>
+          <h3 className="block-title mb-t">
+            <FormattedMessage {...messages.purchaseTypeTitle} />
+          </h3>
+          <Select
+            label={intl.formatMessage(messages.purchaseTypeSelect)}
+            options={options}
+            fullWidth
+            value={purchaseType}
+            clearable={false}
+            onChange={(e) => {
+              setPurchaseType(e.target.value as FormType);
+              setBatchOrder(undefined);
+              setSchedule(undefined);
+            }}
+          />
+          {purchaseType === FormType.SINGULAR && <SaleTunnelInformationSingular />}
+          {purchaseType === FormType.GROUP && <SaleTunnelInformationGroup />}
+        </div>
+      )}
     </div>
   );
 };

package/js/components/SaleTunnel/_styles.scss

@@ -157,6 +157,13 @@
       align-items: center;
       margin: 1rem 0;
       gap: 0.5rem;
+
+      .title {
+        font-weight: var(--c--theme--font--weights--bold);
+        font-size: var(--c--theme--font--sizes--l);
+        margin: 0 0 0.5rem;
+      }
+
       .field {
         width: 90%;
       }
@@ -169,7 +176,7 @@
       }
       .payment-block {
         & > div {
-          margin: 1rem 0;
+          margin: 0 0 1rem;
           flex-direction: row;
         }
       }