@aglyn/plugins-commerce 1.0.0-beta.264 → 1.0.0-beta.266

package/src/lib/tenant-emails.js

@@ -83,23 +83,23 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
             defaultBody: [
                 {
                     block: 'text',
-                    text: 'Thanks for your purchase!',
-                    variant: 'heading'
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
                 },
                 {
                     block: 'text',
-                    text: 'Here is the receipt for your order from {{host.businessName}}.',
-                    variant: 'body'
+                    text: 'Thanks for your order',
+                    variant: 'heading'
                 },
                 {
                     block: 'text',
-                    text: '{{order.summary}}',
+                    text: 'Here is the receipt for your order from {{host.businessName}}. We will email you again as your order moves along, and the order page always shows where it is.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
-                    text: 'Total charged: {{order.total}}',
-                    variant: 'body'
+                    text: '{{order.summary}}\nTotal charged: {{order.total}}',
+                    variant: 'details'
                 },
                 {
                     block: 'text',
@@ -113,7 +113,7 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'Order reference: {{order.ref}}',
+                    text: 'Order {{order.number}} · payment reference {{order.ref}}. Questions about your order? Reply to this email and {{host.businessName}} will get back to you.',
                     variant: 'caption'
                 }
             ],
@@ -157,6 +157,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 ORDER_STATUS_URL_TOKEN
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'Your order is on its way',
@@ -164,13 +169,13 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: '{{host.businessName}} shipped items from order {{order.number}}.',
+                    text: '{{host.businessName}} shipped these items from order {{order.number}}.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
                     text: '{{shipment.summary}}',
-                    variant: 'body'
+                    variant: 'details'
                 },
                 {
                     block: 'text',
@@ -186,6 +191,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                     block: 'button',
                     label: 'Track your order',
                     href: '{{order.statusUrl}}'
+                },
+                {
+                    block: 'text',
+                    text: 'The order page shows every shipment and its tracking as it moves. Questions about your order? Reply to this email and {{host.businessName}} will get back to you.',
+                    variant: 'caption'
                 }
             ],
             footerReason: ORDER_FOOTER_REASON
@@ -208,6 +218,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 ORDER_STATUS_URL_TOKEN
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'Your order was delivered',
@@ -215,13 +230,13 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: '{{host.businessName}} marked order {{order.number}} as delivered.',
+                    text: '{{host.businessName}} marked order {{order.number}} as delivered. We hope you enjoy it.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
                     text: '{{order.summary}}',
-                    variant: 'body'
+                    variant: 'details'
                 },
                 {
                     block: 'button',
@@ -230,7 +245,7 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'If something is missing or not right, reply to this email or ' + 'contact {{host.businessName}}.',
+                    text: 'Something missing or not right? Reply to this email and {{host.businessName}} will sort it out.',
                     variant: 'caption'
                 }
             ],
@@ -264,6 +279,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 ORDER_STATUS_URL_TOKEN
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'Your refund is on its way',
@@ -271,28 +291,28 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: '{{host.businessName}} refunded {{refund.amount}} on order ' + '{{order.number}}.',
+                    text: '{{host.businessName}} refunded {{refund.amount}} on order {{order.number}}.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
-                    text: '{{refund.summary}}',
-                    variant: 'body'
+                    text: '{{refund.summary}}\nTotal refunded: {{refund.amount}}',
+                    variant: 'details'
                 },
                 {
                     block: 'text',
                     text: '{{refund.note}}',
                     variant: 'body'
                 },
-                {
-                    block: 'text',
-                    text: 'Refunds go back to the original payment method and usually ' + 'appear within 5 to 10 business days, depending on your bank.',
-                    variant: 'caption'
-                },
                 {
                     block: 'button',
                     label: 'View your order',
                     href: '{{order.statusUrl}}'
+                },
+                {
+                    block: 'text',
+                    text: 'Refunds go back to the original payment method and usually appear within 5 to 10 business days, depending on your bank.',
+                    variant: 'caption'
                 }
             ],
             footerReason: ORDER_FOOTER_REASON
@@ -320,6 +340,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 ORDER_STATUS_URL_TOKEN
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'Your order was canceled',
@@ -327,13 +352,13 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: '{{host.businessName}} canceled order {{order.number}}.',
+                    text: '{{host.businessName}} canceled order {{order.number}}. These items will not be sent.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
                     text: '{{order.summary}}',
-                    variant: 'body'
+                    variant: 'details'
                 },
                 {
                     block: 'text',
@@ -344,6 +369,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                     block: 'button',
                     label: 'View your order',
                     href: '{{order.statusUrl}}'
+                },
+                {
+                    block: 'text',
+                    text: 'Questions about your order? Reply to this email and {{host.businessName}} will get back to you.',
+                    variant: 'caption'
                 }
             ],
             footerReason: ORDER_FOOTER_REASON
@@ -378,6 +408,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 ORDER_STATUS_URL_TOKEN
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'Your order is ready for pickup',
@@ -385,13 +420,13 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'Order {{order.number}} is ready at {{pickup.location}}.',
+                    text: 'Order {{order.number}} is packed and waiting for you at {{pickup.location}}.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
-                    text: '{{order.summary}}',
-                    variant: 'body'
+                    text: '{{order.summary}}\nPick up at: {{pickup.location}}',
+                    variant: 'details'
                 },
                 {
                     block: 'text',
@@ -403,15 +438,15 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                     text: '{{pickup.instructions}}',
                     variant: 'body'
                 },
-                {
-                    block: 'text',
-                    text: 'Bring your order number, {{order.number}}.',
-                    variant: 'caption'
-                },
                 {
                     block: 'button',
                     label: 'View your order',
                     href: '{{order.statusUrl}}'
+                },
+                {
+                    block: 'text',
+                    text: 'Bring your order number, {{order.number}}. Questions about your order? Reply to this email and {{host.businessName}} will get back to you.',
+                    variant: 'caption'
                 }
             ],
             footerReason: ORDER_FOOTER_REASON
@@ -435,6 +470,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 ORDER_STATUS_URL_TOKEN
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'Thanks for picking up your order',
@@ -442,17 +482,22 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'Order {{order.number}} was picked up from {{pickup.location}}.',
+                    text: 'Order {{order.number}} was picked up from {{pickup.location}}. Enjoy it.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
-                    text: '{{order.summary}}',
-                    variant: 'body'
+                    text: '{{order.summary}}\nPicked up at: {{pickup.location}}',
+                    variant: 'details'
+                },
+                {
+                    block: 'button',
+                    label: 'View your order',
+                    href: '{{order.statusUrl}}'
                 },
                 {
                     block: 'text',
-                    text: 'If something is missing or not right, reply to this email or ' + 'contact {{host.businessName}}.',
+                    text: 'Something missing or not right? Reply to this email and {{host.businessName}} will sort it out.',
                     variant: 'caption'
                 }
             ],
@@ -483,23 +528,33 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
             defaultBody: [
                 {
                     block: 'text',
-                    text: 'Your order is on its way',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
+                {
+                    block: 'text',
+                    text: 'Your order is out for delivery',
                     variant: 'heading'
                 },
                 {
                     block: 'text',
-                    text: '{{host.businessName}} is out delivering order {{order.number}}. ' + 'Your window: {{delivery.window}}.',
+                    text: '{{host.businessName}} is on the way with order {{order.number}}.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
-                    text: '{{order.summary}}',
-                    variant: 'body'
+                    text: '{{order.summary}}\nDelivery window: {{delivery.window}}',
+                    variant: 'details'
                 },
                 {
                     block: 'button',
                     label: 'View your order',
                     href: '{{order.statusUrl}}'
+                },
+                {
+                    block: 'text',
+                    text: 'Questions about your order? Reply to this email and {{host.businessName}} will get back to you.',
+                    variant: 'caption'
                 }
             ],
             footerReason: ORDER_FOOTER_REASON
@@ -537,9 +592,19 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                     name: 'order.ref',
                     description: 'Order reference id',
                     sample: 'cs_test_123'
+                },
+                {
+                    name: 'orders.url',
+                    description: 'The site’s Orders page in the console',
+                    sample: 'https://app.example.com/northwind/hosts/northwind/products/orders'
                 }
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{site.name}} · New order',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'You made a sale',
@@ -547,22 +612,22 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'A new order came in on {{site.name}}.',
+                    text: 'A new paid order came in on {{site.name}}. Here is what was bought and who bought it.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
-                    text: '{{order.summary}}',
-                    variant: 'body'
+                    text: '{{order.summary}}\nTotal: {{order.total}}\nBuyer: {{buyer.email}}\nPayment reference: {{order.ref}}',
+                    variant: 'details'
                 },
                 {
-                    block: 'text',
-                    text: 'Total: {{order.total}}',
-                    variant: 'body'
+                    block: 'button',
+                    label: 'Open orders',
+                    href: '{{orders.url}}'
                 },
                 {
                     block: 'text',
-                    text: 'Buyer: {{buyer.email}} · Order {{order.ref}}',
+                    text: 'Fulfill it from Orders: as you mark it shipped, ready for pickup or delivered, the buyer is emailed at each step.',
                     variant: 'caption'
                 }
             ],
@@ -606,28 +671,23 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
             defaultBody: [
                 {
                     block: 'text',
-                    text: 'Reservation confirmed',
-                    variant: 'heading'
+                    text: '{{host.businessName}} · Reservation',
+                    variant: 'eyebrow'
                 },
                 {
                     block: 'text',
-                    text: 'Your stay at {{host.businessName}} is confirmed.',
-                    variant: 'body'
-                },
-                {
-                    block: 'text',
-                    text: 'Check-in: {{reservation.checkIn}}',
-                    variant: 'body'
+                    text: 'Your stay is confirmed',
+                    variant: 'heading'
                 },
                 {
                     block: 'text',
-                    text: 'Nights: {{reservation.nights}}',
+                    text: 'Your reservation at {{host.businessName}} is booked. Here are the details to keep.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
-                    text: 'Paid today: {{reservation.paid}}',
-                    variant: 'body'
+                    text: 'Check-in: {{reservation.checkIn}}\nNights: {{reservation.nights}}\nPaid today: {{reservation.paid}}\nReference: {{reservation.ref}}',
+                    variant: 'details'
                 },
                 {
                     block: 'text',
@@ -636,7 +696,7 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'Reference: {{reservation.ref}}',
+                    text: 'Questions before you arrive? Reply to this email and {{host.businessName}} will get back to you.',
                     variant: 'caption'
                 }
             ],
@@ -670,7 +730,12 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
             defaultBody: [
                 {
                     block: 'text',
-                    text: 'Your gift card',
+                    text: '{{host.businessName}} · Gift card',
+                    variant: 'eyebrow'
+                },
+                {
+                    block: 'text',
+                    text: 'Your {{giftcard.value}} gift card',
                     variant: 'heading'
                 },
                 {
@@ -685,8 +750,8 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'Gift card code: {{giftcard.code}}',
-                    variant: 'body'
+                    text: 'Value: {{giftcard.value}}\nGift card code: {{giftcard.code}}',
+                    variant: 'details'
                 },
                 {
                     block: 'text',
@@ -695,8 +760,13 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'button',
-                    label: 'Visit {{host.businessName}}',
+                    label: 'Shop {{host.businessName}}',
                     href: '{{host.url}}'
+                },
+                {
+                    block: 'text',
+                    text: 'Keep this email: the code is what you spend the card with.',
+                    variant: 'caption'
                 }
             ],
             footerReason: 'You’re receiving this because a gift card from {{host.businessName}} was sent to this address.'
@@ -732,13 +802,28 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
             defaultBody: [
                 {
                     block: 'text',
-                    text: '{{product.name}} is back in stock at {{host.businessName}}.',
+                    text: '{{host.businessName}}',
+                    variant: 'eyebrow'
+                },
+                {
+                    block: 'text',
+                    text: '{{product.name}} is back in stock',
+                    variant: 'heading'
+                },
+                {
+                    block: 'text',
+                    text: 'You asked to hear when {{product.name}} was back at {{host.businessName}}. It is, and you can order it now.',
                     variant: 'body'
                 },
                 {
                     block: 'button',
-                    label: 'View product',
+                    label: 'Shop {{product.name}}',
                     href: '{{product.url}}'
+                },
+                {
+                    block: 'text',
+                    text: 'You asked {{host.businessName}} to tell you when it was back. Nothing is held for you.',
+                    variant: 'caption'
                 }
             ],
             footerReason: 'You’re receiving this because you asked {{host.businessName}} to tell you when this was back.'
@@ -764,12 +849,22 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
             defaultBody: [
                 {
                     block: 'text',
-                    text: 'You left items in your cart at {{host.businessName}}. Pick up ' + 'where you left off.',
+                    text: '{{host.businessName}}',
+                    variant: 'eyebrow'
+                },
+                {
+                    block: 'text',
+                    text: 'You left something in your cart',
+                    variant: 'heading'
+                },
+                {
+                    block: 'text',
+                    text: 'Your cart at {{host.businessName}} still has your items in it. Pick up where you left off whenever you are ready.',
                     variant: 'body'
                 },
                 {
                     block: 'button',
-                    label: 'Return to cart',
+                    label: 'Return to your cart',
                     href: '{{cart.url}}'
                 },
                 {
@@ -810,6 +905,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 }
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'How did we do?',
@@ -817,13 +917,13 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'Thanks again for your order {{order.number}} from ' + '{{host.businessName}}. Would you tell other shoppers what you ' + 'think? Each link opens the product with a review form.',
+                    text: 'Thanks again for your order {{order.number}} from {{host.businessName}}. Would you tell other shoppers what you think? Each link opens the product with a review form ready.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
                     text: '{{review.products}}',
-                    variant: 'body'
+                    variant: 'links'
                 },
                 {
                     block: 'button',
@@ -859,6 +959,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 }
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Members',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: '{{post.title}}',
@@ -868,6 +973,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                     block: 'text',
                     text: '{{post.body}}',
                     variant: 'body'
+                },
+                {
+                    block: 'button',
+                    label: 'Visit {{host.businessName}}',
+                    href: '{{host.url}}'
                 }
             ],
             footerReason: 'You’re receiving this because you’re a member of {{host.businessName}}.'
@@ -903,6 +1013,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 }
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{site.name}} · Account security',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'Reset your password',
@@ -947,6 +1062,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 }
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{site.name}} · Account security',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'Your password was changed',
@@ -954,7 +1074,7 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'An administrator of {{site.name}} set a new password on your ' + 'account and signed you out on every device. To sign back in, ' + 'get the new password from them, or choose "Forgot password?" on ' + 'the sign-in page to set your own.',
+                    text: 'An administrator of {{site.name}} set a new password on your account and signed you out on every device. To sign back in, get the new password from them, or choose "Forgot password?" on the sign-in page to set your own.',
                     variant: 'body'
                 },
                 {
@@ -964,7 +1084,7 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'If you did not expect this, contact the site owner.',
+                    text: 'If you did not expect this, contact the site owner straight away.',
                     variant: 'caption'
                 }
             ],
@@ -991,6 +1111,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 }
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'Confirm your subscription',
@@ -998,9 +1123,14 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'Please confirm that you want to get {{stream.name}} emails from ' + '{{host.businessName}} at this address.',
+                    text: 'Please confirm that you want {{stream.name}} emails from {{host.businessName}} at this address. Nothing is sent until you do.',
                     variant: 'body'
                 },
+                {
+                    block: 'text',
+                    text: 'List: {{stream.name}}\nFrom: {{host.businessName}}',
+                    variant: 'details'
+                },
                 {
                     block: 'button',
                     label: 'Confirm my subscription',
@@ -1008,7 +1138,7 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: 'The link works for three days. If you did not sign up, ignore this ' + 'message — nothing will be sent.',
+                    text: 'The link works for three days. If you did not sign up, ignore this message and nothing will be sent.',
                     variant: 'caption'
                 }
             ],
@@ -1053,9 +1183,19 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                     name: 'return.customerNote',
                     description: 'What the buyer wrote; empty when they wrote nothing',
                     sample: 'The lid was cracked.'
+                },
+                {
+                    name: 'return.url',
+                    description: 'The return in the console, to approve or decline',
+                    sample: 'https://app.example.com/northwind/hosts/northwind/products/returns?return=ret_123'
                 }
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'A buyer asked for a return',
@@ -1063,22 +1203,27 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: '{{buyer.email}} wants to return items from order {{order.number}}.',
+                    text: '{{buyer.email}} wants to return items from order {{order.number}}. Approve or decline it, and the buyer is emailed your answer.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
-                    text: '{{return.items}}',
-                    variant: 'body'
+                    text: '{{return.items}}\nBuyer: {{buyer.email}}',
+                    variant: 'details'
                 },
                 {
                     block: 'text',
                     text: '{{return.customerNote}}',
                     variant: 'body'
                 },
+                {
+                    block: 'button',
+                    label: 'Review the return',
+                    href: '{{return.url}}'
+                },
                 {
                     block: 'text',
-                    text: 'Approve or decline it under Products → Returns.',
+                    text: 'Returns are under Products → Returns, beside the order they are for.',
                     variant: 'caption'
                 }
             ],
@@ -1104,6 +1249,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 ORDER_STATUS_URL_TOKEN
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'Your return is approved',
@@ -1111,13 +1261,18 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: '{{host.businessName}} approved the return of:',
+                    text: '{{host.businessName}} approved the return of these items from order {{order.number}}.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
                     text: '{{return.items}}',
-                    variant: 'body'
+                    variant: 'details'
+                },
+                {
+                    block: 'text',
+                    text: 'What to do next',
+                    variant: 'subheading'
                 },
                 {
                     block: 'text',
@@ -1133,6 +1288,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                     block: 'button',
                     label: 'View your order',
                     href: '{{order.statusUrl}}'
+                },
+                {
+                    block: 'text',
+                    text: 'Your refund is sent once {{host.businessName}} receives the items, and you will get an email when it is.',
+                    variant: 'caption'
                 }
             ],
             footerReason: ORDER_FOOTER_REASON
@@ -1152,6 +1312,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 ORDER_STATUS_URL_TOKEN
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'We could not accept this return',
@@ -1159,13 +1324,13 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: '{{host.businessName}} declined the return of:',
+                    text: '{{host.businessName}} declined the return of these items from order {{order.number}}.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
                     text: '{{return.items}}',
-                    variant: 'body'
+                    variant: 'details'
                 },
                 {
                     block: 'text',
@@ -1176,6 +1341,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                     block: 'button',
                     label: 'View your order',
                     href: '{{order.statusUrl}}'
+                },
+                {
+                    block: 'text',
+                    text: 'Questions about it? Reply to this email and {{host.businessName}} will get back to you.',
+                    variant: 'caption'
                 }
             ],
             footerReason: ORDER_FOOTER_REASON
@@ -1199,6 +1369,11 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 ORDER_STATUS_URL_TOKEN
             ],
             defaultBody: [
+                {
+                    block: 'text',
+                    text: '{{host.businessName}} · Order {{order.number}}',
+                    variant: 'eyebrow'
+                },
                 {
                     block: 'text',
                     text: 'Your return is refunded',
@@ -1206,18 +1381,23 @@ const ORDER_FOOTER_REASON = 'You’re receiving this because you placed an order
                 },
                 {
                     block: 'text',
-                    text: '{{host.businessName}} received your return and refunded ' + '{{return.refundTotal}} to your original payment method.',
+                    text: '{{host.businessName}} received your return and refunded {{return.refundTotal}} to your original payment method.',
                     variant: 'body'
                 },
                 {
                     block: 'text',
-                    text: '{{return.items}}',
-                    variant: 'body'
+                    text: '{{return.items}}\nTotal refunded: {{return.refundTotal}}',
+                    variant: 'details'
                 },
                 {
                     block: 'button',
                     label: 'View your order',
                     href: '{{order.statusUrl}}'
+                },
+                {
+                    block: 'text',
+                    text: 'Refunds usually appear within 5 to 10 business days, depending on your bank.',
+                    variant: 'caption'
                 }
             ],
             footerReason: ORDER_FOOTER_REASON