Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 2 deletions public/locales/en/invoice-header.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"invoice_number": "No.",
"issued_at": "Issued at: ",
"due_at": "Due at:",
"late_fee": "Late fee:",
"add_late_fee": "Add late fee",
"modal_issued_at_title": "Issued at",
"modal_due_at_title": "Due at"
}
1 change: 0 additions & 1 deletion public/locales/en/team-form.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"website": "Website"
},
"invoicing": {
"invoice_late_fee": "Late fee (%)",
"invoice_due_days": "Payment terms, days",
"currency": "Default currency"
},
Expand Down
8 changes: 1 addition & 7 deletions src/components/invoices/InvoiceHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,7 @@
:inline="true"
field="due_at"/>
</BModal>
<br>{{ $t('late_fee') }}
<AppEditable :value="invoice.late_fee | currency"
:errors="errors"
suffix="%"
field="late_fee"
:placeholder="$t('add_late_fee')"
@change="updateProp({ late_fee: $event })"/>

</div>
</template>
<script>
Expand Down
4 changes: 0 additions & 4 deletions src/components/team/TeamForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@

<b-tab :title="$t('tabs.invoicing')">
<div class="row">
<AppInput :value="team.invoice_late_fee" @change="updateProp({ invoice_late_fee: $event })"
type="number"
:label="$t('invoicing.invoice_late_fee')" field="invoice_late_fee" :errors="errors"
class="col-12"/>
<AppInput :value="team.invoice_due_days" @change="updateProp({ invoice_due_days: $event })"
type="number"
:label="$t('invoicing.invoice_due_days')" field="invoice_due_days" :errors="errors"
Expand Down
11 changes: 0 additions & 11 deletions src/services/invoice.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ class InvoiceService {
async updateInvoice(invoice) {
const requiredFields = {
currency: 'Currency',
late_fee: 'Late Fee',
issued_at: 'Issued At',
due_at: 'Due At',
number: 'Number',
Expand All @@ -40,25 +39,15 @@ class InvoiceService {
async bookInvoice(invoice) {
const requiredFields = {
currency: 'Currency',
late_fee: 'Late fee',
issued_at: 'Issued at',
due_at: 'Due at',
number: 'Number',
client_id: 'Client',
client_name: 'Client name',
client_address: 'Address',
client_postal_code: 'Postal code',
client_city: 'City',
client_email: 'Client\'s email',
client_country: 'Country',
from_name: 'Name',
from_address: 'Address',
from_postal_code: 'Postal code',
from_country: 'Country',
from_city: 'City',
from_website: 'Website',
from_email: 'Your email',
from_phone: 'Your phone',
bank_name: 'Bank name',
bank_account_no: 'Bank account details',
rows: {
Expand Down
2 changes: 0 additions & 2 deletions src/store/invoices.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ export default {
},
async updateTeam({ dispatch }, payload) {
const teamProps = pick(payload.props, {
late_fee: 'invoice_late_fee',
from_name: 'company_name',
from_address: 'company_address',
from_postal_code: 'company_postal_code',
Expand Down Expand Up @@ -180,7 +179,6 @@ export default {
.add(team.invoice_due_days || 14, 'days')
.format('YYYY-MM-DD'),
number: generateInvoiceNumber(getters.all),
late_fee: team.invoice_late_fee || 0.5,
currency: team.currency || 'USD',
};

Expand Down
1 change: 0 additions & 1 deletion src/store/models/invoice.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export default class Invoice extends Model {
issued_at: this.attr(''),
is_compact: this.attr(false),
due_at: this.attr(''),
late_fee: this.attr(''),
currency: this.attr(''),
from_name: this.attr(''),
from_address: this.attr(''),
Expand Down
1 change: 0 additions & 1 deletion src/store/models/team.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export default class Team extends Model {
contact_email: this.attr(''),
contact_phone: this.attr(''),
currency: this.attr(null),
invoice_late_fee: this.attr(null),
invoice_due_days: this.attr(null),
fields: this.hasMany(TeamField, 'team_id'),
updated_at: this.attr(''),
Expand Down