feat: add payment method name for recurring order

intershop · Sep 6, 2024 · 2a0d219 · 2a0d219
1 parent 49f1da8
commit 2a0d219
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/src/app/core/models/recurring-order/recurring-order.interface.ts b/src/app/core/models/recurring-order/recurring-order.interface.ts
@@ -18,6 +18,7 @@ export interface RecurringOrderData extends Omit<RecurringOrderLinkData, 'totalN
   ];
 
   payments?: [{ name: string; id: string }];
+  paymentMethods?: [{ displayName: string }];
 }
 
 export interface RecurringOrderLinkData {

diff --git a/src/app/core/models/recurring-order/recurring-order.mapper.ts b/src/app/core/models/recurring-order/recurring-order.mapper.ts
@@ -82,7 +82,7 @@ export class RecurringOrderMapper {
       invoiceToAddress: data.invoiceToAddress,
       commonShipToAddress: data.shippingBuckets?.[0]?.shipToAddress,
       commonShippingMethod: data.shippingBuckets?.[0]?.shippingMethod,
-      payment: { id: data.payments?.[0].id, displayName: data.payments?.[0].name } as Payment,
+      payment: { id: data.payments?.[0].id, displayName: data.paymentMethods?.[0].displayName } as Payment,
 
       lineItems: data.shippingBuckets?.[0]?.lineItems,
 

diff --git a/src/app/pages/account-recurring-order/account-recurring-order-page.component.html b/src/app/pages/account-recurring-order/account-recurring-order-page.component.html
@@ -112,12 +112,7 @@ <h1>{{ 'account.recurring_order.heading' | translate }}</h1>
     <!-- Payment -->
     <ish-info-box heading="account.recurring_order.details.payment_method.heading" class="infobox-wrapper col-md-6">
       <ng-container *ngIf="recurringOrder.payment">
-        <div class="float-right">
-          <p class="badge badge-info">{{ recurringOrder.payment.status }}</p>
-        </div>
-        <p>
-          {{ recurringOrder.payment.displayName }}
-        </p>
+        {{ recurringOrder.payment.displayName }}
       </ng-container>
     </ish-info-box>
   </div>

diff --git a/...p/pages/account-recurring-orders/recurring-order-list/recurring-order-list.component.html b/...p/pages/account-recurring-orders/recurring-order-list/recurring-order-list.component.html
@@ -99,7 +99,7 @@
     <ng-container cdkColumnDef="actions">
       <th cdk-header-cell *cdkHeaderCellDef data-testing-id="th-order-actions"></th>
       <td cdk-cell *cdkCellDef="let recurringOrder" class="column-price text-nowrap">
-        <span *ngIf="recurringOrder.expired; else switch">{{
+        <span *ngIf="recurringOrder.expired; else switch" class="mr-2">{{
           'account.recurring_orders.expired.text' | translate
         }}</span>
         <ng-template #switch>
-Original file line number
+Diff line change
@@ Expand Up @@
       ];
       payments?: [{ name: string; id: string }];
+      paymentMethods?: [{ displayName: string }];
     }
     export interface RecurringOrderLinkData {
@@ Expand Down @@