richie-education 3.2.2-dev62 → 3.3.1-dev1

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

@@ -146,9 +146,8 @@ export const SaleTunnelInformationSingular = () => {
   const discount = query.data?.discount ?? props.paymentPlan?.discount;
   const fromBatchOrder = query.data?.from_batch_order ?? props.paymentPlan?.from_batch_order;
 
-  const showPaymentSchedule =
+  const isCredentialWithPrice =
     product.type === ProductType.CREDENTIAL &&
-    schedule &&
     (discountedPrice != null ? discountedPrice > 0 : price != null && price > 0);
 
   useEffect(() => {
@@ -204,18 +203,19 @@ export const SaleTunnelInformationSingular = () => {
         </div>
       )}
       <div>
-        {showPaymentSchedule ? (
-          <PaymentScheduleBlock schedule={schedule!} />
-        ) : (
-          <div>
-            <h4 className="block-title">
-              <FormattedMessage {...messages.paymentSchedule} />
-            </h4>
-            <Alert type={VariantType.NEUTRAL}>
-              <FormattedMessage {...messages.noPaymentSchedule} />
-            </Alert>
-          </div>
-        )}
+        {isCredentialWithPrice &&
+          (schedule ? (
+            <PaymentScheduleBlock schedule={schedule!} />
+          ) : (
+            <div>
+              <h4 className="block-title">
+                <FormattedMessage {...messages.paymentSchedule} />
+              </h4>
+              <Alert type={VariantType.NEUTRAL}>
+                <FormattedMessage {...messages.noPaymentSchedule} />
+              </Alert>
+            </div>
+          ))}
         <Voucher
           discount={discount}
           voucherError={voucherError}

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

@@ -374,8 +374,16 @@ describe('SaleTunnel', () => {
     );
     await user.type(screen.getByLabelText('Voucher code'), 'DISCOUNT100');
     await user.click(screen.getByRole('button', { name: 'Validate' }));
-    await screen.findByRole('heading', { level: 4, name: 'Payment schedule' });
-    screen.getByText('No payment required. This order is fully covered.');
+    await screen.findByRole('heading', { level: 3, name: 'Information' });
+    await screen.findByText(
+      'No billing information required. This order is covered by your organization.',
+    );
+    expect(
+      screen.queryByRole('heading', { level: 4, name: 'Payment schedule' }),
+    ).not.toBeInTheDocument();
+    expect(
+      screen.queryByText('No payment required. This order is fully covered.'),
+    ).not.toBeInTheDocument();
     await screen.findByTestId('sale-tunnel__total__amount');
     const $totalAmountVoucher = screen.getByTestId('sale-tunnel__total__amount');
     expect($totalAmountVoucher).toHaveTextContent(

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

@@ -484,8 +484,12 @@ describe.each([
         });
       });
     } else {
-      await screen.findByRole('heading', { level: 4, name: 'Payment schedule' });
-      screen.getByText('No payment required. This order is fully covered.');
+      expect(
+        screen.queryByRole('heading', { level: 4, name: 'Payment schedule' }),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByText('No payment required. This order is fully covered.'),
+      ).not.toBeInTheDocument();
       expect(screen.queryByRole('table')).toBeNull();
     }
 
@@ -624,8 +628,12 @@ describe.each([
         });
       });
     } else {
-      await screen.findByRole('heading', { level: 4, name: 'Payment schedule' });
-      screen.getByText('No payment required. This order is fully covered.');
+      expect(
+        screen.queryByRole('heading', { level: 4, name: 'Payment schedule' }),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByText('No payment required. This order is fully covered.'),
+      ).not.toBeInTheDocument();
       expect(screen.queryByRole('table')).toBeNull();
     }
 
@@ -838,10 +846,12 @@ describe.each([
         'No billing information required. This order is covered by your organization.',
       ),
     ).toBeInTheDocument();
-    expect(screen.getByRole('heading', { level: 4, name: 'Payment schedule' })).toBeInTheDocument();
     expect(
-      screen.getByText('No payment required. This order is fully covered.'),
-    ).toBeInTheDocument();
+      screen.queryByRole('heading', { level: 4, name: 'Payment schedule' }),
+    ).not.toBeInTheDocument();
+    expect(
+      screen.queryByText('No payment required. This order is fully covered.'),
+    ).not.toBeInTheDocument();
   });
 
   it('should hide voucher code input when one is already used', async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "richie-education",
-  "version": "3.2.2-dev62",
+  "version": "3.3.1-dev1",
   "description": "A CMS to build learning portals for Open Education",
   "main": "sandbox/manage.py",
   "scripts": {