Skip to content

Fix admin notification email templates for listing and order events #3042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Armanul46 merged 2 commits into from
Sep 30, 2026
Merged

Fix admin notification email templates for listing and order events #3042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40e60ff
fix: honor admin notification email templates
syedgalib Sep 28, 2026
85cc4bb
Merge branch 'development' into fix/3340-admin-notification-templates
RabbiIslamRony Sep 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions assets/build/js/admin/settings-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3290,8 +3290,8 @@ var FIELD_GROUPS = {
key: 'notification_events',
title: 'Notification events',
description: 'Toggle a channel per event. Click Edit to customize subject, body, and push wording.',
fields: ['notify_admin', 'notify_user', 'email_note', 'email_sub_new_listing', 'email_tmpl_new_listing', 'email_sub_pub_listing', 'email_tmpl_pub_listing', 'email_sub_rejected_listing', 'email_tmpl_rejected_listing', 'email_sub_edit_listing', 'email_tmpl_edit_listing', 'email_sub_to_expire_listing', 'email_tmpl_to_expire_listing', 'email_sub_expired_listing', 'email_tmpl_expired_listing', 'email_sub_to_renewal_listing', 'email_tmpl_to_renewal_listing', 'email_sub_renewed_listing', 'email_tmpl_renewed_listing', 'email_sub_deleted_listing', 'email_tmpl_deleted_listing', 'email_sub_new_order', 'email_tmpl_new_order', 'email_sub_offline_new_order', 'email_tmpl_offline_new_order', 'email_sub_completed_order', 'email_tmpl_completed_order', 'email_sub_listing_contact_email', 'email_tmpl_listing_contact_email', 'email_sub_registration_confirmation', 'email_tmpl_registration_confirmation', 'email_sub_email_verification', 'email_tmpl_email_verification'].concat((0,_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1__["default"])(WEB_PUSH_TEMPLATE_FIELDS), ['email_to_expire_day', 'email_renewal_day']),
hiddenFields: ['notify_admin', 'notify_user', 'email_note', 'email_sub_new_listing', 'email_tmpl_new_listing', 'email_sub_pub_listing', 'email_tmpl_pub_listing', 'email_sub_rejected_listing', 'email_tmpl_rejected_listing', 'email_sub_edit_listing', 'email_tmpl_edit_listing', 'email_sub_to_expire_listing', 'email_tmpl_to_expire_listing', 'email_sub_expired_listing', 'email_tmpl_expired_listing', 'email_sub_to_renewal_listing', 'email_tmpl_to_renewal_listing', 'email_sub_renewed_listing', 'email_tmpl_renewed_listing', 'email_sub_deleted_listing', 'email_tmpl_deleted_listing', 'email_sub_new_order', 'email_tmpl_new_order', 'email_sub_offline_new_order', 'email_tmpl_offline_new_order', 'email_sub_completed_order', 'email_tmpl_completed_order', 'email_sub_listing_contact_email', 'email_tmpl_listing_contact_email', 'email_sub_registration_confirmation', 'email_tmpl_registration_confirmation', 'email_sub_email_verification', 'email_tmpl_email_verification'].concat((0,_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1__["default"])(WEB_PUSH_TEMPLATE_FIELDS)),
fields: ['notify_admin', 'notify_user', 'email_note', 'email_sub_new_listing', 'email_tmpl_new_listing', 'email_sub_pub_listing', 'email_tmpl_pub_listing', 'email_sub_new_listing_admin', 'email_tmpl_new_listing_admin', 'email_sub_pub_listing_admin', 'email_tmpl_pub_listing_admin', 'email_sub_edit_listing_admin', 'email_tmpl_edit_listing_admin', 'email_sub_deleted_listing_admin', 'email_tmpl_deleted_listing_admin', 'email_sub_new_order_admin', 'email_tmpl_new_order_admin', 'email_sub_completed_order_admin', 'email_tmpl_completed_order_admin', 'email_sub_rejected_listing', 'email_tmpl_rejected_listing', 'email_sub_edit_listing', 'email_tmpl_edit_listing', 'email_sub_to_expire_listing', 'email_tmpl_to_expire_listing', 'email_sub_expired_listing', 'email_tmpl_expired_listing', 'email_sub_to_renewal_listing', 'email_tmpl_to_renewal_listing', 'email_sub_renewed_listing', 'email_tmpl_renewed_listing', 'email_sub_deleted_listing', 'email_tmpl_deleted_listing', 'email_sub_new_order', 'email_tmpl_new_order', 'email_sub_offline_new_order', 'email_tmpl_offline_new_order', 'email_sub_completed_order', 'email_tmpl_completed_order', 'email_sub_listing_contact_email', 'email_tmpl_listing_contact_email', 'email_sub_registration_confirmation', 'email_tmpl_registration_confirmation', 'email_sub_email_verification', 'email_tmpl_email_verification'].concat((0,_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1__["default"])(WEB_PUSH_TEMPLATE_FIELDS), ['email_to_expire_day', 'email_renewal_day']),
hiddenFields: ['notify_admin', 'notify_user', 'email_note', 'email_sub_new_listing', 'email_tmpl_new_listing', 'email_sub_pub_listing', 'email_tmpl_pub_listing', 'email_sub_new_listing_admin', 'email_tmpl_new_listing_admin', 'email_sub_pub_listing_admin', 'email_tmpl_pub_listing_admin', 'email_sub_edit_listing_admin', 'email_tmpl_edit_listing_admin', 'email_sub_deleted_listing_admin', 'email_tmpl_deleted_listing_admin', 'email_sub_new_order_admin', 'email_tmpl_new_order_admin', 'email_sub_completed_order_admin', 'email_tmpl_completed_order_admin', 'email_sub_rejected_listing', 'email_tmpl_rejected_listing', 'email_sub_edit_listing', 'email_tmpl_edit_listing', 'email_sub_to_expire_listing', 'email_tmpl_to_expire_listing', 'email_sub_expired_listing', 'email_tmpl_expired_listing', 'email_sub_to_renewal_listing', 'email_tmpl_to_renewal_listing', 'email_sub_renewed_listing', 'email_tmpl_renewed_listing', 'email_sub_deleted_listing', 'email_tmpl_deleted_listing', 'email_sub_new_order', 'email_tmpl_new_order', 'email_sub_offline_new_order', 'email_tmpl_offline_new_order', 'email_sub_completed_order', 'email_tmpl_completed_order', 'email_sub_listing_contact_email', 'email_tmpl_listing_contact_email', 'email_sub_registration_confirmation', 'email_tmpl_registration_confirmation', 'email_sub_email_verification', 'email_tmpl_email_verification'].concat((0,_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1__["default"])(WEB_PUSH_TEMPLATE_FIELDS)),
notificationEvents: {
beforeField: 'notify_admin'
},
Expand Down Expand Up @@ -14778,6 +14778,32 @@ var EVENT_TEMPLATE_MAP = {
body: "email_tmpl_listing_contact_email"
}
};
var ADMIN_EVENT_TEMPLATE_MAP = {
listing_submitted: {
subject: "email_sub_new_listing_admin",
body: "email_tmpl_new_listing_admin"
},
listing_published: {
subject: "email_sub_pub_listing_admin",
body: "email_tmpl_pub_listing_admin"
},
listing_edited: {
subject: "email_sub_edit_listing_admin",
body: "email_tmpl_edit_listing_admin"
},
listing_deleted: {
subject: "email_sub_deleted_listing_admin",
body: "email_tmpl_deleted_listing_admin"
},
order_created: {
subject: "email_sub_new_order_admin",
body: "email_tmpl_new_order_admin"
},
order_completed: {
subject: "email_sub_completed_order_admin",
body: "email_tmpl_completed_order_admin"
}
};
var ADMIN_EVENTS = [["order_created", "Order created", "A new order has been placed"], ["order_completed", "Order completed", "An order has been fulfilled"], ["payment_received", "Payment received", "A payment has been confirmed"], ["listing_submitted", "New listing submitted", "A listing is waiting for review"], ["listing_published", "Listing approved or published", "A listing has gone live"], ["listing_edited", "Listing edited", "A listing was updated by its owner"], ["listing_deleted", "Listing deleted", "A listing has been removed"], ["listing_renewed", "Listing renewed", "A listing plan has been renewed"], ["listing_contact_form", "Listing contact form", "A visitor messaged via a listing"], ["listing_review", "Listing review", "A new review has been posted"]];
var USER_EVENTS = [["listing_submitted", "Listing submitted", "Confirmation their listing was received"], ["listing_published", "Listing approved or published", "Their listing is now live"], ["listing_rejected", "Listing rejected", "Their listing was not approved"], ["listing_edited", "Listing edited", "Confirmation their edit was saved"], ["listing_deleted", "Listing deleted", "Their listing has been removed"], ["listing_to_expire", "Listing nearly expired", "Their listing expires soon"], ["listing_expired", "Listing expired", "Their listing plan has ended"], ["remind_to_renew", "Remind to renew", "Renewal reminder after expiry"], ["listing_renewed", "Listing renewed", "Confirmation their listing was renewed"], ["order_created", "Order created", "Confirmation their order was placed"], ["order_completed", "Order completed", "Their order has been fulfilled"], ["payment_received", "Payment received", "Confirmation of a successful payment"], ["listing_contact_form", "Listing contact form", "A visitor messaged via their listing"], ["listing_review", "Listing review", "Someone reviewed their listing"]];
var ACCOUNT_EVENTS = [["registration_confirmation", "Registration confirmation", "Welcome email sent after a new account is created", {
Expand Down Expand Up @@ -15009,8 +15035,8 @@ var ACCOUNT_EVENTS = [["registration_confirmation", "Registration confirmation",
var disabledDisplayValue = this.disabledDisplayValueForField(fieldKey);
return disabledDisplayValue.length ? disabledDisplayValue : this.backupValueForField(fieldKey);
},
templateForEvent: function templateForEvent(eventKey) {
var template = EVENT_TEMPLATE_MAP[eventKey];
templateForEvent: function templateForEvent(eventKey, recipient) {
var template = recipient === "admin" ? ADMIN_EVENT_TEMPLATE_MAP[eventKey] || EVENT_TEMPLATE_MAP[eventKey] : EVENT_TEMPLATE_MAP[eventKey];
if (!template || !this.templateExists(template)) {
return null;
}
Expand Down Expand Up @@ -15145,7 +15171,7 @@ var ACCOUNT_EVENTS = [["registration_confirmation", "Registration confirmation",
webPushFieldKey: hasWebPush ? webPushFieldKey : "",
label: label,
description: description,
template: _this5.templateForEvent(value),
template: _this5.templateForEvent(value, recipient),
webPushTemplate: hasWebPush ? _this5.webPushTemplateForEvent(value, recipient) : null,
alwaysOn: false,
templateOnly: false
Expand Down
36 changes: 33 additions & 3 deletions assets/src/js/admin/vue/apps/settings-manager/components/Settings_Notification_Events.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,33 @@ const EVENT_TEMPLATE_MAP = {
},
};

const ADMIN_EVENT_TEMPLATE_MAP = {
listing_submitted: {
subject: "email_sub_new_listing_admin",
body: "email_tmpl_new_listing_admin",
},
listing_published: {
subject: "email_sub_pub_listing_admin",
body: "email_tmpl_pub_listing_admin",
},
listing_edited: {
subject: "email_sub_edit_listing_admin",
body: "email_tmpl_edit_listing_admin",
},
listing_deleted: {
subject: "email_sub_deleted_listing_admin",
body: "email_tmpl_deleted_listing_admin",
},
order_created: {
subject: "email_sub_new_order_admin",
body: "email_tmpl_new_order_admin",
},
order_completed: {
subject: "email_sub_completed_order_admin",
body: "email_tmpl_completed_order_admin",
},
};

const ADMIN_EVENTS = [
["order_created", "Order created", "A new order has been placed"],
["order_completed", "Order completed", "An order has been fulfilled"],
Expand Down Expand Up @@ -681,8 +708,11 @@ export default {
: this.backupValueForField(fieldKey);
},

templateForEvent(eventKey) {
const template = EVENT_TEMPLATE_MAP[eventKey];
templateForEvent(eventKey, recipient) {
const template =
recipient === "admin"
? ADMIN_EVENT_TEMPLATE_MAP[eventKey] || EVENT_TEMPLATE_MAP[eventKey]
: EVENT_TEMPLATE_MAP[eventKey];

if (!template || !this.templateExists(template)) {
return null;
Expand Down Expand Up @@ -873,7 +903,7 @@ export default {
webPushFieldKey: hasWebPush ? webPushFieldKey : "",
label,
description,
template: this.templateForEvent(value),
template: this.templateForEvent(value, recipient),
webPushTemplate: hasWebPush
? this.webPushTemplateForEvent(value, recipient)
: null,
Expand Down
24 changes: 24 additions & 0 deletions assets/src/js/admin/vue/apps/settings-manager/settings-redesign-map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1606,6 +1606,18 @@ const FIELD_GROUPS = {
'email_tmpl_new_listing',
'email_sub_pub_listing',
'email_tmpl_pub_listing',
'email_sub_new_listing_admin',
'email_tmpl_new_listing_admin',
'email_sub_pub_listing_admin',
'email_tmpl_pub_listing_admin',
'email_sub_edit_listing_admin',
'email_tmpl_edit_listing_admin',
'email_sub_deleted_listing_admin',
'email_tmpl_deleted_listing_admin',
'email_sub_new_order_admin',
'email_tmpl_new_order_admin',
'email_sub_completed_order_admin',
'email_tmpl_completed_order_admin',
'email_sub_rejected_listing',
'email_tmpl_rejected_listing',
'email_sub_edit_listing',
Expand Down Expand Up @@ -1644,6 +1656,18 @@ const FIELD_GROUPS = {
'email_tmpl_new_listing',
'email_sub_pub_listing',
'email_tmpl_pub_listing',
'email_sub_new_listing_admin',
'email_tmpl_new_listing_admin',
'email_sub_pub_listing_admin',
'email_tmpl_pub_listing_admin',
'email_sub_edit_listing_admin',
'email_tmpl_edit_listing_admin',
'email_sub_deleted_listing_admin',
'email_tmpl_deleted_listing_admin',
'email_sub_new_order_admin',
'email_tmpl_new_order_admin',
'email_sub_completed_order_admin',
'email_tmpl_completed_order_admin',
'email_sub_rejected_listing',
'email_tmpl_rejected_listing',
'email_sub_edit_listing',
Expand Down
7 changes: 7 additions & 0 deletions docs/agents/directorist-settings-panel/references/settings-option-catalog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,13 @@ Redesigned UI note: Notifications renders as `Channels` plus merged `Events & Te
- `email_note`: placeholder note shown in template settings.
- `email_sub_new_listing`, `email_tmpl_new_listing`: new listing email subject/body.
- `email_sub_pub_listing`, `email_tmpl_pub_listing`: approved/published listing subject/body.
- `email_sub_new_listing_admin`, `email_tmpl_new_listing_admin`: admin listing-submitted subject/body; default to the legacy admin email. Read by `ATBDP_Email::notify_admin_listing_submitted()`.
- `email_sub_pub_listing_admin`, `email_tmpl_pub_listing_admin`: admin listing-published subject/body; default to the legacy admin email. Read by `ATBDP_Email::notify_admin_listing_published()`.
- `email_sub_edit_listing_admin`, `email_tmpl_edit_listing_admin`: admin listing-edited subject/body; default to the legacy admin email. Read by `ATBDP_Email::notify_admin_listing_edited()`.
- `email_sub_deleted_listing_admin`, `email_tmpl_deleted_listing_admin`: admin listing-deleted subject/body; default to the legacy admin email. Read by `ATBDP_Email::notify_admin_listing_deleted()`.
- `email_sub_new_order_admin`, `email_tmpl_new_order_admin`: admin order-created subject/body; default to the legacy admin email. Read by `ATBDP_Email::notify_admin_order_created()`.
- `email_sub_completed_order_admin`, `email_tmpl_completed_order_admin`: admin order-completed subject/body; default to the legacy admin email. Read by `ATBDP_Email::notify_admin_order_completed()`.
These admin values are stored in `atbdp_option` through the existing settings save handler and use its existing text-field sanitization. The listing-owner option keys remain independent; existing owner values are not copied into the new admin fields.
- `email_sub_rejected_listing`, `email_tmpl_rejected_listing`: rejected listing subject/body.
- `email_sub_edit_listing`, `email_tmpl_edit_listing`: edited listing subject/body.
- `email_sub_to_expire_listing`, `email_tmpl_to_expire_listing`: about-to-expire listing subject/body.
Expand Down
Loading
Loading