diff --git a/app/components/modals/cropper-modal.js b/app/components/modals/cropper-modal.js index b75ece6d0fa..6d2f040f98f 100644 --- a/app/components/modals/cropper-modal.js +++ b/app/components/modals/cropper-modal.js @@ -8,7 +8,7 @@ export default class extends ModalBase { onVisible() { const viewport = {}; const factor = 150; - const aspectRatio = this.getWithDefault('aspectRatio', [2, 1]); + const aspectRatio = this.get('aspectRatio') ?? [2, 1]; viewport.width = aspectRatio[0] * factor; viewport.height = aspectRatio[1] * factor; viewport.type = 'square'; diff --git a/app/components/orders/order-summary.js b/app/components/orders/order-summary.js index 596c2ce46f0..3c9341a73b9 100644 --- a/app/components/orders/order-summary.js +++ b/app/components/orders/order-summary.js @@ -14,7 +14,7 @@ export default class OrderSummary extends Component.extend(FormMixin) { @computed('data.tickets', 'data.tickets.@each.attendees') get total() { return sumBy(this.data.tickets.toArray(), - ticket => (ticket.getWithDefault('price', 0) - ticket.getWithDefault('discount', 0)) * ticket.getWithDefault('attendees.length', 0) + ticket => (ticket.get('price') ?? 0 - ticket.get('discount') ?? 0) * ticket.get('attendees.length') ?? 0 ); } diff --git a/app/controllers/events/view/tickets/add-order.js b/app/controllers/events/view/tickets/add-order.js index 74a6db29b41..3a9537c5382 100644 --- a/app/controllers/events/view/tickets/add-order.js +++ b/app/controllers/events/view/tickets/add-order.js @@ -8,7 +8,7 @@ export default class AddOrderController extends Controller { @computed('model.tickets.@each.orderQuantity') get hasTicketsInOrder() { return sumBy(this.model.tickets.toArray(), - ticket => ticket.getWithDefault('orderQuantity', 0) + ticket => ticket.get('orderQuantity') ?? 0 ) > 0; } diff --git a/app/router.js b/app/router.js index 653414feddc..f1d6a0bb994 100644 --- a/app/router.js +++ b/app/router.js @@ -24,7 +24,7 @@ class Router extends RouterScroll { _trackPage() { scheduleOnce('afterRender', this, () => { const page = this.url; - const title = this.getWithDefault('currentRouteName', 'unknown'); + const title = this.get('currentRouteName') ?? 'unknown'; this.metrics.trackPage({ page, title }); this.set('session.currentRouteName', title); });