richie-education 3.1.3-dev2 → 3.1.3-dev24

package/.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,
+};

package/js/api/joanie.ts

@@ -127,8 +127,8 @@ export const getRoutes = () => {
     },
     organizations: {
       get: `${baseUrl}/organizations/:id/`,
-      courseProductRelations: {
-        get: `${baseUrl}/organizations/:organization_id/course-product-relations/:id/`,
+      offerings: {
+        get: `${baseUrl}/organizations/:organization_id/offerings/:id/`,
       },
       courses: {
         get: `${baseUrl}/organizations/:organization_id/courses/:id/`,
@@ -156,8 +156,8 @@ export const getRoutes = () => {
     courseRuns: {
       get: `${baseUrl}/course-runs/:id/`,
     },
-    courseProductRelations: {
-      get: `${baseUrl}/course-product-relations/:id/`,
+    offerings: {
+      get: `${baseUrl}/offerings/:id/`,
     },
     contractDefinitions: {
       previewTemplate: `${baseUrl}/contract_definitions/:id/preview_template/`,
@@ -470,12 +470,12 @@ const API = (): Joanie.API => {
         ).then(checkStatus);
       },
     },
-    courseProductRelations: {
-      get: (filters?: Joanie.CourseProductRelationQueryFilters) => {
+    offerings: {
+      get: (filters?: Joanie.OfferingQueryFilters) => {
         return fetchWithJWT(
           filters?.organization_id
-            ? buildApiUrl(ROUTES.organizations.courseProductRelations.get, filters)
-            : buildApiUrl(ROUTES.courseProductRelations.get, filters),
+            ? buildApiUrl(ROUTES.organizations.offerings.get, filters)
+            : buildApiUrl(ROUTES.offerings.get, filters),
         ).then(checkStatus);
       },
     },

package/js/components/ContractFrame/OrganizationContractFrame.spec.tsx

@@ -6,14 +6,10 @@ import { IntlProvider } from 'react-intl';
 import fetchMock from 'fetch-mock';
 import { QueryStateFactory } from 'utils/test/factories/reactQuery';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
-import {
-  ContractFactory,
-  CourseProductRelationFactory,
-  OrganizationFactory,
-} from 'utils/test/factories/joanie';
+import { ContractFactory, OfferingFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import JoanieSessionProvider from 'contexts/SessionContext/JoanieSessionProvider';
-import { isCourseProductRelation } from 'types/Joanie';
+import { isOffering } from 'types/Joanie';
 import { Props } from './AbstractContractFrame';
 import { OrganizationContractFrame } from '.';
 
@@ -77,31 +73,29 @@ describe('OrganizationContractFrame', () => {
 
   it.each([
     {
-      label: 'contractList: undefined, courseProductRelation: undefined',
+      label: 'contractList: undefined, offering: undefined',
       contractList: undefined,
-      courseProductRelation: undefined,
+      offering: undefined,
     },
     {
-      label: 'contractList: 2 Contract, courseProductRelation: undefined',
+      label: 'contractList: 2 Contract, offering: undefined',
       contractList: ContractFactory().many(2),
-      courseProductRelation: undefined,
+      offering: undefined,
     },
     {
-      label: 'contractList: undefined, courseProductRelation: one CourseProductRelation',
+      label: 'contractList: undefined, offering: one Offering',
       contractList: undefined,
-      courseProductRelation: CourseProductRelationFactory().one(),
+      offering: OfferingFactory().one(),
     },
   ])(
     'should implement AbstractContractFrame for organization and $label',
-    async ({ contractList, courseProductRelation }) => {
+    async ({ contractList, offering }) => {
       const organization = OrganizationFactory().one();
       const contracts = contractList || ContractFactory().many(2);
       const isOpen = faker.datatype.boolean();
 
       const invitationLinkQueryString =
-        courseProductRelation && isCourseProductRelation(courseProductRelation)
-          ? `?course_product_relation_ids=${courseProductRelation.id}`
-          : '';
+        offering && isOffering(offering) ? `?offering_ids=${offering.id}` : '';
       const expectedUrls = {
         getInvitationLink: `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts-signature-link/${invitationLinkQueryString}`,
         checkSignature: `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?id=${contracts[0].id}&id=${contracts[1].id}`,
@@ -133,9 +127,7 @@ describe('OrganizationContractFrame', () => {
           <Wrapper client={client}>
             <OrganizationContractFrame
               organizationId={organization.id}
-              courseProductRelationIds={
-                courseProductRelation ? [courseProductRelation.id] : undefined
-              }
+              offeringIds={offering ? [offering.id] : undefined}
               isOpen={isOpen}
               onDone={handleDone}
               onClose={handleClose}

package/js/components/ContractFrame/OrganizationContractFrame.tsx

@@ -4,17 +4,17 @@ import { useJoanieApi } from 'contexts/JoanieApiContext';
 import AbstractContractFrame, {
   AbstractProps,
 } from 'components/ContractFrame/AbstractContractFrame';
-import { Contract, CourseProductRelation } from 'types/Joanie';
+import { Contract, Offering } from 'types/Joanie';
 
 interface Props extends AbstractProps {
   contractIds?: Contract['id'][];
   organizationId: string;
-  courseProductRelationIds?: CourseProductRelation['id'][];
+  offeringIds?: Offering['id'][];
 }
 
 const OrganizationContractFrame = ({
   organizationId,
-  courseProductRelationIds = [],
+  offeringIds = [],
   contractIds,
   onDone,
   ...props
@@ -29,7 +29,7 @@ const OrganizationContractFrame = ({
      be signed. We need to keep track of these ids to check if all contracts have been signed.
      */
     const response = await api.organizations.contracts.getSignatureLinks({
-      course_product_relation_ids: courseProductRelationIds,
+      offering_ids: offeringIds,
       organization_id: organizationId,
       contracts_ids: contractIds,
     });

package/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();

package/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 {

package/js/components/CourseGlimpse/utils.ts

@@ -8,21 +8,21 @@ import {
 } from 'types/Course';
 import {
   CourseListItem as JoanieCourse,
-  CourseProductRelationLight,
-  isCourseProductRelation,
+  OfferingLight,
+  isOffering,
   ProductType,
 } from 'types/Joanie';
 import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherDashboardPaths';
 import { CourseGlimpseCourse } from '.';
 
-const getCourseGlimpsePropsFromCourseProductRelation = (
-  courseProductRelation: CourseProductRelationLight,
+const getCourseGlimpsePropsFromOffering = (
+  offering: OfferingLight,
   intl: IntlShape,
   organizationId?: string,
 ): CourseGlimpseCourse => {
   const courseRouteParams = {
-    courseId: courseProductRelation.course.id,
-    courseProductRelationId: courseProductRelation.id,
+    courseId: offering.course.id,
+    offeringId: offering.id,
   };
   const courseRoute = organizationId
     ? generatePath(TeacherDashboardPaths.ORGANIZATION_PRODUCT, {
@@ -31,35 +31,30 @@ const getCourseGlimpsePropsFromCourseProductRelation = (
       })
     : generatePath(TeacherDashboardPaths.COURSE_PRODUCT, courseRouteParams);
   return {
-    id: courseProductRelation.id,
-    code: courseProductRelation.course.code,
-    title: courseProductRelation.product.title,
-    cover_image: courseProductRelation.course.cover
+    id: offering.id,
+    code: offering.course.code,
+    title: offering.product.title,
+    cover_image: offering.course.cover
       ? {
-          src: courseProductRelation.course.cover.src,
+          src: offering.course.cover.src,
         }
       : null,
     organization: {
-      title: courseProductRelation.organizations[0].title,
-      image: courseProductRelation.organizations[0].logo || null,
+      title: offering.organizations[0].title,
+      image: offering.organizations[0].logo || null,
     },
-    product_id: courseProductRelation.product.id,
+    product_id: offering.product.id,
     course_route: courseRoute,
-    state: courseProductRelation.product.state,
+    state: offering.product.state,
     certificate_offer:
-      courseProductRelation.product.type === ProductType.CERTIFICATE
-        ? CourseCertificateOffer.PAID
-        : null,
-    offer: courseProductRelation.product.type === ProductType.CREDENTIAL ? CourseOffer.PAID : null,
+      offering.product.type === ProductType.CERTIFICATE ? CourseCertificateOffer.PAID : null,
+    offer: offering.product.type === ProductType.CREDENTIAL ? CourseOffer.PAID : null,
     certificate_price:
-      courseProductRelation.product.type === ProductType.CERTIFICATE
-        ? courseProductRelation.product.price
-        : null,
-    price:
-      courseProductRelation.product.type === ProductType.CREDENTIAL
-        ? courseProductRelation.product.price
-        : null,
-    price_currency: courseProductRelation.product.price_currency,
+      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,
   };
 };
 
@@ -84,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 = (
@@ -121,16 +118,18 @@ const getCourseGlimpsePropsFromJoanieCourse = (
     certificate_offer: null,
     offer: null,
     certificate_price: null,
+    discounted_price: null,
+    discount: null,
   };
 };
 
 export const getCourseGlimpseProps = (
-  course: RichieCourse | (JoanieCourse | CourseProductRelationLight),
+  course: RichieCourse | (JoanieCourse | OfferingLight),
   intl?: IntlShape,
   organizationId?: string,
 ): CourseGlimpseCourse => {
-  if (isCourseProductRelation(course)) {
-    return getCourseGlimpsePropsFromCourseProductRelation(course, intl!, organizationId);
+  if (isOffering(course)) {
+    return getCourseGlimpsePropsFromOffering(course, intl!, organizationId);
   }
 
   if (isRichieCourse(course)) {

package/js/components/CourseGlimpseList/utils.ts

@@ -1,10 +1,10 @@
 import { IntlShape } from 'react-intl';
-import { CourseProductRelationLight, CourseListItem as JoanieCourse } from 'types/Joanie';
+import { OfferingLight, CourseListItem as JoanieCourse } from 'types/Joanie';
 import { Course as RichieCourse } from 'types/Course';
 import { CourseGlimpseCourse, getCourseGlimpseProps } from 'components/CourseGlimpse';
 
 export const getCourseGlimpseListProps = (
-  courses: RichieCourse[] | (JoanieCourse | CourseProductRelationLight)[],
+  courses: RichieCourse[] | (JoanieCourse | OfferingLight)[],
   intl?: IntlShape,
   organizationId?: string,
 ): CourseGlimpseCourse[] => {

package/js/components/PurchaseButton/index.tsx

@@ -42,7 +42,7 @@ const messages = defineMessages({
 
 interface PurchaseButtonPropsBase {
   product: Joanie.CredentialProduct | Joanie.CertificateProduct;
-  orderGroup?: Joanie.OrderGroup;
+  offering?: Joanie.Offering;
   isWithdrawable: boolean;
   disabled?: boolean;
   className?: string;
@@ -66,8 +66,8 @@ interface CertificatePurchaseButtonProps extends PurchaseButtonPropsBase {
 const PurchaseButton = ({
   product,
   course,
+  offering,
   enrollment,
-  orderGroup,
   isWithdrawable,
   organizations,
   disabled = false,
@@ -140,8 +140,8 @@ const PurchaseButton = ({
         {...saleTunnelModal}
         product={product}
         organizations={organizations}
+        offering={offering}
         enrollment={enrollment}
-        orderGroup={orderGroup}
         course={course}
         isWithdrawable={isWithdrawable}
         onFinish={onFinish}

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

@@ -19,9 +19,7 @@ export const CredentialSaleTunnel = (props: CredentialSaleTunnelProps) => {
   );
 };
 
-const CredentialPaymentButton = ({
-  course,
-}: Pick<CredentialSaleTunnelProps, 'course' | 'orderGroup'>) => {
+const CredentialPaymentButton = ({ course }: Pick<CredentialSaleTunnelProps, 'course'>) => {
   return (
     <SubscriptionButton
       buildOrderPayload={(payload) => ({

package/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, 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';
@@ -26,6 +34,8 @@ export interface SaleTunnelContextType {
   order?: Order;
   product: Product;
   webAnalyticsEventKey: string;
+  offering?: Offering;
+  enrollment?: Enrollment;
 
   // internal
   step: SaleTunnelStep;
@@ -113,6 +123,8 @@ export const GenericSaleTunnel = (props: GenericSaleTunnelProps) => {
       webAnalyticsEventKey: props.eventKey,
       order,
       product: props.product,
+      offering: props.offering,
+      enrollment: props.enrollment,
       props,
       billingAddress,
       setBillingAddress,

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

@@ -8,6 +8,7 @@ import useOpenEdxProfile from 'hooks/useOpenEdxProfile';
 import { usePaymentSchedule } from 'hooks/usePaymentSchedule';
 import { Spinner } from 'components/Spinner';
 import WithdrawRightCheckbox from 'components/SaleTunnel/WithdrawRightCheckbox';
+import { ProductType } from 'types/Joanie';
 
 const messages = defineMessages({
   title: {
@@ -54,6 +55,7 @@ const messages = defineMessages({
 });
 
 export const SaleTunnelInformation = () => {
+  const { product } = useSaleTunnelContext();
   return (
     <div className="sale-tunnel__main__column sale-tunnel__information">
       <div>
@@ -70,7 +72,7 @@ export const SaleTunnelInformation = () => {
         </div>
       </div>
       <div>
-        <PaymentScheduleBlock />
+        {product.type === ProductType.CREDENTIAL && <PaymentScheduleBlock />}
         <Total />
         <WithdrawRightCheckbox />
       </div>
@@ -99,7 +101,11 @@ const Email = () => {
 };
 
 const Total = () => {
-  const { product } = 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">
@@ -107,11 +113,7 @@ const Total = () => {
           <FormattedMessage {...messages.totalLabel} />
         </div>
         <div className="block-title">
-          <FormattedNumber
-            value={product.price}
-            style="currency"
-            currency={product.price_currency}
-          />
+          <FormattedNumber value={totalPrice} style="currency" currency={product.price_currency} />
         </div>
       </div>
     </div>

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

@@ -72,7 +72,7 @@ interface Props {
   buildOrderPayload: (
     payload: Pick<
       OrderCreationPayload,
-      'product_id' | 'billing_address' | 'order_group_id' | 'has_waived_withdrawal_right'
+      'product_id' | 'billing_address' | 'has_waived_withdrawal_right'
     >,
   ) => OrderCreationPayload;
 }
@@ -124,7 +124,6 @@ const SubscriptionButton = ({ buildOrderPayload }: Props) => {
     const payload = buildOrderPayload({
       product_id: product.id,
       billing_address: billingAddress!,
-      order_group_id: saleTunnelProps.orderGroup?.id,
       has_waived_withdrawal_right: hasWaivedWithdrawalRight,
     });
 

package/js/components/SaleTunnel/index.credential.spec.tsx

@@ -1,5 +1,5 @@
 import fetchMock from 'fetch-mock';
-import { act, fireEvent, screen, waitFor } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import queryString from 'query-string';
 import {
   RichieContextFactory as mockRichieContextFactory,
@@ -11,11 +11,9 @@ import {
   AddressFactory,
   CredentialOrderFactory,
   CredentialProductFactory,
-  OrderGroupFactory,
 } from 'utils/test/factories/joanie';
 import type * as Joanie from 'types/Joanie';
-import { Maybe } from 'types/utils';
-import { NOT_CANCELED_ORDER_STATES, OrderCredentialCreationPayload } from 'types/Joanie';
+import { NOT_CANCELED_ORDER_STATES } from 'types/Joanie';
 import { SaleTunnel, SaleTunnelProps } from 'components/SaleTunnel/index';
 import { render } from 'utils/test/render';
 import { getAddressLabel } from 'components/SaleTunnel/AddressSelector';
@@ -83,11 +81,9 @@ describe('SaleTunnel / Credential', () => {
   it('should create an order with an order group', async () => {
     const course = PacedCourseFactory().one();
     const product = CredentialProductFactory().one();
-    const orderGroup = OrderGroupFactory().one();
     const billingAddress: Joanie.Address = AddressFactory({ is_main: true }).one();
 
-    let createOrderPayload: Maybe<OrderCredentialCreationPayload>;
-    const order = CredentialOrderFactory({ order_group_id: orderGroup.id }).one();
+    const order = CredentialOrderFactory().one();
     const orderQueryParameters = {
       course_code: course.code,
       product_id: product.id,
@@ -100,15 +96,12 @@ describe('SaleTunnel / Credential', () => {
         `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
         [],
       )
-      .post('https://joanie.endpoint/api/v1.0/orders/', (_, { body }) => {
-        createOrderPayload = JSON.parse(body as any);
-        return order;
-      })
+      .post('https://joanie.endpoint/api/v1.0/orders/', order)
       .get('https://joanie.endpoint/api/v1.0/addresses/', [billingAddress], {
         overwriteRoutes: true,
       });
 
-    render(<Wrapper product={product} course={course} orderGroup={orderGroup} />, {
+    render(<Wrapper product={product} course={course} />, {
       queryOptions: { client: createTestQueryClient({ user: richieUser }) },
     });
 
@@ -121,12 +114,5 @@ describe('SaleTunnel / Credential', () => {
 
     // - Payment button should not be disabled.
     expect($button.disabled).toBe(false);
-
-    // - User clicks on pay button
-    await act(async () => {
-      fireEvent.click($button);
-    });
-
-    await waitFor(() => expect(createOrderPayload?.order_group_id).toEqual(orderGroup.id));
   });
 });

package/js/components/SaleTunnel/index.full-process.spec.tsx

@@ -15,7 +15,7 @@ import CourseProductItem from 'widgets/SyllabusCourseRunsList/components/CourseP
 import {
   AddressFactory,
   ContractFactory,
-  CourseProductRelationFactory,
+  OfferingFactory,
   CredentialOrderFactory,
   CreditCardFactory,
   PaymentFactory,
@@ -99,7 +99,7 @@ describe('SaleTunnel', () => {
      */
     const course = PacedCourseFactory().one();
     const product = ProductFactory().one();
-    const relation = CourseProductRelationFactory({
+    const offering = OfferingFactory({
       course,
       product,
       is_withdrawable: false,
@@ -108,7 +108,7 @@ describe('SaleTunnel', () => {
 
     fetchMock.get(
       `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/`,
-      relation,
+      offering,
     );
     fetchMock.get(
       `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,