Skip to content

fix-8833:Additional custom form disappears in attendee form setup #8857

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
merged 2 commits into from
Jun 28, 2023
Merged

fix-8833:Additional custom form disappears in attendee form setup #8857

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
3157c2c
fix-8833:Additional custom form disappears in attendee form setup
odkhang Jun 28, 2023
c048215
Merge branch 'development' into khangon_tma/fix-8833
khangon Jun 28, 2023
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
2 changes: 1 addition & 1 deletion app/routes/events/view/edit/attendee.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default class AttendeeRoute extends Route.extend(CustomFormMixin) {
customForms : (await event.query('customForms', {
filter : filterOptions,
sort : 'id',
'page[size]' : 50
'page[size]' : 500
})).toArray().filter(field => field.form === 'attendee')
};
return data;
Expand Down
23 changes: 22 additions & 1 deletion app/routes/orders/pending.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,32 @@ export default class PendingRoute extends Route {
reload : true
});
const eventDetails = await order.query('event', { include: 'tax' });
const tickets = await order.query('tickets', {});
const filterOptions = [
{
or: []
}
];
tickets.forEach(ticket => {
filterOptions[0].or.pushObject({
name : 'form_id',
op : 'eq',
val : ticket.formID
});
});

filterOptions[0].or.pushObject({
name : 'is_required',
op : 'eq',
val : true
});

return {
order,
event : eventDetails,
form : await eventDetails.query('customForms', {
'page[size]' : 70,
filter : filterOptions,
'page[size]' : 700,
sort : 'id'
})
};
Expand Down