@chevre/domain 24.1.0-alpha.57 → 24.1.0-alpha.59
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/emailMessageBuilder.d.ts +1 -1
- package/lib/chevre/repo/acceptedOffer.d.ts +7 -3
- package/lib/chevre/repo/acceptedOffer.js +5 -5
- package/lib/chevre/repo/acceptedOfferInReserve.d.ts +6 -2
- package/lib/chevre/repo/acceptedOfferInReserve.js +4 -4
- package/lib/chevre/repo/factory/acceptedOffer/reserveTransaction2itemOffered.d.ts +3 -1
- package/lib/chevre/repo/factory/acceptedOffer/reserveTransaction2itemOffered.js +4 -3
- package/lib/chevre/repo/mongoose/schemas/order.js +6 -5
- package/lib/chevre/repo/order.js +2 -2
- package/lib/chevre/repo/orderInTransaction.d.ts +1 -1
- package/lib/chevre/repo/orderInTransaction.js +1 -1
- package/lib/chevre/service/delivery/factory.d.ts +1 -1
- package/lib/chevre/service/order/deleteOrder.js +1 -4
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.d.ts +1 -1
- package/lib/chevre/service/order/sendOrder.js +1 -3
- package/lib/chevre/service/reserve/findByCode.js +1 -1
- package/lib/chevre/service/reserve/searchByOrder.js +1 -1
- package/lib/chevre/service/task/confirmReserveTransaction.js +1 -1
- package/lib/chevre/service/task/payment/payByTask.js +1 -1
- package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.d.ts +1 -1
- package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.d.ts +1 -1
- package/lib/chevre/service/transaction/returnOrder/potentialActions.d.ts +1 -1
- package/lib/chevre/service/transaction/returnOrder/preStart.js +1 -1
- package/lib/chevre/service/transaction/returnOrder.js +1 -1
- package/lib/chevre/service/validation/validateOrder.js +1 -1
- package/package.json +2 -2
|
@@ -4,7 +4,7 @@ type ISendableEmailMessage = factory.action.transfer.send.message.email.IObjectA
|
|
|
4
4
|
identifier: string;
|
|
5
5
|
name: string;
|
|
6
6
|
};
|
|
7
|
-
export type IOrderAsCreateEmailParams = Pick<factory.order.IOrder, 'confirmationNumber' | '
|
|
7
|
+
export type IOrderAsCreateEmailParams = Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
|
|
8
8
|
/**
|
|
9
9
|
* 注文配送メッセージを作成する
|
|
10
10
|
*/
|
|
@@ -6,7 +6,7 @@ type IProjection4searchWithUnwoundAcceptedOffers = {
|
|
|
6
6
|
} & {};
|
|
7
7
|
type IDistinctField = 'acceptedOffers.id' | 'acceptedOffers.itemOffered.reservationNumber' | 'acceptedOffers.itemOffered.reservationFor.id' | 'acceptedOffers.serialNumber' | 'acceptedOffers.offeredThrough.identifier' | 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode';
|
|
8
8
|
interface ISearchSlicedAcceptedOffersResult {
|
|
9
|
-
acceptedOffers: IAcceptedOffer[];
|
|
9
|
+
acceptedOffers: Pick<IAcceptedOffer, 'id' | 'itemOffered' | 'offeredThrough' | 'priceSpecification' | 'serialNumber' | 'typeOf'>[];
|
|
10
10
|
numAcceptedOffers: number;
|
|
11
11
|
}
|
|
12
12
|
/**
|
|
@@ -23,7 +23,9 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
|
|
|
23
23
|
/**
|
|
24
24
|
* 索条件を最小化(2026-06-05~)
|
|
25
25
|
*/
|
|
26
|
-
params: Pick<factory.order.ISearchConditions, 'limit' | 'orderNumbers' | 'page' | 'project' | 'provider' | 'sort' | 'orderDate'>, projection: IProjection4searchWithUnwoundAcceptedOffers
|
|
26
|
+
params: Pick<factory.order.ISearchConditions, 'limit' | 'orderNumbers' | 'page' | 'project' | 'provider' | 'sort' | 'orderDate'>, projection: IProjection4searchWithUnwoundAcceptedOffers, options: {
|
|
27
|
+
noName: boolean;
|
|
28
|
+
}): Promise<(factory.order.IOrder & {
|
|
27
29
|
acceptedOffers: [IAcceptedOffer];
|
|
28
30
|
_id?: never;
|
|
29
31
|
})[]>;
|
|
@@ -64,7 +66,9 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
|
|
|
64
66
|
reservedTicket?: never;
|
|
65
67
|
};
|
|
66
68
|
};
|
|
67
|
-
}
|
|
69
|
+
}, options: {
|
|
70
|
+
noName: boolean;
|
|
71
|
+
}): Promise<Pick<IAcceptedOffer, 'id' | 'itemOffered' | 'offeredThrough' | 'priceSpecification' | 'serialNumber' | 'typeOf'>[]>;
|
|
68
72
|
/**
|
|
69
73
|
* 注文オファーをsliceして検索する(2024-01-10~)
|
|
70
74
|
*/
|
|
@@ -24,7 +24,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
|
|
|
24
24
|
/**
|
|
25
25
|
* 索条件を最小化(2026-06-05~)
|
|
26
26
|
*/
|
|
27
|
-
params, projection) {
|
|
27
|
+
params, projection, options) {
|
|
28
28
|
const conditions = order_2.OrderRepo.CREATE_MONGO_CONDITIONS(params);
|
|
29
29
|
const aggregate = this.orderModel.aggregate();
|
|
30
30
|
// unwind->matchでは遅い
|
|
@@ -63,7 +63,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
|
|
|
63
63
|
const reservationNumbers = [...new Set(orders.map((order) => String(order.acceptedOffers[0].serialNumber)))];
|
|
64
64
|
let acceptedOffersByReserveTransaction = [];
|
|
65
65
|
if (reservationNumbers.length > 0) {
|
|
66
|
-
acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
|
|
66
|
+
acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers }, options);
|
|
67
67
|
}
|
|
68
68
|
return orders.map((order) => {
|
|
69
69
|
const acceptedOffer = order.acceptedOffers[0];
|
|
@@ -136,7 +136,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
|
|
|
136
136
|
* 注文オファーを展開して検索する
|
|
137
137
|
* 注文番号指定で1注文ドキュメントから参照する想定
|
|
138
138
|
*/
|
|
139
|
-
async searchAcceptedOffersByOrderNumber(filter) {
|
|
139
|
+
async searchAcceptedOffersByOrderNumber(filter, options) {
|
|
140
140
|
/**
|
|
141
141
|
* unwind前に1ドキュメントを特定するためのstage
|
|
142
142
|
*/
|
|
@@ -183,7 +183,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
|
|
|
183
183
|
.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
|
|
184
184
|
.exec();
|
|
185
185
|
// 予約取引を参照(2026-05-18~)
|
|
186
|
-
return this.addAcceptedOffersDetails(acceptedOffers);
|
|
186
|
+
return this.addAcceptedOffersDetails(acceptedOffers, options);
|
|
187
187
|
}
|
|
188
188
|
/**
|
|
189
189
|
* 注文オファーをsliceして検索する(2024-01-10~)
|
|
@@ -210,7 +210,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
|
|
|
210
210
|
const { acceptedOffers, numAcceptedOffers } = result;
|
|
211
211
|
// 予約取引を参照(2026-05-18~)
|
|
212
212
|
return {
|
|
213
|
-
acceptedOffers: await this.addAcceptedOffersDetails(acceptedOffers),
|
|
213
|
+
acceptedOffers: await this.addAcceptedOffersDetails(acceptedOffers, { noName: true }),
|
|
214
214
|
numAcceptedOffers
|
|
215
215
|
};
|
|
216
216
|
}
|
|
@@ -2,7 +2,7 @@ import type { Connection } from 'mongoose';
|
|
|
2
2
|
import { factory } from '../factory';
|
|
3
3
|
import { IModel } from './mongoose/schemas/assetTransaction';
|
|
4
4
|
import { IAcceptedOfferByReserveTransaction } from './factory/acceptedOffer/reserveTransaction2itemOffered';
|
|
5
|
-
export type IAcceptedOffer =
|
|
5
|
+
export type IAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'id' | 'itemOffered' | 'offeredThrough' | 'serialNumber' | 'typeOf' | 'name'> & {
|
|
6
6
|
/**
|
|
7
7
|
* COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
|
|
8
8
|
*/
|
|
@@ -22,9 +22,13 @@ export declare class AcceptedOfferInReserveRepo {
|
|
|
22
22
|
* 予約番号リスト
|
|
23
23
|
*/
|
|
24
24
|
reservationNumbers: string[];
|
|
25
|
+
}, options: {
|
|
26
|
+
noName: boolean;
|
|
25
27
|
}): Promise<IAcceptedOfferByReserveTransaction[]>;
|
|
26
28
|
/**
|
|
27
29
|
* 予約取引からオファー詳細情報を付加する
|
|
28
30
|
*/
|
|
29
|
-
protected addAcceptedOffersDetails(acceptedOffers: IAcceptedOffer[]
|
|
31
|
+
protected addAcceptedOffersDetails(acceptedOffers: IAcceptedOffer[], options: {
|
|
32
|
+
noName: boolean;
|
|
33
|
+
}): Promise<IAcceptedOffer[]>;
|
|
30
34
|
}
|
|
@@ -20,7 +20,7 @@ class AcceptedOfferInReserveRepo {
|
|
|
20
20
|
/**
|
|
21
21
|
* 予約番号指定で予約取引から注文オファーを生成する
|
|
22
22
|
*/
|
|
23
|
-
async findAcceptedOffersByReservationNumbers(params) {
|
|
23
|
+
async findAcceptedOffersByReservationNumbers(params, options) {
|
|
24
24
|
const { reservationNumbers } = params;
|
|
25
25
|
if (!Array.isArray(reservationNumbers) || reservationNumbers.length === 0) {
|
|
26
26
|
throw new factory_1.factory.errors.ArgumentNull('reservationNumbers');
|
|
@@ -35,13 +35,13 @@ class AcceptedOfferInReserveRepo {
|
|
|
35
35
|
.exec();
|
|
36
36
|
debug('findSubReservationsByReservationNumbers: reservationNumbers.length === reserveTransactions.length?', reservationNumbers.length === reserveTransactions.length);
|
|
37
37
|
return reserveTransactions.reduce((a, b) => {
|
|
38
|
-
return [...a, ...(0, reserveTransaction2itemOffered_1.reserveTransaction2itemOffered)(b)];
|
|
38
|
+
return [...a, ...(0, reserveTransaction2itemOffered_1.reserveTransaction2itemOffered)(b, options)];
|
|
39
39
|
}, []);
|
|
40
40
|
}
|
|
41
41
|
/**
|
|
42
42
|
* 予約取引からオファー詳細情報を付加する
|
|
43
43
|
*/
|
|
44
|
-
async addAcceptedOffersDetails(acceptedOffers) {
|
|
44
|
+
async addAcceptedOffersDetails(acceptedOffers, options) {
|
|
45
45
|
const offeredThroughIdentifier = acceptedOffers.at(0)?.offeredThrough?.identifier;
|
|
46
46
|
if (offeredThroughIdentifier === factory_1.factory.service.webAPI.Identifier.COA) {
|
|
47
47
|
// COAでは予約取引を参照しない
|
|
@@ -50,7 +50,7 @@ class AcceptedOfferInReserveRepo {
|
|
|
50
50
|
const reservationNumbers = [...new Set(acceptedOffers.map((acceptedOffer) => String(acceptedOffer.serialNumber)))];
|
|
51
51
|
let acceptedOffersByReserveTransaction = [];
|
|
52
52
|
if (reservationNumbers.length > 0) {
|
|
53
|
-
acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
|
|
53
|
+
acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers }, options);
|
|
54
54
|
}
|
|
55
55
|
return acceptedOffers.map((acceptedOffer) => {
|
|
56
56
|
const acceptedOfferByReserveTransaction = acceptedOffersByReserveTransaction.find(((offer) => offer.itemOffered.id === acceptedOffer.itemOffered.id));
|
|
@@ -3,5 +3,7 @@ type IAcceptedOfferByReserveTransaction = Pick<factory.order.IOptimizedAcceptedO
|
|
|
3
3
|
/**
|
|
4
4
|
* 予約取引を注文のitemOfferedへ変換する
|
|
5
5
|
*/
|
|
6
|
-
declare function reserveTransaction2itemOffered(params: Pick<factory.assetTransaction.reserve.ITransaction, 'object'
|
|
6
|
+
declare function reserveTransaction2itemOffered(params: Pick<factory.assetTransaction.reserve.ITransaction, 'object'>, options: {
|
|
7
|
+
noName: boolean;
|
|
8
|
+
}): IAcceptedOfferByReserveTransaction[];
|
|
7
9
|
export { IAcceptedOfferByReserveTransaction, reserveTransaction2itemOffered };
|
|
@@ -38,7 +38,8 @@ function createReservedTicket(reservedTicket) {
|
|
|
38
38
|
/**
|
|
39
39
|
* 予約取引を注文のitemOfferedへ変換する
|
|
40
40
|
*/
|
|
41
|
-
function reserveTransaction2itemOffered(params) {
|
|
41
|
+
function reserveTransaction2itemOffered(params, options) {
|
|
42
|
+
const { noName } = options;
|
|
42
43
|
const { object } = params;
|
|
43
44
|
// subReservationは配列のはず
|
|
44
45
|
if (!Array.isArray(object.subReservation)) {
|
|
@@ -56,7 +57,6 @@ function reserveTransaction2itemOffered(params) {
|
|
|
56
57
|
// チケットを注文用に生成
|
|
57
58
|
const reservedTicket = createReservedTicket(subReservationReserveTransaction.reservedTicket);
|
|
58
59
|
const reservationByReserveTransaction = {
|
|
59
|
-
additionalProperty,
|
|
60
60
|
id,
|
|
61
61
|
typeOf,
|
|
62
62
|
reservedTicket,
|
|
@@ -65,11 +65,12 @@ function reserveTransaction2itemOffered(params) {
|
|
|
65
65
|
reservationFor,
|
|
66
66
|
...((typeof additionalTicketText === 'string') && { additionalTicketText }),
|
|
67
67
|
...((typeof programMembershipUsed?.identifier === 'string') && { programMembershipUsed }),
|
|
68
|
+
...((Array.isArray(additionalProperty)) && { additionalProperty }),
|
|
68
69
|
};
|
|
69
70
|
return {
|
|
70
71
|
itemOffered: reservationByReserveTransaction,
|
|
71
72
|
...((price !== undefined) && { priceSpecification: price }),
|
|
72
|
-
...((reservedTicket.ticketType.name !== undefined) && { name: reservedTicket.ticketType.name })
|
|
73
|
+
...((!noName && reservedTicket.ticketType.name !== undefined) && { name: reservedTicket.ticketType.name })
|
|
73
74
|
};
|
|
74
75
|
});
|
|
75
76
|
}
|
|
@@ -11,7 +11,6 @@ const schemaDefinition = {
|
|
|
11
11
|
broker: mongoose_1.SchemaTypes.Mixed,
|
|
12
12
|
project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
|
|
13
13
|
typeOf: { type: String, required: true },
|
|
14
|
-
identifier: [mongoose_1.SchemaTypes.Mixed],
|
|
15
14
|
name: String,
|
|
16
15
|
seller: mongoose_1.SchemaTypes.Mixed,
|
|
17
16
|
customer: mongoose_1.SchemaTypes.Mixed,
|
|
@@ -22,13 +21,15 @@ const schemaDefinition = {
|
|
|
22
21
|
priceCurrency: String,
|
|
23
22
|
acceptedOffers: [mongoose_1.SchemaTypes.Mixed],
|
|
24
23
|
paymentMethods: [mongoose_1.SchemaTypes.Mixed],
|
|
25
|
-
url: String,
|
|
26
24
|
orderStatus: String,
|
|
27
|
-
previousOrderStatus: String,
|
|
25
|
+
previousOrderStatus: String,
|
|
28
26
|
orderDate: { type: Date, required: true },
|
|
29
|
-
isGift: Boolean,
|
|
30
27
|
dateReturned: Date,
|
|
31
|
-
orderedItem: [mongoose_1.SchemaTypes.Mixed]
|
|
28
|
+
orderedItem: [mongoose_1.SchemaTypes.Mixed]
|
|
29
|
+
// 以下廃止(2026-06-13~)
|
|
30
|
+
// identifier: SchemaTypes.Mixed, // 廃止するためにMixed化(2026-06-12~)
|
|
31
|
+
// isGift: Boolean,
|
|
32
|
+
// url: String,
|
|
32
33
|
};
|
|
33
34
|
const schemaOptions = {
|
|
34
35
|
autoIndex: settings_1.MONGO_AUTO_INDEX,
|
package/lib/chevre/repo/order.js
CHANGED
|
@@ -9,8 +9,8 @@ const settings_1 = require("../settings");
|
|
|
9
9
|
* ドキュメント検索時に指定可能なprojectionフィールドを厳密に定義する
|
|
10
10
|
*/
|
|
11
11
|
const AVAILABLE_PROJECT_FIELDS = [
|
|
12
|
-
'broker', 'confirmationNumber', 'customer', 'dateReturned', '
|
|
13
|
-
'paymentMethods', 'previousOrderStatus', 'price', 'priceCurrency', 'project', 'returner', 'seller', 'typeOf',
|
|
12
|
+
'broker', 'confirmationNumber', 'customer', 'dateReturned', 'name', 'orderDate', 'orderNumber', 'orderStatus', 'orderedItem',
|
|
13
|
+
'paymentMethods', 'previousOrderStatus', 'price', 'priceCurrency', 'project', 'returner', 'seller', 'typeOf',
|
|
14
14
|
'paymentMethods.accountId', 'paymentMethods.additionalProperty', 'paymentMethods.issuedThrough', 'paymentMethods.name', 'paymentMethods.paymentMethod',
|
|
15
15
|
'paymentMethods.paymentMethodId', 'paymentMethods.totalPaymentDue',
|
|
16
16
|
'customer.id', 'customer.typeOf'
|
|
@@ -16,7 +16,7 @@ type IAcceptedOffer = factory.order.IAcceptedOffer & {
|
|
|
16
16
|
/**
|
|
17
17
|
* typeOf: Orderへドキュメント変換時の編集フィールド
|
|
18
18
|
*/
|
|
19
|
-
export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationNumber' | '
|
|
19
|
+
export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'> & {
|
|
20
20
|
url?: never;
|
|
21
21
|
identifier?: never;
|
|
22
22
|
name?: never;
|
|
@@ -38,7 +38,7 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
|
|
|
38
38
|
let acceptedOffersByReserveTransaction = [];
|
|
39
39
|
const reservationNumbers = [...new Set(doc.acceptedOffers.map((aceptedOffer) => aceptedOffer.itemOffered.reservationNumber))];
|
|
40
40
|
if (reservationNumbers.length > 0) {
|
|
41
|
-
acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
|
|
41
|
+
acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers }, { noName: true });
|
|
42
42
|
}
|
|
43
43
|
return doc.acceptedOffers.map((acceptedOffer) => {
|
|
44
44
|
const acceptedOfferByReserve = acceptedOffersByReserveTransaction.find((acceptedOfferByReserveTransaction) => acceptedOfferByReserveTransaction.itemOffered.id === acceptedOffer.itemOffered.id);
|
|
@@ -5,7 +5,7 @@ export type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factory.owners
|
|
|
5
5
|
*/
|
|
6
6
|
export declare function createOwnershipInfosFromOrder(params: {
|
|
7
7
|
order: Pick<factory.order.IOrder, 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'> & {
|
|
8
|
-
acceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
|
|
8
|
+
acceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification' | 'name'> & {
|
|
9
9
|
/**
|
|
10
10
|
* COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
|
|
11
11
|
*/
|
|
@@ -93,10 +93,7 @@ function deleteReservationsByOrder(order) {
|
|
|
93
93
|
const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
|
|
94
94
|
orderNumber: { $eq: order.orderNumber },
|
|
95
95
|
project: { id: { $eq: order.project.id } },
|
|
96
|
-
|
|
97
|
-
// itemOffered: { typeOf: { $in: [factory.reservationType.EventReservation] } }
|
|
98
|
-
}
|
|
99
|
-
});
|
|
96
|
+
}, { noName: true });
|
|
100
97
|
const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
|
|
101
98
|
if (reservationIds.length > 0) {
|
|
102
99
|
await repos.reservation.deleteByIds({ project: { id: order.project.id }, ids: reservationIds });
|
package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ type IInTransitOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'projec
|
|
|
5
5
|
limit: number;
|
|
6
6
|
page: number;
|
|
7
7
|
};
|
|
8
|
-
deliveredAcceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
|
|
8
|
+
deliveredAcceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification' | 'name'> & {
|
|
9
9
|
/**
|
|
10
10
|
* COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
|
|
11
11
|
*/
|
|
@@ -103,8 +103,7 @@ function sendOrder(params) {
|
|
|
103
103
|
project: { id: { $eq: order.project.id } }
|
|
104
104
|
});
|
|
105
105
|
acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
|
|
106
|
-
debug('delivering...', order.orderNumber,
|
|
107
|
-
params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
|
|
106
|
+
debug('delivering...', order.orderNumber, params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
|
|
108
107
|
// 所有権作成
|
|
109
108
|
if (createOwnerships) {
|
|
110
109
|
creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
|
|
@@ -159,7 +158,6 @@ function sendOrder(params) {
|
|
|
159
158
|
price: order.price,
|
|
160
159
|
priceCurrency: order.priceCurrency
|
|
161
160
|
}
|
|
162
|
-
// placeOrderTransaction
|
|
163
161
|
})(repos);
|
|
164
162
|
}
|
|
165
163
|
else {
|
|
@@ -39,7 +39,7 @@ function findByCode(params) {
|
|
|
39
39
|
// typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
})).shift();
|
|
42
|
+
}, { noName: true })).shift();
|
|
43
43
|
if (acceptedOffer === undefined) {
|
|
44
44
|
throw new factory_1.factory.errors.NotFound('acceptedOffer');
|
|
45
45
|
}
|
|
@@ -16,7 +16,7 @@ function searchByOrder(params) {
|
|
|
16
16
|
// typeOf: { $in: [reservationType] }
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
|
-
});
|
|
19
|
+
}, { noName: true });
|
|
20
20
|
const reservationIds = acceptedOffers.map((offer) => {
|
|
21
21
|
if (offer.itemOffered.typeOf === reservationType) {
|
|
22
22
|
return offer.itemOffered.id;
|
|
@@ -139,7 +139,7 @@ function fixOrderAsPurpose(params) {
|
|
|
139
139
|
const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
|
|
140
140
|
orderNumber: { $eq: order.orderNumber },
|
|
141
141
|
project: { id: { $eq: params.project.id } }
|
|
142
|
-
});
|
|
142
|
+
}, { noName: true });
|
|
143
143
|
return {
|
|
144
144
|
...order,
|
|
145
145
|
acceptedOffers
|
package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { factory } from '../../../../factory';
|
|
2
2
|
import type { ISetting } from '../../../../repo/setting';
|
|
3
3
|
export declare function createReturnPaymentMethodActions(params: {
|
|
4
|
-
order: Pick<factory.order.IOrder, 'confirmationNumber' | '
|
|
4
|
+
order: Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
|
|
5
5
|
returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
|
|
6
6
|
transaction: Pick<factory.transaction.returnOrder.ITransaction, 'object'>;
|
|
7
7
|
}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
|
|
@@ -2,7 +2,7 @@ import { factory } from '../../../../factory';
|
|
|
2
2
|
import type { ISetting } from '../../../../repo/setting';
|
|
3
3
|
type IPotentialSendEmailMessageAction = factory.action.transfer.returnAction.order.IPotentialSendEmailMessageAction;
|
|
4
4
|
export declare function createSendEmailMessaegActionsOnReturn(params: {
|
|
5
|
-
order: Pick<factory.order.IOrder, 'confirmationNumber' | '
|
|
5
|
+
order: Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
|
|
6
6
|
returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
|
|
7
7
|
emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
|
|
8
8
|
}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { factory } from '../../../factory';
|
|
2
2
|
import type { ISetting } from '../../../repo/setting';
|
|
3
|
-
type IReturningOrder4potentialActions = Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | '
|
|
3
|
+
type IReturningOrder4potentialActions = Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'project' | 'seller' | 'typeOf'>;
|
|
4
4
|
declare function createPotentialActions(params: {
|
|
5
5
|
dateReturned: Date;
|
|
6
6
|
orders: IReturningOrder4potentialActions[];
|
|
@@ -144,7 +144,7 @@ function fixOrders(params) {
|
|
|
144
144
|
const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
|
|
145
145
|
orderNumber: { $eq: params.object.order[0].orderNumber },
|
|
146
146
|
project: { id: { $eq: params.project.id } }
|
|
147
|
-
});
|
|
147
|
+
}, { noName: true });
|
|
148
148
|
return { acceptedOffers, eventIds, offerIds, orders };
|
|
149
149
|
};
|
|
150
150
|
}
|
|
@@ -108,7 +108,7 @@ function confirm(params) {
|
|
|
108
108
|
orderNumbers: [transaction.object.order[0].orderNumber]
|
|
109
109
|
}, {
|
|
110
110
|
inclusion: [
|
|
111
|
-
'confirmationNumber', 'customer', '
|
|
111
|
+
'confirmationNumber', 'customer', 'orderDate', 'orderNumber', 'orderStatus',
|
|
112
112
|
'orderedItem', 'paymentMethods', 'price', 'priceCurrency', 'project', 'seller', 'typeOf'
|
|
113
113
|
]
|
|
114
114
|
});
|
|
@@ -22,7 +22,7 @@ function validateOrder(params) {
|
|
|
22
22
|
const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
|
|
23
23
|
orderNumber: { $eq: params.orderNumber },
|
|
24
24
|
project: { id: { $eq: params.project.id } }
|
|
25
|
-
});
|
|
25
|
+
}, { noName: true });
|
|
26
26
|
let payTransactions = [];
|
|
27
27
|
if (order.paymentMethods.length > 0) {
|
|
28
28
|
payTransactions = await repos.assetTransaction.search({
|
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": "8.2.0
|
|
14
|
+
"@chevre/factory": "8.2.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",
|
|
@@ -91,5 +91,5 @@
|
|
|
91
91
|
"postversion": "git push origin --tags",
|
|
92
92
|
"prepublishOnly": "npm run clean && npm run build"
|
|
93
93
|
},
|
|
94
|
-
"version": "24.1.0-alpha.
|
|
94
|
+
"version": "24.1.0-alpha.59"
|
|
95
95
|
}
|