@vendure/email-plugin 1.4.4 → 1.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { AccountRegistrationEvent, IdentifierChangeRequestEvent, OrderStateTransitionEvent, PasswordResetEvent,
|
|
1
|
+
import { AccountRegistrationEvent, IdentifierChangeRequestEvent, OrderStateTransitionEvent, PasswordResetEvent, ShippingLine } from '@vendure/core';
|
|
2
2
|
import { EmailEventHandler } from './event-handler';
|
|
3
3
|
export declare const orderConfirmationHandler: EmailEventHandler<"order-confirmation", import("./types").EventWithAsyncData<OrderStateTransitionEvent, {
|
|
4
|
-
|
|
4
|
+
shippingLines: ShippingLine[];
|
|
5
5
|
}>>;
|
|
6
6
|
export declare const emailVerificationHandler: EmailEventHandler<"email-verification", AccountRegistrationEvent>;
|
|
7
7
|
export declare const passwordResetHandler: EmailEventHandler<"password-reset", PasswordResetEvent>;
|
|
@@ -9,28 +9,22 @@ exports.orderConfirmationHandler = new event_listener_1.EmailEventListener('orde
|
|
|
9
9
|
.on(core_1.OrderStateTransitionEvent)
|
|
10
10
|
.filter(event => event.toState === 'PaymentSettled' && event.fromState !== 'Modifying' && !!event.order.customer)
|
|
11
11
|
.loadData(async (context) => {
|
|
12
|
-
const
|
|
12
|
+
const shippingLines = [];
|
|
13
|
+
const entityHydrator = context.injector.get(core_1.EntityHydrator);
|
|
13
14
|
for (const line of context.event.order.shippingLines || []) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
.findOne(line.shippingMethodId);
|
|
20
|
-
}
|
|
21
|
-
else if (line.shippingMethod) {
|
|
22
|
-
shippingMethod = line.shippingMethod;
|
|
23
|
-
}
|
|
24
|
-
if (shippingMethod) {
|
|
25
|
-
shippingMethods.push(shippingMethod);
|
|
15
|
+
await entityHydrator.hydrate(context.event.ctx, line, {
|
|
16
|
+
relations: ['shippingMethod'],
|
|
17
|
+
});
|
|
18
|
+
if (line.shippingMethod) {
|
|
19
|
+
shippingLines.push(line);
|
|
26
20
|
}
|
|
27
21
|
}
|
|
28
|
-
return {
|
|
22
|
+
return { shippingLines };
|
|
29
23
|
})
|
|
30
24
|
.setRecipient(event => event.order.customer.emailAddress)
|
|
31
25
|
.setFrom(`{{ fromAddress }}`)
|
|
32
26
|
.setSubject(`Order confirmation for #{{ order.code }}`)
|
|
33
|
-
.setTemplateVars(event => ({ order: event.order,
|
|
27
|
+
.setTemplateVars(event => ({ order: event.order, shippingLines: event.data.shippingLines }))
|
|
34
28
|
.setMockEvent(mock_events_1.mockOrderStateTransitionEvent);
|
|
35
29
|
exports.emailVerificationHandler = new event_listener_1.EmailEventListener('email-verification')
|
|
36
30
|
.on(core_1.AccountRegistrationEvent)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-email-handlers.js","sourceRoot":"","sources":["../../src/default-email-handlers.ts"],"names":[],"mappings":";;;AAAA,0CAA0C;AAC1C,wCAQuB;AAGvB,qDAAsD;AACtD,+CAKuB;AAEV,QAAA,wBAAwB,GAAG,IAAI,mCAAkB,CAAC,oBAAoB,CAAC;KAC/E,EAAE,CAAC,gCAAyB,CAAC;KAC7B,MAAM,CACH,KAAK,CAAC,EAAE,CACJ,KAAK,CAAC,OAAO,KAAK,gBAAgB,IAAI,KAAK,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CACtG;KACA,QAAQ,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;IACtB,MAAM,
|
|
1
|
+
{"version":3,"file":"default-email-handlers.js","sourceRoot":"","sources":["../../src/default-email-handlers.ts"],"names":[],"mappings":";;;AAAA,0CAA0C;AAC1C,wCAQuB;AAGvB,qDAAsD;AACtD,+CAKuB;AAEV,QAAA,wBAAwB,GAAG,IAAI,mCAAkB,CAAC,oBAAoB,CAAC;KAC/E,EAAE,CAAC,gCAAyB,CAAC;KAC7B,MAAM,CACH,KAAK,CAAC,EAAE,CACJ,KAAK,CAAC,OAAO,KAAK,gBAAgB,IAAI,KAAK,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CACtG;KACA,QAAQ,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;IACtB,MAAM,aAAa,GAAmB,EAAE,CAAC;IACzC,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,qBAAc,CAAC,CAAC;IAE5D,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,IAAI,EAAE,EAAE;QACxD,MAAM,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE;YAClD,SAAS,EAAE,CAAC,gBAAgB,CAAC;SAChC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC5B;KACJ;IACD,OAAO,EAAE,aAAa,EAAE,CAAC;AAC7B,CAAC,CAAC;KACD,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,QAAS,CAAC,YAAY,CAAC;KACzD,OAAO,CAAC,mBAAmB,CAAC;KAC5B,UAAU,CAAC,0CAA0C,CAAC;KACtD,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;KAC3F,YAAY,CAAC,2CAA6B,CAAC,CAAC;AAEpC,QAAA,wBAAwB,GAAG,IAAI,mCAAkB,CAAC,oBAAoB,CAAC;KAC/E,EAAE,CAAC,+BAAwB,CAAC;KAC5B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,UAAU,CAAC;KACxE,MAAM,CAAC,KAAK,CAAC,EAAE;IACZ,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAC1D,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,iCAA0B,CACL,CAAC;IAC5C,OAAO,CAAC,gBAAgB,IAAI,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC;AACxE,CAAC,CAAC;KACD,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;KAC5C,OAAO,CAAC,mBAAmB,CAAC;KAC5B,UAAU,CAAC,kCAAkC,CAAC;KAC9C,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvB,iBAAiB,EAAE,KAAK,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,iBAAiB;CAClF,CAAC,CAAC;KACF,YAAY,CAAC,0CAA4B,CAAC,CAAC;AAEnC,QAAA,oBAAoB,GAAG,IAAI,mCAAkB,CAAC,gBAAgB,CAAC;KACvE,EAAE,CAAC,yBAAkB,CAAC;KACtB,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;KAC5C,OAAO,CAAC,mBAAmB,CAAC;KAC5B,UAAU,CAAC,0BAA0B,CAAC;KACtC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvB,kBAAkB,EAAE,KAAK,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,kBAAkB;CACpF,CAAC,CAAC;KACF,YAAY,CAAC,oCAAsB,CAAC,CAAC;AAE7B,QAAA,yBAAyB,GAAG,IAAI,mCAAkB,CAAC,sBAAsB,CAAC;KAClF,EAAE,CAAC,mCAA4B,CAAC;KAChC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,iBAAkB,CAAC;KACpF,OAAO,CAAC,mBAAmB,CAAC;KAC5B,UAAU,CAAC,4CAA4C,CAAC;KACxD,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvB,qBAAqB,EAAE,KAAK,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,qBAAqB;CAC1F,CAAC,CAAC;KACF,YAAY,CAAC,yCAA2B,CAAC,CAAC;AAElC,QAAA,oBAAoB,GAAuC;IACpE,gCAAwB;IACxB,gCAAwB;IACxB,4BAAoB;IACpB,iCAAyB;CAC5B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/email-plugin",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.5",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
"@types/fs-extra": "^9.0.1",
|
|
36
36
|
"@types/handlebars": "^4.1.0",
|
|
37
37
|
"@types/mjml": "^4.0.4",
|
|
38
|
-
"@vendure/common": "^1.4.
|
|
39
|
-
"@vendure/core": "^1.4.
|
|
38
|
+
"@vendure/common": "^1.4.5",
|
|
39
|
+
"@vendure/core": "^1.4.5",
|
|
40
40
|
"rimraf": "^3.0.2",
|
|
41
41
|
"typescript": "4.3.5"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "e55ab047e8c6478546a776ab770c2145b8e86b4b"
|
|
44
44
|
}
|
|
@@ -97,7 +97,7 @@
|
|
|
97
97
|
<td>
|
|
98
98
|
<img alt="{{ productVariant.name }}"
|
|
99
99
|
style="width: 50px; height: 50px;"
|
|
100
|
-
src="{{ featuredAsset.preview }}?w=50&h=50" />
|
|
100
|
+
src="assets/{{ featuredAsset.preview }}?w=50&h=50" />
|
|
101
101
|
</td>
|
|
102
102
|
<td>{{ quantity }} x {{ productVariant.name }}</td>
|
|
103
103
|
<td>{{ productVariant.quantity }}</td>
|
|
@@ -116,9 +116,9 @@
|
|
|
116
116
|
<td colspan="3">Sub-total:</td>
|
|
117
117
|
<td>${{ formatMoney order.subTotalWithTax }}</td>
|
|
118
118
|
</tr>
|
|
119
|
-
{{#each
|
|
119
|
+
{{#each shippingLines }}
|
|
120
120
|
<tr class="order-row">
|
|
121
|
-
<td colspan="3">Shipping ({{ name }}):</td>
|
|
121
|
+
<td colspan="3">Shipping ({{ shippingMethod.name }}):</td>
|
|
122
122
|
<td>${{ formatMoney priceWithTax }}</td>
|
|
123
123
|
</tr>
|
|
124
124
|
{{/each}}
|