Skip to content

fix: Use correct billing info and PDF URL #5146

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
Sep 25, 2020
Merged

fix: Use correct billing info and PDF URL #5146

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
bff4657
fix: Use correct billing info and PDF URL
iamareebjamal Sep 25, 2020
ba6537c
Update app/templates/event-invoice/paid.hbs
iamareebjamal Sep 25, 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
5 changes: 0 additions & 5 deletions app/models/event-invoice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ export default ModelBase.extend({
paymentMode : attr('string'),
stripeToken : attr('string'),
last4 : attr('string'),
address : attr('string'),
city : attr('string'),
state : attr('string'),
country : attr('string'),
zipcode : attr('string'),
expMonth : attr('number'),
expYear : attr('number'),
amount : attr('number'),
Expand Down
6 changes: 5 additions & 1 deletion app/models/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,9 @@ export default ModelBase.extend({
const user = this.store.peekRecord('user', this.id);
this.authManager.persistCurrentUser(user);
}
}
},

fullName: computed('firstName', 'lastName', function() {
return [this.firstName, this.lastName].filter(Boolean).join(' ');
})
});
24 changes: 12 additions & 12 deletions app/templates/components/event-invoice/billing-info.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,44 @@
<div class="ui padded segment">
<div class="ui list">
<div class="item">
<strong>{{t 'From'}}:</strong> {{this.user.billingContactName}}
<strong>{{t 'From'}}:</strong> {{this.settings.adminBillingContactName}}
</div>
<div class="item">
<strong>{{t 'Phone'}}:</strong> {{this.user.billingPhone}}
<strong>{{t 'Company'}}:</strong> {{this.settings.adminCompany}}
</div>
<div class="item">
<strong>{{t 'Email'}}:</strong> {{this.user.email}}
<strong>{{t 'Phone'}}:</strong> {{this.settings.adminBillingPhone}}
</div>
<div class="item">
<strong>{{t 'Billing Address'}}:</strong> {{this.user.billingAddress}}
<strong>{{t 'Email'}}:</strong> {{this.settings.adminBillingEmail}}
</div>
<div class="item">
<strong>{{t 'Zip Code'}}:</strong> {{this.user.billingZipCode}}
<strong>{{t 'Zip Code'}}:</strong> {{this.settings.adminBillingZip}}
</div>
<div class="item">
<strong>{{t 'Country'}}:</strong> {{this.user.billingCountry}}
<strong>{{t 'Country'}}:</strong> {{this.settings.adminBillingCountry}}
</div>
</div>
</div>
<div class="ui padded segment">
<div class="ui list">
<div class="item">
<strong>{{t 'To'}}:</strong> {{this.settings.adminBillingContactName}}
<strong>{{t 'To'}}:</strong> {{or this.user.billingContactName this.user.fullName}}
</div>
<div class="item">
<strong>{{t 'Company'}}:</strong> {{this.settings.adminCompany}}
<strong>{{t 'Phone'}}:</strong> {{this.user.billingPhone}}
</div>
<div class="item">
<strong>{{t 'Phone'}}:</strong> {{this.settings.adminBillingPhone}}
<strong>{{t 'Email'}}:</strong> {{this.user.email}}
</div>
<div class="item">
<strong>{{t 'Email'}}:</strong> {{this.settings.adminBillingEmail}}
<strong>{{t 'Billing Address'}}:</strong> {{this.user.billingAddress}}
</div>
<div class="item">
<strong>{{t 'Zip Code'}}:</strong> {{this.settings.adminBillingZip}}
<strong>{{t 'Zip Code'}}:</strong> {{this.user.billingZipCode}}
</div>
<div class="item">
<strong>{{t 'Country'}}:</strong> {{this.settings.adminBillingCountry}}
<strong>{{t 'Country'}}:</strong> {{this.user.billingCountry}}
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/event-invoice/paid.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
</div>
<div class="row">
<div class="column right aligned">
<button {{action 'downloadEventInvoice' this.model.event.name this.model.identifier }}
<a href="{{ this.model.invoicePdfUrl }}" target="_blank" rel="noopener"
class="ui labeled icon blue {{if this.isLoadingInvoice 'loading'}} button">
<i class="print alternate icon"></i>
{{t 'Print Invoice'}}
</button>
</a>
</div>
</div>
<div class="row">
Expand Down
51 changes: 2 additions & 49 deletions app/templates/event-invoice/review.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,8 @@
<h1 class="ui header">{{t 'Review Invoice'}}</h1>
<div class="row">
<div class="sixteen wide column">
<div class="ui segments">
<div class="ui secondary segment">
<h3 class="weight-400">{{t 'Billing Info'}}</h3>
</div>
<div class="ui padded segment">
<div class="ui list">
<div class="item">
<strong>{{t 'From'}}:</strong> {{this.model.user.billingContactName}}
</div>
<div class="item">
<strong>{{t 'Phone'}}:</strong> {{this.model.user.billingPhone}}
</div>
<div class="item">
<strong>{{t 'Email'}}:</strong> {{this.model.user.email}}
</div>
<div class="item">
<strong>{{t 'Billing Address'}}:</strong> {{this.model.user.billingAddress}}
</div>
<div class="item">
<strong>{{t 'Zip Code'}}:</strong> {{this.model.user.billingZipCode}}
</div>
<div class="item">
<strong>{{t 'Country'}}:</strong> {{this.model.user.billingCountry}}
</div>
</div>
</div>
<div class="ui padded segment">
<div class="ui list">
<div class="item">
<strong>{{t 'To'}}:</strong> {{this.settings.adminBillingContactName}}
</div>
<div class="item">
<strong>{{t 'Company'}}:</strong> {{this.settings.adminCompany}}
</div>
<div class="item">
<strong>{{t 'Phone'}}:</strong> {{this.settings.adminBillingPhone}}
</div>
<div class="item">
<strong>{{t 'Email'}}:</strong> {{this.settings.adminBillingEmail}}
</div>
<div class="item">
<strong>{{t 'Zip Code'}}:</strong> {{this.settings.adminBillingZip}}
</div>
<div class="item">
<strong>{{t 'Country'}}:</strong> {{this.settings.adminBillingCountry}}
</div>
</div>
</div>
</div>
<EventInvoice::BillingInfo
@user={{this.model.user}} />
<div class="ui segments">
<div class="ui secondary segment">
<h3 class="weight-400">{{t 'Invoice Details'}}</h3>
Expand Down