@chevre/domain 25.2.0-alpha.32 → 25.2.0-alpha.33
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.
- package/lib/chevre/repo/order.d.ts +0 -733
- package/lib/chevre/repo/order.js +20 -13
- package/lib/chevre/repo/orderInTransaction.d.ts +8 -1
- package/lib/chevre/repo/transaction.d.ts +2 -2
- package/lib/chevre/service/offer/event/authorize/factory.d.ts +0 -2
- package/lib/chevre/service/offer/event/authorize/factory.js +90 -82
- package/lib/chevre/service/offer/event/authorize.d.ts +0 -4
- package/lib/chevre/service/offer/event/authorize.js +1 -1
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js +3 -2
- package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.d.ts +28 -2
- package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.js +11 -12
- package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.d.ts +4 -2
- package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.js +6 -6
- package/lib/chevre/service/transaction/placeOrder/confirm/prepareUnitPriceOfferConditions.d.ts +32 -4
- package/lib/chevre/service/transaction/placeOrder/confirm.d.ts +6 -4
- package/lib/chevre/service/transaction/placeOrder/confirm.js +2 -2
- package/package.json +2 -2
|
@@ -154,739 +154,6 @@ export declare class OrderRepo {
|
|
|
154
154
|
$unset: any;
|
|
155
155
|
arrayFilters?: any[];
|
|
156
156
|
}): Promise<import("mongoose").UpdateWriteOpResult>;
|
|
157
|
-
savePaymentMethodId4migaration(params: {
|
|
158
|
-
id: string;
|
|
159
|
-
paymentMethod: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
|
|
160
|
-
}): Promise<(import("mongoose").FlattenMaps<{
|
|
161
|
-
project: {
|
|
162
|
-
typeOf: factory.organizationType.Project;
|
|
163
|
-
id: string;
|
|
164
|
-
};
|
|
165
|
-
broker?: {
|
|
166
|
-
id: string;
|
|
167
|
-
typeOf: factory.personType;
|
|
168
|
-
} | undefined;
|
|
169
|
-
confirmationNumber: string;
|
|
170
|
-
customer: {
|
|
171
|
-
id: string;
|
|
172
|
-
typeOf: factory.personType;
|
|
173
|
-
additionalProperty?: {
|
|
174
|
-
name: string;
|
|
175
|
-
value: string;
|
|
176
|
-
}[] | undefined;
|
|
177
|
-
address?: string | undefined;
|
|
178
|
-
age?: string | undefined;
|
|
179
|
-
email?: string | undefined;
|
|
180
|
-
givenName?: string | undefined;
|
|
181
|
-
familyName?: string | undefined;
|
|
182
|
-
gender?: string | undefined;
|
|
183
|
-
identifier?: {
|
|
184
|
-
name: string;
|
|
185
|
-
value: string;
|
|
186
|
-
}[] | undefined;
|
|
187
|
-
name?: string | undefined;
|
|
188
|
-
telephone?: string | undefined;
|
|
189
|
-
image?: string | undefined;
|
|
190
|
-
url?: string | undefined;
|
|
191
|
-
} | {
|
|
192
|
-
id: string;
|
|
193
|
-
typeOf: factory.creativeWorkType.WebApplication;
|
|
194
|
-
additionalProperty?: {
|
|
195
|
-
name: string;
|
|
196
|
-
value: string;
|
|
197
|
-
}[] | undefined;
|
|
198
|
-
address?: string | undefined;
|
|
199
|
-
age?: string | undefined;
|
|
200
|
-
email?: string | undefined;
|
|
201
|
-
givenName?: string | undefined;
|
|
202
|
-
familyName?: string | undefined;
|
|
203
|
-
gender?: string | undefined;
|
|
204
|
-
identifier?: {
|
|
205
|
-
name: string;
|
|
206
|
-
value: string;
|
|
207
|
-
}[] | undefined;
|
|
208
|
-
name?: string | undefined;
|
|
209
|
-
telephone?: string | undefined;
|
|
210
|
-
image?: string | undefined;
|
|
211
|
-
url?: string | undefined;
|
|
212
|
-
} | {
|
|
213
|
-
id: string;
|
|
214
|
-
typeOf: factory.organizationType.Organization;
|
|
215
|
-
additionalProperty?: {
|
|
216
|
-
name: string;
|
|
217
|
-
value: string;
|
|
218
|
-
}[] | undefined;
|
|
219
|
-
address?: string | undefined;
|
|
220
|
-
age?: string | undefined;
|
|
221
|
-
email?: string | undefined;
|
|
222
|
-
givenName?: string | undefined;
|
|
223
|
-
familyName?: string | undefined;
|
|
224
|
-
gender?: string | undefined;
|
|
225
|
-
identifier?: {
|
|
226
|
-
name: string;
|
|
227
|
-
value: string;
|
|
228
|
-
}[] | undefined;
|
|
229
|
-
name?: string | undefined;
|
|
230
|
-
telephone?: string | undefined;
|
|
231
|
-
image?: string | undefined;
|
|
232
|
-
url?: string | undefined;
|
|
233
|
-
};
|
|
234
|
-
dateReturned?: Date | undefined;
|
|
235
|
-
name?: string | undefined;
|
|
236
|
-
orderedItem?: {
|
|
237
|
-
typeOf: "OrderItem";
|
|
238
|
-
orderedItem: {
|
|
239
|
-
typeOf: factory.product.ProductType.EventService;
|
|
240
|
-
serviceOutput: {
|
|
241
|
-
typeOf: factory.reservationType.EventReservation | factory.reservationType.ReservationPackage;
|
|
242
|
-
reservationFor: {
|
|
243
|
-
location?: {
|
|
244
|
-
branchCode: string;
|
|
245
|
-
name?: {
|
|
246
|
-
ja?: string | undefined;
|
|
247
|
-
en?: string | undefined;
|
|
248
|
-
kr?: string | undefined;
|
|
249
|
-
} | undefined;
|
|
250
|
-
typeOf: factory.placeType.ScreeningRoom;
|
|
251
|
-
} | undefined;
|
|
252
|
-
typeOf: factory.eventType.ScreeningEvent;
|
|
253
|
-
id: string;
|
|
254
|
-
name?: {
|
|
255
|
-
ja?: string | undefined;
|
|
256
|
-
en?: string | undefined;
|
|
257
|
-
kr?: string | undefined;
|
|
258
|
-
} | undefined;
|
|
259
|
-
startDate?: Date | undefined;
|
|
260
|
-
endDate?: Date | undefined;
|
|
261
|
-
};
|
|
262
|
-
};
|
|
263
|
-
serviceType?: {
|
|
264
|
-
typeOf: "CategoryCode";
|
|
265
|
-
codeValue: string;
|
|
266
|
-
inCodeSet: {
|
|
267
|
-
typeOf: "CategoryCodeSet";
|
|
268
|
-
identifier: factory.categoryCode.CategorySetIdentifier;
|
|
269
|
-
};
|
|
270
|
-
} | undefined;
|
|
271
|
-
id?: string | undefined;
|
|
272
|
-
};
|
|
273
|
-
}[] | undefined;
|
|
274
|
-
orderStatus: factory.orderStatus;
|
|
275
|
-
paymentMethods: {
|
|
276
|
-
accountId?: string | undefined;
|
|
277
|
-
name: string;
|
|
278
|
-
paymentMethod?: {
|
|
279
|
-
amount?: {
|
|
280
|
-
currency: string;
|
|
281
|
-
} | undefined;
|
|
282
|
-
identifier: string;
|
|
283
|
-
} | undefined;
|
|
284
|
-
paymentMethodId: string;
|
|
285
|
-
paymentStatus?: (factory.paymentStatusType.PaymentAutomaticallyApplied | factory.paymentStatusType.PaymentDue) | undefined;
|
|
286
|
-
totalPaymentDue?: {
|
|
287
|
-
value: number;
|
|
288
|
-
currency: factory.unitCode.C62 | factory.priceCurrency.JPY;
|
|
289
|
-
typeOf: "MonetaryAmount";
|
|
290
|
-
} | undefined;
|
|
291
|
-
additionalProperty: {
|
|
292
|
-
name: string;
|
|
293
|
-
value: string;
|
|
294
|
-
}[];
|
|
295
|
-
issuedThrough: {
|
|
296
|
-
typeOf: import("@chevre/factory/lib/chevre/service/paymentService").PaymentServiceType;
|
|
297
|
-
id: string;
|
|
298
|
-
};
|
|
299
|
-
referencesOrder?: never | undefined;
|
|
300
|
-
}[];
|
|
301
|
-
previousOrderStatus?: factory.orderStatus | undefined;
|
|
302
|
-
price: number;
|
|
303
|
-
priceCurrency: factory.priceCurrency;
|
|
304
|
-
returner?: {
|
|
305
|
-
id: string;
|
|
306
|
-
typeOf: factory.personType | factory.organizationType.Project | factory.creativeWorkType.WebApplication;
|
|
307
|
-
} | undefined;
|
|
308
|
-
seller: {
|
|
309
|
-
id: string;
|
|
310
|
-
name: string;
|
|
311
|
-
typeOf: factory.organizationType.Corporation;
|
|
312
|
-
additionalProperty?: {
|
|
313
|
-
name: string;
|
|
314
|
-
value: string;
|
|
315
|
-
}[] | undefined;
|
|
316
|
-
};
|
|
317
|
-
typeOf: factory.order.OrderType;
|
|
318
|
-
orderNumber: string;
|
|
319
|
-
orderDate: Date;
|
|
320
|
-
acceptedOffers?: ({
|
|
321
|
-
itemOffered: {
|
|
322
|
-
id: string;
|
|
323
|
-
typeOf: factory.reservationType.EventReservation;
|
|
324
|
-
additionalTicketText?: string | undefined;
|
|
325
|
-
programMembershipUsed?: {
|
|
326
|
-
typeOf: factory.programMembership.ProgramMembershipType;
|
|
327
|
-
identifier: string;
|
|
328
|
-
issuedThrough: {
|
|
329
|
-
serviceType: {
|
|
330
|
-
codeValue: string;
|
|
331
|
-
};
|
|
332
|
-
typeOf: import("@chevre/factory/lib/chevre/service/paymentService").PaymentServiceType.FaceToFace;
|
|
333
|
-
};
|
|
334
|
-
} | {
|
|
335
|
-
typeOf: factory.programMembership.ProgramMembershipType;
|
|
336
|
-
identifier: string;
|
|
337
|
-
issuedThrough: {
|
|
338
|
-
id: string;
|
|
339
|
-
serviceType: {
|
|
340
|
-
codeValue: string;
|
|
341
|
-
};
|
|
342
|
-
typeOf: import("@chevre/factory/lib/chevre/service/paymentService").PaymentServiceType.CreditCard;
|
|
343
|
-
};
|
|
344
|
-
} | undefined;
|
|
345
|
-
reservationNumber: string;
|
|
346
|
-
issuedThrough: {
|
|
347
|
-
typeOf: factory.product.ProductType.EventService;
|
|
348
|
-
serviceType?: never | undefined;
|
|
349
|
-
id?: never | undefined;
|
|
350
|
-
};
|
|
351
|
-
reservationFor: {
|
|
352
|
-
id: string;
|
|
353
|
-
name: {
|
|
354
|
-
ja?: string | undefined;
|
|
355
|
-
en?: string | undefined;
|
|
356
|
-
kr?: string | undefined;
|
|
357
|
-
};
|
|
358
|
-
typeOf: factory.eventType.ScreeningEvent;
|
|
359
|
-
location: {
|
|
360
|
-
typeOf: factory.placeType.ScreeningRoom;
|
|
361
|
-
branchCode: string;
|
|
362
|
-
name?: {
|
|
363
|
-
ja?: string | undefined;
|
|
364
|
-
en?: string | undefined;
|
|
365
|
-
kr?: string | undefined;
|
|
366
|
-
} | undefined;
|
|
367
|
-
address?: {
|
|
368
|
-
ja?: string | undefined;
|
|
369
|
-
en?: string | undefined;
|
|
370
|
-
kr?: string | undefined;
|
|
371
|
-
} | undefined;
|
|
372
|
-
maximumAttendeeCapacity?: never | undefined;
|
|
373
|
-
};
|
|
374
|
-
startDate: Date;
|
|
375
|
-
endDate: Date;
|
|
376
|
-
doorTime?: Date | undefined;
|
|
377
|
-
superEvent: {
|
|
378
|
-
id: string;
|
|
379
|
-
name: {
|
|
380
|
-
ja?: string | undefined;
|
|
381
|
-
en?: string | undefined;
|
|
382
|
-
kr?: string | undefined;
|
|
383
|
-
};
|
|
384
|
-
typeOf: factory.eventType.ScreeningEventSeries;
|
|
385
|
-
location: {
|
|
386
|
-
typeOf: factory.placeType.MovieTheater;
|
|
387
|
-
id: string;
|
|
388
|
-
branchCode: string;
|
|
389
|
-
name?: {
|
|
390
|
-
ja?: string | undefined;
|
|
391
|
-
en?: string | undefined;
|
|
392
|
-
kr?: string | undefined;
|
|
393
|
-
} | undefined;
|
|
394
|
-
};
|
|
395
|
-
soundFormat?: {
|
|
396
|
-
typeOf: string;
|
|
397
|
-
name: string;
|
|
398
|
-
}[] | undefined;
|
|
399
|
-
headline?: {
|
|
400
|
-
ja?: string | undefined;
|
|
401
|
-
en?: string | undefined;
|
|
402
|
-
kr?: string | undefined;
|
|
403
|
-
} | undefined;
|
|
404
|
-
identifier?: string | undefined;
|
|
405
|
-
coaInfo?: {
|
|
406
|
-
dateMgtkBegin?: string | undefined;
|
|
407
|
-
dateMvtkBegin: string;
|
|
408
|
-
flgMgtkUse?: string | undefined;
|
|
409
|
-
flgMvtkUse: string;
|
|
410
|
-
flgNotDiscount?: string | undefined;
|
|
411
|
-
titleBranchNum: string;
|
|
412
|
-
kbnEirin?: {
|
|
413
|
-
kubunCode: string;
|
|
414
|
-
kubunName: string;
|
|
415
|
-
kubunNameEng: string;
|
|
416
|
-
kubunAddPrice: number;
|
|
417
|
-
} | undefined;
|
|
418
|
-
kbnEizou?: {
|
|
419
|
-
kubunCode: string;
|
|
420
|
-
kubunName: string;
|
|
421
|
-
kubunNameEng: string;
|
|
422
|
-
kubunAddPrice: number;
|
|
423
|
-
} | undefined;
|
|
424
|
-
kbnJoueihousiki?: {
|
|
425
|
-
kubunCode: string;
|
|
426
|
-
kubunName: string;
|
|
427
|
-
kubunNameEng: string;
|
|
428
|
-
kubunAddPrice: number;
|
|
429
|
-
} | undefined;
|
|
430
|
-
kbnJimakufukikae?: {
|
|
431
|
-
kubunCode: string;
|
|
432
|
-
kubunName: string;
|
|
433
|
-
kubunNameEng: string;
|
|
434
|
-
kubunAddPrice: number;
|
|
435
|
-
} | undefined;
|
|
436
|
-
} | undefined;
|
|
437
|
-
alternativeHeadline?: string | {
|
|
438
|
-
ja?: string | undefined;
|
|
439
|
-
en?: string | undefined;
|
|
440
|
-
kr?: string | undefined;
|
|
441
|
-
} | undefined;
|
|
442
|
-
duration?: string | undefined;
|
|
443
|
-
workPerformed: {
|
|
444
|
-
id?: string | undefined;
|
|
445
|
-
name?: string | {
|
|
446
|
-
ja?: string | undefined;
|
|
447
|
-
en?: string | undefined;
|
|
448
|
-
kr?: string | undefined;
|
|
449
|
-
} | undefined;
|
|
450
|
-
typeOf: factory.creativeWorkType.Movie;
|
|
451
|
-
identifier: string;
|
|
452
|
-
duration?: string | undefined;
|
|
453
|
-
};
|
|
454
|
-
};
|
|
455
|
-
identifier?: string | undefined;
|
|
456
|
-
coaInfo?: {
|
|
457
|
-
titleBranchNum: string;
|
|
458
|
-
dateJouei: string;
|
|
459
|
-
titleCode: string;
|
|
460
|
-
timeBegin: string;
|
|
461
|
-
timeEnd: string;
|
|
462
|
-
screenCode: string;
|
|
463
|
-
trailerTime: number;
|
|
464
|
-
nameServiceDay: string;
|
|
465
|
-
availableNum: number;
|
|
466
|
-
rsvStartDate: string;
|
|
467
|
-
rsvEndDate: string;
|
|
468
|
-
flgEarlyBooking: import("@coasystems/factory/lib/factory/master").FlgEarlyBooking;
|
|
469
|
-
theaterCode: string;
|
|
470
|
-
kbnService?: {
|
|
471
|
-
kubunCode: string;
|
|
472
|
-
kubunName: string;
|
|
473
|
-
kubunNameEng: string;
|
|
474
|
-
kubunAddPrice: number;
|
|
475
|
-
} | undefined;
|
|
476
|
-
kbnAcoustic?: {
|
|
477
|
-
kubunCode: string;
|
|
478
|
-
kubunName: string;
|
|
479
|
-
kubunNameEng: string;
|
|
480
|
-
kubunAddPrice: number;
|
|
481
|
-
} | undefined;
|
|
482
|
-
} | undefined;
|
|
483
|
-
};
|
|
484
|
-
reservedTicket: {
|
|
485
|
-
typeOf: import("@chevre/factory/lib/chevre/reservation").TicketType;
|
|
486
|
-
identifier: string;
|
|
487
|
-
ticketedSeat?: {
|
|
488
|
-
typeOf: factory.placeType.Seat;
|
|
489
|
-
seatingType?: import("@chevre/factory/lib/chevre/place/seat").ISeatingType | undefined;
|
|
490
|
-
seatNumber: string;
|
|
491
|
-
seatRow: string;
|
|
492
|
-
seatSection: string;
|
|
493
|
-
} | undefined;
|
|
494
|
-
dateIssued?: Date | undefined;
|
|
495
|
-
ticketType: {
|
|
496
|
-
id?: string | undefined;
|
|
497
|
-
name?: {
|
|
498
|
-
ja?: string | undefined;
|
|
499
|
-
en?: string | undefined;
|
|
500
|
-
kr?: string | undefined;
|
|
501
|
-
} | undefined;
|
|
502
|
-
typeOf: factory.offerType.Offer;
|
|
503
|
-
identifier: string;
|
|
504
|
-
};
|
|
505
|
-
coaTicketInfo?: {
|
|
506
|
-
ticketCode: string;
|
|
507
|
-
stdPrice: number;
|
|
508
|
-
addPrice: number;
|
|
509
|
-
spseatAdd1: number;
|
|
510
|
-
spseatAdd2: number;
|
|
511
|
-
disPrice: number;
|
|
512
|
-
salePrice: number;
|
|
513
|
-
mvtkAppPrice: number;
|
|
514
|
-
ticketCount: number;
|
|
515
|
-
spseatKbn: string;
|
|
516
|
-
seatNum: string;
|
|
517
|
-
addGlasses: number;
|
|
518
|
-
kbnEisyahousiki: string;
|
|
519
|
-
mvtkNum: string;
|
|
520
|
-
mvtkKbnDenshiken: string;
|
|
521
|
-
mvtkKbnMaeuriken: string;
|
|
522
|
-
mvtkKbnKensyu: string;
|
|
523
|
-
mvtkSalesPrice: number;
|
|
524
|
-
kbnMgtk: string;
|
|
525
|
-
ticketName: string;
|
|
526
|
-
ticketNameKana: string;
|
|
527
|
-
ticketNameEng: string;
|
|
528
|
-
usePoint: number;
|
|
529
|
-
} | undefined;
|
|
530
|
-
coaReserveAmount?: number | undefined;
|
|
531
|
-
ticketNumber?: string | undefined;
|
|
532
|
-
ticketToken?: string | undefined;
|
|
533
|
-
};
|
|
534
|
-
additionalProperty?: {
|
|
535
|
-
name: string;
|
|
536
|
-
value: string;
|
|
537
|
-
}[] | undefined;
|
|
538
|
-
};
|
|
539
|
-
offeredThrough: {
|
|
540
|
-
typeOf: "WebAPI";
|
|
541
|
-
identifier: import("@chevre/factory/lib/chevre/service/webAPI").Identifier.COA;
|
|
542
|
-
};
|
|
543
|
-
priceSpecification?: {
|
|
544
|
-
priceCurrency: factory.priceCurrency;
|
|
545
|
-
typeOf: factory.priceSpecificationType.CompoundPriceSpecification;
|
|
546
|
-
valueAddedTaxIncluded: boolean;
|
|
547
|
-
priceComponent: ({
|
|
548
|
-
name?: string | {
|
|
549
|
-
ja?: string | undefined;
|
|
550
|
-
en?: string | undefined;
|
|
551
|
-
kr?: string | undefined;
|
|
552
|
-
} | undefined;
|
|
553
|
-
price: number;
|
|
554
|
-
priceCurrency: factory.priceCurrency;
|
|
555
|
-
typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
|
|
556
|
-
valueAddedTaxIncluded: boolean;
|
|
557
|
-
accounting?: never | undefined;
|
|
558
|
-
appliesToCategoryCode: {
|
|
559
|
-
typeOf: "CategoryCode";
|
|
560
|
-
codeValue: string;
|
|
561
|
-
inCodeSet: {
|
|
562
|
-
typeOf: "CategoryCodeSet";
|
|
563
|
-
identifier: factory.categoryCode.CategorySetIdentifier.SeatingType | factory.categoryCode.CategorySetIdentifier.SoundFormatType | factory.categoryCode.CategorySetIdentifier.VideoFormatType;
|
|
564
|
-
};
|
|
565
|
-
}[];
|
|
566
|
-
} | {
|
|
567
|
-
name?: string | {
|
|
568
|
-
ja?: string | undefined;
|
|
569
|
-
en?: string | undefined;
|
|
570
|
-
kr?: string | undefined;
|
|
571
|
-
} | undefined;
|
|
572
|
-
price: number;
|
|
573
|
-
priceCurrency: factory.priceCurrency;
|
|
574
|
-
typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
|
|
575
|
-
valueAddedTaxIncluded: boolean;
|
|
576
|
-
accounting?: never | undefined;
|
|
577
|
-
appliesToMovieTicket: {
|
|
578
|
-
typeOf: import("@chevre/factory/lib/chevre/service/paymentService").PaymentServiceType.MovieTicket;
|
|
579
|
-
serviceType: string;
|
|
580
|
-
serviceOutput: {
|
|
581
|
-
typeOf: string;
|
|
582
|
-
};
|
|
583
|
-
};
|
|
584
|
-
appliesToVideoFormat: string;
|
|
585
|
-
} | {
|
|
586
|
-
name?: string | {
|
|
587
|
-
ja?: string | undefined;
|
|
588
|
-
en?: string | undefined;
|
|
589
|
-
kr?: string | undefined;
|
|
590
|
-
} | undefined;
|
|
591
|
-
price: number;
|
|
592
|
-
priceCurrency: factory.priceCurrency;
|
|
593
|
-
typeOf: factory.priceSpecificationType.UnitPriceSpecification;
|
|
594
|
-
valueAddedTaxIncluded: boolean;
|
|
595
|
-
accounting?: {
|
|
596
|
-
typeOf: "Accounting";
|
|
597
|
-
operatingRevenue?: {
|
|
598
|
-
typeOf: "AccountTitle";
|
|
599
|
-
codeValue: string;
|
|
600
|
-
} | undefined;
|
|
601
|
-
accountsReceivable?: number | undefined;
|
|
602
|
-
} | undefined;
|
|
603
|
-
appliesToMovieTicket?: {
|
|
604
|
-
typeOf: import("@chevre/factory/lib/chevre/service/paymentService").PaymentServiceType.MovieTicket;
|
|
605
|
-
serviceOutput: {
|
|
606
|
-
typeOf: string;
|
|
607
|
-
};
|
|
608
|
-
serviceType: string;
|
|
609
|
-
identifier?: string | undefined;
|
|
610
|
-
}[] | undefined;
|
|
611
|
-
appliesToAddOn?: {
|
|
612
|
-
typeOf: factory.offerType.Offer;
|
|
613
|
-
id?: string | undefined;
|
|
614
|
-
identifier?: string | undefined;
|
|
615
|
-
itemOffered: {
|
|
616
|
-
id?: string | undefined;
|
|
617
|
-
name?: {
|
|
618
|
-
ja?: string | undefined;
|
|
619
|
-
en?: string | undefined;
|
|
620
|
-
} | undefined;
|
|
621
|
-
typeOf: factory.product.ProductType.Product;
|
|
622
|
-
productID: string;
|
|
623
|
-
};
|
|
624
|
-
}[] | undefined;
|
|
625
|
-
referenceQuantity: {
|
|
626
|
-
typeOf: factory.quantitativeValue.QuantitativeValueType;
|
|
627
|
-
value?: (number | factory.quantitativeValue.StringValue) | undefined;
|
|
628
|
-
unitCode?: factory.unitCode | undefined;
|
|
629
|
-
minValue?: number | undefined;
|
|
630
|
-
};
|
|
631
|
-
})[];
|
|
632
|
-
} | undefined;
|
|
633
|
-
serialNumber: string;
|
|
634
|
-
id?: string | undefined;
|
|
635
|
-
typeOf: factory.offerType;
|
|
636
|
-
name?: never | undefined;
|
|
637
|
-
} | {
|
|
638
|
-
itemOffered: {
|
|
639
|
-
id: string;
|
|
640
|
-
typeOf: factory.reservationType.EventReservation;
|
|
641
|
-
additionalProperty?: never | undefined;
|
|
642
|
-
additionalTicketText?: string | undefined;
|
|
643
|
-
programMembershipUsed?: {
|
|
644
|
-
typeOf: factory.programMembership.ProgramMembershipType;
|
|
645
|
-
identifier: string;
|
|
646
|
-
issuedThrough: {
|
|
647
|
-
serviceType: {
|
|
648
|
-
codeValue: string;
|
|
649
|
-
};
|
|
650
|
-
typeOf: import("@chevre/factory/lib/chevre/service/paymentService").PaymentServiceType.FaceToFace;
|
|
651
|
-
};
|
|
652
|
-
} | {
|
|
653
|
-
typeOf: factory.programMembership.ProgramMembershipType;
|
|
654
|
-
identifier: string;
|
|
655
|
-
issuedThrough: {
|
|
656
|
-
id: string;
|
|
657
|
-
serviceType: {
|
|
658
|
-
codeValue: string;
|
|
659
|
-
};
|
|
660
|
-
typeOf: import("@chevre/factory/lib/chevre/service/paymentService").PaymentServiceType.CreditCard;
|
|
661
|
-
};
|
|
662
|
-
} | undefined;
|
|
663
|
-
reservationNumber: string;
|
|
664
|
-
issuedThrough: {
|
|
665
|
-
typeOf: factory.product.ProductType.EventService;
|
|
666
|
-
serviceType?: {
|
|
667
|
-
typeOf: "CategoryCode";
|
|
668
|
-
codeValue: string;
|
|
669
|
-
inCodeSet: {
|
|
670
|
-
typeOf: "CategoryCodeSet";
|
|
671
|
-
identifier: factory.categoryCode.CategorySetIdentifier;
|
|
672
|
-
};
|
|
673
|
-
} | undefined;
|
|
674
|
-
id: string;
|
|
675
|
-
};
|
|
676
|
-
reservationFor: {
|
|
677
|
-
id: string;
|
|
678
|
-
name: {
|
|
679
|
-
ja?: string | undefined;
|
|
680
|
-
en?: string | undefined;
|
|
681
|
-
kr?: string | undefined;
|
|
682
|
-
};
|
|
683
|
-
typeOf: factory.eventType.ScreeningEvent;
|
|
684
|
-
location: {
|
|
685
|
-
typeOf: factory.placeType.ScreeningRoom;
|
|
686
|
-
branchCode: string;
|
|
687
|
-
name?: {
|
|
688
|
-
ja?: string | undefined;
|
|
689
|
-
en?: string | undefined;
|
|
690
|
-
kr?: string | undefined;
|
|
691
|
-
} | undefined;
|
|
692
|
-
address?: {
|
|
693
|
-
ja?: string | undefined;
|
|
694
|
-
en?: string | undefined;
|
|
695
|
-
kr?: string | undefined;
|
|
696
|
-
} | undefined;
|
|
697
|
-
maximumAttendeeCapacity?: never | undefined;
|
|
698
|
-
};
|
|
699
|
-
startDate: Date;
|
|
700
|
-
endDate: Date;
|
|
701
|
-
doorTime?: Date | undefined;
|
|
702
|
-
superEvent: {
|
|
703
|
-
id: string;
|
|
704
|
-
name: {
|
|
705
|
-
ja?: string | undefined;
|
|
706
|
-
en?: string | undefined;
|
|
707
|
-
kr?: string | undefined;
|
|
708
|
-
};
|
|
709
|
-
typeOf: factory.eventType.ScreeningEventSeries;
|
|
710
|
-
location: {
|
|
711
|
-
typeOf: factory.placeType.MovieTheater;
|
|
712
|
-
id: string;
|
|
713
|
-
branchCode: string;
|
|
714
|
-
name?: {
|
|
715
|
-
ja?: string | undefined;
|
|
716
|
-
en?: string | undefined;
|
|
717
|
-
kr?: string | undefined;
|
|
718
|
-
} | undefined;
|
|
719
|
-
};
|
|
720
|
-
soundFormat?: {
|
|
721
|
-
typeOf: string;
|
|
722
|
-
name: string;
|
|
723
|
-
}[] | undefined;
|
|
724
|
-
headline?: {
|
|
725
|
-
ja?: string | undefined;
|
|
726
|
-
en?: string | undefined;
|
|
727
|
-
kr?: string | undefined;
|
|
728
|
-
} | undefined;
|
|
729
|
-
workPerformed: {
|
|
730
|
-
id?: string | undefined;
|
|
731
|
-
name?: string | {
|
|
732
|
-
ja?: string | undefined;
|
|
733
|
-
en?: string | undefined;
|
|
734
|
-
kr?: string | undefined;
|
|
735
|
-
} | undefined;
|
|
736
|
-
typeOf: factory.creativeWorkType.Movie;
|
|
737
|
-
identifier: string;
|
|
738
|
-
duration?: string | undefined;
|
|
739
|
-
};
|
|
740
|
-
identifier?: never | undefined;
|
|
741
|
-
alternativeHeadline?: never | undefined;
|
|
742
|
-
duration?: never | undefined;
|
|
743
|
-
coaInfo?: never | undefined;
|
|
744
|
-
};
|
|
745
|
-
identifier?: never | undefined;
|
|
746
|
-
coaInfo?: never | undefined;
|
|
747
|
-
};
|
|
748
|
-
reservedTicket: {
|
|
749
|
-
typeOf: import("@chevre/factory/lib/chevre/reservation").TicketType;
|
|
750
|
-
identifier: string;
|
|
751
|
-
ticketedSeat?: {
|
|
752
|
-
typeOf: factory.placeType.Seat;
|
|
753
|
-
seatingType?: import("@chevre/factory/lib/chevre/place/seat").ISeatingType | undefined;
|
|
754
|
-
seatNumber: string;
|
|
755
|
-
seatRow: string;
|
|
756
|
-
seatSection: string;
|
|
757
|
-
} | undefined;
|
|
758
|
-
ticketType: {
|
|
759
|
-
id?: string | undefined;
|
|
760
|
-
name?: {
|
|
761
|
-
ja?: string | undefined;
|
|
762
|
-
en?: string | undefined;
|
|
763
|
-
kr?: string | undefined;
|
|
764
|
-
} | undefined;
|
|
765
|
-
typeOf: factory.offerType.Offer;
|
|
766
|
-
identifier: string;
|
|
767
|
-
additionalProperty?: {
|
|
768
|
-
name: string;
|
|
769
|
-
value: string;
|
|
770
|
-
}[] | undefined;
|
|
771
|
-
description?: string | {
|
|
772
|
-
ja?: string | undefined;
|
|
773
|
-
en?: string | undefined;
|
|
774
|
-
kr?: string | undefined;
|
|
775
|
-
} | undefined;
|
|
776
|
-
};
|
|
777
|
-
ticketNumber?: never | undefined;
|
|
778
|
-
dateIssued?: never | undefined;
|
|
779
|
-
ticketToken?: never | undefined;
|
|
780
|
-
coaTicketInfo?: never | undefined;
|
|
781
|
-
coaReserveAmount?: never | undefined;
|
|
782
|
-
};
|
|
783
|
-
};
|
|
784
|
-
offeredThrough: {
|
|
785
|
-
typeOf: "WebAPI";
|
|
786
|
-
identifier: import("@chevre/factory/lib/chevre/service/webAPI").Identifier.Chevre;
|
|
787
|
-
};
|
|
788
|
-
priceSpecification?: {
|
|
789
|
-
priceCurrency: factory.priceCurrency;
|
|
790
|
-
typeOf: factory.priceSpecificationType.CompoundPriceSpecification;
|
|
791
|
-
valueAddedTaxIncluded: boolean;
|
|
792
|
-
priceComponent: ({
|
|
793
|
-
name?: string | {
|
|
794
|
-
ja?: string | undefined;
|
|
795
|
-
en?: string | undefined;
|
|
796
|
-
kr?: string | undefined;
|
|
797
|
-
} | undefined;
|
|
798
|
-
price: number;
|
|
799
|
-
priceCurrency: factory.priceCurrency;
|
|
800
|
-
typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
|
|
801
|
-
valueAddedTaxIncluded: boolean;
|
|
802
|
-
accounting?: never | undefined;
|
|
803
|
-
appliesToCategoryCode: {
|
|
804
|
-
typeOf: "CategoryCode";
|
|
805
|
-
codeValue: string;
|
|
806
|
-
inCodeSet: {
|
|
807
|
-
typeOf: "CategoryCodeSet";
|
|
808
|
-
identifier: factory.categoryCode.CategorySetIdentifier.SeatingType | factory.categoryCode.CategorySetIdentifier.SoundFormatType | factory.categoryCode.CategorySetIdentifier.VideoFormatType;
|
|
809
|
-
};
|
|
810
|
-
}[];
|
|
811
|
-
} | {
|
|
812
|
-
name?: string | {
|
|
813
|
-
ja?: string | undefined;
|
|
814
|
-
en?: string | undefined;
|
|
815
|
-
kr?: string | undefined;
|
|
816
|
-
} | undefined;
|
|
817
|
-
price: number;
|
|
818
|
-
priceCurrency: factory.priceCurrency;
|
|
819
|
-
typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
|
|
820
|
-
valueAddedTaxIncluded: boolean;
|
|
821
|
-
accounting?: never | undefined;
|
|
822
|
-
appliesToMovieTicket: {
|
|
823
|
-
typeOf: import("@chevre/factory/lib/chevre/service/paymentService").PaymentServiceType.MovieTicket;
|
|
824
|
-
serviceType: string;
|
|
825
|
-
serviceOutput: {
|
|
826
|
-
typeOf: string;
|
|
827
|
-
};
|
|
828
|
-
};
|
|
829
|
-
appliesToVideoFormat: string;
|
|
830
|
-
} | {
|
|
831
|
-
name?: string | {
|
|
832
|
-
ja?: string | undefined;
|
|
833
|
-
en?: string | undefined;
|
|
834
|
-
kr?: string | undefined;
|
|
835
|
-
} | undefined;
|
|
836
|
-
price: number;
|
|
837
|
-
priceCurrency: factory.priceCurrency;
|
|
838
|
-
typeOf: factory.priceSpecificationType.UnitPriceSpecification;
|
|
839
|
-
valueAddedTaxIncluded: boolean;
|
|
840
|
-
accounting?: {
|
|
841
|
-
typeOf: "Accounting";
|
|
842
|
-
operatingRevenue?: {
|
|
843
|
-
typeOf: "AccountTitle";
|
|
844
|
-
codeValue: string;
|
|
845
|
-
} | undefined;
|
|
846
|
-
accountsReceivable?: number | undefined;
|
|
847
|
-
} | undefined;
|
|
848
|
-
appliesToMovieTicket?: {
|
|
849
|
-
typeOf: import("@chevre/factory/lib/chevre/service/paymentService").PaymentServiceType.MovieTicket;
|
|
850
|
-
serviceOutput: {
|
|
851
|
-
typeOf: string;
|
|
852
|
-
};
|
|
853
|
-
serviceType: string;
|
|
854
|
-
identifier?: string | undefined;
|
|
855
|
-
}[] | undefined;
|
|
856
|
-
appliesToAddOn?: {
|
|
857
|
-
typeOf: factory.offerType.Offer;
|
|
858
|
-
id?: string | undefined;
|
|
859
|
-
identifier?: string | undefined;
|
|
860
|
-
itemOffered: {
|
|
861
|
-
id?: string | undefined;
|
|
862
|
-
name?: {
|
|
863
|
-
ja?: string | undefined;
|
|
864
|
-
en?: string | undefined;
|
|
865
|
-
} | undefined;
|
|
866
|
-
typeOf: factory.product.ProductType.Product;
|
|
867
|
-
productID: string;
|
|
868
|
-
};
|
|
869
|
-
}[] | undefined;
|
|
870
|
-
referenceQuantity: {
|
|
871
|
-
typeOf: factory.quantitativeValue.QuantitativeValueType;
|
|
872
|
-
value?: (number | factory.quantitativeValue.StringValue) | undefined;
|
|
873
|
-
unitCode?: factory.unitCode | undefined;
|
|
874
|
-
minValue?: number | undefined;
|
|
875
|
-
};
|
|
876
|
-
})[];
|
|
877
|
-
} | undefined;
|
|
878
|
-
serialNumber: string;
|
|
879
|
-
id?: string | undefined;
|
|
880
|
-
typeOf: factory.offerType;
|
|
881
|
-
name?: never | undefined;
|
|
882
|
-
})[] | undefined;
|
|
883
|
-
identifier?: string | undefined;
|
|
884
|
-
paymentMethodId?: string | undefined;
|
|
885
|
-
}> & {
|
|
886
|
-
_id: import("mongoose").Types.ObjectId;
|
|
887
|
-
} & {
|
|
888
|
-
__v: number;
|
|
889
|
-
}) | null>;
|
|
890
157
|
aggregateOrder(params: {
|
|
891
158
|
project?: {
|
|
892
159
|
id?: {
|
package/lib/chevre/repo/order.js
CHANGED
|
@@ -848,19 +848,26 @@ class OrderRepo {
|
|
|
848
848
|
})
|
|
849
849
|
.exec();
|
|
850
850
|
}
|
|
851
|
-
async savePaymentMethodId4migaration(params
|
|
852
|
-
|
|
853
|
-
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
|
|
862
|
-
|
|
863
|
-
}
|
|
851
|
+
// public async savePaymentMethodId4migaration(params: {
|
|
852
|
+
// id: string;
|
|
853
|
+
// paymentMethod: IPaymentMethodByPaymentUrl;
|
|
854
|
+
// }) {
|
|
855
|
+
// const { paymentMethodId } = params.paymentMethod;
|
|
856
|
+
// if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
|
|
857
|
+
// throw new factory.errors.ArgumentNull('paymentMethod.paymentMethodId');
|
|
858
|
+
// }
|
|
859
|
+
// // 注文ドキュメントにも保管する(2026-07-12~)
|
|
860
|
+
// return this.orderModel.findOneAndUpdate(
|
|
861
|
+
// {
|
|
862
|
+
// identifier: { $eq: params.id },
|
|
863
|
+
// paymentMethodId: { $exists: false }
|
|
864
|
+
// },
|
|
865
|
+
// { $set: { paymentMethodId } },
|
|
866
|
+
// { projection: { _id: 1 } }
|
|
867
|
+
// )
|
|
868
|
+
// .lean()
|
|
869
|
+
// .exec();
|
|
870
|
+
// }
|
|
864
871
|
async aggregateOrder(params) {
|
|
865
872
|
const matchConditions = {
|
|
866
873
|
orderDate: {
|
|
@@ -57,6 +57,13 @@ export type IMinimizedAcceptedOffer = Pick<factory.order.IOptimizedAcceptedOffer
|
|
|
57
57
|
priceSpecification?: never;
|
|
58
58
|
name?: never;
|
|
59
59
|
};
|
|
60
|
+
export interface IPaymentMethodByPaymentUrl {
|
|
61
|
+
/**
|
|
62
|
+
* 決済採用時に発行済の決済方法ID
|
|
63
|
+
* 決済承認時に指定が可能
|
|
64
|
+
*/
|
|
65
|
+
paymentMethodId: string;
|
|
66
|
+
}
|
|
60
67
|
/**
|
|
61
68
|
* 取引中注文リポジトリ
|
|
62
69
|
*/
|
|
@@ -154,7 +161,7 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
|
|
|
154
161
|
*/
|
|
155
162
|
savePaymentMethodId(params: {
|
|
156
163
|
id: string;
|
|
157
|
-
paymentMethod:
|
|
164
|
+
paymentMethod: IPaymentMethodByPaymentUrl;
|
|
158
165
|
}, options: {
|
|
159
166
|
savePaymentMethodIdInTransaction: boolean;
|
|
160
167
|
}): Promise<void>;
|
|
@@ -144,7 +144,7 @@ export declare class TransactionRepo {
|
|
|
144
144
|
agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
|
|
145
145
|
status: factory.transactionStatusType;
|
|
146
146
|
tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
|
|
147
|
-
potentialActions?:
|
|
147
|
+
potentialActions?: undefined;
|
|
148
148
|
} & {
|
|
149
149
|
_id: import("mongoose").Types.ObjectId;
|
|
150
150
|
} & {
|
|
@@ -182,7 +182,7 @@ export declare class TransactionRepo {
|
|
|
182
182
|
agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
|
|
183
183
|
status: factory.transactionStatusType;
|
|
184
184
|
tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
|
|
185
|
-
potentialActions?:
|
|
185
|
+
potentialActions?: undefined;
|
|
186
186
|
} & {
|
|
187
187
|
_id: import("mongoose").Types.ObjectId;
|
|
188
188
|
} & {
|
|
@@ -27,8 +27,6 @@ declare function acceptedOffers2authorizeResult(params: {
|
|
|
27
27
|
acceptedOffers4result: IResultAcceptedOffer[];
|
|
28
28
|
noOfferSpecified: boolean;
|
|
29
29
|
ticketOffers: factory.product.ITicketOffer[];
|
|
30
|
-
}, options: {
|
|
31
|
-
useLegacyAuthorizeOfferResult: boolean;
|
|
32
30
|
}): factory.action.authorize.offer.eventService.IResult & {
|
|
33
31
|
onlyPrice?: boolean;
|
|
34
32
|
};
|
|
@@ -144,93 +144,101 @@ function acceptedOffers2amount(params) {
|
|
|
144
144
|
});
|
|
145
145
|
return amount;
|
|
146
146
|
}
|
|
147
|
-
function acceptedOffers2programMembershipUsed(params
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
147
|
+
// function acceptedOffers2programMembershipUsed(params: {
|
|
148
|
+
// acceptedOffers: IResultAcceptedOffer[];
|
|
149
|
+
// }): factory.action.authorize.offer.eventService.IAggregateProgramMembershipUsed {
|
|
150
|
+
// const programMembershipUsed: factory.action.authorize.offer.eventService.IAggregateProgramMembershipUsed = [];
|
|
151
|
+
// const permitIdentifiers: string[] = [];
|
|
152
|
+
// params.acceptedOffers.forEach(
|
|
153
|
+
// ({ itemOffered }) => {
|
|
154
|
+
// if (itemOffered.programMembershipUsed?.typeOf === factory.programMembership.ProgramMembershipType.ProgramMembership) {
|
|
155
|
+
// // メンバーシップコードに対してユニークに集計
|
|
156
|
+
// if (!permitIdentifiers.includes(itemOffered.programMembershipUsed.identifier)) {
|
|
157
|
+
// permitIdentifiers.push(itemOffered.programMembershipUsed.identifier);
|
|
158
|
+
// const issuedThroughTypeOf = itemOffered.programMembershipUsed.issuedThrough.typeOf;
|
|
159
|
+
// if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
|
|
160
|
+
// programMembershipUsed.push({
|
|
161
|
+
// typeOf: factory.permit.PermitType.Permit,
|
|
162
|
+
// identifier: itemOffered.programMembershipUsed.identifier,
|
|
163
|
+
// issuedThrough: { typeOf: issuedThroughTypeOf }
|
|
164
|
+
// });
|
|
165
|
+
// } else {
|
|
166
|
+
// programMembershipUsed.push({
|
|
167
|
+
// typeOf: factory.permit.PermitType.Permit,
|
|
168
|
+
// identifier: itemOffered.programMembershipUsed.identifier,
|
|
169
|
+
// issuedThrough: { typeOf: issuedThroughTypeOf, id: itemOffered.programMembershipUsed.issuedThrough.id }
|
|
170
|
+
// });
|
|
171
|
+
// }
|
|
172
|
+
// }
|
|
173
|
+
// }
|
|
174
|
+
// }
|
|
175
|
+
// );
|
|
176
|
+
// return programMembershipUsed;
|
|
177
|
+
// }
|
|
178
|
+
function acceptedOffers2authorizeResult(params) {
|
|
179
|
+
const { acceptedOffers4result, noOfferSpecified,
|
|
180
|
+
// ticketOffers
|
|
181
|
+
} = params;
|
|
182
|
+
// let offers: factory.action.authorize.offer.eventService.IAcceptedOfferInResult[] | undefined;
|
|
180
183
|
let price;
|
|
181
|
-
let programMembershipUsed = [];
|
|
184
|
+
// let programMembershipUsed: factory.action.authorize.offer.eventService.IAggregateProgramMembershipUsed = [];
|
|
182
185
|
if (!noOfferSpecified) {
|
|
183
186
|
price = acceptedOffers2amount({ acceptedOffers: acceptedOffers4result }); // オファー指定の場合のみ金額計算(2023-11-27~)
|
|
184
|
-
programMembershipUsed = acceptedOffers2programMembershipUsed({ acceptedOffers: acceptedOffers4result });
|
|
187
|
+
// programMembershipUsed = acceptedOffers2programMembershipUsed({ acceptedOffers: acceptedOffers4result });
|
|
185
188
|
// オファーIDごとに集計
|
|
186
|
-
const offerIds = [...new Set(acceptedOffers4result.map((o) => String(o.id)))];
|
|
187
|
-
//
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
});
|
|
214
|
-
}
|
|
215
|
-
if (useLegacyAuthorizeOfferResult) {
|
|
216
|
-
return {
|
|
217
|
-
typeOf: factory_1.factory.offerType.AggregateOffer,
|
|
218
|
-
// priceCurrency, // discontinue(2026-07-06~)
|
|
219
|
-
// amount: [], // discontinue(2026-07-06~)
|
|
220
|
-
itemOffered: {
|
|
221
|
-
serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
|
|
222
|
-
},
|
|
223
|
-
...(typeof price === 'number') ? { price } : undefined,
|
|
224
|
-
...(Array.isArray(offers)) ? { offers } : undefined
|
|
225
|
-
};
|
|
226
|
-
}
|
|
227
|
-
else {
|
|
228
|
-
return {
|
|
229
|
-
typeOf: factory_1.factory.offerType.AggregateOffer,
|
|
230
|
-
onlyPrice: true,
|
|
231
|
-
...(typeof price === 'number') ? { price } : undefined,
|
|
232
|
-
};
|
|
189
|
+
// const offerIds = [...new Set(acceptedOffers4result.map((o) => String(o.id)))];
|
|
190
|
+
// offers = offerIds.map<factory.action.authorize.offer.eventService.IAcceptedOfferInResult>((offerId) => {
|
|
191
|
+
// const acceptedOffer = ticketOffers.find(({ id }) => id === offerId);
|
|
192
|
+
// if (acceptedOffer === undefined) {
|
|
193
|
+
// throw new factory.errors.Internal(`acceptedOffer not found [id:${offerId}]`);
|
|
194
|
+
// }
|
|
195
|
+
// const amountOfThisGood: number = acceptedOffers4result.filter(({ id }) => id === offerId).length;
|
|
196
|
+
// // const amountOfThisGood: number = acceptedOffers.filter(({ id }) => id === offerId).length;
|
|
197
|
+
// const { acceptedPaymentMethod, priceSpecification } = acceptedOffer;
|
|
198
|
+
// const unitPriceSpec = priceSpecification.priceComponent.find(
|
|
199
|
+
// (spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification
|
|
200
|
+
// && (!Array.isArray(spec.appliesToAddOn)) // アドオン単価ではない
|
|
201
|
+
// ) as IUnitPriceSpecification | undefined;
|
|
202
|
+
// if (unitPriceSpec === undefined) {
|
|
203
|
+
// throw new factory.errors.Internal(`unitPriceSpec not found [id:${offerId}]`);
|
|
204
|
+
// }
|
|
205
|
+
// const { eligibleQuantity } = unitPriceSpec;
|
|
206
|
+
// return {
|
|
207
|
+
// id: offerId,
|
|
208
|
+
// includesObject: { amountOfThisGood },
|
|
209
|
+
// typeOf: factory.offerType.Offer,
|
|
210
|
+
// priceSpecification: {
|
|
211
|
+
// ...(eligibleQuantity !== undefined) ? { eligibleQuantity } : undefined,
|
|
212
|
+
// // ...(eligibleTransactionVolume !== undefined) ? { eligibleTransactionVolume } : undefined // discontinue(2026-07-05~)
|
|
213
|
+
// },
|
|
214
|
+
// ...(acceptedPaymentMethod !== undefined) ? { acceptedPaymentMethod } : undefined
|
|
215
|
+
// };
|
|
216
|
+
// });
|
|
233
217
|
}
|
|
218
|
+
// discontinue useLegacyAuthorizeOfferResult(2026-07-18~)
|
|
219
|
+
// if (useLegacyAuthorizeOfferResult) {
|
|
220
|
+
// return {
|
|
221
|
+
// typeOf: factory.offerType.AggregateOffer,
|
|
222
|
+
// // priceCurrency, // discontinue(2026-07-06~)
|
|
223
|
+
// // amount: [], // discontinue(2026-07-06~)
|
|
224
|
+
// itemOffered: {
|
|
225
|
+
// serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
|
|
226
|
+
// },
|
|
227
|
+
// ...(typeof price === 'number') ? { price } : undefined,
|
|
228
|
+
// ...(Array.isArray(offers)) ? { offers } : undefined
|
|
229
|
+
// };
|
|
230
|
+
// } else {
|
|
231
|
+
// return {
|
|
232
|
+
// typeOf: factory.offerType.AggregateOffer,
|
|
233
|
+
// onlyPrice: true,
|
|
234
|
+
// ...(typeof price === 'number') ? { price } : undefined,
|
|
235
|
+
// };
|
|
236
|
+
// }
|
|
237
|
+
return {
|
|
238
|
+
typeOf: factory_1.factory.offerType.AggregateOffer,
|
|
239
|
+
onlyPrice: true,
|
|
240
|
+
...(typeof price === 'number') ? { price } : undefined,
|
|
241
|
+
};
|
|
234
242
|
}
|
|
235
243
|
function responseBody2acceptedOffers4result(params) {
|
|
236
244
|
let acceptedOffers4result = [];
|
|
@@ -78,7 +78,7 @@ function authorize(params, options) {
|
|
|
78
78
|
}
|
|
79
79
|
throw error;
|
|
80
80
|
}
|
|
81
|
-
const result = (0, factory_2.acceptedOffers2authorizeResult)({ acceptedOffers4result, noOfferSpecified, ticketOffers }
|
|
81
|
+
const result = (0, factory_2.acceptedOffers2authorizeResult)({ acceptedOffers4result, noOfferSpecified, ticketOffers });
|
|
82
82
|
await repos.authorizeOfferAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
|
|
83
83
|
return { id: action.id, result };
|
|
84
84
|
};
|
|
@@ -23,7 +23,8 @@ function onOrderProcessing(params) {
|
|
|
23
23
|
debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
|
|
24
24
|
let tasks;
|
|
25
25
|
let creatingCheckResourceTask;
|
|
26
|
-
const sendEmailMessageByOnOrderProcessing =
|
|
26
|
+
// const sendEmailMessageByOnOrderProcessing =
|
|
27
|
+
// params.placeOrderTransaction?.potentialActions?.order?.onOrderProcessing?.sendEmailMessage;
|
|
27
28
|
switch (params.order.orderStatus) {
|
|
28
29
|
case factory_1.factory.orderStatus.OrderProcessing:
|
|
29
30
|
tasks = (0, factory_2.createInformProcessingOrderTasks)(params.order, setting);
|
|
@@ -49,7 +50,7 @@ function onOrderProcessing(params) {
|
|
|
49
50
|
// OrderProcessingにおけるEメール送信に対応(2024-01-17~)
|
|
50
51
|
await (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
|
|
51
52
|
sendEmailMessage: [
|
|
52
|
-
|
|
53
|
+
// ...(Array.isArray(sendEmailMessageByOnOrderProcessing)) ? sendEmailMessageByOnOrderProcessing : []
|
|
53
54
|
],
|
|
54
55
|
order: params.order
|
|
55
56
|
})(repos);
|
package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.d.ts
CHANGED
|
@@ -1,6 +1,32 @@
|
|
|
1
1
|
import { factory } from '../../../../../factory';
|
|
2
2
|
import type { ISetting } from '../../../../../repo/setting';
|
|
3
3
|
import type { IOrderAsResult } from '../factory/result';
|
|
4
|
+
/**
|
|
5
|
+
* Eメール送信パラメータ
|
|
6
|
+
*/
|
|
7
|
+
interface ISendEmailMessageParams {
|
|
8
|
+
/**
|
|
9
|
+
* Eメールカスタマイズ
|
|
10
|
+
* メール本文をカスタマイズしたい場合、PUGテンプレートを指定
|
|
11
|
+
* 挿入変数として`order`を使用できます
|
|
12
|
+
* {@link https://pugjs.org/api/getting-started.html}
|
|
13
|
+
*/
|
|
14
|
+
object?: factory.creativeWork.message.email.ICustomization;
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* 取引確定後アクションパラメータ
|
|
18
|
+
*/
|
|
19
|
+
export interface IPotentialActionsParams {
|
|
20
|
+
order?: {
|
|
21
|
+
potentialActions?: {
|
|
22
|
+
sendOrder?: {
|
|
23
|
+
potentialActions?: {
|
|
24
|
+
sendEmailMessage?: ISendEmailMessageParams[];
|
|
25
|
+
};
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
};
|
|
29
|
+
}
|
|
4
30
|
export declare function createSendEmailMessageActions(params: {
|
|
5
31
|
order: IOrderAsResult & {
|
|
6
32
|
confirmationNumber: string;
|
|
@@ -12,8 +38,8 @@ export declare function createSendEmailMessageActions(params: {
|
|
|
12
38
|
customer: factory.order.ICustomer;
|
|
13
39
|
seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
|
|
14
40
|
paymentMethods: factory.order.IReferencedInvoice[];
|
|
15
|
-
potentialActions?:
|
|
41
|
+
potentialActions?: IPotentialActionsParams;
|
|
16
42
|
}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
|
|
17
43
|
emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
|
|
18
|
-
sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[];
|
|
19
44
|
}>;
|
|
45
|
+
export {};
|
package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createSendEmailMessageActions = createSendEmailMessageActions;
|
|
4
4
|
const emailMessageBuilder_1 = require("../../../../../emailMessageBuilder");
|
|
5
|
-
const factory_1 = require("../../../../../factory");
|
|
6
5
|
async function createSendEmailMessageActions(params, setting) {
|
|
7
6
|
// 注文配送メール送信設定
|
|
8
7
|
const emailMessages = [];
|
|
9
|
-
const sendEmailMessageActions = [];
|
|
8
|
+
// const sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[] = [];
|
|
10
9
|
const sendEmailMessageOnOrderSentParams = params.potentialActions?.order?.potentialActions?.sendOrder?.potentialActions?.sendEmailMessage;
|
|
11
10
|
if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
|
|
12
11
|
// pugテンプレートに渡す変数を最小化(2026-06-19~)
|
|
@@ -27,16 +26,16 @@ async function createSendEmailMessageActions(params, setting) {
|
|
|
27
26
|
// ...(params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined
|
|
28
27
|
}, setting);
|
|
29
28
|
emailMessages.push(emailMessage);
|
|
30
|
-
// 送信アクション最適化に対応(2024-04-29~)
|
|
31
|
-
const sendEmailMessageActionObject = {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
};
|
|
35
|
-
// optimize(2024-05-07~)
|
|
36
|
-
sendEmailMessageActions.push({
|
|
37
|
-
|
|
38
|
-
});
|
|
29
|
+
// // 送信アクション最適化に対応(2024-04-29~)
|
|
30
|
+
// const sendEmailMessageActionObject: factory.action.transfer.send.message.email.IObject = {
|
|
31
|
+
// identifier: emailMessage.identifier,
|
|
32
|
+
// typeOf: factory.creativeWorkType.EmailMessage
|
|
33
|
+
// };
|
|
34
|
+
// // optimize(2024-05-07~)
|
|
35
|
+
// sendEmailMessageActions.push({
|
|
36
|
+
// object: sendEmailMessageActionObject
|
|
37
|
+
// });
|
|
39
38
|
}));
|
|
40
39
|
}
|
|
41
|
-
return {
|
|
40
|
+
return { emailMessages };
|
|
42
41
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { factory } from '../../../../factory';
|
|
2
2
|
import type { ISetting } from '../../../../repo/setting';
|
|
3
|
+
import { IPotentialActionsParams } from './potentialActions/sendEmailMessage';
|
|
3
4
|
import { IOrderAsResult } from './factory/result';
|
|
5
|
+
export { IPotentialActionsParams };
|
|
4
6
|
/**
|
|
5
7
|
* 取引のポストアクションを作成する
|
|
6
8
|
*/
|
|
@@ -15,8 +17,8 @@ export declare function createPotentialActions(params: {
|
|
|
15
17
|
customer: factory.order.ICustomer;
|
|
16
18
|
seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
|
|
17
19
|
paymentMethods: factory.order.IReferencedInvoice[];
|
|
18
|
-
potentialActions?:
|
|
20
|
+
potentialActions?: IPotentialActionsParams;
|
|
19
21
|
}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
|
|
20
|
-
potentialActions
|
|
22
|
+
potentialActions?: never;
|
|
21
23
|
emailMessages: factory.creativeWork.message.email.ICreativeWork[];
|
|
22
24
|
}>;
|
|
@@ -7,13 +7,13 @@ const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
|
|
|
7
7
|
*/
|
|
8
8
|
async function createPotentialActions(params, setting) {
|
|
9
9
|
// 注文処理開始メール送信設定
|
|
10
|
-
const { emailMessages
|
|
10
|
+
const { emailMessages } = await (0, sendEmailMessage_1.createSendEmailMessageActions)(params, setting);
|
|
11
11
|
return {
|
|
12
12
|
emailMessages,
|
|
13
|
-
potentialActions: {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
13
|
+
// potentialActions: {
|
|
14
|
+
// order: {
|
|
15
|
+
// onOrderProcessing: { sendEmailMessage: sendEmailMessageActions } // optimize(2024-06-29~)
|
|
16
|
+
// }
|
|
17
|
+
// }
|
|
18
18
|
};
|
|
19
19
|
}
|
package/lib/chevre/service/transaction/placeOrder/confirm/prepareUnitPriceOfferConditions.d.ts
CHANGED
|
@@ -2,14 +2,42 @@ import type { OfferRepo } from '../../../../repo/offer/unitPriceInCatalog';
|
|
|
2
2
|
import { factory } from '../../../../factory';
|
|
3
3
|
export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
|
|
4
4
|
type IOrderAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'offeredThrough' | 'serialNumber' | 'priceSpecification' | 'id'>;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
interface IAcceptedOfferInResult extends Pick<factory.product.ITicketOffer, 'acceptedPaymentMethod' | 'id' | 'typeOf'> {
|
|
6
|
+
typeOf: factory.offerType.Offer;
|
|
7
|
+
id: string;
|
|
8
|
+
includesObject: {
|
|
9
|
+
amountOfThisGood: number;
|
|
10
|
+
};
|
|
11
|
+
/**
|
|
12
|
+
* 取引確定時の検証に必要な情報のみ保管する
|
|
13
|
+
*/
|
|
14
|
+
priceSpecification?: Pick<factory.priceSpecification.unitPrice.IPriceSpecification, 'eligibleQuantity'>;
|
|
15
|
+
}
|
|
16
|
+
export type IAggregateProgramMembershipUsed = (factory.assetTransaction.reserve.IPermitIssuedThroughFaceToFace | factory.assetTransaction.reserve.IPermitIssuedThroughMembershipService)[];
|
|
17
|
+
type IPreparedResult = Pick<factory.action.authorize.offer.eventService.IResult, 'price' | 'typeOf'> & {
|
|
18
|
+
/**
|
|
19
|
+
* オファーIDごとの集計
|
|
20
|
+
*/
|
|
21
|
+
offers?: IAcceptedOfferInResult[];
|
|
22
|
+
itemOffered?: {
|
|
23
|
+
serviceOutput: {
|
|
24
|
+
/**
|
|
25
|
+
* programMembershipUsed required(2024-08-15~)
|
|
26
|
+
*/
|
|
27
|
+
programMembershipUsed: IAggregateProgramMembershipUsed;
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
};
|
|
8
31
|
/**
|
|
9
32
|
* 注文ドキュメントと予約取引ドキュメントを参照することによって生成した、単価オファー検証条件
|
|
10
33
|
* 元々オファー承認アクションのresultに保管されていた
|
|
11
34
|
*/
|
|
12
|
-
type IPreparedUnitPriceOfferConditions = Pick<IAuthorizeEventServiceOffer, 'id'
|
|
35
|
+
type IPreparedUnitPriceOfferConditions = Pick<IAuthorizeEventServiceOffer, 'id'> & {
|
|
36
|
+
result?: IPreparedResult;
|
|
37
|
+
};
|
|
38
|
+
export declare function createAuthorizeOfferResultsExpected(params: {
|
|
39
|
+
authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
|
|
40
|
+
}): Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
|
|
13
41
|
declare function prepareUnitPriceOfferConditions(params: {
|
|
14
42
|
project: {
|
|
15
43
|
id: string;
|
|
@@ -13,6 +13,7 @@ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
|
|
|
13
13
|
import { factory } from '../../../factory';
|
|
14
14
|
import { PlaceOrderFactory } from '../../../factory/transaction';
|
|
15
15
|
import { IOrderAsResult } from './confirm/factory/result';
|
|
16
|
+
import { IPotentialActionsParams } from './confirm/potentialActions';
|
|
16
17
|
interface IConfirmOperationRepos {
|
|
17
18
|
acceptPayAction: AcceptPayActionRepo;
|
|
18
19
|
authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
|
|
@@ -41,12 +42,13 @@ interface IConfirmOptions {
|
|
|
41
42
|
* 注文における最大CreditCardIF決済方法数
|
|
42
43
|
*/
|
|
43
44
|
maxNumCreditCardPaymentMethod: number;
|
|
45
|
+
}
|
|
46
|
+
type IConfirmParams = PlaceOrderFactory.IConfirmParams & {
|
|
44
47
|
/**
|
|
45
|
-
*
|
|
48
|
+
* 取引確定後アクション
|
|
46
49
|
*/
|
|
47
|
-
|
|
48
|
-
}
|
|
49
|
-
type IConfirmParams = PlaceOrderFactory.IConfirmParams;
|
|
50
|
+
potentialActions?: IPotentialActionsParams;
|
|
51
|
+
};
|
|
50
52
|
interface IConfirmResult {
|
|
51
53
|
order: Pick<IOrderAsResult, 'confirmationNumber' | 'orderNumber'>;
|
|
52
54
|
customer: factory.order.ICustomer;
|
|
@@ -155,7 +155,7 @@ function confirm(params, options) {
|
|
|
155
155
|
if (typeof setting?.defaultSenderEmail !== 'string') {
|
|
156
156
|
throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
|
|
157
157
|
}
|
|
158
|
-
const { emailMessages
|
|
158
|
+
const { emailMessages } = await (0, potentialActions_1.createPotentialActions)({
|
|
159
159
|
order: placingOrder, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
|
|
160
160
|
customer,
|
|
161
161
|
seller,
|
|
@@ -178,7 +178,7 @@ function confirm(params, options) {
|
|
|
178
178
|
confirmationNumber: placingOrder.confirmationNumber
|
|
179
179
|
},
|
|
180
180
|
result: result,
|
|
181
|
-
...((options.useTransactionPotentialActions) && { potentialActions }) // support undefined(2026-07-17~)
|
|
181
|
+
// ...((options.useTransactionPotentialActions) && { potentialActions }) // support undefined(2026-07-17~)
|
|
182
182
|
});
|
|
183
183
|
}
|
|
184
184
|
catch (error) {
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@aws-sdk/client-cognito-identity-provider": "3.600.0",
|
|
13
13
|
"@aws-sdk/credential-providers": "3.600.0",
|
|
14
|
-
"@chevre/factory": "
|
|
14
|
+
"@chevre/factory": "10.0.0-alpha.0",
|
|
15
15
|
"@motionpicture/coa-service": "10.0.0",
|
|
16
16
|
"@motionpicture/gmo-service": "6.1.0-alpha.0",
|
|
17
17
|
"@sendgrid/client": "8.1.4",
|
|
@@ -92,5 +92,5 @@
|
|
|
92
92
|
"postversion": "git push origin --tags",
|
|
93
93
|
"prepublishOnly": "npm run clean && npm run build"
|
|
94
94
|
},
|
|
95
|
-
"version": "25.2.0-alpha.
|
|
95
|
+
"version": "25.2.0-alpha.33"
|
|
96
96
|
}
|