richie-education 2.28.2-dev26 → 2.28.2-dev39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/js/api/joanie.ts +30 -1
- package/js/components/{SaleTunnel/CreditCardSelector → CreditCardSelector}/index.spec.tsx +8 -38
- package/js/components/{SaleTunnel/CreditCardSelector → CreditCardSelector}/index.tsx +15 -22
- package/js/components/PaymentScheduleGrid/_styles.scss +13 -0
- package/js/components/PaymentScheduleGrid/index.tsx +50 -70
- package/js/components/PurchaseButton/index.spec.tsx +27 -12
- package/js/components/SaleTunnel/GenericPaymentButton/index.tsx +2 -7
- package/js/components/SaleTunnel/GenericSaleTunnel.tsx +22 -3
- package/js/components/SaleTunnel/SaleTunnelInformation/index.tsx +43 -17
- package/js/components/SaleTunnel/Sponsors/SaleTunnelSponsors.scss +4 -5
- package/js/components/SaleTunnel/Sponsors/SaleTunnelSponsors.tsx +34 -11
- package/js/components/SaleTunnel/_styles.scss +6 -4
- package/js/components/SaleTunnel/index.credential.spec.tsx +5 -7
- package/js/components/SaleTunnel/index.full-process.spec.tsx +7 -1
- package/js/components/SaleTunnel/index.spec.tsx +127 -61
- package/js/hooks/usePaymentSchedule.tsx +23 -0
- package/js/hooks/useResources/useResourcesRoot.ts +3 -3
- package/js/index.tsx +2 -0
- package/js/types/Joanie.ts +31 -0
- package/js/utils/OrderHelper/index.ts +13 -0
- package/js/utils/test/factories/joanie.ts +32 -19
- package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrder.spec.tsx +110 -2
- package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrder.tsx +90 -2
- package/js/widgets/Dashboard/components/DashboardItem/Order/OrderPaymentDetailsModal/_styles.scss +7 -0
- package/js/widgets/Dashboard/components/DashboardItem/Order/OrderPaymentDetailsModal/index.tsx +106 -0
- package/js/widgets/Dashboard/components/DashboardItem/Order/OrderPaymentRetryModal/index.tsx +212 -0
- package/js/widgets/Dashboard/components/DashboardItem/Order/OrderStateLearnerMessage/index.tsx +16 -0
- package/js/widgets/Dashboard/components/DashboardItem/Order/OrderStateMessage/index.tsx +3 -0
- package/package.json +2 -1
- package/scss/components/_index.scss +2 -1
- /package/js/components/{SaleTunnel/CreditCardSelector → CreditCardSelector}/_styles.scss +0 -0
package/js/widgets/Dashboard/components/DashboardItem/Order/OrderStateLearnerMessage/index.tsx
CHANGED
|
@@ -29,6 +29,12 @@ export const messages = defineMessages({
|
|
|
29
29
|
'Status shown on the dashboard order item when order is validated with certificate',
|
|
30
30
|
defaultMessage: 'Completed',
|
|
31
31
|
},
|
|
32
|
+
statusPendingPayment: {
|
|
33
|
+
id: 'components.DashboardItem.Order.OrderStateMessage.statusPendingPayment',
|
|
34
|
+
description:
|
|
35
|
+
'Status shown on the dashboard order item when order is validated with certificate and pending payment',
|
|
36
|
+
defaultMessage: 'Completed',
|
|
37
|
+
},
|
|
32
38
|
statusWaitingSignature: {
|
|
33
39
|
id: 'components.DashboardItem.Order.OrderStateMessage.statusWaitingSignature',
|
|
34
40
|
description:
|
|
@@ -46,6 +52,16 @@ export const messages = defineMessages({
|
|
|
46
52
|
description: 'Status shown on the dashboard order item when order is canceled',
|
|
47
53
|
defaultMessage: 'Canceled',
|
|
48
54
|
},
|
|
55
|
+
statusNoPayment: {
|
|
56
|
+
id: 'components.DashboardItem.Order.OrderStateMessage.statusNoPayment',
|
|
57
|
+
description: 'Status shown on the dashboard order item when order is in no payment state',
|
|
58
|
+
defaultMessage: 'Failed payment',
|
|
59
|
+
},
|
|
60
|
+
statusFailedPayment: {
|
|
61
|
+
id: 'components.DashboardItem.Order.OrderStateMessage.statusFailedPayment',
|
|
62
|
+
description: 'Status shown on the dashboard order item when order is in failed payment state',
|
|
63
|
+
defaultMessage: 'Failed payment',
|
|
64
|
+
},
|
|
49
65
|
statusOther: {
|
|
50
66
|
id: 'components.DashboardItem.Order.OrderStateMessage.statusOther',
|
|
51
67
|
description: 'Status shown on the dashboard order item when order status is unknown',
|
|
@@ -36,6 +36,9 @@ const OrderStateMessage = ({ order, contractDefinition, messages }: OrderStateMe
|
|
|
36
36
|
[OrderStatus.WAITING_COUNTER_SIGNATURE]: messages.statusWaitingCounterSignature,
|
|
37
37
|
[OrderStatus.COMPLETED]: messages.statusCompleted,
|
|
38
38
|
[OrderStatus.ON_GOING]: messages.statusOnGoing,
|
|
39
|
+
[OrderStatus.NO_PAYMENT]: messages.statusNoPayment,
|
|
40
|
+
[OrderStatus.PENDING_PAYMENT]: messages.statusPendingPayment,
|
|
41
|
+
[OrderStatus.FAILED_PAYMENT]: messages.statusFailedPayment,
|
|
39
42
|
};
|
|
40
43
|
const status = OrderHelper.getState(order, contractDefinition);
|
|
41
44
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "richie-education",
|
|
3
|
-
"version": "2.28.2-
|
|
3
|
+
"version": "2.28.2-dev39",
|
|
4
4
|
"description": "A CMS to build learning portals for Open Education",
|
|
5
5
|
"main": "sandbox/manage.py",
|
|
6
6
|
"scripts": {
|
|
@@ -63,6 +63,7 @@
|
|
|
63
63
|
"@tanstack/query-core": "5.51.15",
|
|
64
64
|
"@tanstack/query-sync-storage-persister": "5.51.15",
|
|
65
65
|
"@tanstack/react-query": "5.51.15",
|
|
66
|
+
"@tanstack/react-query-devtools": "5.51.5",
|
|
66
67
|
"@tanstack/react-query-persist-client": "5.51.15",
|
|
67
68
|
"@testing-library/dom": "10.4.0",
|
|
68
69
|
"@testing-library/jest-dom": "6.4.8",
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
@import '../../js/components/AddressesManagement/styles';
|
|
2
|
+
@import '../../js/components/CreditCardSelector/styles';
|
|
2
3
|
@import '../../js/components/ContractFrame/styles';
|
|
3
4
|
@import '../../js/components/Tabs/styles';
|
|
4
5
|
@import '../../js/components/TeacherDashboardCourseList/styles';
|
|
@@ -8,7 +9,6 @@
|
|
|
8
9
|
@import '../../js/components/PurchaseButton/styles';
|
|
9
10
|
@import '../../js/components/SaleTunnel/styles';
|
|
10
11
|
@import '../../js/components/SaleTunnel/AddressSelector/styles';
|
|
11
|
-
@import '../../js/components/SaleTunnel/CreditCardSelector/styles';
|
|
12
12
|
@import '../../js/components/SaleTunnel/ProductPath/styles';
|
|
13
13
|
@import '../../js/components/SaleTunnel/Sponsors/SaleTunnelSponsors';
|
|
14
14
|
@import '../../js/components/SuccessIcon/styles';
|
|
@@ -32,6 +32,7 @@
|
|
|
32
32
|
@import '../../js/widgets/Dashboard/components/DashboardCard/styles';
|
|
33
33
|
@import '../../js/widgets/Dashboard/components/DashboardItem/Certificate/styles';
|
|
34
34
|
@import '../../js/widgets/Dashboard/components/DashboardItem/Order/styles';
|
|
35
|
+
@import '../../js/widgets/Dashboard/components/DashboardItem/Order/OrderPaymentDetailsModal/styles';
|
|
35
36
|
@import '../../js/widgets/Dashboard/components/DashboardItem/Contract/_styles';
|
|
36
37
|
@import '../../js/widgets/Dashboard/components/DashboardItem/styles';
|
|
37
38
|
@import '../../js/widgets/Dashboard/components/DashboardLayout/styles';
|
|
File without changes
|