@cinerino/sdk 12.7.0-alpha.1 → 12.7.0-alpha.3
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/example/src/cloud/transaction/processPlaceOrderByCreditCard3DS.ts +8 -1
- package/lib/abstract/chevrePay/payment.d.ts +14 -5
- package/lib/abstract/chevrePay/payment.js +20 -10
- package/lib/abstract/cloud/pay/payment.d.ts +23 -0
- package/lib/abstract/cloud/pay/payment.js +78 -9
- package/lib/bundle.js +98 -19
- package/package.json +1 -1
|
@@ -76,7 +76,8 @@ async function main() {
|
|
|
76
76
|
.toDate(),
|
|
77
77
|
inSessionThrough: moment()
|
|
78
78
|
.add(1, 'week')
|
|
79
|
-
.toDate()
|
|
79
|
+
.toDate(),
|
|
80
|
+
eventStatuses: [client.factory.eventStatusType.EventScheduled]
|
|
80
81
|
});
|
|
81
82
|
console.log(searchScreeningEventsResult.data.length, 'events found');
|
|
82
83
|
|
|
@@ -119,7 +120,13 @@ async function main() {
|
|
|
119
120
|
}
|
|
120
121
|
|
|
121
122
|
// 出力メンバーシップ対応の場合チケット発行
|
|
123
|
+
// let ticketToken: string | undefined;
|
|
122
124
|
const { ticketToken } = await paymentService.issueTicketThroughCreditCard({
|
|
125
|
+
// ticketedInvoice: {
|
|
126
|
+
// issuedThrough: {
|
|
127
|
+
// id: paymentServiceId
|
|
128
|
+
// }
|
|
129
|
+
// },
|
|
123
130
|
ticketedPermit: {
|
|
124
131
|
issuedThrough: {
|
|
125
132
|
id: paymentServiceId
|
|
@@ -37,9 +37,7 @@ export declare class PaymentService extends Service {
|
|
|
37
37
|
authorizeCreditCard(params: {
|
|
38
38
|
object: IAuthorizeCreditCardObject;
|
|
39
39
|
purpose: IPurpose;
|
|
40
|
-
},
|
|
41
|
-
async?: boolean;
|
|
42
|
-
}): Promise<IAuthorizeResult>;
|
|
40
|
+
}, __?: {}): Promise<IAuthorizeResult>;
|
|
43
41
|
/**
|
|
44
42
|
* 決済カード決済承認
|
|
45
43
|
*/
|
|
@@ -48,8 +46,7 @@ export declare class PaymentService extends Service {
|
|
|
48
46
|
ticketToken: string;
|
|
49
47
|
};
|
|
50
48
|
purpose: IPurpose;
|
|
51
|
-
}, options
|
|
52
|
-
async?: boolean;
|
|
49
|
+
}, options: {
|
|
53
50
|
/**
|
|
54
51
|
* 決済カード認証アクションID
|
|
55
52
|
*/
|
|
@@ -185,6 +182,7 @@ export declare class PaymentService extends Service {
|
|
|
185
182
|
purpose: IPurpose;
|
|
186
183
|
}): Promise<ITicket>;
|
|
187
184
|
issueTicketThroughCreditCard(params: {
|
|
185
|
+
ticketedInvoice?: never;
|
|
188
186
|
ticketedPermit: {
|
|
189
187
|
issuedThrough: {
|
|
190
188
|
/**
|
|
@@ -194,6 +192,17 @@ export declare class PaymentService extends Service {
|
|
|
194
192
|
};
|
|
195
193
|
};
|
|
196
194
|
purpose: IPurpose;
|
|
195
|
+
} | {
|
|
196
|
+
ticketedInvoice: {
|
|
197
|
+
issuedThrough: {
|
|
198
|
+
/**
|
|
199
|
+
* 発行決済サービスID
|
|
200
|
+
*/
|
|
201
|
+
id: string;
|
|
202
|
+
};
|
|
203
|
+
};
|
|
204
|
+
ticketedPermit?: never;
|
|
205
|
+
purpose: IPurpose;
|
|
197
206
|
}): Promise<ITicket>;
|
|
198
207
|
issueTicketThroughMovieTicket(params: {
|
|
199
208
|
ticketedInvoice: {
|
|
@@ -154,7 +154,7 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
154
154
|
/**
|
|
155
155
|
* クレジットカード決済承認
|
|
156
156
|
*/
|
|
157
|
-
PaymentService.prototype.authorizeCreditCard = function (params,
|
|
157
|
+
PaymentService.prototype.authorizeCreditCard = function (params, __) {
|
|
158
158
|
return __awaiter(this, void 0, void 0, function () {
|
|
159
159
|
var object, purpose, amount, issuedThrough, paymentMethod, creditCard, method, paymentMethodId, name, additionalProperty, ticketToken;
|
|
160
160
|
var _this = this;
|
|
@@ -169,8 +169,10 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
169
169
|
object: __assign(__assign(__assign(__assign(__assign(__assign({ amount: amount, issuedThrough: issuedThrough, paymentMethod: paymentMethod }, (creditCard !== undefined && creditCard !== null) ? { creditCard: creditCard } : undefined), (typeof name === 'string') ? { name: name } : undefined), (typeof method === 'string') ? { method: method } : undefined), (typeof paymentMethodId === 'string') ? { paymentMethodId: paymentMethodId } : undefined), (typeof ticketToken === 'string') ? { ticketToken: ticketToken } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty: additionalProperty } : undefined),
|
|
170
170
|
purpose: purpose
|
|
171
171
|
},
|
|
172
|
-
qs:
|
|
173
|
-
|
|
172
|
+
qs: {
|
|
173
|
+
async: true,
|
|
174
|
+
purpose: { id: purpose.id } // 追加(2024-04-01~)
|
|
175
|
+
}
|
|
174
176
|
})
|
|
175
177
|
.then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
176
178
|
return [2 /*return*/, response.json()];
|
|
@@ -183,11 +185,12 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
183
185
|
*/
|
|
184
186
|
PaymentService.prototype.authorizeMovieTicket = function (params, options) {
|
|
185
187
|
return __awaiter(this, void 0, void 0, function () {
|
|
186
|
-
var object, purpose, issuedThrough, paymentMethod, movieTickets, name, additionalProperty, ticketToken;
|
|
188
|
+
var object, purpose, issuedThrough, paymentMethod, movieTickets, name, additionalProperty, ticketToken, checkedActionId;
|
|
187
189
|
var _this = this;
|
|
188
190
|
return __generator(this, function (_a) {
|
|
189
191
|
object = params.object, purpose = params.purpose;
|
|
190
192
|
issuedThrough = object.issuedThrough, paymentMethod = object.paymentMethod, movieTickets = object.movieTickets, name = object.name, additionalProperty = object.additionalProperty, ticketToken = object.ticketToken;
|
|
193
|
+
checkedActionId = options.checkedActionId;
|
|
191
194
|
return [2 /*return*/, this.fetch({
|
|
192
195
|
uri: "/payment/" + factory.service.paymentService.PaymentServiceType.MovieTicket + "/authorize",
|
|
193
196
|
method: 'POST',
|
|
@@ -196,8 +199,11 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
196
199
|
object: __assign(__assign(__assign(__assign({ issuedThrough: issuedThrough, paymentMethod: paymentMethod }, (Array.isArray(movieTickets)) ? { movieTickets: movieTickets } : undefined), (typeof name === 'string') ? { name: name } : undefined), (typeof ticketToken === 'string') ? { ticketToken: ticketToken } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty: additionalProperty } : undefined),
|
|
197
200
|
purpose: purpose
|
|
198
201
|
},
|
|
199
|
-
qs:
|
|
200
|
-
|
|
202
|
+
qs: {
|
|
203
|
+
checkedActionId: checkedActionId,
|
|
204
|
+
async: true,
|
|
205
|
+
purpose: { id: purpose.id } // 追加(2024-04-01~)
|
|
206
|
+
}
|
|
201
207
|
})
|
|
202
208
|
.then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
203
209
|
return [2 /*return*/, response.json()];
|
|
@@ -445,17 +451,21 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
445
451
|
};
|
|
446
452
|
PaymentService.prototype.issueTicketThroughCreditCard = function (params) {
|
|
447
453
|
return __awaiter(this, void 0, void 0, function () {
|
|
448
|
-
var purpose, ticketedPermit;
|
|
454
|
+
var purpose, ticketedPermit, ticketedInvoice, serviceOutputType;
|
|
449
455
|
var _this = this;
|
|
450
456
|
return __generator(this, function (_a) {
|
|
451
|
-
purpose = params.purpose, ticketedPermit = params.ticketedPermit;
|
|
457
|
+
purpose = params.purpose, ticketedPermit = params.ticketedPermit, ticketedInvoice = params.ticketedInvoice;
|
|
458
|
+
serviceOutputType = (typeof (ticketedPermit === null || ticketedPermit === void 0 ? void 0 : ticketedPermit.issuedThrough.id) === 'string')
|
|
459
|
+
? factory.permit.PermitType.Permit
|
|
460
|
+
: 'Invoice';
|
|
452
461
|
return [2 /*return*/, this.fetch({
|
|
453
462
|
uri: "/payment/" + factory.service.paymentService.PaymentServiceType.CreditCard + "/tickets",
|
|
454
463
|
method: 'POST',
|
|
455
464
|
expectedStatusCodes: [http_status_1.CREATED],
|
|
456
|
-
body: { purpose: purpose, ticketedPermit: ticketedPermit },
|
|
465
|
+
body: { purpose: purpose, ticketedPermit: ticketedPermit, ticketedInvoice: ticketedInvoice },
|
|
457
466
|
qs: {
|
|
458
|
-
purpose: { id: purpose.id }
|
|
467
|
+
purpose: { id: purpose.id },
|
|
468
|
+
serviceOutputType: serviceOutputType // log目的でクエリ追加(2025-11-09~)
|
|
459
469
|
}
|
|
460
470
|
})
|
|
461
471
|
.then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
@@ -18,6 +18,11 @@ export declare class PaymentService extends Service {
|
|
|
18
18
|
authorizeCreditCardAsync(params: {
|
|
19
19
|
object: IAuthorizeCreditCardObject;
|
|
20
20
|
purpose: IPurpose;
|
|
21
|
+
}, options?: {
|
|
22
|
+
/**
|
|
23
|
+
* min: 1000 ms
|
|
24
|
+
*/
|
|
25
|
+
intervalAfterIssueTicketInMS?: number;
|
|
21
26
|
}): Promise<{
|
|
22
27
|
/**
|
|
23
28
|
* task ID
|
|
@@ -52,6 +57,11 @@ export declare class PaymentService extends Service {
|
|
|
52
57
|
publishCreditCardPaymentUrlAsync(params: {
|
|
53
58
|
object: IPublishPaymentUrlObject;
|
|
54
59
|
purpose: IPurpose;
|
|
60
|
+
}, options?: {
|
|
61
|
+
/**
|
|
62
|
+
* min: 1000 ms
|
|
63
|
+
*/
|
|
64
|
+
intervalAfterIssueTicketInMS?: number;
|
|
55
65
|
}): Promise<{
|
|
56
66
|
/**
|
|
57
67
|
* task ID
|
|
@@ -227,6 +237,7 @@ export declare class PaymentService extends Service {
|
|
|
227
237
|
* CreditCardIF決済によるチケット発行
|
|
228
238
|
*/
|
|
229
239
|
issueTicketThroughCreditCard(params: {
|
|
240
|
+
ticketedInvoice?: never;
|
|
230
241
|
ticketedPermit: {
|
|
231
242
|
issuedThrough: {
|
|
232
243
|
/**
|
|
@@ -236,6 +247,18 @@ export declare class PaymentService extends Service {
|
|
|
236
247
|
};
|
|
237
248
|
};
|
|
238
249
|
purpose: IPurpose;
|
|
250
|
+
} | {
|
|
251
|
+
ticketedInvoice: {
|
|
252
|
+
issuedThrough: {
|
|
253
|
+
/**
|
|
254
|
+
* 発行決済サービスID
|
|
255
|
+
*/
|
|
256
|
+
id: string;
|
|
257
|
+
};
|
|
258
|
+
};
|
|
259
|
+
ticketedPermit?: never;
|
|
260
|
+
purpose: IPurpose;
|
|
239
261
|
}): Promise<ITicket>;
|
|
240
262
|
private issueTicketThroughMovieTicketUntilSuccess;
|
|
263
|
+
private issueTicketThroughCreditCardIfNotExists;
|
|
241
264
|
}
|
|
@@ -83,7 +83,8 @@ var http_status_1 = require("http-status");
|
|
|
83
83
|
var factory = require("../../factory");
|
|
84
84
|
var index_1 = require("../../index");
|
|
85
85
|
var service_1 = require("../../service");
|
|
86
|
-
var
|
|
86
|
+
var MIN_INTERVAL_AFTER_ISSUE_TICKET_MS = 1000;
|
|
87
|
+
var RETRY_ISSUE_TICKET_INTERVAL_MS = 5000;
|
|
87
88
|
function wait(waitInMilliseconds) {
|
|
88
89
|
return __awaiter(this, void 0, void 0, function () {
|
|
89
90
|
return __generator(this, function (_a) {
|
|
@@ -132,13 +133,14 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
132
133
|
/**
|
|
133
134
|
* クレジットカード決済承認(非同期)
|
|
134
135
|
*/
|
|
135
|
-
PaymentService.prototype.authorizeCreditCardAsync = function (params) {
|
|
136
|
+
PaymentService.prototype.authorizeCreditCardAsync = function (params, options) {
|
|
136
137
|
return __awaiter(this, void 0, void 0, function () {
|
|
137
|
-
var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
|
|
138
|
+
var object, purpose, intervalAfterIssueTicketInMS, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
|
|
138
139
|
return __generator(this, function (_b) {
|
|
139
140
|
switch (_b.label) {
|
|
140
141
|
case 0:
|
|
141
142
|
object = params.object, purpose = params.purpose;
|
|
143
|
+
intervalAfterIssueTicketInMS = options === null || options === void 0 ? void 0 : options.intervalAfterIssueTicketInMS;
|
|
142
144
|
_a = this.options, auth = _a.auth, endpoint = _a.endpoint, project = _a.project, seller = _a.seller, disableAutoRetry = _a.disableAutoRetry, retryableStatusCodes = _a.retryableStatusCodes;
|
|
143
145
|
return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
|
|
144
146
|
case 1:
|
|
@@ -153,7 +155,16 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
153
155
|
})];
|
|
154
156
|
case 2:
|
|
155
157
|
paymentService = _b.sent();
|
|
156
|
-
return [
|
|
158
|
+
return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, {
|
|
159
|
+
checkPaymentMethodId: true,
|
|
160
|
+
intervalAfterIssueTicketInMS: intervalAfterIssueTicketInMS
|
|
161
|
+
})];
|
|
162
|
+
case 3:
|
|
163
|
+
ticketToken = (_b.sent()).ticketToken;
|
|
164
|
+
return [2 /*return*/, paymentService.authorizeCreditCard({
|
|
165
|
+
object: __assign(__assign({}, object), { ticketToken: ticketToken }),
|
|
166
|
+
purpose: purpose
|
|
167
|
+
}, { async: true })];
|
|
157
168
|
}
|
|
158
169
|
});
|
|
159
170
|
});
|
|
@@ -189,7 +200,7 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
189
200
|
return [2 /*return*/, paymentService.authorizeMovieTicket({
|
|
190
201
|
object: __assign(__assign({}, object), { ticketToken: ticketToken }),
|
|
191
202
|
purpose: purpose
|
|
192
|
-
}, {
|
|
203
|
+
}, { checkedActionId: checkedActionId })];
|
|
193
204
|
}
|
|
194
205
|
});
|
|
195
206
|
});
|
|
@@ -197,12 +208,14 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
197
208
|
/**
|
|
198
209
|
* 決済採用(決済ロケーション発行)(非同期)
|
|
199
210
|
*/
|
|
200
|
-
PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params) {
|
|
211
|
+
PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params, options) {
|
|
201
212
|
return __awaiter(this, void 0, void 0, function () {
|
|
202
|
-
var _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
|
|
213
|
+
var object, purpose, intervalAfterIssueTicketInMS, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
|
|
203
214
|
return __generator(this, function (_b) {
|
|
204
215
|
switch (_b.label) {
|
|
205
216
|
case 0:
|
|
217
|
+
object = params.object, purpose = params.purpose;
|
|
218
|
+
intervalAfterIssueTicketInMS = options === null || options === void 0 ? void 0 : options.intervalAfterIssueTicketInMS;
|
|
206
219
|
_a = this.options, auth = _a.auth, endpoint = _a.endpoint, project = _a.project, seller = _a.seller, disableAutoRetry = _a.disableAutoRetry, retryableStatusCodes = _a.retryableStatusCodes;
|
|
207
220
|
return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
|
|
208
221
|
case 1:
|
|
@@ -218,7 +231,16 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
218
231
|
})];
|
|
219
232
|
case 2:
|
|
220
233
|
paymentService = _b.sent();
|
|
221
|
-
return [
|
|
234
|
+
return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, {
|
|
235
|
+
checkPaymentMethodId: false,
|
|
236
|
+
intervalAfterIssueTicketInMS: intervalAfterIssueTicketInMS
|
|
237
|
+
})];
|
|
238
|
+
case 3:
|
|
239
|
+
ticketToken = (_b.sent()).ticketToken;
|
|
240
|
+
return [2 /*return*/, paymentService.publishCreditCardPaymentUrlAsync({
|
|
241
|
+
object: __assign(__assign({}, object), { ticketToken: ticketToken }),
|
|
242
|
+
purpose: purpose
|
|
243
|
+
})];
|
|
222
244
|
}
|
|
223
245
|
});
|
|
224
246
|
});
|
|
@@ -622,7 +644,7 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
622
644
|
return [3 /*break*/, 7];
|
|
623
645
|
case 7:
|
|
624
646
|
// n秒待機
|
|
625
|
-
return [4 /*yield*/, wait(
|
|
647
|
+
return [4 /*yield*/, wait(RETRY_ISSUE_TICKET_INTERVAL_MS)];
|
|
626
648
|
case 8:
|
|
627
649
|
// n秒待機
|
|
628
650
|
_c.sent();
|
|
@@ -638,6 +660,53 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
638
660
|
});
|
|
639
661
|
});
|
|
640
662
|
};
|
|
663
|
+
PaymentService.prototype.issueTicketThroughCreditCardIfNotExists = function (params, options) {
|
|
664
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
665
|
+
var object, purpose, checkPaymentMethodId, intervalAfterIssueTicketInMS, issueForcibly, ticketToken, paymentMethodId, automaticallyIssuedTicket;
|
|
666
|
+
return __generator(this, function (_a) {
|
|
667
|
+
switch (_a.label) {
|
|
668
|
+
case 0:
|
|
669
|
+
object = params.object, purpose = params.purpose;
|
|
670
|
+
checkPaymentMethodId = options.checkPaymentMethodId;
|
|
671
|
+
intervalAfterIssueTicketInMS = (typeof options.intervalAfterIssueTicketInMS === 'number'
|
|
672
|
+
&& options.intervalAfterIssueTicketInMS > MIN_INTERVAL_AFTER_ISSUE_TICKET_MS)
|
|
673
|
+
? options.intervalAfterIssueTicketInMS
|
|
674
|
+
: MIN_INTERVAL_AFTER_ISSUE_TICKET_MS;
|
|
675
|
+
issueForcibly = false;
|
|
676
|
+
ticketToken = object.ticketToken;
|
|
677
|
+
paymentMethodId = object.paymentMethodId;
|
|
678
|
+
if (checkPaymentMethodId) {
|
|
679
|
+
// 承認時は、ticketTokenもpaymentMethodIdも指定がない場合に、自動発行
|
|
680
|
+
if ((typeof ticketToken !== 'string' || ticketToken === '')
|
|
681
|
+
&& (typeof paymentMethodId !== 'string' || paymentMethodId === '')) {
|
|
682
|
+
issueForcibly = true;
|
|
683
|
+
}
|
|
684
|
+
}
|
|
685
|
+
else {
|
|
686
|
+
// 決済URL発行時は、ticketTokenの指定がない場合に、自動発行
|
|
687
|
+
if (typeof ticketToken !== 'string' || ticketToken === '') {
|
|
688
|
+
issueForcibly = true;
|
|
689
|
+
}
|
|
690
|
+
}
|
|
691
|
+
if (!issueForcibly) {
|
|
692
|
+
return [2 /*return*/, { ticketToken: ticketToken }];
|
|
693
|
+
}
|
|
694
|
+
return [4 /*yield*/, this.issueTicketThroughCreditCard({
|
|
695
|
+
ticketedInvoice: { issuedThrough: { id: object.issuedThrough.id } },
|
|
696
|
+
purpose: purpose
|
|
697
|
+
})];
|
|
698
|
+
case 1:
|
|
699
|
+
automaticallyIssuedTicket = _a.sent();
|
|
700
|
+
// n秒待機
|
|
701
|
+
return [4 /*yield*/, wait(intervalAfterIssueTicketInMS)];
|
|
702
|
+
case 2:
|
|
703
|
+
// n秒待機
|
|
704
|
+
_a.sent();
|
|
705
|
+
return [2 /*return*/, automaticallyIssuedTicket];
|
|
706
|
+
}
|
|
707
|
+
});
|
|
708
|
+
});
|
|
709
|
+
};
|
|
641
710
|
return PaymentService;
|
|
642
711
|
}(service_1.Service));
|
|
643
712
|
exports.PaymentService = PaymentService;
|
package/lib/bundle.js
CHANGED
|
@@ -18136,7 +18136,7 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
18136
18136
|
/**
|
|
18137
18137
|
* クレジットカード決済承認
|
|
18138
18138
|
*/
|
|
18139
|
-
PaymentService.prototype.authorizeCreditCard = function (params,
|
|
18139
|
+
PaymentService.prototype.authorizeCreditCard = function (params, __) {
|
|
18140
18140
|
return __awaiter(this, void 0, void 0, function () {
|
|
18141
18141
|
var object, purpose, amount, issuedThrough, paymentMethod, creditCard, method, paymentMethodId, name, additionalProperty, ticketToken;
|
|
18142
18142
|
var _this = this;
|
|
@@ -18151,8 +18151,10 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
18151
18151
|
object: __assign(__assign(__assign(__assign(__assign(__assign({ amount: amount, issuedThrough: issuedThrough, paymentMethod: paymentMethod }, (creditCard !== undefined && creditCard !== null) ? { creditCard: creditCard } : undefined), (typeof name === 'string') ? { name: name } : undefined), (typeof method === 'string') ? { method: method } : undefined), (typeof paymentMethodId === 'string') ? { paymentMethodId: paymentMethodId } : undefined), (typeof ticketToken === 'string') ? { ticketToken: ticketToken } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty: additionalProperty } : undefined),
|
|
18152
18152
|
purpose: purpose
|
|
18153
18153
|
},
|
|
18154
|
-
qs:
|
|
18155
|
-
|
|
18154
|
+
qs: {
|
|
18155
|
+
async: true,
|
|
18156
|
+
purpose: { id: purpose.id } // 追加(2024-04-01~)
|
|
18157
|
+
}
|
|
18156
18158
|
})
|
|
18157
18159
|
.then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
18158
18160
|
return [2 /*return*/, response.json()];
|
|
@@ -18165,11 +18167,12 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
18165
18167
|
*/
|
|
18166
18168
|
PaymentService.prototype.authorizeMovieTicket = function (params, options) {
|
|
18167
18169
|
return __awaiter(this, void 0, void 0, function () {
|
|
18168
|
-
var object, purpose, issuedThrough, paymentMethod, movieTickets, name, additionalProperty, ticketToken;
|
|
18170
|
+
var object, purpose, issuedThrough, paymentMethod, movieTickets, name, additionalProperty, ticketToken, checkedActionId;
|
|
18169
18171
|
var _this = this;
|
|
18170
18172
|
return __generator(this, function (_a) {
|
|
18171
18173
|
object = params.object, purpose = params.purpose;
|
|
18172
18174
|
issuedThrough = object.issuedThrough, paymentMethod = object.paymentMethod, movieTickets = object.movieTickets, name = object.name, additionalProperty = object.additionalProperty, ticketToken = object.ticketToken;
|
|
18175
|
+
checkedActionId = options.checkedActionId;
|
|
18173
18176
|
return [2 /*return*/, this.fetch({
|
|
18174
18177
|
uri: "/payment/" + factory.service.paymentService.PaymentServiceType.MovieTicket + "/authorize",
|
|
18175
18178
|
method: 'POST',
|
|
@@ -18178,8 +18181,11 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
18178
18181
|
object: __assign(__assign(__assign(__assign({ issuedThrough: issuedThrough, paymentMethod: paymentMethod }, (Array.isArray(movieTickets)) ? { movieTickets: movieTickets } : undefined), (typeof name === 'string') ? { name: name } : undefined), (typeof ticketToken === 'string') ? { ticketToken: ticketToken } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty: additionalProperty } : undefined),
|
|
18179
18182
|
purpose: purpose
|
|
18180
18183
|
},
|
|
18181
|
-
qs:
|
|
18182
|
-
|
|
18184
|
+
qs: {
|
|
18185
|
+
checkedActionId: checkedActionId,
|
|
18186
|
+
async: true,
|
|
18187
|
+
purpose: { id: purpose.id } // 追加(2024-04-01~)
|
|
18188
|
+
}
|
|
18183
18189
|
})
|
|
18184
18190
|
.then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
18185
18191
|
return [2 /*return*/, response.json()];
|
|
@@ -18427,17 +18433,21 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
18427
18433
|
};
|
|
18428
18434
|
PaymentService.prototype.issueTicketThroughCreditCard = function (params) {
|
|
18429
18435
|
return __awaiter(this, void 0, void 0, function () {
|
|
18430
|
-
var purpose, ticketedPermit;
|
|
18436
|
+
var purpose, ticketedPermit, ticketedInvoice, serviceOutputType;
|
|
18431
18437
|
var _this = this;
|
|
18432
18438
|
return __generator(this, function (_a) {
|
|
18433
|
-
purpose = params.purpose, ticketedPermit = params.ticketedPermit;
|
|
18439
|
+
purpose = params.purpose, ticketedPermit = params.ticketedPermit, ticketedInvoice = params.ticketedInvoice;
|
|
18440
|
+
serviceOutputType = (typeof (ticketedPermit === null || ticketedPermit === void 0 ? void 0 : ticketedPermit.issuedThrough.id) === 'string')
|
|
18441
|
+
? factory.permit.PermitType.Permit
|
|
18442
|
+
: 'Invoice';
|
|
18434
18443
|
return [2 /*return*/, this.fetch({
|
|
18435
18444
|
uri: "/payment/" + factory.service.paymentService.PaymentServiceType.CreditCard + "/tickets",
|
|
18436
18445
|
method: 'POST',
|
|
18437
18446
|
expectedStatusCodes: [http_status_1.CREATED],
|
|
18438
|
-
body: { purpose: purpose, ticketedPermit: ticketedPermit },
|
|
18447
|
+
body: { purpose: purpose, ticketedPermit: ticketedPermit, ticketedInvoice: ticketedInvoice },
|
|
18439
18448
|
qs: {
|
|
18440
|
-
purpose: { id: purpose.id }
|
|
18449
|
+
purpose: { id: purpose.id },
|
|
18450
|
+
serviceOutputType: serviceOutputType // log目的でクエリ追加(2025-11-09~)
|
|
18441
18451
|
}
|
|
18442
18452
|
})
|
|
18443
18453
|
.then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
@@ -24065,7 +24075,8 @@ var http_status_1 = require("http-status");
|
|
|
24065
24075
|
var factory = require("../../factory");
|
|
24066
24076
|
var index_1 = require("../../index");
|
|
24067
24077
|
var service_1 = require("../../service");
|
|
24068
|
-
var
|
|
24078
|
+
var MIN_INTERVAL_AFTER_ISSUE_TICKET_MS = 1000;
|
|
24079
|
+
var RETRY_ISSUE_TICKET_INTERVAL_MS = 5000;
|
|
24069
24080
|
function wait(waitInMilliseconds) {
|
|
24070
24081
|
return __awaiter(this, void 0, void 0, function () {
|
|
24071
24082
|
return __generator(this, function (_a) {
|
|
@@ -24114,13 +24125,14 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
24114
24125
|
/**
|
|
24115
24126
|
* クレジットカード決済承認(非同期)
|
|
24116
24127
|
*/
|
|
24117
|
-
PaymentService.prototype.authorizeCreditCardAsync = function (params) {
|
|
24128
|
+
PaymentService.prototype.authorizeCreditCardAsync = function (params, options) {
|
|
24118
24129
|
return __awaiter(this, void 0, void 0, function () {
|
|
24119
|
-
var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
|
|
24130
|
+
var object, purpose, intervalAfterIssueTicketInMS, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
|
|
24120
24131
|
return __generator(this, function (_b) {
|
|
24121
24132
|
switch (_b.label) {
|
|
24122
24133
|
case 0:
|
|
24123
24134
|
object = params.object, purpose = params.purpose;
|
|
24135
|
+
intervalAfterIssueTicketInMS = options === null || options === void 0 ? void 0 : options.intervalAfterIssueTicketInMS;
|
|
24124
24136
|
_a = this.options, auth = _a.auth, endpoint = _a.endpoint, project = _a.project, seller = _a.seller, disableAutoRetry = _a.disableAutoRetry, retryableStatusCodes = _a.retryableStatusCodes;
|
|
24125
24137
|
return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
|
|
24126
24138
|
case 1:
|
|
@@ -24135,7 +24147,16 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
24135
24147
|
})];
|
|
24136
24148
|
case 2:
|
|
24137
24149
|
paymentService = _b.sent();
|
|
24138
|
-
return [
|
|
24150
|
+
return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, {
|
|
24151
|
+
checkPaymentMethodId: true,
|
|
24152
|
+
intervalAfterIssueTicketInMS: intervalAfterIssueTicketInMS
|
|
24153
|
+
})];
|
|
24154
|
+
case 3:
|
|
24155
|
+
ticketToken = (_b.sent()).ticketToken;
|
|
24156
|
+
return [2 /*return*/, paymentService.authorizeCreditCard({
|
|
24157
|
+
object: __assign(__assign({}, object), { ticketToken: ticketToken }),
|
|
24158
|
+
purpose: purpose
|
|
24159
|
+
}, { async: true })];
|
|
24139
24160
|
}
|
|
24140
24161
|
});
|
|
24141
24162
|
});
|
|
@@ -24171,7 +24192,7 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
24171
24192
|
return [2 /*return*/, paymentService.authorizeMovieTicket({
|
|
24172
24193
|
object: __assign(__assign({}, object), { ticketToken: ticketToken }),
|
|
24173
24194
|
purpose: purpose
|
|
24174
|
-
}, {
|
|
24195
|
+
}, { checkedActionId: checkedActionId })];
|
|
24175
24196
|
}
|
|
24176
24197
|
});
|
|
24177
24198
|
});
|
|
@@ -24179,12 +24200,14 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
24179
24200
|
/**
|
|
24180
24201
|
* 決済採用(決済ロケーション発行)(非同期)
|
|
24181
24202
|
*/
|
|
24182
|
-
PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params) {
|
|
24203
|
+
PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params, options) {
|
|
24183
24204
|
return __awaiter(this, void 0, void 0, function () {
|
|
24184
|
-
var _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
|
|
24205
|
+
var object, purpose, intervalAfterIssueTicketInMS, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
|
|
24185
24206
|
return __generator(this, function (_b) {
|
|
24186
24207
|
switch (_b.label) {
|
|
24187
24208
|
case 0:
|
|
24209
|
+
object = params.object, purpose = params.purpose;
|
|
24210
|
+
intervalAfterIssueTicketInMS = options === null || options === void 0 ? void 0 : options.intervalAfterIssueTicketInMS;
|
|
24188
24211
|
_a = this.options, auth = _a.auth, endpoint = _a.endpoint, project = _a.project, seller = _a.seller, disableAutoRetry = _a.disableAutoRetry, retryableStatusCodes = _a.retryableStatusCodes;
|
|
24189
24212
|
return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
|
|
24190
24213
|
case 1:
|
|
@@ -24200,7 +24223,16 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
24200
24223
|
})];
|
|
24201
24224
|
case 2:
|
|
24202
24225
|
paymentService = _b.sent();
|
|
24203
|
-
return [
|
|
24226
|
+
return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, {
|
|
24227
|
+
checkPaymentMethodId: false,
|
|
24228
|
+
intervalAfterIssueTicketInMS: intervalAfterIssueTicketInMS
|
|
24229
|
+
})];
|
|
24230
|
+
case 3:
|
|
24231
|
+
ticketToken = (_b.sent()).ticketToken;
|
|
24232
|
+
return [2 /*return*/, paymentService.publishCreditCardPaymentUrlAsync({
|
|
24233
|
+
object: __assign(__assign({}, object), { ticketToken: ticketToken }),
|
|
24234
|
+
purpose: purpose
|
|
24235
|
+
})];
|
|
24204
24236
|
}
|
|
24205
24237
|
});
|
|
24206
24238
|
});
|
|
@@ -24604,7 +24636,7 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
24604
24636
|
return [3 /*break*/, 7];
|
|
24605
24637
|
case 7:
|
|
24606
24638
|
// n秒待機
|
|
24607
|
-
return [4 /*yield*/, wait(
|
|
24639
|
+
return [4 /*yield*/, wait(RETRY_ISSUE_TICKET_INTERVAL_MS)];
|
|
24608
24640
|
case 8:
|
|
24609
24641
|
// n秒待機
|
|
24610
24642
|
_c.sent();
|
|
@@ -24620,6 +24652,53 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
24620
24652
|
});
|
|
24621
24653
|
});
|
|
24622
24654
|
};
|
|
24655
|
+
PaymentService.prototype.issueTicketThroughCreditCardIfNotExists = function (params, options) {
|
|
24656
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
24657
|
+
var object, purpose, checkPaymentMethodId, intervalAfterIssueTicketInMS, issueForcibly, ticketToken, paymentMethodId, automaticallyIssuedTicket;
|
|
24658
|
+
return __generator(this, function (_a) {
|
|
24659
|
+
switch (_a.label) {
|
|
24660
|
+
case 0:
|
|
24661
|
+
object = params.object, purpose = params.purpose;
|
|
24662
|
+
checkPaymentMethodId = options.checkPaymentMethodId;
|
|
24663
|
+
intervalAfterIssueTicketInMS = (typeof options.intervalAfterIssueTicketInMS === 'number'
|
|
24664
|
+
&& options.intervalAfterIssueTicketInMS > MIN_INTERVAL_AFTER_ISSUE_TICKET_MS)
|
|
24665
|
+
? options.intervalAfterIssueTicketInMS
|
|
24666
|
+
: MIN_INTERVAL_AFTER_ISSUE_TICKET_MS;
|
|
24667
|
+
issueForcibly = false;
|
|
24668
|
+
ticketToken = object.ticketToken;
|
|
24669
|
+
paymentMethodId = object.paymentMethodId;
|
|
24670
|
+
if (checkPaymentMethodId) {
|
|
24671
|
+
// 承認時は、ticketTokenもpaymentMethodIdも指定がない場合に、自動発行
|
|
24672
|
+
if ((typeof ticketToken !== 'string' || ticketToken === '')
|
|
24673
|
+
&& (typeof paymentMethodId !== 'string' || paymentMethodId === '')) {
|
|
24674
|
+
issueForcibly = true;
|
|
24675
|
+
}
|
|
24676
|
+
}
|
|
24677
|
+
else {
|
|
24678
|
+
// 決済URL発行時は、ticketTokenの指定がない場合に、自動発行
|
|
24679
|
+
if (typeof ticketToken !== 'string' || ticketToken === '') {
|
|
24680
|
+
issueForcibly = true;
|
|
24681
|
+
}
|
|
24682
|
+
}
|
|
24683
|
+
if (!issueForcibly) {
|
|
24684
|
+
return [2 /*return*/, { ticketToken: ticketToken }];
|
|
24685
|
+
}
|
|
24686
|
+
return [4 /*yield*/, this.issueTicketThroughCreditCard({
|
|
24687
|
+
ticketedInvoice: { issuedThrough: { id: object.issuedThrough.id } },
|
|
24688
|
+
purpose: purpose
|
|
24689
|
+
})];
|
|
24690
|
+
case 1:
|
|
24691
|
+
automaticallyIssuedTicket = _a.sent();
|
|
24692
|
+
// n秒待機
|
|
24693
|
+
return [4 /*yield*/, wait(intervalAfterIssueTicketInMS)];
|
|
24694
|
+
case 2:
|
|
24695
|
+
// n秒待機
|
|
24696
|
+
_a.sent();
|
|
24697
|
+
return [2 /*return*/, automaticallyIssuedTicket];
|
|
24698
|
+
}
|
|
24699
|
+
});
|
|
24700
|
+
});
|
|
24701
|
+
};
|
|
24623
24702
|
return PaymentService;
|
|
24624
24703
|
}(service_1.Service));
|
|
24625
24704
|
exports.PaymentService = PaymentService;
|