@sakeetech/vendure-payment-viva 0.2.6 → 0.2.8

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.
@@ -1 +1 @@
1
- {"version":3,"file":"shop-api.resolver.d.ts","sourceRoot":"","sources":["../../src/api/shop-api.resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAIH,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,cAAc,EACd,uBAAuB,EAExB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAG3E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAgC5D,qBACa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IACA,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAJpC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,uBAAuB,EACnC,YAAY,EAAE,mBAAmB,EACJ,OAAO,EAAE,wBAAwB;IAI3E,aAAa,CACE,SAAS,EAAE,MAAM,EAC7B,GAAG,EAAE,cAAc,GACzB,OAAO,CAAC,MAAM,CAAC;YAqJJ,aAAa;CA4B5B"}
1
+ {"version":3,"file":"shop-api.resolver.d.ts","sourceRoot":"","sources":["../../src/api/shop-api.resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAIH,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,cAAc,EACd,uBAAuB,EAGxB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAG3E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AA+B5D,qBACa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IACA,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAJpC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,uBAAuB,EACnC,YAAY,EAAE,mBAAmB,EACJ,OAAO,EAAE,wBAAwB;IAI3E,aAAa,CACE,SAAS,EAAE,MAAM,EAC7B,GAAG,EAAE,cAAc,GACzB,OAAO,CAAC,MAAM,CAAC;YAyKJ,aAAa;CA4B5B"}
@@ -47,7 +47,6 @@ const core_1 = require("@vendure/core");
47
47
  const state_machine_service_js_1 = require("../services/state-machine.service.js");
48
48
  const error_envelope_js_1 = require("../util/error-envelope.js");
49
49
  const constants_js_1 = require("../constants.js");
50
- const payment_method_handler_js_1 = require("../payment-method-handler.js");
51
50
  // ---------------------------------------------------------------------------
52
51
  // Terminal statuses that cannot be cancelled
53
52
  // ---------------------------------------------------------------------------
@@ -151,12 +150,34 @@ let VivaShopApiResolver = class VivaShopApiResolver {
151
150
  });
152
151
  }
153
152
  // -------------------------------------------------------------------------
154
- // Step 7: invoke the payment handler's cancelPayment (voids Viva auth +
155
- // updates viva_transaction.status = 'cancelled')
153
+ // Step 7: cancel the Vendure Payment via the payment state machine.
154
+ //
155
+ // PaymentService.cancelPayment invokes our handler's cancelPayment (which
156
+ // voids the Viva order + sets viva_transaction.status='cancelled') AND
157
+ // transitions the Vendure Payment Created→Cancelled. The transition is the
158
+ // critical half: Vendure's totalCoveredByPayments() counts every payment
159
+ // except Error/Declined/Cancelled, so a lingering Created payment makes the
160
+ // order's outstanding amount 0 — the customer cannot retry, and the ISV
161
+ // guard then throws "isvAmount must be strictly less than order amount (0)".
162
+ // Calling the handler fn directly (the previous behaviour) voided Viva but
163
+ // never moved the Payment off Created. See issue #12.
164
+ //
165
+ // Our handler throws VivaPluginError on a Viva-side failure; core does NOT
166
+ // catch it, so it propagates here, the Payment is left untouched, and we map
167
+ // the error below exactly as before.
156
168
  // -------------------------------------------------------------------------
157
169
  try {
158
- // cancelPayment on the handler throws VivaPluginError on failure
159
- await payment_method_handler_js_1.vivaPaymentMethodHandler.cancelPaymentFn(ctx, order, payment, {});
170
+ const cancelResult = await this.paymentService.cancelPayment(ctx, payment.id);
171
+ if ((0, core_1.isGraphQlErrorResult)(cancelResult)) {
172
+ // The Payment FSM rejected Created→Cancelled (should not happen with the
173
+ // default process). Surface rather than silently proceeding.
174
+ core_1.Logger.error(`[cancelPayment] PaymentService.cancelPayment failed for paymentId=${paymentId}: ` +
175
+ `${cancelResult.message ?? 'unknown transition error'}`, constants_js_1.VIVA_LOG_CONTEXT);
176
+ return cancelPaymentError({
177
+ errorCode: 'VIVA_INTERNAL_ERROR',
178
+ message: 'Failed to cancel the payment.',
179
+ });
180
+ }
160
181
  }
161
182
  catch (err) {
162
183
  if (err instanceof error_envelope_js_1.VivaPluginError) {
@@ -1 +1 @@
1
- {"version":3,"file":"shop-api.resolver.js","sourceRoot":"","sources":["../../src/api/shop-api.resolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shop-api.resolver.js","sourceRoot":"","sources":["../../src/api/shop-api.resolver.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"payment-method-handler.d.ts","sourceRoot":"","sources":["../src/payment-method-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,oBAAoB,EAAwB,MAAM,eAAe,CAAC;AAG3E,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAElE,OAAO,EACL,gBAAgB,EAEjB,MAAM,uCAAuC,CAAC;AAM/C,OAAO,KAAK,EACV,wBAAwB,EAEzB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAqQ1E,kEAAkE;AAClE,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,OAAO,EAAE,wBAAwB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,EAAE,mBAAmB,CAAC;IAClC,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,IAAI,CAOP;AASD,eAAO,MAAM,wBAAwB,0BAmZnC,CAAC"}
1
+ {"version":3,"file":"payment-method-handler.d.ts","sourceRoot":"","sources":["../src/payment-method-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,oBAAoB,EAAwB,MAAM,eAAe,CAAC;AAG3E,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAElE,OAAO,EACL,gBAAgB,EAEjB,MAAM,uCAAuC,CAAC;AAM/C,OAAO,KAAK,EACV,wBAAwB,EAEzB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAgV1E,kEAAkE;AAClE,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,OAAO,EAAE,wBAAwB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,EAAE,mBAAmB,CAAC;IAClC,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,IAAI,CAOP;AASD,eAAO,MAAM,wBAAwB,0BA0ZnC,CAAC"}
@@ -37,6 +37,14 @@ const TERMINAL_STATUSES = new Set(['captured', 'refunded', 'partially_refunded',
37
37
  * @see references/viva-docs/md/payment-source-for-isv.txt:101
38
38
  */
39
39
  const DEFAULT_SOURCE_CODE = 'Default';
40
+ /**
41
+ * Viva createOrder field length limits (per the create-order OpenAPI body).
42
+ * Values are clamped before transmission so an over-long order code or name
43
+ * never trips a 400.
44
+ */
45
+ const MERCHANT_TRNS_MAX = 50;
46
+ const CUSTOMER_TRNS_MAX = 255;
47
+ const CUSTOMER_FULL_NAME_MAX = 100;
40
48
  // ---------------------------------------------------------------------------
41
49
  // Module-level singletons (set in init)
42
50
  // ---------------------------------------------------------------------------
@@ -195,6 +203,44 @@ function resolveCheckoutColor(options, ctx) {
195
203
  return options.resolveCheckoutColor?.(ctx);
196
204
  return options.checkoutColor;
197
205
  }
206
+ /**
207
+ * Build the Viva createOrder identity fields from the Vendure order.
208
+ *
209
+ * The order passed into `createPayment` is loaded with its `customer` relation
210
+ * (OrderService.getOrderOrThrow default relations include `'customer'`), so the
211
+ * customer scalars are available without an extra query. All fields are
212
+ * conditionally included (omitted when absent) and length-clamped to the Viva
213
+ * createOrder limits. The core `Payments` client maps the typed names to the
214
+ * wire body (`customerEmail → email`, `customerPhone → phone`,
215
+ * `customerFullName → fullName`; `merchantTrns`/`customerTrns` pass through).
216
+ *
217
+ * - `merchantTrns` ← `order.code` (always; merchant-facing, echoed in webhooks
218
+ * as `EventData.MerchantTrns` for reconciliation cross-checks).
219
+ * - `customerTrns` ← `resolveCustomerTrns(order, ctx)` or `Order <code>`.
220
+ * - `customerEmail`/`customerFullName`/`customerPhone` ← order.customer (when set).
221
+ *
222
+ * @see references/viva-docs/md/isv-partner-program.txt:104 (create-order body)
223
+ */
224
+ function buildOrderIdentity(options, order, ctx) {
225
+ const customerTrnsRaw = options.resolveCustomerTrns
226
+ ? options.resolveCustomerTrns(order, ctx)
227
+ : `Order ${order.code}`;
228
+ const identity = {
229
+ merchantTrns: order.code.slice(0, MERCHANT_TRNS_MAX),
230
+ customerTrns: customerTrnsRaw.slice(0, CUSTOMER_TRNS_MAX),
231
+ };
232
+ const customer = order.customer;
233
+ if (customer) {
234
+ if (customer.emailAddress)
235
+ identity.customerEmail = customer.emailAddress;
236
+ const fullName = `${customer.firstName ?? ''} ${customer.lastName ?? ''}`.trim();
237
+ if (fullName)
238
+ identity.customerFullName = fullName.slice(0, CUSTOMER_FULL_NAME_MAX);
239
+ if (customer.phoneNumber)
240
+ identity.customerPhone = customer.phoneNumber;
241
+ }
242
+ return identity;
243
+ }
198
244
  /**
199
245
  * Stable idempotency key for (channelId, orderId, amountMinor, currencyCode).
200
246
  * D11: used as both Idempotency-Key header value and pending-row lookup key.
@@ -360,10 +406,16 @@ exports.vivaPaymentMethodHandler = new core_1.PaymentMethodHandler({
360
406
  idempotencyKey,
361
407
  ...(merchantId !== undefined ? { merchantId } : {}),
362
408
  };
409
+ // Customer identity + merchant reference, drawn from the order already in
410
+ // scope (its `customer` relation is loaded by Vendure). Tags the Viva
411
+ // transaction with the Vendure order code, pre-fills the Smart Checkout
412
+ // page, and lets Viva send its receipt + 3DS email hint. See issue #11.
413
+ const identity = buildOrderIdentity(options, order, ctx);
363
414
  const response = await isvPayments.createOrder({
364
415
  amount: BigInt(amount),
365
416
  currencyCode,
366
417
  sourceCode,
418
+ ...identity,
367
419
  // ISV platform fee (minor units) — already resolved + guarded above.
368
420
  // Verified against the Viva create-order OpenAPI body: `isvAmount` is
369
421
  // "the amount paid out to the ISV partner", NOT added to `amount` but
@@ -1 +1 @@
1
- {"version":3,"file":"payment-method-handler.js","sourceRoot":"","sources":["../src/payment-method-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"payment-method-handler.js","sourceRoot":"","sources":["../src/payment-method-handler.ts"],"names":[],"mappings":"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"}
@@ -40,9 +40,23 @@
40
40
  */
41
41
  import type { PaymentProcess } from '@vendure/core';
42
42
  /**
43
- * Permits the `Created Created` self-transition that `createPayment`'s
44
- * `state: 'Created'` return forces. Registered via
45
- * `config.paymentOptions.customPaymentProcess` in the plugin's `configuration()`.
43
+ * Custom payment process for the Viva redirect flow. Two responsibilities:
44
+ *
45
+ * 1. `transitions` permits the `Created → Created` self-transition that
46
+ * `createPayment`'s `state: 'Created'` return forces (public #10).
47
+ *
48
+ * 2. `onTransitionStart` — reconciles the `viva_transaction.paymentId` proxy
49
+ * (#13). `createPayment` writes the row keyed on `order.id` because Vendure
50
+ * assigns the real `Payment.id` only AFTER the handler returns, so it has no
51
+ * way to store it. This hook runs during the create-time transition, where
52
+ * the real `Payment.id` IS available, and reconciles the row (located by the
53
+ * unique `vivaOrderCode` it stamped into the payment metadata). Without it,
54
+ * every later lookup by `Payment.id` — cancelPayment, the webhook settle
55
+ * path, settlePayment, createRefund — misses, and only worked when
56
+ * `order.id === payment.id` (true in test DBs, false in production).
57
+ *
58
+ * Registered via `config.paymentOptions.customPaymentProcess` in the plugin's
59
+ * `configuration()`.
46
60
  */
47
61
  export declare const vivaPaymentProcess: PaymentProcess<never>;
48
62
  //# sourceMappingURL=payment-process.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"payment-process.d.ts","sourceRoot":"","sources":["../src/payment-process.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAAC,KAAK,CAQpD,CAAC"}
1
+ {"version":3,"file":"payment-process.d.ts","sourceRoot":"","sources":["../src/payment-process.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAmC,MAAM,eAAe,CAAC;AAMrF;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAAC,KAAK,CAoCpD,CAAC"}
@@ -41,10 +41,28 @@
41
41
  */
42
42
  Object.defineProperty(exports, "__esModule", { value: true });
43
43
  exports.vivaPaymentProcess = void 0;
44
+ const core_1 = require("@vendure/core");
45
+ const state_machine_service_js_1 = require("./services/state-machine.service.js");
46
+ const constants_js_1 = require("./constants.js");
47
+ let stateMachine;
44
48
  /**
45
- * Permits the `Created Created` self-transition that `createPayment`'s
46
- * `state: 'Created'` return forces. Registered via
47
- * `config.paymentOptions.customPaymentProcess` in the plugin's `configuration()`.
49
+ * Custom payment process for the Viva redirect flow. Two responsibilities:
50
+ *
51
+ * 1. `transitions` permits the `Created → Created` self-transition that
52
+ * `createPayment`'s `state: 'Created'` return forces (public #10).
53
+ *
54
+ * 2. `onTransitionStart` — reconciles the `viva_transaction.paymentId` proxy
55
+ * (#13). `createPayment` writes the row keyed on `order.id` because Vendure
56
+ * assigns the real `Payment.id` only AFTER the handler returns, so it has no
57
+ * way to store it. This hook runs during the create-time transition, where
58
+ * the real `Payment.id` IS available, and reconciles the row (located by the
59
+ * unique `vivaOrderCode` it stamped into the payment metadata). Without it,
60
+ * every later lookup by `Payment.id` — cancelPayment, the webhook settle
61
+ * path, settlePayment, createRefund — misses, and only worked when
62
+ * `order.id === payment.id` (true in test DBs, false in production).
63
+ *
64
+ * Registered via `config.paymentOptions.customPaymentProcess` in the plugin's
65
+ * `configuration()`.
48
66
  */
49
67
  exports.vivaPaymentProcess = {
50
68
  transitions: {
@@ -54,5 +72,28 @@ exports.vivaPaymentProcess = {
54
72
  mergeStrategy: 'merge',
55
73
  },
56
74
  },
75
+ init(injector) {
76
+ stateMachine = injector.get(state_machine_service_js_1.StateMachineService);
77
+ },
78
+ async onTransitionStart(_fromState, toState, data) {
79
+ // Only at creation, and only for payments WE created — identified by the
80
+ // vivaOrderCode we stamped into the metadata (the PaymentMethod code is
81
+ // operator-chosen and unreliable).
82
+ if (toState !== 'Created' || !stateMachine)
83
+ return;
84
+ const vivaOrderCode = data.payment?.metadata?.['vivaOrderCode'];
85
+ if (!vivaOrderCode)
86
+ return;
87
+ // NEVER block the payment: reconciliation failure is logged and swallowed
88
+ // (returning undefined = transition allowed). Runs inside the createPayment
89
+ // transaction, so it sees the row inserted earlier in the same unit of work.
90
+ try {
91
+ await stateMachine.reconcilePaymentId(data.ctx, vivaOrderCode, data.payment.id);
92
+ }
93
+ catch (err) {
94
+ core_1.Logger.error(`[vivaPaymentProcess] Failed to reconcile viva_transaction.paymentId for ` +
95
+ `vivaOrderCode=${vivaOrderCode}: ${err instanceof Error ? err.message : String(err)}`, constants_js_1.VIVA_LOG_CONTEXT);
96
+ }
97
+ },
57
98
  };
58
99
  //# sourceMappingURL=payment-process.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"payment-process.js","sourceRoot":"","sources":["../src/payment-process.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;;;AAIH;;;;GAIG;AACU,QAAA,kBAAkB,GAA0B;IACvD,WAAW,EAAE;QACX,OAAO,EAAE;YACP,EAAE,EAAE,CAAC,SAAS,CAAC;YACf,qEAAqE;YACrE,aAAa,EAAE,OAAO;SACvB;KACF;CACF,CAAC"}
1
+ {"version":3,"file":"payment-process.js","sourceRoot":"","sources":["../src/payment-process.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;;;AAEH,wCAAuC;AAEvC,kFAA0E;AAC1E,iDAAkD;AAElD,IAAI,YAA6C,CAAC;AAElD;;;;;;;;;;;;;;;;;;GAkBG;AACU,QAAA,kBAAkB,GAA0B;IACvD,WAAW,EAAE;QACX,OAAO,EAAE;YACP,EAAE,EAAE,CAAC,SAAS,CAAC;YACf,qEAAqE;YACrE,aAAa,EAAE,OAAO;SACvB;KACF;IAED,IAAI,CAAC,QAAkB;QACrB,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,8CAAmB,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,EAAE,IAA2B;QACtE,yEAAyE;QACzE,wEAAwE;QACxE,mCAAmC;QACnC,IAAI,OAAO,KAAK,SAAS,IAAI,CAAC,YAAY;YAAE,OAAO;QACnD,MAAM,aAAa,GAAI,IAAI,CAAC,OAAO,EAAE,QAAgD,EAAE,CACrF,eAAe,CACM,CAAC;QACxB,IAAI,CAAC,aAAa;YAAE,OAAO;QAE3B,0EAA0E;QAC1E,4EAA4E;QAC5E,6EAA6E;QAC7E,IAAI,CAAC;YACH,MAAM,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAClF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,aAAM,CAAC,KAAK,CACV,0EAA0E;gBACxE,iBAAiB,aAAa,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EACvF,+BAAgB,CACjB,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC"}
@@ -36,6 +36,26 @@ export declare class StateMachineService {
36
36
  * Returns null if not found.
37
37
  */
38
38
  getVivaTransaction(ctx: RequestContext, channelId: string | number, paymentId: string | number): Promise<VivaTransaction | null>;
39
+ /**
40
+ * Reconcile a pending row's `paymentId` from the createPayment proxy value
41
+ * (the order id, written because Vendure assigns the real Payment.id only
42
+ * AFTER the handler returns — see payment-method-handler.createPayment) to the
43
+ * real Payment.id.
44
+ *
45
+ * The row is located by its globally-unique `vivaOrderCode` (NOT the proxy
46
+ * paymentId), so exactly one row is targeted with no id-collision risk. This
47
+ * is invoked from the viva PaymentProcess.onTransitionStart once the real
48
+ * Payment.id exists, which makes EVERY later lookup keyed on Payment.id resolve
49
+ * — cancelPayment (resolver + handler), settlePayment, createRefund, and the
50
+ * webhook settle path (which reads `vivaRow.paymentId` as a Payment id).
51
+ *
52
+ * Without it, those lookups only worked when `order.id === payment.id` (true
53
+ * in fresh test DBs, false in production), so the whole post-create lifecycle
54
+ * silently broke. See sakee-tech/vivawallet-npm-public#13.
55
+ *
56
+ * Idempotent: re-setting the same value updates 0 rows. Returns rows affected.
57
+ */
58
+ reconcilePaymentId(ctx: RequestContext, vivaOrderCode: string, realPaymentId: string | number): Promise<number>;
39
59
  /**
40
60
  * INSERT-OR-NOTHING write of a pending VivaTransaction row.
41
61
  *
@@ -1 +1 @@
1
- {"version":3,"file":"state-machine.service.d.ts","sourceRoot":"","sources":["../../src/services/state-machine.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,uBAAuB,EAAU,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC9F,OAAO,KAAK,EAAE,cAAc,EAAW,MAAM,eAAe,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAOpF,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB;AAMD,qBACa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAFd,UAAU,EAAE,uBAAuB,EACnC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc;IAGjD;;;OAGG;IACG,kBAAkB,CACtB,GAAG,EAAE,cAAc,EACnB,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAOlC;;;;;;;;;;OAUG;IACG,wBAAwB,CAC5B,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC;QAAE,GAAG,EAAE,eAAe,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC;IAgD1D;;OAEG;IACG,YAAY,CAChB,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC;IAYhB;;OAEG;IACG,SAAS,CACb,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,MAAM,EAAE,qBAAqB,EAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjC,OAAO,CAAC,IAAI,CAAC;IAwBhB;;;;;OAKG;IACG,0BAA0B,CAC9B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC;IAWhB;;;;;OAKG;IACG,2BAA2B,CAC/B,GAAG,EAAE,cAAc,EACnB,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC;IAIhB;;;;;OAKG;IACG,4BAA4B,CAChC,GAAG,EAAE,cAAc,EACnB,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC;IAIhB;;;;;;;;;;;;;OAaG;IACG,0BAA0B,CAC9B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC;IAgChB,OAAO,CAAC,oBAAoB;CAQ7B"}
1
+ {"version":3,"file":"state-machine.service.d.ts","sourceRoot":"","sources":["../../src/services/state-machine.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,uBAAuB,EAAU,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC9F,OAAO,KAAK,EAAE,cAAc,EAAW,MAAM,eAAe,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAOpF,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB;AAMD,qBACa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAFd,UAAU,EAAE,uBAAuB,EACnC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc;IAGjD;;;OAGG;IACG,kBAAkB,CACtB,GAAG,EAAE,cAAc,EACnB,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAOlC;;;;;;;;;;;;;;;;;;OAkBG;IACG,kBAAkB,CACtB,GAAG,EAAE,cAAc,EACnB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,GAAG,MAAM,GAC7B,OAAO,CAAC,MAAM,CAAC;IASlB;;;;;;;;;;OAUG;IACG,wBAAwB,CAC5B,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC;QAAE,GAAG,EAAE,eAAe,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC;IAgD1D;;OAEG;IACG,YAAY,CAChB,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC;IAYhB;;OAEG;IACG,SAAS,CACb,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,MAAM,EAAE,qBAAqB,EAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjC,OAAO,CAAC,IAAI,CAAC;IAwBhB;;;;;OAKG;IACG,0BAA0B,CAC9B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC;IAWhB;;;;;OAKG;IACG,2BAA2B,CAC/B,GAAG,EAAE,cAAc,EACnB,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC;IAIhB;;;;;OAKG;IACG,4BAA4B,CAChC,GAAG,EAAE,cAAc,EACnB,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC;IAIhB;;;;;;;;;;;;;OAaG;IACG,0BAA0B,CAC9B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC;IAgChB,OAAO,CAAC,oBAAoB;CAQ7B"}
@@ -53,6 +53,30 @@ let StateMachineService = class StateMachineService {
53
53
  where: { channelId: channelId, paymentId: paymentId },
54
54
  });
55
55
  }
56
+ /**
57
+ * Reconcile a pending row's `paymentId` from the createPayment proxy value
58
+ * (the order id, written because Vendure assigns the real Payment.id only
59
+ * AFTER the handler returns — see payment-method-handler.createPayment) to the
60
+ * real Payment.id.
61
+ *
62
+ * The row is located by its globally-unique `vivaOrderCode` (NOT the proxy
63
+ * paymentId), so exactly one row is targeted with no id-collision risk. This
64
+ * is invoked from the viva PaymentProcess.onTransitionStart once the real
65
+ * Payment.id exists, which makes EVERY later lookup keyed on Payment.id resolve
66
+ * — cancelPayment (resolver + handler), settlePayment, createRefund, and the
67
+ * webhook settle path (which reads `vivaRow.paymentId` as a Payment id).
68
+ *
69
+ * Without it, those lookups only worked when `order.id === payment.id` (true
70
+ * in fresh test DBs, false in production), so the whole post-create lifecycle
71
+ * silently broke. See sakee-tech/vivawallet-npm-public#13.
72
+ *
73
+ * Idempotent: re-setting the same value updates 0 rows. Returns rows affected.
74
+ */
75
+ async reconcilePaymentId(ctx, vivaOrderCode, realPaymentId) {
76
+ const repo = this.connection.getRepository(ctx, viva_transaction_entity_js_1.VivaTransaction);
77
+ const result = await repo.update({ vivaOrderCode }, { paymentId: realPaymentId });
78
+ return result.affected ?? 0;
79
+ }
56
80
  /**
57
81
  * INSERT-OR-NOTHING write of a pending VivaTransaction row.
58
82
  *
@@ -1 +1 @@
1
- {"version":3,"file":"state-machine.service.js","sourceRoot":"","sources":["../../src/services/state-machine.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"state-machine.service.js","sourceRoot":"","sources":["../../src/services/state-machine.service.ts"],"names":[],"mappings":"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"}
package/dist/types.d.ts CHANGED
@@ -44,6 +44,18 @@ export interface VendureOrder {
44
44
  readonly totalWithTax: number;
45
45
  readonly currencyCode: string;
46
46
  readonly state: string;
47
+ /**
48
+ * Customer relation — loaded by Vendure on the order passed into
49
+ * `createPayment` (OrderService.getOrderOrThrow includes `'customer'` in its
50
+ * default relations). Present once `setCustomerForOrder` has run; `null` for
51
+ * a guest order with no customer set yet.
52
+ */
53
+ readonly customer?: {
54
+ readonly emailAddress?: string;
55
+ readonly firstName?: string;
56
+ readonly lastName?: string;
57
+ readonly phoneNumber?: string;
58
+ } | null;
47
59
  }
48
60
  export interface RedlockClient {
49
61
  acquire(resources: string[], duration: number): Promise<{
@@ -107,6 +119,20 @@ export interface VivaCommonOptions {
107
119
  * Same substitution rules as `successUrl`.
108
120
  */
109
121
  failureUrl: string | ((ctx: VendureRequestContext) => string);
122
+ /**
123
+ * Resolve the customer-facing transaction description (`customerTrns`) sent
124
+ * to Viva. It appears on the Smart Checkout page and the customer's bank
125
+ * statement, so a shop/order reference here improves UX and reconciliation.
126
+ *
127
+ * Default: `Order <order.code>`. The plugin always also sends
128
+ * `merchantTrns = order.code` (merchant-facing, echoed in webhooks) — that is
129
+ * not configurable. Both values are length-clamped on the wire (`merchantTrns`
130
+ * ≤50, `customerTrns` ≤255).
131
+ *
132
+ * @example
133
+ * resolveCustomerTrns: (order) => `Acme Store — order ${order.code}`
134
+ */
135
+ resolveCustomerTrns?: (order: VendureOrder, ctx: VendureRequestContext) => string;
110
136
  /**
111
137
  * Refund strategy. Defaults to `'auto'`.
112
138
  *
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sakeetech/vendure-payment-viva",
3
- "version": "0.2.6",
3
+ "version": "0.2.8",
4
4
  "description": "Vendure plugin for Viva Wallet (ISV multi-tenant). Wraps viva-payments-core.",
5
5
  "license": "MIT",
6
6
  "repository": {