feat: Order recurrence (subscription support)

projects/requisition-management/src/app/components/checkout-receipt-requisition/checkout-receipt-requisition.component.html

@@ -10,7 +10,7 @@ <h1>
         <a
           [routerLink]="['/account/requisitions/buyer/' + req.id, { status: 'PENDING' }]"
           data-testing-id="requisition-number"
-          >{{ req.requisitionNo }}</a
+          >{{ req.requisitionNo ? req.requisitionNo : req.recurringOrderDocumentNo }}</a
         >
       </strong>
     </p>

projects/requisition-management/src/app/models/requisition/requisition.interface.ts

@@ -9,6 +9,7 @@ import { RequisitionApproval, RequisitionUserBudget } from './requisition.model'
 export interface RequisitionBaseData extends BasketBaseData {
   requisitionNo: string;
   orderNo?: string;
+  recurringOrderDocumentNo?: string;
   order?: {
     itemId: string;
   };

projects/requisition-management/src/app/models/requisition/requisition.mapper.ts

@@ -24,6 +24,7 @@ export class RequisitionMapper {
           id: data.id,
           requisitionNo: data.requisitionNo,
           orderNo: data.orderNo,
+          recurringOrderDocumentNo: data.recurringOrderDocumentNo,
           creationDate: data.creationDate,
           userBudget: this.fromUserBudgets(data.userBudgets, data.purchaseCurrency),
           lineItemCount: data.lineItemCount,

projects/requisition-management/src/app/models/requisition/requisition.model.ts

@@ -39,6 +39,7 @@ type RequisitionBasket = Omit<AbstractBasket<LineItem>, 'approval'>;
 export interface Requisition extends RequisitionBasket {
   requisitionNo: string;
   orderNo?: string;
+  recurringOrderDocumentNo?: string;
   creationDate: number;
   lineItemCount: number;
 

src/app/core/facades/checkout.facade.ts

@@ -52,6 +52,7 @@ import {
   updateBasketAddress,
   updateBasketCostCenter,
   updateBasketItem,
+  updateBasketRecurrence,
   updateBasketShippingMethod,
   updateConcardisCvcLastUpdated,
 } from 'ish-core/store/customer/basket';
@@ -143,6 +144,10 @@ export class CheckoutFacade {
     this.store.dispatch(updateBasketCostCenter({ costCenter }));
   }
 
+  updateBasketRecurrence(recurrence: any) {
+    this.store.dispatch(updateBasketRecurrence({ recurrence }));
+  }
+
   updateBasketExternalOrderReference(externalOrderReference: string) {
     this.store.dispatch(updateBasket({ update: { externalOrderReference } }));
   }

src/app/core/models/basket/basket.interface.ts

@@ -10,6 +10,7 @@ import { PaymentInstrument } from 'ish-core/models/payment-instrument/payment-in
 import { PaymentMethodBaseData } from 'ish-core/models/payment-method/payment-method.interface';
 import { PaymentData } from 'ish-core/models/payment/payment.interface';
 import { PriceItemData } from 'ish-core/models/price-item/price-item.interface';
+import { Recurrence } from 'ish-core/models/recurrence/recurrence.model';
 import { ShippingMethodData } from 'ish-core/models/shipping-method/shipping-method.interface';
 
 export interface BasketBaseData {
@@ -55,6 +56,7 @@ export interface BasketBaseData {
     firstName: string;
     lastName: string;
   };
+  recurrence?: Recurrence;
 }
 
 export interface BasketIncludedData {

src/app/core/models/basket/basket.mapper.ts

@@ -74,6 +74,7 @@ export class BasketMapper {
       user: data.buyer,
       externalOrderReference: data.externalOrderReference,
       messageToMerchant: data.messageToMerchant,
+      recurrence: data.recurrence,
     };
   }
 

src/app/core/models/basket/basket.model.ts

@@ -6,6 +6,7 @@ import { BasketTotal } from 'ish-core/models/basket-total/basket-total.model';
 import { BasketValidationResultType } from 'ish-core/models/basket-validation/basket-validation.model';
 import { LineItem, LineItemView } from 'ish-core/models/line-item/line-item.model';
 import { Payment } from 'ish-core/models/payment/payment.model';
+import { Recurrence } from 'ish-core/models/recurrence/recurrence.model';
 import { ShippingMethod } from 'ish-core/models/shipping-method/shipping-method.model';
 
 export interface AbstractBasket<T> {
@@ -36,6 +37,7 @@ export interface AbstractBasket<T> {
   };
   externalOrderReference?: string;
   messageToMerchant?: string;
+  recurrence?: Recurrence;
 }
 
 export type Basket = AbstractBasket<LineItem>;

src/app/core/models/recurrence/recurrence.model.ts

@@ -0,0 +1,6 @@
+export interface Recurrence {
+  interval: string;
+  startDate: string;
+  endDate?: string;
+  repetitions?: number;
+}

src/app/core/services/basket/basket.service.ts

@@ -17,6 +17,7 @@ import { BasketValidation, BasketValidationScopeType } from 'ish-core/models/bas
 import { BasketBaseData, BasketData } from 'ish-core/models/basket/basket.interface';
 import { BasketMapper } from 'ish-core/models/basket/basket.mapper';
 import { Basket } from 'ish-core/models/basket/basket.model';
+import { Recurrence } from 'ish-core/models/recurrence/recurrence.model';
 import { ShippingMethodData } from 'ish-core/models/shipping-method/shipping-method.interface';
 import { ShippingMethodMapper } from 'ish-core/models/shipping-method/shipping-method.mapper';
 import { ShippingMethod } from 'ish-core/models/shipping-method/shipping-method.model';
@@ -31,7 +32,8 @@ export type BasketUpdateType =
   | { costCenter: string }
   | { externalOrderReference: string }
   | { invoiceToAddress: string }
-  | { messageToMerchant: string };
+  | { messageToMerchant: string }
+  | { recurrence: Recurrence };
 
 /**
  * The Basket Service handles the interaction with the 'baskets' REST API.

src/app/core/store/customer/basket/basket.actions.ts

@@ -68,6 +68,12 @@ export const updateBasketCostCenter = createAction(
   '[Basket] Assign a Cost Center at Basket ',
   payload<{ costCenter: string }>()
 );
+
+export const updateBasketRecurrence = createAction(
+  '[Basket] Set the Recurrence Information at Basket ',
+  payload<{ recurrence: any }>()
+);
+
 export const addMessageToMerchant = createAction(
   '[Basket] Message to Merchant',
   payload<{ messageToMerchant: string }>()

src/app/core/store/customer/basket/basket.effects.ts

@@ -63,6 +63,7 @@ import {
   updateBasket,
   updateBasketCostCenter,
   updateBasketFail,
+  updateBasketRecurrence,
   updateBasketShippingMethod,
 } from './basket.actions';
 import { getCurrentBasket, getCurrentBasketId } from './basket.selectors';
@@ -211,6 +212,17 @@ export class BasketEffects {
     )
   );
 
+  /**
+   * Sets the recurrence at the current basket.
+   */
+  updateBasketRecurrence$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(updateBasketRecurrence),
+      mapToPayloadProperty('recurrence'),
+      map(recurrence => updateBasket({ update: { recurrence } }))
+    )
+  );
+
   /**
    * Sets a message to merchant at the current basket.
    */

src/app/pages/basket/basket-order-recurrence-edit/basket-order-recurrence-edit.component.html

@@ -0,0 +1,31 @@
+<div id="order-recurrence">
+  <div>
+    <input
+      type="radio"
+      id="order_recurrence_single"
+      name="order_recurrence"
+      value="single-order"
+      class="form-check-input"
+      [checked]="!recurrence"
+      (change)="updateOrderRecurrence(null)"
+    />
+    <label class="form-check-label" for="order_recurrence_single">One-time purchase</label>
+  </div>
+  <div>
+    <input
+      type="radio"
+      id="order_recurrence_recurring"
+      name="order_recurrence"
+      value="recurring-order"
+      class="form-check-input"
+      [checked]="!!recurrence"
+      (change)="updateOrderRecurrence(defaultRecurrence)"
+    />
+    <label class="form-check-label" for="order_recurrence_recurring">Recurring order</label>
+  </div>
+  <div *ngIf="!!recurrence" class="mt-3">
+    <form [formGroup]="form">
+      <formly-form [form]="form" [fields]="fields" [model]="model" />
+    </form>
+  </div>
+</div>

src/app/pages/basket/basket-order-recurrence-edit/basket-order-recurrence-edit.component.scss

@@ -0,0 +1,11 @@
+@import 'variables';
+
+#order-recurrence {
+  padding: ($space-default * 0.5) ($space-default * 1.5);
+  margin: ($space-default * 1) ($space-default * -1.5);
+  background-color: $white;
+}
+
+#order-recurrence-configuration {
+  height: 100px;
+}

src/app/pages/basket/basket-order-recurrence-edit/basket-order-recurrence-edit.component.spec.ts

@@ -0,0 +1,27 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BasketOrderRecurrenceEditComponent } from './basket-order-recurrence-edit.component';
+
+describe('Basket Order Recurrence Edit Component', () => {
+  let component: BasketOrderRecurrenceEditComponent;
+  let fixture: ComponentFixture<BasketOrderRecurrenceEditComponent>;
+  let element: HTMLElement;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [BasketOrderRecurrenceEditComponent],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BasketOrderRecurrenceEditComponent);
+    component = fixture.componentInstance;
+    element = fixture.nativeElement;
+  });
+
+  it('should be created', () => {
+    expect(component).toBeTruthy();
+    expect(element).toBeTruthy();
+    expect(() => fixture.detectChanges()).not.toThrow();
+  });
+});