Skip to content
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

Jump to bottom

fix: Order Page: Remove empty spaces #5561

Merged
merged 4 commits into from
Nov 11, 2020
Merged

fix: Order Page: Remove empty spaces #5561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44ecdd1
remove-spaces
sachinchauhan2889 Nov 10, 2020
5da52c8
new-fix
sachinchauhan2889 Nov 10, 2020
d74d43a
button-fix
sachinchauhan2889 Nov 11, 2020
af10c3e
button-unstacked
sachinchauhan2889 Nov 11, 2020
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
4 changes: 4 additions & 0 deletions app/styles/partials/overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,7 @@ body.dimmable.undetached.dimmed {
margin-left: auto !important;
margin-top: auto !important;
}

.space-between {
justify-content: space-between;
}
2 changes: 1 addition & 1 deletion app/templates/components/orders/order-summary.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<h3 class="weight-400">{{t 'Order Summary'}}</h3>
</div>
{{#if (and (or (eq this.session.currentRouteName 'orders.new') (eq this.session.currentRouteName 'orders.view') (eq this.session.currentRouteName 'orders.pending')) (not-eq this.data.status 'cancelled'))}}
<table class="ui very basic tablet stackable table order-summary center aligned">
<table class="ui very basic unstackable table order-summary center aligned">
<thead>
<tr>
{{#if (eq this.data.amount 0)}}
Expand Down
45 changes: 18 additions & 27 deletions app/templates/orders/view.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,41 +19,32 @@
@data={{this.model.order}}
@event={{this.model.event}}
@eventCurrency={{this.model.order.event.paymentCurrency}} />
</div>
<div class="mobile hidden six wide column">
<Orders::EventInfo
@data={{this.model.order}} />
</div>
</div>
<div class="row">
<div class="column right aligned">
<button class="ui labeled icon {{if this.isLoadingTickets 'loading'}} {{if this.device.isMobile 'fluid'}} button"
{{action this.downloadTickets this.model.event.name this.model.order.identifier}}>
<i class="ticket alternate icon"></i>
{{t 'Download Tickets'}}
</button>
<button {{action 'downloadInvoice' this.model.event.name this.model.order.identifier }}
class="ui labeled icon blue {{if this.isLoadingInvoice 'loading'}} {{if this.device.isMobile 'fluid'}} button">
<i class="download icon"></i>
{{t 'Download Invoice'}}
</button>
</div>
</div>
<div class="row">
<div class="ten wide column">
<br/>
<Forms::Orders::AttendeeList
@save="save"
@data={{this.model.order}}
@fields={{this.model.form}}
@event={{this.model.event}} />
</div>
<div class="six wide column">
<div class="row">
<div class="mobile hidden row">
<Orders::TicketHolder
@data={{this.model.order}} />
</div>
<Orders::EventInfo
@data={{this.model.order}} />
<br/>
<div class="d-flex space-between">
<button class="ui labeled icon {{if this.isLoadingTickets 'loading'}} {{if this.device.isMobile 'fluid'}} button"
{{action this.downloadTickets this.model.event.name this.model.order.identifier}}>
<i class="ticket alternate icon"></i>
{{t 'Download Tickets'}}
</button>
<button {{action 'downloadInvoice' this.model.event.name this.model.order.identifier }}
class="ui labeled icon blue {{if this.isLoadingInvoice 'loading'}} {{if this.device.isMobile 'fluid'}} button">
<i class="download icon"></i>
{{t 'Download Invoice'}}
</button>
</div>
<br/>
<Orders::TicketHolder
@data={{this.model.order}} />
</div>
</div>
</div>