Skip to content

Commit cafebc1

Browse files
ntthitrinhkhangon
andauthored
feature-8687: When user loads order confirmation page after initial registration ticket info and price often disappear (#8997)
Co-authored-by: Khang On - TMA <[email protected]>
1 parent 47224cc commit cafebc1

File tree

4 files changed

+33
-0
lines changed

4 files changed

+33
-0
lines changed

app/routes/orders/pending.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,21 @@ export default class PendingRoute extends Route {
2222
});
2323
const eventDetails = await order.query('event', { include: 'tax' });
2424
const tickets = await order.query('tickets', {});
25+
26+
await tickets.forEach(ticket => {
27+
ticket.query('attendees', {
28+
filter: [{
29+
name : 'order',
30+
op : 'has',
31+
val : {
32+
name : 'id',
33+
op : 'eq',
34+
val : order.originalId
35+
}
36+
}]
37+
});
38+
});
39+
2540
const filterOptions = [
2641
{
2742
or: []
@@ -43,6 +58,7 @@ export default class PendingRoute extends Route {
4358

4459
return {
4560
order,
61+
tickets,
4662
event : eventDetails,
4763
form : await eventDetails.query('customForms', {
4864
filter : filterOptions,

app/routes/orders/view.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,25 @@ export default class ViewRoute extends Route {
2727
reload : true
2828
});
2929
const eventDetails = await order.query('event', { include: 'tax' });
30+
const tickets = await order.query('tickets', {});
31+
await tickets.forEach(ticket => {
32+
ticket.query('attendees', {
33+
filter: [{
34+
name : 'order',
35+
op : 'has',
36+
val : {
37+
name : 'id',
38+
op : 'eq',
39+
val : order.originalId
40+
}
41+
}]
42+
});
43+
});
3044

3145
return hash({
3246
order,
3347
event : eventDetails,
48+
tickets,
3449
taxDetails : eventDetails.isTaxEnabled && eventDetails.get('tax', { cache: true, public: true }),
3550
form : eventDetails.query('customForms', {
3651
'page[size]' : 70,

app/templates/orders/pending.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<div class="row">
1818
<div class="nine wide column">
1919
<Orders::OrderSummary
20+
@tickets={{this.model.tickets}}
2021
@data={{this.model.order}}
2122
@event={{this.model.event}}
2223
@eventCurrency={{this.model.order.event.paymentCurrency}} />

app/templates/orders/view.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<div class="row">
1818
<div class="ten wide column print">
1919
<Orders::OrderSummary
20+
@tickets={{this.model.tickets}}
2021
@data={{this.model.order}}
2122
@event={{this.model.event}}
2223
@eventCurrency={{this.model.order.event.paymentCurrency}} />

0 commit comments

Comments
 (0)