richie-education 2.28.2-dev26 → 2.28.2-dev53

package/js/widgets/Dashboard/components/DashboardItem/Order/OrderPaymentDetailsModal/index.tsx

@@ -0,0 +1,126 @@
+import {
+  Alert,
+  Button,
+  Loader,
+  Modal,
+  ModalProps,
+  ModalSize,
+  useModal,
+  VariantType,
+} from '@openfun/cunningham-react';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { useState, useEffect } from 'react';
+import { PaymentScheduleGrid } from 'components/PaymentScheduleGrid';
+import { CreditCard, Order } from 'types/Joanie';
+import { CreditCardSelector } from 'components/CreditCardSelector';
+import { OrderHelper } from 'utils/OrderHelper';
+import { OrderPaymentRetryModal } from 'widgets/Dashboard/components/DashboardItem/Order/OrderPaymentRetryModal';
+import { Maybe } from 'types/utils';
+import { useCreditCard } from 'hooks/useCreditCards';
+
+const messages = defineMessages({
+  title: {
+    id: 'components.DashboardItemOrder.PaymentModal.title',
+    defaultMessage: 'Payment details',
+    description: 'Title of the payment modal',
+  },
+  scheduleTitle: {
+    id: 'components.DashboardItemOrder.PaymentModal.scheduleTitle',
+    defaultMessage: 'Repayment schedule',
+    description: 'Title of the payment schedule',
+  },
+  paymentMethodTitle: {
+    id: 'components.DashboardItemOrder.PaymentModal.paymentMethodTitle',
+    defaultMessage: 'Payment method',
+    description: 'Title of the payment method section',
+  },
+  paymentNeededMessage: {
+    id: 'components.DashboardItemOrder.paymentNeededMessage',
+    description: 'Message displayed when payment is needed',
+    defaultMessage: 'The payment failed, please update your payment method',
+  },
+  paymentNeededButton: {
+    id: 'components.DashboardItemOrder.paymentNeededButton',
+    description: 'Button label for the payment needed message',
+    defaultMessage: 'Pay {amount}',
+  },
+});
+
+interface PaymentModalProps extends Pick<ModalProps, 'isOpen' | 'onClose'> {
+  order: Order;
+}
+
+export const OrderPaymentDetailsModal = ({ order, ...props }: PaymentModalProps) => {
+  const intl = useIntl();
+  const retryModal = useModal();
+  const failedInstallment = OrderHelper.getFailedInstallment(order);
+  return (
+    <>
+      <Modal {...props} size={ModalSize.MEDIUM} title={intl.formatMessage(messages.title)}>
+        <h3 className="order-payment-details__title mb-s">
+          <FormattedMessage {...messages.paymentMethodTitle} />
+        </h3>
+        <CreditCardSelectorWrapper selectedCreditCardId={order.credit_card_id} />
+        <h3 className="order-payment-details__title mb-s mt-b">
+          <FormattedMessage {...messages.scheduleTitle} />
+        </h3>
+        {failedInstallment && (
+          <Alert
+            className="mb-t"
+            type={VariantType.ERROR}
+            buttons={
+              <Button size="small" onClick={retryModal.open}>
+                <FormattedMessage
+                  {...messages.paymentNeededButton}
+                  values={{
+                    amount: intl.formatNumber(failedInstallment.amount, {
+                      style: 'currency',
+                      currency: failedInstallment.currency,
+                    }),
+                  }}
+                />
+              </Button>
+            }
+          >
+            <FormattedMessage {...messages.paymentNeededMessage} />
+          </Alert>
+        )}
+        {order.payment_schedule && <PaymentScheduleGrid schedule={order.payment_schedule} />}
+      </Modal>
+      {failedInstallment && (
+        <OrderPaymentRetryModal {...retryModal} installment={failedInstallment} order={order} />
+      )}
+    </>
+  );
+};
+
+const CreditCardSelectorWrapper = ({
+  selectedCreditCardId,
+}: {
+  selectedCreditCardId: Maybe<string>;
+}) => {
+  const {
+    item: creditCard,
+    states: { fetching },
+  } = useCreditCard(selectedCreditCardId);
+  const [selectedCreditCard, setSelectedCreditCard] = useState<Maybe<CreditCard>>(creditCard);
+
+  useEffect(() => {
+    if (!selectedCreditCard && creditCard) {
+      setSelectedCreditCard(creditCard);
+    }
+  }, [creditCard]);
+
+  if (fetching) {
+    return <Loader size="small" />;
+  }
+
+  return (
+    <CreditCardSelector
+      creditCard={selectedCreditCard || creditCard}
+      setCreditCard={setSelectedCreditCard}
+      quickRemove={false}
+      allowEdit={false}
+    />
+  );
+};

package/js/widgets/Dashboard/components/DashboardItem/Order/OrderPaymentRetryModal/index.tsx

@@ -0,0 +1,209 @@
+import {
+  Alert,
+  Button,
+  Modal,
+  ModalProps,
+  ModalSize,
+  useModals,
+  VariantType,
+} from '@openfun/cunningham-react';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { useRef, useState } from 'react';
+import { CreditCard, Order, PaymentInstallment, ACTIVE_ORDER_STATES } from 'types/Joanie';
+import { CreditCardSelector } from 'components/CreditCardSelector';
+import { useJoanieApi } from 'contexts/JoanieApiContext';
+import { Payment, PaymentErrorMessageId } from 'components/PaymentInterfaces/types';
+import PaymentInterface from 'components/PaymentInterfaces';
+import { PAYMENT_SETTINGS } from 'settings';
+import { useOrders } from 'hooks/useOrders';
+import { Spinner } from 'components/Spinner';
+
+const messages = defineMessages({
+  title: {
+    id: 'components.DashboardItemOrder.OrderPaymentRetryModal.title',
+    defaultMessage: 'Retry payment',
+    description: 'Title of the payment retry modal',
+  },
+  description: {
+    id: 'components.DashboardItemOrder.OrderPaymentRetryModal.description',
+    defaultMessage:
+      'The payment failed, please choose another payment method or add a new one during the payment',
+    description: 'Message displayed when payment is needed',
+  },
+  submit: {
+    id: 'components.DashboardItemOrder.OrderPaymentRetryModal.submit',
+    defaultMessage: 'Pay {amount}',
+    description: 'Message displayed when payment is needed',
+  },
+  paymentInProgress: {
+    defaultMessage: 'Payment in progress',
+    description: 'Label for screen reader when a retry payment is in progress.',
+    id: 'components.DashboardItemOrder.OrderPaymentRetryModal.paymentInProgress',
+  },
+  successTitle: {
+    defaultMessage: 'Payment successful',
+    description: 'Title of the payment success modal',
+    id: 'components.DashboardItemOrder.OrderPaymentRetryModal.successTitle',
+  },
+  successDescription: {
+    defaultMessage: 'The payment was successful',
+    description: 'Description of the payment success modal',
+    id: 'components.DashboardItemOrder.OrderPaymentRetryModal.successDescription',
+  },
+  errorFailedSubmitInstallmentPayment: {
+    defaultMessage: 'Failed to submit installment payment, please retry later.',
+    description: 'Error message when submitting installment payment fails',
+    id: 'components.DashboardItemOrder.OrderPaymentRetryModal.errorFailedSubmitInstallmentPayment',
+  },
+  errorAbortingPolling: {
+    defaultMessage:
+      'Your payment has succeeded but your order validation is taking too long, you can close this dialog and come back later.',
+    description: 'Error message when submitting installment payment fails',
+    id: 'components.DashboardItemOrder.OrderPaymentRetryModal.errorAbortingPolling',
+  },
+});
+
+interface Props extends Pick<ModalProps, 'isOpen' | 'onClose'> {
+  installment: PaymentInstallment;
+  order: Order;
+}
+
+enum ComponentStates {
+  IDLE = 'idle',
+  LOADING = 'loading',
+  ERROR = 'error',
+}
+
+export const OrderPaymentRetryModal = ({ installment, order, ...props }: Props) => {
+  const intl = useIntl();
+  const API = useJoanieApi();
+  const timeoutRef = useRef<NodeJS.Timeout>();
+  const { methods: orderMethods } = useOrders(undefined, { enabled: false });
+  const [payment, setPayment] = useState<Payment>();
+  const [state, setState] = useState<ComponentStates>(ComponentStates.IDLE);
+  const [error, setError] = useState<string>();
+  const [creditCard, setCreditCard] = useState<CreditCard>();
+  const modals = useModals();
+
+  const pay = async () => {
+    setState(ComponentStates.LOADING);
+    try {
+      const paymentResponse = await API.user.orders.submit_installment_payment(order.id, {
+        credit_card_id: creditCard?.id,
+      });
+      if (paymentResponse) {
+        setPayment(paymentResponse);
+      } else {
+        // In case of bug.
+        setError(intl.formatMessage(messages.errorFailedSubmitInstallmentPayment));
+        setState(ComponentStates.ERROR);
+      }
+    } catch (e) {
+      setError(intl.formatMessage(messages.errorFailedSubmitInstallmentPayment));
+      setState(ComponentStates.ERROR);
+    }
+  };
+
+  const handleError = (messageId: string = PaymentErrorMessageId.ERROR_DEFAULT) => {
+    setState(ComponentStates.ERROR);
+    setError(messageId);
+  };
+
+  const isOrderValidated = async (id: string): Promise<Boolean> => {
+    const orderToCheck = await API.user.orders.get({ id });
+    return orderToCheck !== null && ACTIVE_ORDER_STATES.includes(orderToCheck.state);
+  };
+
+  const settled = async () => {
+    await orderMethods.invalidate();
+    props.onClose();
+    await modals.messageModal({
+      messageType: VariantType.SUCCESS,
+      title: intl.formatMessage(messages.successTitle),
+      children: intl.formatMessage(messages.successDescription),
+    });
+  };
+
+  const handleSuccess = () => {
+    let round = 0;
+
+    const checkOrderValidity = async () => {
+      if (round >= PAYMENT_SETTINGS.pollLimit) {
+        timeoutRef.current = undefined;
+        setState(ComponentStates.ERROR);
+        setError(intl.formatMessage(messages.errorAbortingPolling));
+      } else {
+        const isValidated = await isOrderValidated(order.id);
+        if (isValidated) {
+          setState(ComponentStates.IDLE);
+          timeoutRef.current = undefined;
+          settled();
+        } else {
+          round++;
+          timeoutRef.current = setTimeout(checkOrderValidity, PAYMENT_SETTINGS.pollInterval);
+        }
+      }
+    };
+
+    checkOrderValidity();
+  };
+
+  return (
+    <>
+      <Modal
+        {...props}
+        size={ModalSize.MEDIUM}
+        title={intl.formatMessage(messages.title)}
+        closeOnEsc={state !== ComponentStates.LOADING}
+        preventClose={state === ComponentStates.LOADING}
+        hideCloseButton={state === ComponentStates.LOADING}
+        actions={
+          <Button
+            color="primary"
+            size="small"
+            fullWidth={true}
+            onClick={pay}
+            disabled={state === ComponentStates.LOADING}
+            data-testid="order-payment-retry-modal-submit-button"
+          >
+            {state === ComponentStates.LOADING ? (
+              <Spinner theme="light" aria-labelledby="payment-in-progress">
+                <span id="payment-in-progress">
+                  <FormattedMessage {...messages.paymentInProgress} />
+                </span>
+              </Spinner>
+            ) : (
+              <FormattedMessage
+                {...messages.submit}
+                values={{
+                  amount: intl.formatNumber(installment.amount, {
+                    style: 'currency',
+                    currency: installment.currency,
+                  }),
+                }}
+              />
+            )}
+          </Button>
+        }
+      >
+        {error && (
+          <Alert type={VariantType.ERROR} className="mb-t">
+            {error}
+          </Alert>
+        )}
+        <Alert className="mb-b">
+          <FormattedMessage {...messages.description} />
+        </Alert>
+        <CreditCardSelector
+          creditCard={creditCard}
+          setCreditCard={setCreditCard}
+          quickRemove={state !== ComponentStates.LOADING}
+          allowEdit={state !== ComponentStates.LOADING}
+        />
+      </Modal>
+      {state === ComponentStates.LOADING && payment && (
+        <PaymentInterface {...payment} onError={handleError} onSuccess={handleSuccess} />
+      )}
+    </>
+  );
+};

package/js/widgets/Dashboard/components/DashboardItem/Order/OrderStateLearnerMessage/index.spec.tsx

@@ -1,11 +1,7 @@
 import React, { PropsWithChildren } from 'react';
 import { screen } from '@testing-library/react';
 import { createIntl } from 'react-intl';
-import {
-  ContractDefinitionFactory,
-  ContractFactory,
-  CredentialOrderFactory,
-} from 'utils/test/factories/joanie';
+import { CredentialOrderFactory } from 'utils/test/factories/joanie';
 import { OrderState } from 'types/Joanie';
 import { render } from 'utils/test/render';
 import { IntlWrapper } from 'utils/test/wrappers/IntlWrapper';
@@ -13,86 +9,37 @@ import OrderStateLearnerMessage, { messages } from '.';
 
 const intl = createIntl({ locale: 'en' });
 
-describe('<DashboardItemOrder/>', () => {
+describe('<OrderStateLearnerMessage/>', () => {
   it.each([
-    [OrderState.DRAFT, 'Draft'],
-    [OrderState.SUBMITTED, 'Submitted'],
-    [OrderState.PENDING, 'Pending'],
+    [OrderState.ASSIGNED, 'Pending'],
     [OrderState.CANCELED, 'Canceled'],
-  ])(
-    'should display message from order state: %s when order have no contract',
-    (state, expectedMessage) => {
-      const order = CredentialOrderFactory({ state }).one();
-      render(<OrderStateLearnerMessage order={order} />, {
-        wrapper: ({ children }: PropsWithChildren) => <IntlWrapper>{children}</IntlWrapper>,
-      });
-      expect(screen.getByText(expectedMessage)).toBeInTheDocument();
-    },
-  );
-
-  it.each([
-    [OrderState.DRAFT, 'Draft'],
-    [OrderState.SUBMITTED, 'Submitted'],
-    [OrderState.PENDING, 'Pending'],
-    [OrderState.CANCELED, 'Canceled'],
-  ])(
-    'should display message from order state: %s when order have no contract',
-    (state, expectedMessage) => {
-      const orderWithContract = CredentialOrderFactory({
-        state,
-        contract: ContractFactory().one(),
-      }).one();
-      render(<OrderStateLearnerMessage order={orderWithContract} />, {
-        wrapper: ({ children }: PropsWithChildren) => <IntlWrapper>{children}</IntlWrapper>,
-      });
-      expect(screen.getByText(expectedMessage)).toBeInTheDocument();
-    },
-  );
-
-  it('should display message for validated order that need learner signature', () => {
-    const order = CredentialOrderFactory({
-      state: OrderState.VALIDATED,
-      contract: null,
-    }).one();
-
-    const contractDefinition = ContractDefinitionFactory().one();
-
-    render(<OrderStateLearnerMessage order={order} contractDefinition={contractDefinition} />, {
-      wrapper: ({ children }: PropsWithChildren) => <IntlWrapper>{children}</IntlWrapper>,
-    });
-    expect(screen.getByText('Signature required')).toBeInTheDocument();
-  });
-
-  it("should display message for validated order that don't have a generated certificate", () => {
-    const order = CredentialOrderFactory({
-      state: OrderState.VALIDATED,
-      contract: ContractFactory({ student_signed_on: new Date().toISOString() }).one(),
-      certificate_id: undefined,
-    }).one();
+    [OrderState.COMPLETED, 'On going'],
+    [OrderState.DRAFT, 'Pending'],
+    [OrderState.FAILED_PAYMENT, 'Last direct debit has failed'],
+    [OrderState.NO_PAYMENT, 'First direct debit has failed'],
+    [OrderState.PENDING, 'Pending for the first direct debit'],
+    [OrderState.PENDING_PAYMENT, 'On going'],
+    [OrderState.SIGNING, 'Signature required'],
+    [OrderState.TO_SAVE_PAYMENT_METHOD, 'Payment method is missing'],
+    [OrderState.TO_SIGN, 'Signature required'],
+  ])('should display message from order state: %s', (state, expectedMessage) => {
+    const order = CredentialOrderFactory({ state }).one();
     render(<OrderStateLearnerMessage order={order} />, {
       wrapper: ({ children }: PropsWithChildren) => <IntlWrapper>{children}</IntlWrapper>,
     });
-    expect(
-      screen.getByText(intl.formatMessage(messages.statusOnGoing), {
-        exact: false,
-      }),
-    );
+    expect(screen.getByText(expectedMessage)).toBeInTheDocument();
   });
 
-  it('should display message for validated order that have a generated certificate', () => {
+  it('should display message for completed order that have a generated certificate', () => {
     const order = CredentialOrderFactory({
-      state: OrderState.VALIDATED,
-      contract: ContractFactory({
-        student_signed_on: new Date().toISOString(),
-        organization_signed_on: new Date().toISOString(),
-      }).one(),
+      state: OrderState.COMPLETED,
       certificate_id: 'FAKE_CERTIFICATE_ID',
     }).one();
     render(<OrderStateLearnerMessage order={order} />, {
       wrapper: ({ children }: PropsWithChildren) => <IntlWrapper>{children}</IntlWrapper>,
     });
     expect(
-      screen.getByText(intl.formatMessage(messages.statusCompleted), {
+      screen.getByText(intl.formatMessage(messages.statusPassed), {
         exact: false,
       }),
     );

package/js/widgets/Dashboard/components/DashboardItem/Order/OrderStateLearnerMessage/index.tsx

@@ -1,55 +1,70 @@
 import { defineMessages } from 'react-intl';
-import OrderStateMessage, { OrderStateMessageBaseProps } from '../OrderStateMessage';
+import OrderStateMessage, { OrderStateMessageBaseProps, MessageKeys } from '../OrderStateMessage';
 
-export const messages = defineMessages({
+export const messages = defineMessages<MessageKeys>({
   statusDraft: {
-    id: 'components.DashboardItem.Order.OrderStateMessage.statusDraft',
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusDraft',
     description: 'Status shown on the dashboard order item when order is draft.',
-    defaultMessage: 'Draft',
+    defaultMessage: 'Pending',
   },
-  statusSubmitted: {
-    id: 'components.DashboardItem.Order.OrderStateMessage.statusSubmitted',
-    description: 'Status shown on the dashboard order item when order is submitted.',
-    defaultMessage: 'Submitted',
+  statusAssigned: {
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusAssigned',
+    description: 'Status shown on the dashboard order item when order is assigned.',
+    defaultMessage: 'Pending',
   },
   statusPending: {
-    id: 'components.DashboardItem.Order.OrderStateMessage.statusPending',
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusPending',
     description: 'Status shown on the dashboard order item when order is pending.',
-    defaultMessage: 'Pending',
+    defaultMessage: 'Pending for the first direct debit',
   },
-  statusOnGoing: {
-    id: 'components.DashboardItem.Order.OrderStateMessage.statusOnGoing',
-    description:
-      'Status shown on the dashboard order item when order is validated with no certificate',
+  statusPendingPayment: {
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusPendingPayment',
+    description: 'Status shown on the dashboard order item when order is pending for payment',
     defaultMessage: 'On going',
   },
   statusCompleted: {
-    id: 'components.DashboardItem.Order.OrderStateMessage.statusCompleted',
-    description:
-      'Status shown on the dashboard order item when order is validated with certificate',
-    defaultMessage: 'Completed',
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusCompleted',
+    description: 'Status shown on the dashboard order item when order is completed',
+    defaultMessage: 'On going',
   },
   statusWaitingSignature: {
-    id: 'components.DashboardItem.Order.OrderStateMessage.statusWaitingSignature',
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusWaitingSignature',
     description:
       "Status shown on the dashboard order item when order is validated with contract's learner signature missing.",
     defaultMessage: 'Signature required',
   },
   statusWaitingCounterSignature: {
-    id: 'components.DashboardItem.Order.OrderStateMessage.statusWaitingCounterSignature',
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusWaitingCounterSignature',
     description:
       "Status shown on the dashboard order item when order is validated with contract's organization signature missing.",
     defaultMessage: 'On going',
   },
+  statusWaitingPaymentMethod: {
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusWaitingPaymentMethod',
+    description:
+      'Status shown on the dashboard order item when order is in to_save_payment_method state.',
+    defaultMessage: 'Payment method is missing',
+  },
   statusCanceled: {
-    id: 'components.DashboardItem.Order.OrderStateMessage.statusCanceled',
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusCanceled',
     description: 'Status shown on the dashboard order item when order is canceled',
     defaultMessage: 'Canceled',
   },
-  statusOther: {
-    id: 'components.DashboardItem.Order.OrderStateMessage.statusOther',
-    description: 'Status shown on the dashboard order item when order status is unknown',
-    defaultMessage: '{state}',
+  statusNoPayment: {
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusNoPayment',
+    description: 'Status shown on the dashboard order item when order is in no payment state',
+    defaultMessage: 'First direct debit has failed',
+  },
+  statusFailedPayment: {
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusFailedPayment',
+    description: 'Status shown on the dashboard order item when order is in failed payment state',
+    defaultMessage: 'Last direct debit has failed',
+  },
+  statusPassed: {
+    id: 'components.DashboardItem.Order.OrderStateLearnerMessage.statusPassed',
+    description:
+      'Status shown on the dashboard order item when order is completed and has a certificate',
+    defaultMessage: 'Successfully completed',
   },
 });
 

package/js/widgets/Dashboard/components/DashboardItem/Order/OrderStateMessage/index.tsx

@@ -1,26 +1,33 @@
 import { FormattedMessage, MessageDescriptor } from 'react-intl';
 import { useEffect } from 'react';
-import {
-  CertificateOrder,
-  CredentialOrder,
-  OrderState,
-  ContractDefinition,
-  NestedCourseOrder,
-} from 'types/Joanie';
+import { CertificateOrder, CredentialOrder, OrderState, NestedCourseOrder } from 'types/Joanie';
 import { StringHelper } from 'utils/StringHelper';
 import { handle } from 'utils/errors/handle';
 import { OrderHelper, OrderStatus } from 'utils/OrderHelper';
 
 export interface OrderStateMessageBaseProps {
   order: CredentialOrder | CertificateOrder | NestedCourseOrder;
-  contractDefinition?: ContractDefinition;
 }
 
+export type MessageKeys =
+  | 'statusDraft'
+  | 'statusAssigned'
+  | 'statusPending'
+  | 'statusPendingPayment'
+  | 'statusCompleted'
+  | 'statusWaitingSignature'
+  | 'statusWaitingCounterSignature'
+  | 'statusWaitingPaymentMethod'
+  | 'statusCanceled'
+  | 'statusNoPayment'
+  | 'statusFailedPayment'
+  | 'statusPassed';
+
 interface OrderStateMessageProps extends OrderStateMessageBaseProps {
-  messages: Record<string, MessageDescriptor>;
+  messages: Record<MessageKeys, MessageDescriptor>;
 }
 
-const OrderStateMessage = ({ order, contractDefinition, messages }: OrderStateMessageProps) => {
+const OrderStateMessage = ({ order, messages }: OrderStateMessageProps) => {
   useEffect(() => {
     if (!Object.values(OrderState).includes(order.state)) {
       handle(new Error(`Unknown order state ${order.state}`));
@@ -28,24 +35,23 @@ const OrderStateMessage = ({ order, contractDefinition, messages }: OrderStateMe
   }, [order.state]);
 
   const orderStatusMessagesMap = {
+    [OrderStatus.ASSIGNED]: messages.statusAssigned,
+    [OrderStatus.CANCELED]: messages.statusCanceled,
     [OrderStatus.DRAFT]: messages.statusDraft,
-    [OrderStatus.SUBMITTED]: messages.statusSubmitted,
+    [OrderStatus.COMPLETED]: messages.statusCompleted,
+    [OrderStatus.FAILED_PAYMENT]: messages.statusFailedPayment,
+    [OrderStatus.NO_PAYMENT]: messages.statusNoPayment,
+    [OrderStatus.PASSED]: messages.statusPassed,
     [OrderStatus.PENDING]: messages.statusPending,
-    [OrderStatus.CANCELED]: messages.statusCanceled,
-    [OrderStatus.WAITING_SIGNATURE]: messages.statusWaitingSignature,
+    [OrderStatus.PENDING_PAYMENT]: messages.statusPendingPayment,
     [OrderStatus.WAITING_COUNTER_SIGNATURE]: messages.statusWaitingCounterSignature,
-    [OrderStatus.COMPLETED]: messages.statusCompleted,
-    [OrderStatus.ON_GOING]: messages.statusOnGoing,
+    [OrderStatus.WAITING_PAYMENT_METHOD]: messages.statusWaitingPaymentMethod,
+    [OrderStatus.WAITING_SIGNATURE]: messages.statusWaitingSignature,
   };
-  const status = OrderHelper.getState(order, contractDefinition);
+  const status = OrderHelper.getState(order);
 
   if (status === null) {
-    return (
-      <FormattedMessage
-        {...messages.statusOther}
-        values={{ state: StringHelper.capitalizeFirst(order.state) }}
-      />
-    );
+    return StringHelper.capitalizeFirst(order.state);
   }
 
   return <FormattedMessage {...orderStatusMessagesMap[status]} />;