richie 3.1.3.dev17__py2.py3-none-any.whl → 3.1.3.dev24__py2.py3-none-any.whl

frontend/.storybook/__mocks__/utils/context.ts

@@ -13,3 +13,7 @@ let context = {
 (window as any).__richie_frontend_context__ = {
   context: RichieContextFactory(context).one(),
 };
+
+(window as any).jest = {
+    fn: ((fnc: any) => fnc) as any,
+};

frontend/js/components/CourseGlimpse/index.spec.tsx

@@ -59,6 +59,8 @@ describe('widgets/Search/components/CourseGlimpse', () => {
     certificate_offer: CourseCertificateOffer.FREE,
     certificate_price: null,
     price_currency: 'EUR',
+    discounted_price: null,
+    discount: null,
   };
 
   const contextProps: CommonDataProps['context'] = RichieContextFactory().one();

frontend/js/components/CourseGlimpse/index.tsx

@@ -47,6 +47,8 @@ export interface CourseGlimpseCourse {
   certificate_price: Nullable<number>;
   price: Nullable<number>;
   price_currency: string;
+  discounted_price: Nullable<number>;
+  discount: Nullable<string>;
 }
 
 export interface CourseGlimpseProps {

frontend/js/components/CourseGlimpse/utils.ts

@@ -53,6 +53,8 @@ const getCourseGlimpsePropsFromOffering = (
       offering.product.type === ProductType.CERTIFICATE ? offering.product.price : null,
     price: offering.product.type === ProductType.CREDENTIAL ? offering.product.price : null,
     price_currency: offering.product.price_currency,
+    discounted_price: offering.product.discounted_price || null,
+    discount: offering.product.discount || null,
   };
 };
 
@@ -77,6 +79,8 @@ const getCourseGlimpsePropsFromRichieCourse = (course: RichieCourse): CourseGlim
   certificate_offer: course.certificate_offer,
   offer: course.offer,
   certificate_price: course.certificate_price,
+  discounted_price: course.discounted_price,
+  discount: course.discount,
 });
 
 const getCourseGlimpsePropsFromJoanieCourse = (
@@ -114,6 +118,8 @@ const getCourseGlimpsePropsFromJoanieCourse = (
     certificate_offer: null,
     offer: null,
     certificate_price: null,
+    discounted_price: null,
+    discount: null,
   };
 };
 

frontend/js/components/SaleTunnel/GenericSaleTunnel.tsx

@@ -10,7 +10,15 @@ import {
 } from 'react';
 import { SaleTunnelSponsors } from 'components/SaleTunnel/Sponsors/SaleTunnelSponsors';
 import { SaleTunnelProps } from 'components/SaleTunnel/index';
-import { Address, Offering, CreditCard, Order, OrderState, Product } from 'types/Joanie';
+import {
+  Address,
+  Enrollment,
+  Offering,
+  CreditCard,
+  Order,
+  OrderState,
+  Product,
+} from 'types/Joanie';
 import useProductOrder from 'hooks/useProductOrder';
 import { SaleTunnelSuccess } from 'components/SaleTunnel/SaleTunnelSuccess';
 import WebAnalyticsAPIHandler from 'api/web-analytics';
@@ -27,6 +35,7 @@ export interface SaleTunnelContextType {
   product: Product;
   webAnalyticsEventKey: string;
   offering?: Offering;
+  enrollment?: Enrollment;
 
   // internal
   step: SaleTunnelStep;
@@ -115,6 +124,7 @@ export const GenericSaleTunnel = (props: GenericSaleTunnelProps) => {
       order,
       product: props.product,
       offering: props.offering,
+      enrollment: props.enrollment,
       props,
       billingAddress,
       setBillingAddress,

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

@@ -101,7 +101,11 @@ const Email = () => {
 };
 
 const Total = () => {
-  const { product, offering } = useSaleTunnelContext();
+  const { product, offering, enrollment } = useSaleTunnelContext();
+  const totalPrice =
+    enrollment?.offerings?.[0]?.rules?.discounted_price ??
+    offering?.rules.discounted_price ??
+    product.price;
   return (
     <div className="sale-tunnel__total">
       <div className="sale-tunnel__total__amount mt-t" data-testid="sale-tunnel__total__amount">
@@ -109,11 +113,7 @@ const Total = () => {
           <FormattedMessage {...messages.totalLabel} />
         </div>
         <div className="block-title">
-          <FormattedNumber
-            value={offering?.rules.discounted_price || product.price}
-            style="currency"
-            currency={product.price_currency}
-          />
+          <FormattedNumber value={totalPrice} style="currency" currency={product.price_currency} />
         </div>
       </div>
     </div>

frontend/js/components/SaleTunnel/index.spec.tsx

@@ -8,6 +8,7 @@ import { useState } from 'react';
 import { OrderState, Product, ProductType, NOT_CANCELED_ORDER_STATES } from 'types/Joanie';
 import {
   RichieContextFactory as mockRichieContextFactory,
+  CourseStateFactory,
   UserFactory,
   PacedCourseFactory,
 } from 'utils/test/factories/richie';
@@ -16,12 +17,14 @@ import {
   CertificateOrderFactory,
   CertificateProductFactory,
   OfferingFactory,
+  CourseRunFactory,
   CredentialOrderFactory,
   CredentialProductFactory,
   CreditCardFactory,
   EnrollmentFactory,
   PaymentInstallmentFactory,
 } from 'utils/test/factories/joanie';
+import { Priority } from 'types';
 import { render } from 'utils/test/render';
 import { SaleTunnel, SaleTunnelProps } from 'components/SaleTunnel/index';
 import { setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
@@ -97,7 +100,7 @@ describe.each([
     return (
       <SaleTunnel
         {...props}
-        enrollment={enrollment}
+        enrollment={props.enrollment ?? enrollment}
         course={productType === ProductType.CREDENTIAL ? course : undefined}
         isOpen={open}
         onClose={() => setOpen(false)}
@@ -449,6 +452,57 @@ describe.each([
     );
   });
 
+  // Fixes the issue : https://github.com/openfun/richie/issues/2645
+  it('should show the certificate product total with discounted price', async () => {
+    const product = ProductFactory({
+      price: 600,
+      target_courses: [course],
+    }).one();
+    const enrollmentDiscounted = EnrollmentFactory({
+      course_run: CourseRunFactory({
+        state: CourseStateFactory({ priority: Priority.ONGOING_OPEN }).one(),
+        course,
+      }).one(),
+      offerings: [
+        OfferingFactory({
+          product,
+          rules: {
+            discounted_price: 540,
+            discount_rate: 0.1,
+          },
+        }).one(),
+      ],
+    }).one();
+
+    if (product.type === ProductType.CERTIFICATE) {
+      enrollmentDiscounted.offerings[0].product = product;
+
+      fetchMock.get(
+        `https://joanie.endpoint/api/v1.0/orders/?enrollment_id=${enrollmentDiscounted.id}&product_id=${product.id}&state=pending&state=pending_payment&state=no_payment&state=failed_payment&state=completed&state=draft&state=assigned&state=to_sign&state=signing&state=to_save_payment_method`,
+        {
+          results: [],
+          next: null,
+          previous: null,
+          count: 0,
+        },
+      );
+
+      render(
+        <Wrapper product={product} enrollment={enrollmentDiscounted} isWithdrawable={true} />,
+        { queryOptions: { client: createTestQueryClient({ user: richieUser }) } },
+      );
+
+      const $totalAmount = screen.getByTestId('sale-tunnel__total__amount');
+      expect($totalAmount).toHaveTextContent(
+        'Total' +
+          formatPrice(
+            enrollmentDiscounted.offerings[0].rules.discounted_price!,
+            product.price_currency,
+          ).replace(/(\u202F|\u00a0)/g, ' '),
+      );
+    }
+  });
+
   it('should show the product payment schedule with discounted price', async () => {
     const intl = createIntl({ locale: 'en' });
     const schedule = PaymentInstallmentFactory().many(2);

frontend/js/components/SaleTunnel/index.stories.tsx

@@ -1,6 +1,11 @@
 import { StoryObj, Meta } from '@storybook/react';
 import { BaseJoanieAppWrapper } from 'utils/test/wrappers/BaseJoanieAppWrapper';
-import { ProductFactory } from 'utils/test/factories/joanie';
+import {
+  CertificateProductFactory,
+  EnrollmentFactory,
+  OfferingFactory,
+  ProductFactory,
+} from 'utils/test/factories/joanie';
 import { PacedCourseFactory } from 'utils/test/factories/richie';
 import { SaleTunnel, SaleTunnelProps } from './index';
 
@@ -28,6 +33,16 @@ export default {
 
 type Story = StoryObj<typeof SaleTunnel>;
 
-export const Default: Story = {
+export const Credential: Story = {
   args: {},
 };
+
+export const CertificateDiscount: Story = {
+  args: {
+    product: CertificateProductFactory({ price: 100, price_currency: 'EUR' }).one(),
+    course: PacedCourseFactory().one(),
+    enrollment: EnrollmentFactory({
+      offerings: OfferingFactory({ rules: { discounted_price: 80 } }).many(1),
+    }).one(),
+  },
+};

frontend/js/types/Course.ts

@@ -47,6 +47,8 @@ export interface Course extends Resource {
   certificate_price: Nullable<number>;
   price: Nullable<number>;
   price_currency: string;
+  discounted_price: Nullable<number>;
+  discount: Nullable<string>;
 }
 
 export function isRichieCourse(course: Course | JoanieCourse): course is Course {

frontend/js/types/Joanie.ts

@@ -149,6 +149,8 @@ export interface Product {
   state: CourseState;
   instructions: Nullable<string>;
   contract_definition?: ContractDefinition;
+  discounted_price: Nullable<number>;
+  discount: Nullable<string>;
 }
 
 export interface CredentialProduct extends Product {

frontend/js/types/index.ts

@@ -35,11 +35,13 @@ export interface CourseRun {
   title?: string;
   snapshot?: string;
   display_mode: CourseRunDisplayMode;
-  price?: number;
+  price?: Nullable<number>;
   price_currency?: string;
   offer?: string;
-  certificate_price?: number;
+  certificate_price?: Nullable<number>;
   certificate_offer?: string;
+  discounted_price: Nullable<number>;
+  discount: Nullable<string>;
 }
 
 export enum Priority {

frontend/js/utils/test/factories/joanie.ts

@@ -205,6 +205,8 @@ export const CredentialProductFactory = factory((): CredentialProduct => {
     remaining_order_count: faker.number.int({ min: 1, max: 100 }),
     state: CourseStateFactory().one(),
     instructions: null,
+    discounted_price: null,
+    discount: null,
   };
 });
 

frontend/js/utils/test/factories/richie.ts

@@ -60,11 +60,11 @@ export const CourseRunFactory = factory<CourseRun>(() => {
     certificateOfferValues[Math.floor(Math.random() * certificateOfferValues.length)];
   const currency = faker.finance.currency().code;
   const price = [OfferType.FREE, OfferType.PARTIALLY_FREE].includes(offer)
-    ? 0
+    ? null
     : parseFloat(faker.finance.amount({ min: 1, max: 100, symbol: currency, autoFormat: true }));
   const certificatePrice =
     certificateOffer === OfferType.FREE
-      ? 0
+      ? null
       : parseFloat(faker.finance.amount({ min: 1, max: 100, symbol: currency, autoFormat: true }));
   return {
     id: faker.number.int(),
@@ -83,6 +83,8 @@ export const CourseRunFactory = factory<CourseRun>(() => {
     offer,
     certificate_price: certificatePrice,
     certificate_offer: certificateOffer,
+    discounted_price: null,
+    discount: null,
   };
 });
 
@@ -244,5 +246,7 @@ export const CourseLightFactory = factory<Course>(() => {
     certificate_price: null,
     price: null,
     price_currency: 'EUR',
+    discounted_price: null,
+    discount: null,
   };
 });

frontend/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/_styles.scss

@@ -67,6 +67,11 @@
       }
     }
 
+    & .product-widget__header-main {
+      display: flex;
+      justify-content: center;
+    }
+
     & .product-widget__title {
       color: r-theme-val(product-item, light-color);
       font-size: 1.5rem;
@@ -76,7 +81,7 @@
       background-color: r-theme-val(product-item, light-color);
       border-radius: 100vw;
       color: r-theme-val(product-item, base-border);
-      font-size: 0.81rem;
+      font-size: 1rem;
       margin-bottom: 0.3rem;
       padding: 0.375rem 0.81rem;
       white-space: nowrap;
@@ -90,6 +95,7 @@
 
       &-discount {
         color: r-theme-val(product-item, feedback-color);
+        text-decoration: none;
       }
     }
 

frontend/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/components/CourseProductCourseRuns/CourseRunList.tsx

@@ -68,7 +68,7 @@ const CourseRunList = ({ courseRuns }: Props) => {
               </strong>
               <span
                 data-testid={`course-run-${courseRun.id}-enrollment-dates`}
-                className="course-runs-item__metadata"
+                className="course-runs-item__metadata course-runs-item__enrollment-date"
               >
                 <EnrollmentDate
                   enrollment_start={courseRun.enrollment_start}
@@ -77,7 +77,7 @@ const CourseRunList = ({ courseRuns }: Props) => {
               </span>
               <span
                 data-testid={`course-run-${courseRun.id}-languages`}
-                className="course-runs-item__metadata"
+                className="course-runs-item__metadata course-runs-item__languages"
               >
                 <FormattedMessage
                   {...sharedMessages.language}

frontend/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/components/CourseProductCourseRuns/_styles.scss

@@ -113,6 +113,15 @@
       line-height: 1.4em;
     }
 
+    &__enrollment-date {
+      font-weight: bold;
+      color: #03317f;
+    }
+
+    &__languages {
+      font-weight: bold;
+    }
+
     &__feedback {
       color: r-theme-val(product-item, feedback-color);
     }

richie/apps/courses/admin.py

@@ -60,8 +60,12 @@ class CourseRunAdminForm(TranslatableModelForm):
             "price_currency",
             "offer",
             "price",
+            "discounted_price",
+            "discount",
             "certificate_offer",
             "certificate_price",
+            "certificate_discounted_price",
+            "certificate_discount",
             "sync_mode",
             "display_mode",
         ]
@@ -158,8 +162,12 @@ class CourseRunAdmin(FrontendEditableAdminMixin, TranslatableAdmin):
         "price_currency",
         "offer",
         "price",
+        "discounted_price",
+        "discount",
         "certificate_offer",
         "certificate_price",
+        "certificate_discounted_price",
+        "certificate_discount",
         "sync_mode",
     )
     list_display = ["id"]

richie/apps/courses/migrations/0040_courserun_certificate_discount_and_more.py

@@ -0,0 +1,68 @@
+# Generated by Django 4.2.23 on 2025-07-04 15:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("courses", "0039_program_duration_program_effort_program_price"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="courserun",
+            name="certificate_discount",
+            field=models.CharField(
+                blank=True,
+                help_text="The discount applied to the certificate",
+                max_length=20,
+                null=True,
+                verbose_name="certificate discount",
+            ),
+        ),
+        migrations.AddField(
+            model_name="courserun",
+            name="certificate_discounted_price",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                help_text="The discounted price of the certificate",
+                max_digits=9,
+                null=True,
+                verbose_name="certificate discounted price",
+            ),
+        ),
+        migrations.AddField(
+            model_name="courserun",
+            name="discount",
+            field=models.CharField(
+                blank=True,
+                help_text="The discount applied to the course run",
+                max_length=20,
+                null=True,
+                verbose_name="discount",
+            ),
+        ),
+        migrations.AddField(
+            model_name="courserun",
+            name="discounted_price",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                help_text="The discounted price of the course run",
+                max_digits=9,
+                null=True,
+                verbose_name="discounted price",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="course",
+            name="is_listed",
+            field=models.BooleanField(
+                default=True,
+                help_text="Tick if you want the course to be visible.",
+                verbose_name="is listed",
+            ),
+        ),
+    ]

richie/apps/courses/models/course.py

@@ -869,6 +869,21 @@ class CourseRun(TranslatableModel):
         max_length=7,
         default=getattr(settings, "RICHIE_DEFAULT_COURSE_RUN_PRICE_CURRENCY", "EUR"),
     )
+    discounted_price = models.DecimalField(
+        _("discounted price"),
+        max_digits=9,
+        decimal_places=2,
+        null=True,
+        blank=True,
+        help_text=_("The discounted price of the course run"),
+    )
+    discount = models.CharField(
+        _("discount"),
+        max_length=20,
+        null=True,
+        blank=True,
+        help_text=_("The discount applied to the course run"),
+    )
     offer = models.CharField(
         _("offer"),
         choices=lazy(lambda: CourseRunOffer.choices, tuple)(),
@@ -884,6 +899,21 @@ class CourseRun(TranslatableModel):
         blank=True,
         help_text=_("The price of the certificate"),
     )
+    certificate_discounted_price = models.DecimalField(
+        _("certificate discounted price"),
+        max_digits=9,
+        decimal_places=2,
+        null=True,
+        blank=True,
+        help_text=_("The discounted price of the certificate"),
+    )
+    certificate_discount = models.CharField(
+        _("certificate discount"),
+        max_length=20,
+        null=True,
+        blank=True,
+        help_text=_("The discount applied to the certificate"),
+    )
     certificate_offer = models.CharField(
         _("certificate offer"),
         choices=lazy(lambda: CertificateOffer.choices, tuple)(),

richie/apps/courses/serializers.py

@@ -46,6 +46,10 @@ class ReactPropsCourseRunSerializer(serializers.ModelSerializer):
             "offer",
             "certificate_price",
             "certificate_offer",
+            "discounted_price",
+            "discount",
+            "certificate_discounted_price",
+            "certificate_discount",
         ]
 
     def get_snapshot(self, course_run):
@@ -85,6 +89,10 @@ class CourseRunSerializer(serializers.ModelSerializer):
             "offer",
             "certificate_price",
             "certificate_offer",
+            "discounted_price",
+            "discount",
+            "certificate_discounted_price",
+            "certificate_discount",
         ]
 
 
@@ -111,5 +119,9 @@ class SyncCourseRunSerializer(serializers.ModelSerializer):
             "offer",
             "certificate_price",
             "certificate_offer",
+            "discounted_price",
+            "discount",
+            "certificate_discounted_price",
+            "certificate_discount",
         ]
         extra_kwargs = {"resource_link": {"required": True}}