fix: get the script by id instead of depending on document.currentScr…#677
Open
creativeindustriesgroup wants to merge 27 commits intoHiEventsDev:developfrom
Open
Conversation
…ipt which seems to be unreliable
daveearley
requested changes
Jul 23, 2025
Contributor
daveearley
left a comment
There was a problem hiding this comment.
Thanks for working on this! Some minor comments
Co-authored-by: Dave Earley <dave.m.earley@gmail.com>
daveearley
reviewed
Aug 10, 2025
…v#719) Co-authored-by: Dave Earley <dave@hi.events>
Fix: Attendee ticket email syntax (HiEventsDev#737)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dave Earley <dave@hi.events> Fix: Attendee ticket email syntax (HiEventsDev#737)
# Conflicts: # backend/app/Mail/Attendee/AttendeeTicketMail.php # backend/app/Mail/Order/OrderSummary.php # backend/app/Resources/Account/AccountResource.php # backend/app/Services/Domain/Email/EmailTemplateService.php # backend/app/Services/Domain/Email/EmailTokenContextBuilder.php # backend/app/Services/Domain/Email/MailBuilderService.php # backend/app/Services/Domain/Payment/Stripe/StripeAccountSyncService.php # backend/app/Services/Infrastructure/Email/LiquidTemplateRenderer.php # backend/composer.lock # backend/database/migrations/2025_10_02_084321_create_account_stripe_platforms_table.php # backend/resources/views/emails/custom-template.blade.php # backend/tests/Unit/Services/Domain/Email/EmailTemplateServiceTest.php # backend/tests/Unit/Services/Domain/Email/EmailTokenContextBuilderTest.php # frontend/package.json # frontend/src/components/common/AttendeeTicket/AttendeeTicket.module.scss # frontend/src/components/common/AttendeeTicket/index.tsx # frontend/src/components/common/Editor/Controls/InsertLiquidVariableControl.tsx # frontend/src/components/common/Editor/Controls/LiquidTokenControl.tsx # frontend/src/components/common/EmailTemplateEditor/EmailTemplateEditor.tsx # frontend/src/components/layouts/CheckIn/index.tsx # frontend/src/components/modals/ManageAttendeeModal/index.tsx # frontend/src/components/routes/account/ManageAccount/sections/PaymentSettings/index.tsx # frontend/src/components/routes/event/TicketDesigner/TicketDesignerPrint.tsx # frontend/src/components/routes/event/TicketDesigner/TicketPreview.tsx # frontend/src/components/routes/product-widget/PrintOrder/PrintOrder.module.scss # frontend/src/components/routes/product-widget/PrintOrder/index.tsx # frontend/src/locales.ts # frontend/src/locales/de.js # frontend/src/locales/de.po # frontend/src/locales/en.js # frontend/src/locales/en.po # frontend/src/locales/es.js # frontend/src/locales/es.po # frontend/src/locales/fr.js # frontend/src/locales/fr.po # frontend/src/locales/it.js # frontend/src/locales/it.po # frontend/src/locales/nl.js # frontend/src/locales/nl.po # frontend/src/locales/pt-br.js # frontend/src/locales/pt-br.po # frontend/src/locales/pt.js # frontend/src/locales/pt.po # frontend/src/locales/ru.js # frontend/src/locales/ru.po # frontend/src/locales/tr.js # frontend/src/locales/tr.po # frontend/src/locales/vi.js # frontend/src/locales/vi.po # frontend/src/locales/zh-cn.js # frontend/src/locales/zh-cn.po # frontend/src/locales/zh-hk.js # frontend/src/locales/zh-hk.po # frontend/src/types.ts # frontend/yarn.lock
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Refactor the current method for getting the current script to make it more reliable. Fixes #676.
Improvements to widget script handling:
document.getElementById('hievent-widget-script')instead of relying ondocument.currentScript, ensuring the script is explicitly located and validated. This change was applied in bothfrontend/public/widget.jsandfrontend/src/embed/widget.jsfor consistency. [1] [2]embedScriptin theWidgetEditorcomponent to include theid="hievent-widget-script"attribute, aligning it with the updated script identification logic.(sorry for the import re-organise):
frontend/src/components/common/WidgetEditor/index.tsxre-ordered. I opened Hi.Events in the wrong IDE Workspace (sorry!).