feat(payments-plugin): more manual merge fixes

packages/payments-plugin/e2e/mollie-dev-server.ts

@@ -14,8 +14,8 @@ import localtunnel from 'localtunnel';
 import path from 'path';
 
 import { initialData } from '../../../e2e-common/e2e-initial-data';
-import { MolliePlugin } from '../src/mollie';
 import { molliePaymentHandler } from '../package/mollie/mollie.handler';
+import { MolliePlugin } from '../src/mollie';
 
 import { CREATE_PAYMENT_METHOD } from './graphql/admin-queries';
 import {

packages/payments-plugin/e2e/mollie-payment.e2e-spec.ts

@@ -80,9 +80,6 @@ const mockData = {
         metadata: {
             languageCode: 'nl',
         },
-        metadata: {
-            languageCode: 'nl',
-        },
         mode: 'test',
         method: 'test-method',
         profileId: '123',

packages/payments-plugin/src/mollie/mollie.service.ts

@@ -30,6 +30,7 @@ import { totalCoveredByPayments } from '@vendure/core/dist/service/helpers/utils
 
 import { loggerCtx, PLUGIN_INIT_OPTIONS } from './constants';
 import { OrderWithMollieReference } from './custom-fields';
+import { createExtendedMollieClient, ExtendedMollieClient, ManageOrderLineInput } from './extended-mollie-client';
 import {
     ErrorCode,
     MolliePaymentIntentError,
@@ -40,14 +41,13 @@ import {
 import { molliePaymentHandler } from './mollie.handler';
 import {
     amountToCents,
+    areOrderLinesEqual,
     getLocale,
-    isAmountEqual,
     toAmount,
     toMollieAddress,
     toMollieOrderLines,
 } from './mollie.helpers';
 import { MolliePluginOptions } from './mollie.plugin';
-import { createExtendedMollieClient, ExtendedMollieClient, ManageOrderLineInput } from './extended-mollie-client';
 
 interface OrderStatusInput {
     paymentMethodId: string;