richie-education 2.28.2-dev39 → 2.28.2-dev53

package/js/pages/TeacherDashboardContractsLayout/components/SignOrganizationContractButton/index.spec.tsx

@@ -5,6 +5,7 @@ import { IntlProvider } from 'react-intl';
 import { QueryClientProvider } from '@tanstack/react-query';
 import fetchMock from 'fetch-mock';
 import userEvent from '@testing-library/user-event';
+import { CunninghamProvider } from '@openfun/cunningham-react';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import JoanieApiProvider from 'contexts/JoanieApiContext';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
@@ -21,11 +22,13 @@ jest.mock('utils/context', () => ({
 describe('TeacherDashboardContractsLayout/SignOrganizationContractButton', () => {
   const Wrapper = ({ children }: PropsWithChildren) => {
     return (
-      <IntlProvider locale="en">
-        <QueryClientProvider client={createTestQueryClient({ user: true })}>
-          <JoanieApiProvider>{children}</JoanieApiProvider>
-        </QueryClientProvider>
-      </IntlProvider>
+      <CunninghamProvider>
+        <IntlProvider locale="en">
+          <QueryClientProvider client={createTestQueryClient({ user: true })}>
+            <JoanieApiProvider>{children}</JoanieApiProvider>
+          </QueryClientProvider>
+        </IntlProvider>
+      </CunninghamProvider>
     );
   };
 
@@ -46,8 +49,6 @@ describe('TeacherDashboardContractsLayout/SignOrganizationContractButton', () =>
     expect(
       screen.getByRole('button', { name: 'Sign all pending contracts (12)' }),
     ).toBeInTheDocument();
-    const DashboardContractFramePortal = document.getElementsByClassName('ReactModalPortal');
-    expect(DashboardContractFramePortal).toHaveLength(1);
   });
 
   it("shouldn't display sign button user don't have some contract to sign", () => {
@@ -63,8 +64,6 @@ describe('TeacherDashboardContractsLayout/SignOrganizationContractButton', () =>
     expect(
       screen.queryByRole('button', { name: /Sign all pending contracts/ }),
     ).not.toBeInTheDocument();
-    const DashboardContractFramePortal = document.getElementsByClassName('ReactModalPortal');
-    expect(DashboardContractFramePortal).toHaveLength(1);
   });
 
   it.each([

package/js/pages/TeacherDashboardCourseLearnersLayout/components/CourseLearnerDataGrid/index.spec.tsx

@@ -14,7 +14,7 @@ import CourseLearnerDataGrid from '.';
 describe('pages/CourseLearnerDataGrid', () => {
   it('should render a list of user', async () => {
     const courseOrderList = NestedCourseOrderFactory({
-      state: OrderState.VALIDATED,
+      state: OrderState.COMPLETED,
       certificate_id: faker.string.uuid(),
     }).many(3);
     render(

package/js/pages/TeacherDashboardCourseLearnersLayout/components/CourseLearnerDataGrid/index.tsx

@@ -74,12 +74,7 @@ const CourseLearnerDataGrid = ({
       headerName: intl.formatMessage(messages.columnState),
       enableSorting: false,
       renderCell: (params: { row: Row }) => {
-        return (
-          <OrderStateTeacherMessage
-            order={params.row.courseOrder}
-            contractDefinition={params.row.courseOrder.product.contract_definition_id}
-          />
-        );
+        return <OrderStateTeacherMessage order={params.row.courseOrder} />;
       },
     },
     {

package/js/settings/settings.test.ts

@@ -1,5 +1,5 @@
-// This confiuration file is used for testing.
-// Mostly usefull to test our test tools.
+// This configuration file is used for testing.
+// Mostly useful to test our test tools.
 import { DevDemoUser } from 'api/lms/dummy';
 
 /**
@@ -14,3 +14,12 @@ import { DevDemoUser } from 'api/lms/dummy';
  *  * student_user
  */
 export const CURRENT_JOANIE_DEV_DEMO_USER: DevDemoUser = 'admin';
+
+export const CONTRACT_SETTINGS = {
+  // Interval in ms to poll the related order when a signature has succeeded.
+  pollInterval: 150,
+  // Number of retries
+  pollLimit: 45,
+  // Simulated sign request delay
+  dummySignatureSignTimeout: 100,
+};

package/js/types/Joanie.ts

@@ -259,17 +259,42 @@ export interface EnrollmentLight {
 
 // Order
 export enum OrderState {
-  DRAFT = 'draft',
-  SUBMITTED = 'submitted',
+  ASSIGNED = 'assigned',
   CANCELED = 'canceled',
+  COMPLETED = 'completed',
+  DRAFT = 'draft',
+  FAILED_PAYMENT = 'failed_payment',
+  NO_PAYMENT = 'no_payment',
   PENDING = 'pending',
   PENDING_PAYMENT = 'pending_payment',
-  VALIDATED = 'validated',
-  NO_PAYMENT = 'no_payment',
-  FAILED_PAYMENT = 'failed_payment',
-}
-
-export const ACTIVE_ORDER_STATES = [OrderState.PENDING, OrderState.VALIDATED, OrderState.SUBMITTED];
+  SIGNING = 'signing',
+  TO_SAVE_PAYMENT_METHOD = 'to_save_payment_method',
+  TO_SIGN = 'to_sign',
+}
+
+export const PURCHASABLE_ORDER_STATES = [
+  OrderState.DRAFT,
+  OrderState.ASSIGNED,
+  OrderState.TO_SIGN,
+  OrderState.SIGNING,
+  OrderState.TO_SAVE_PAYMENT_METHOD,
+];
+
+export const ACTIVE_ORDER_STATES = [
+  OrderState.PENDING,
+  OrderState.PENDING_PAYMENT,
+  OrderState.NO_PAYMENT,
+  OrderState.FAILED_PAYMENT,
+  OrderState.COMPLETED,
+];
+
+export const NOT_CANCELED_ORDER_STATES = [...ACTIVE_ORDER_STATES, ...PURCHASABLE_ORDER_STATES];
+
+export const ENROLLABLE_ORDER_STATES = [
+  OrderState.COMPLETED,
+  OrderState.PENDING_PAYMENT,
+  OrderState.FAILED_PAYMENT,
+];
 
 export interface Order {
   id: string;
@@ -290,6 +315,7 @@ export interface Order {
   organization: Organization;
   order_group_id?: OrderGroup['id'];
   payment_schedule?: PaymentSchedule;
+  credit_card_id?: CreditCard['id'];
 }
 
 export interface CredentialOrder extends Order {
@@ -297,20 +323,12 @@ export interface CredentialOrder extends Order {
   enrollment: null;
 }
 
-export interface CredentialOrderWithPaymentInfo extends CredentialOrder {
-  payment_info: Payment;
-}
-
 export interface CertificateOrder extends Order {
   course: null;
   enrollment: EnrollmentLight;
   target_courses: never[];
 }
 
-export interface CertificateOrderWithPaymentInfo extends CertificateOrder {
-  payment_info: Payment;
-}
-
 export type OrderLite = Pick<
   Order,
   | 'id'
@@ -329,9 +347,11 @@ export interface AbstractNestedOrder {
   product_title: string;
   owner_name: string;
   state: OrderState;
+  course: Nullable<CourseLight>;
+  enrollment: Nullable<EnrollmentLight>;
 }
 export interface NestedCertificateOrder extends AbstractNestedOrder {
-  course: undefined;
+  course: null;
   enrollment: EnrollmentLight;
 }
 export const isNestedCredentialOrder = (
@@ -342,7 +362,7 @@ export const isNestedCredentialOrder = (
 
 export interface NestedCredentialOrder extends AbstractNestedOrder {
   course: CourseLight;
-  enrollment: undefined;
+  enrollment: null;
 }
 
 export type OrderEnrollment = Pick<Order, 'id' | 'state' | 'product_id' | 'certificate_id'>;
@@ -376,10 +396,10 @@ export interface OrderGroup {
 }
 
 export enum CreditCardBrand {
-  MASTERCARD = 'Mastercard',
-  MAESTRO = 'Maestro',
-  VISA = 'Visa',
-  CB = 'CB',
+  MASTERCARD = 'mastercard',
+  MAESTRO = 'maestro',
+  VISA = 'visa',
+  CB = 'cb',
 }
 
 // Credit Card
@@ -444,7 +464,7 @@ export interface AddressCreationPayload extends Omit<Address, 'id' | 'is_main'>
 interface AbstractOrderProductCreationPayload {
   product_id: Product['id'];
   order_group_id?: OrderGroup['id'];
-  has_consent_to_terms: boolean;
+  billing_address: Omit<Address, 'id' | 'is_main'>;
 }
 
 interface OrderCertificateCreationPayload extends AbstractOrderProductCreationPayload {
@@ -460,15 +480,9 @@ export type OrderSubmitInstallmentPayment = {
   credit_card_id?: string;
 };
 
-interface OrderAbortPayload {
-  id: Order['id'];
-  payment_id?: string;
-}
-
-interface OrderSubmitPayload {
+interface OrderSetPaymentMethodPayload {
   id: Order['id'];
-  billing_address: Omit<Address, 'id' | 'is_main'>;
-  credit_card_id?: CreditCard['id'];
+  credit_card_id: CreditCard['id'];
 }
 
 export interface PaginatedResourceQuery extends ResourcesQuery {
@@ -563,14 +577,15 @@ interface APIUser {
     update(payload: Address): Promise<Address>;
   };
   creditCards: {
-    create(payload: Omit<CreditCard, 'id'>): Promise<CreditCard>;
     delete(id: CreditCard['id']): Promise<void>;
+    get(): Promise<PaginatedResponse<CreditCard>>;
     get(filters?: ResourcesQuery): Promise<CreditCard>;
     get(): Promise<CreditCard[]>;
     update(payload: CreditCard): Promise<CreditCard>;
+    tokenize(): Promise<Payment>;
   };
   orders: {
-    abort(payload: OrderAbortPayload): Promise<void>;
+    cancel(id: Order['id']): Promise<void>;
     create(payload: OrderCreationPayload): Promise<CredentialOrder | CertificateOrder>;
     get<Filters extends OrderResourcesQuery = OrderResourcesQuery>(
       filters?: Filters,
@@ -580,12 +595,12 @@ interface APIUser {
     invoice: {
       download(payload: { order_id: Order['id']; invoice_reference: string }): Promise<File>;
     };
-    submit(payload: OrderSubmitPayload): Promise<OrderPaymentInfo>;
     submit_for_signature(id: string): Promise<ContractInvitationLinkResponse>;
     submit_installment_payment(
       id: string,
       payload?: OrderSubmitInstallmentPayment,
     ): Promise<Payment>;
+    set_payment_method(payload: OrderSetPaymentMethodPayload): Promise<void>;
   };
   certificates: {
     download(id: string): Promise<File>;

package/js/utils/OrderHelper/index.ts

@@ -1,56 +1,52 @@
 import {
-  OrderEnrollment,
   ACTIVE_ORDER_STATES,
+  ENROLLABLE_ORDER_STATES,
+  NestedCourseOrder,
   Order,
+  OrderEnrollment,
   OrderState,
-  ContractDefinition,
-  NestedCourseOrder,
   PaymentScheduleState,
 } from 'types/Joanie';
 
 export enum OrderStatus {
-  DRAFT = 'draft',
-  SUBMITTED = 'submitted',
-  PENDING = 'pending',
+  ASSIGNED = 'assigned',
   CANCELED = 'canceled',
-  WAITING_SIGNATURE = 'waiting_signature',
-  WAITING_COUNTER_SIGNATURE = 'waiting_counter_signature',
   COMPLETED = 'completed',
-  ON_GOING = 'on_going',
+  DRAFT = 'draft',
+  FAILED_PAYMENT = 'failed_payment',
   NO_PAYMENT = 'no_payment',
+  PASSED = 'passed',
+  PENDING = 'pending',
   PENDING_PAYMENT = 'pending_payment',
-  FAILED_PAYMENT = 'failed_payment',
+  WAITING_COUNTER_SIGNATURE = 'waiting_counter_signature',
+  WAITING_PAYMENT_METHOD = 'waiting_payment_method',
+  WAITING_SIGNATURE = 'waiting_signature',
 }
 
 /**
  * Helper class for orders
  */
 export class OrderHelper {
-  static getState(order: Order | NestedCourseOrder, contractDefinition?: ContractDefinition) {
-    const { certificate_id: certificateId } = order;
-
-    if (order.state === OrderState.VALIDATED) {
-      if (OrderHelper.orderNeedsSignature(order, contractDefinition)) {
-        return OrderStatus.WAITING_SIGNATURE;
-      }
-      if (OrderHelper.orderNeedsCounterSignature(order)) {
-        return OrderStatus.WAITING_COUNTER_SIGNATURE;
-      }
-      if (certificateId) {
-        return OrderStatus.COMPLETED;
-      } else {
-        return OrderStatus.ON_GOING;
-      }
+  static getState(order: Order | NestedCourseOrder) {
+    if (OrderHelper.allowEnrollment(order) && OrderHelper.orderNeedsCounterSignature(order)) {
+      return OrderStatus.WAITING_COUNTER_SIGNATURE;
+    }
+    if (order.state === OrderState.COMPLETED && order.certificate_id) {
+      return OrderStatus.PASSED;
     }
 
     const orderStatusMap = {
-      [OrderState.DRAFT]: OrderStatus.DRAFT,
-      [OrderState.SUBMITTED]: OrderStatus.SUBMITTED,
-      [OrderState.PENDING]: OrderStatus.PENDING,
+      [OrderState.ASSIGNED]: OrderStatus.ASSIGNED,
       [OrderState.CANCELED]: OrderStatus.CANCELED,
+      [OrderState.COMPLETED]: OrderStatus.COMPLETED,
+      [OrderState.DRAFT]: OrderStatus.DRAFT,
+      [OrderState.FAILED_PAYMENT]: OrderStatus.FAILED_PAYMENT,
       [OrderState.NO_PAYMENT]: OrderStatus.NO_PAYMENT,
+      [OrderState.PENDING]: OrderStatus.PENDING,
       [OrderState.PENDING_PAYMENT]: OrderStatus.PENDING_PAYMENT,
-      [OrderState.FAILED_PAYMENT]: OrderStatus.PENDING_PAYMENT,
+      [OrderState.SIGNING]: OrderStatus.WAITING_SIGNATURE,
+      [OrderState.TO_SAVE_PAYMENT_METHOD]: OrderStatus.WAITING_PAYMENT_METHOD,
+      [OrderState.TO_SIGN]: OrderStatus.WAITING_SIGNATURE,
     };
 
     if (order.state in orderStatusMap) {
@@ -69,18 +65,8 @@ export class OrderHelper {
     return orders.find(filter);
   }
 
-  /**
-   * tell us if a order need to be sign by it's owner (the learner user).
-   */
-  static orderNeedsSignature(
-    order: Order | NestedCourseOrder,
-    contractDefinition?: ContractDefinition,
-  ) {
-    return (
-      order?.state === OrderState.VALIDATED &&
-      contractDefinition &&
-      !(order.contract && order.contract.student_signed_on)
-    );
+  static orderNeedsSignature(order: Order | NestedCourseOrder) {
+    return [OrderState.TO_SIGN, OrderState.SIGNING].includes(order.state);
   }
 
   /**
@@ -88,7 +74,7 @@ export class OrderHelper {
    */
   static orderNeedsCounterSignature(order: Order | NestedCourseOrder) {
     return (
-      order?.state === OrderState.VALIDATED &&
+      ACTIVE_ORDER_STATES.includes(order.state) &&
       order.contract &&
       order.contract.student_signed_on &&
       !order.contract.organization_signed_on
@@ -100,4 +86,14 @@ export class OrderHelper {
       (installment) => installment.state === PaymentScheduleState.REFUSED,
     );
   }
+
+  static allowEnrollment(order?: Order | NestedCourseOrder | OrderEnrollment) {
+    if (!order) return false;
+    return ENROLLABLE_ORDER_STATES.includes(order.state);
+  }
+
+  static isActive(order?: Order | NestedCourseOrder | OrderEnrollment) {
+    if (!order) return false;
+    return ACTIVE_ORDER_STATES.includes(order.state);
+  }
 }

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

@@ -5,7 +5,6 @@ import {
   Certificate,
   CertificateDefinition,
   CertificateOrder,
-  CertificateOrderWithPaymentInfo,
   CertificateProduct,
   Contract,
   ContractDefinition,
@@ -16,7 +15,6 @@ import {
   CourseProductRelation,
   CourseRun,
   CredentialOrder,
-  CredentialOrderWithPaymentInfo,
   CredentialProduct,
   CreditCard,
   CreditCardBrand,
@@ -45,6 +43,9 @@ import { Payment, PaymentProviders } from 'components/PaymentInterfaces/types';
 import { CourseStateFactory } from 'utils/test/factories/richie';
 import { FactoryHelper } from 'utils/test/factories/helper';
 import { JoanieUserApiAbilityActions, JoanieUserProfile } from 'types/User';
+import { SaleTunnelContextType, SaleTunnelStep } from 'components/SaleTunnel/GenericSaleTunnel';
+import { SaleTunnelProps } from 'components/SaleTunnel';
+import { noop } from 'utils/index';
 import { factory } from './factories';
 
 export const UserLightFactory = factory((): UserLight => {
@@ -140,7 +141,7 @@ export const ContractFactory = factory((): Contract => {
     organization_signatory: null,
     created_on: faker.date.past().toISOString(),
     definition: ContractDefinitionFactory().one(),
-    order: NestedCredentialOrderFactory().one(),
+    order: NestedCredentialOrderFactory({ state: OrderState.TO_SIGN }).one(),
   };
 });
 
@@ -314,7 +315,7 @@ export const NestedCourseOrderFactory = factory((): NestedCourseOrder => {
     owner: UserLightFactory().one(),
     course_id: faker.string.uuid(),
     product_id: faker.string.uuid(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
     enrollment_id: faker.string.uuid(),
     organization: OrganizationFactory().one(),
     certificate_id: faker.string.uuid(),
@@ -363,7 +364,7 @@ export const OrderEnrollmentFactory = factory((): OrderEnrollment => {
   return {
     id: faker.string.uuid(),
     product_id: faker.string.uuid(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
   };
 });
 
@@ -375,19 +376,19 @@ export const OrderLiteFactory = factory((): OrderLite => {
     main_invoice_reference: faker.string.uuid(),
     total: faker.number.int(),
     product_id: faker.string.uuid(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
   };
 });
 
 export const NestedCertificateOrderFactory = factory((): NestedCertificateOrder => {
   return {
     id: faker.string.uuid(),
-    course: undefined,
+    course: null,
     enrollment: EnrollmentLightFactory().one(),
     organization: OrganizationFactory().one(),
     product_title: FactoryHelper.unique(faker.lorem.words, { args: [1] }),
     owner_name: faker.internet.userName(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
   };
 });
 
@@ -395,11 +396,11 @@ export const NestedCredentialOrderFactory = factory((): NestedCredentialOrder =>
   return {
     id: faker.string.uuid(),
     course: CourseLightFactory().one(),
-    enrollment: undefined,
+    enrollment: null,
     organization: OrganizationFactory().one(),
     product_title: FactoryHelper.unique(faker.lorem.words, { args: [1] }),
     owner_name: faker.internet.userName(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
   };
 });
 
@@ -411,7 +412,7 @@ const AbstractOrderFactory = factory((): Order => {
     total: faker.number.int(),
     total_currency: faker.finance.currencyCode(),
     main_invoice_reference: faker.string.uuid(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
     product_id: faker.string.uuid(),
     target_courses: TargetCourseFactory().many(5),
     target_enrollments: [],
@@ -422,56 +423,22 @@ const AbstractOrderFactory = factory((): Order => {
   };
 });
 
-export const CredentialOrderFactory = factory((): CredentialOrder => {
-  const order = {
+export const CredentialOrderFactory = factory(
+  (): CredentialOrder => ({
     ...AbstractOrderFactory().one(),
     course: CourseLightFactory().one(),
     enrollment: null,
     payment_schedule: PaymentInstallmentFactory().many(3),
-  };
-  return order;
-});
-
-export const CredentialOrderWithPaymentFactory = factory((): CredentialOrderWithPaymentInfo => {
-  return {
-    ...CredentialOrderFactory().one(),
-    payment_info: PaymentFactory().one(),
-  };
-});
-
-export const CredentialOrderWithOneClickPaymentFactory = factory(
-  (): CredentialOrderWithPaymentInfo => {
-    return {
-      ...CredentialOrderFactory().one(),
-      payment_info: PaymentFactory().one(),
-    };
-  },
+  }),
 );
 
-export const CertificateOrderFactory = factory((): CertificateOrder => {
-  const order = {
+export const CertificateOrderFactory = factory(
+  (): CertificateOrder => ({
     ...AbstractOrderFactory().one(),
     course: null,
     target_courses: [],
     enrollment: EnrollmentLightFactory().one(),
-  };
-  return order;
-});
-
-export const CertificateOrderWithPaymentFactory = factory((): CertificateOrderWithPaymentInfo => {
-  return {
-    ...CertificateOrderFactory().one(),
-    payment_info: PaymentFactory().one(),
-  };
-});
-
-export const CertificateOrderWithOneClickPaymentFactory = factory(
-  (): CertificateOrderWithPaymentInfo => {
-    return {
-      ...CertificateOrderFactory().one(),
-      payment_info: PaymentFactory().one(),
-    };
-  },
+  }),
 );
 
 export const AddressFactory = factory((): Address => {
@@ -507,3 +474,21 @@ export const PaymentFactory = factory((): Payment => {
     url: faker.internet.url(),
   };
 });
+
+export const SaleTunnelContextFactory = factory(
+  (): SaleTunnelContextType => ({
+    webAnalyticsEventKey: 'eventKey',
+    order: CredentialOrderFactory().one(),
+    product: ProductFactory().one(),
+    props: {} as SaleTunnelProps,
+    billingAddress: undefined,
+    setBillingAddress: noop,
+    setCreditCard: noop,
+    onPaymentSuccess: noop,
+    step: SaleTunnelStep.IDLE,
+    registerSubmitCallback: noop,
+    unregisterSubmitCallback: noop,
+    runSubmitCallbacks: () => new Promise((resolve) => resolve()),
+    nextStep: noop,
+  }),
+);

package/js/widgets/Dashboard/components/DashboardItem/CourseEnrolling/index.tsx

@@ -9,7 +9,6 @@ import {
   CourseRun,
   CredentialOrder,
   Enrollment,
-  Product,
 } from 'types/Joanie';
 import { Spinner } from 'components/Spinner';
 import Banner, { BannerType } from 'components/Banner';
@@ -68,10 +67,11 @@ const messages = defineMessages({
     description: 'Text displayed when course runs list is loading',
     id: 'components.DashboardItemCourseEnrollingRun.courseRunsLoading',
   },
-  contractUnsigned: {
-    id: 'components.DashboardItemCourseEnrollingRun.contractUnsigned',
-    description: 'Message displayed as disabled button title when a contract needs to be signed.',
-    defaultMessage: 'You have to sign the training contract before enrolling to your course.',
+  cannotEnroll: {
+    id: 'components.DashboardItemCourseEnrollingRun.cannotEnroll',
+    description:
+      'Message displayed as disabled button title when the order state does not allow enrollment.',
+    defaultMessage: 'You cannot enroll yet to this training.',
   },
 });
 
@@ -81,7 +81,6 @@ interface DashboardItemCourseEnrollingProps {
   course: AbstractCourse;
   activeEnrollment?: Enrollment;
   order?: CredentialOrder;
-  product?: Product;
   writable: boolean;
   hideEnrollButtons?: boolean;
   icon?: boolean;
@@ -93,7 +92,6 @@ export const DashboardItemCourseEnrolling = ({
   activeEnrollment,
   writable,
   order,
-  product,
   icon = false,
   notEnrolledUrl = '#',
   hideEnrollButtons,
@@ -121,7 +119,6 @@ export const DashboardItemCourseEnrolling = ({
           course={course}
           enrollments={CoursesHelper.findCourseEnrollmentsInOrder(course, order)}
           order={order}
-          product={product}
         />
       )}
     </div>
@@ -132,14 +129,12 @@ interface DashboardItemCourseEnrollingRunsProps {
   course: AbstractCourse;
   enrollments: Enrollment[];
   order?: CredentialOrder;
-  product?: Product;
 }
 
 const DashboardItemCourseEnrollingRuns = ({
   course,
   enrollments,
   order,
-  product,
 }: DashboardItemCourseEnrollingRunsProps) => {
   const { enroll, isLoading, error } = useEnroll(enrollments, order);
 
@@ -176,7 +171,6 @@ const DashboardItemCourseEnrollingRuns = ({
           selected={data.selected}
           enroll={() => enroll(data.courseRun)}
           order={order}
-          product={product}
         />
       ))}
       {isLoading && (
@@ -200,7 +194,6 @@ interface DashboardItemCourseEnrollingRunProps {
   selected: boolean;
   enroll: () => void;
   order?: CredentialOrder | CertificateOrder;
-  product?: Product;
 }
 
 export const DashboardItemCourseEnrollingRun = ({
@@ -208,14 +201,11 @@ export const DashboardItemCourseEnrollingRun = ({
   selected,
   enroll,
   order,
-  product,
 }: DashboardItemCourseEnrollingRunProps) => {
   const intl = useIntl();
   const formatDate = useDateFormat();
   const courseRunPeriodMessage = useCourseRunPeriodMessage(courseRun, selected);
-  const haveToSignContract = order
-    ? OrderHelper.orderNeedsSignature(order, product?.contract_definition)
-    : false;
+  const canEnroll = OrderHelper.allowEnrollment(order);
   const isOpenedForEnrollment = useMemo(
     () => courseRun.state.priority < Priority.FUTURE_NOT_YET_OPEN,
     [courseRun],
@@ -266,11 +256,11 @@ export const DashboardItemCourseEnrollingRun = ({
       ) : (
         <div>
           <Button
-            disabled={!isOpenedForEnrollment || haveToSignContract}
+            disabled={!isOpenedForEnrollment || !canEnroll}
             color="tertiary"
             size="small"
             onClick={enroll}
-            title={haveToSignContract ? intl.formatMessage(messages.contractUnsigned) : ''}
+            title={!canEnroll ? intl.formatMessage(messages.cannotEnroll) : ''}
           >
             <FormattedMessage {...messages.enrollRun} />
           </Button>