TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-30 21:21:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix small issue

Browse Source
This commit is contained in:
yogesh_gohil
2019-11-18 12:14:08 +05:30
parent 52d3c6a944
commit 4a8ac36b3a
8 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
resources/assets/js/views/dashboard/Dashboard.vue
View File

@ -168,12 +168,12 @@
>
<table-column :label="$t('dashboard.recent_invoices_card.due_on')" show="formattedDueDate" />
<table-column :label="$t('dashboard.recent_invoices_card.customer')" show="user.name" />
<table-column
<table-column
:label="$t('invoices.status')"
sort-as="status"
>
<template slot-scope="row" >
<span> {{ $t('invoices.status') }}</span>
<span> {{ $t('invoices.status') }}</span>
<span :class="'inv-status-'+row.status.toLowerCase()">{{ (row.status != 'PARTIALLY_PAID')? row.status : row.status.replace('_', ' ') }}</span>
</template>
</table-column>
@ -190,7 +190,7 @@
>
<template slot-scope="row">
<v-dropdown>
<a slot="activator" href="#">
<a slot="activator" href="#/">
<dot-icon />
</a>
<v-dropdown-item>
@ -203,14 +203,14 @@
{{ $t('invoices.view') }}
</router-link>
</v-dropdown-item>
<v-dropdown-item>
<a class="dropdown-item" href="#" @click="sendInvoice(row.id)" >
<v-dropdown-item v-if="row.status == 'DRAFT'">
<a class="dropdown-item" href="#/" @click="sendInvoice(row.id)" >
<font-awesome-icon icon="envelope" class="dropdown-item-icon" />
{{ $t('invoices.send_invoice') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status === 'DRAFT'">
<a class="dropdown-item" href="#" @click="sentInvoice(row.id)">
<a class="dropdown-item" href="#/" @click="sentInvoice(row.id)">
<font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
{{ $t('invoices.mark_as_sent') }}
</a>
@ -272,7 +272,7 @@
>
<template slot-scope="row">
<v-dropdown>
<a slot="activator" href="#">
<a slot="activator" href="#/">
<dot-icon />
</a>
<v-dropdown-item>
@ -294,35 +294,35 @@
</router-link>
</v-dropdown-item>
<v-dropdown-item>
<a class="dropdown-item" href="#" @click="convertInToinvoice(row.id)">
<font-awesome-icon icon="envelope" class="dropdown-item-icon" />
<a class="dropdown-item" href="#/" @click="convertInToinvoice(row.id)">
<font-awesome-icon icon="file-alt" class="dropdown-item-icon" />
{{ $t('estimates.convert_to_invoice') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status === 'DRAFT'">
<a class="dropdown-item" href="#" @click.self="onMarkAsSent(row.id)">
<a class="dropdown-item" href="#/" @click.self="onMarkAsSent(row.id)">
<font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
{{ $t('estimates.mark_as_sent') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status !== 'SENT'">
<a class="dropdown-item" href="#" @click.self="sendEstimate(row.id)">
<a class="dropdown-item" href="#/" @click.self="sendEstimate(row.id)">
<font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
{{ $t('estimates.send_estimate') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status !== 'ACCEPTED'">
<a class="dropdown-item" href="#" @click.self="onMarkAsAccepted(row.id)">
<a class="dropdown-item" href="#/" @click.self="onMarkAsAccepted(row.id)">
<font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
{{ $t('estimates.mark_as_accepted') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status !== 'REJECTED'">
<a class="dropdown-item" href="#" @click.self="onMarkAsRejected(row.id)">
<font-awesome-icon icon="times-circle" class="dropdown-item-icon" />
{{ $t('estimates.mark_as_rejected') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status !== 'REJECTED'">
<a class="dropdown-item" href="#/" @click.self="onMarkAsRejected(row.id)">
<font-awesome-icon icon="times-circle" class="dropdown-item-icon" />
{{ $t('estimates.mark_as_rejected') }}
</a>
</v-dropdown-item>
</v-dropdown>
</template>
</table-column>
@ -459,7 +459,7 @@ export default {
swal({
title: this.$t('general.are_you_sure'),
text: this.$t('estimates.confirm_conversion'),
icon: '/assets/icon/envelope-solid.svg',
icon: '/assets/icon/file-alt-solid.svg',
buttons: true,
dangerMode: true
}).then(async (willDelete) => {
@ -603,7 +603,7 @@ export default {
}
})
},
async sendEstimate (id) {
swal({
title: this.$t('general.are_you_sure'),

18
resources/assets/js/views/estimates/Index.vue
View File

@ -245,31 +245,31 @@
</router-link>
</v-dropdown-item>
<v-dropdown-item>
<a class="dropdown-item" href="#" @click="convertInToinvoice(row.id)">
<font-awesome-icon icon="envelope" class="dropdown-item-icon" />
<a class="dropdown-item" href="#/" @click="convertInToinvoice(row.id)">
<font-awesome-icon icon="file-alt" class="dropdown-item-icon" />
{{ $t('estimates.convert_to_invoice') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status !== 'SENT'">
<a class="dropdown-item" href="#" @click.self="onMarkAsSent(row.id)">
<a class="dropdown-item" href="#/" @click.self="onMarkAsSent(row.id)">
<font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
{{ $t('estimates.mark_as_sent') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status !== 'SENT'">
<a class="dropdown-item" href="#" @click.self="sendEstimate(row.id)">
<a class="dropdown-item" href="#/" @click.self="sendEstimate(row.id)">
<font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
{{ $t('estimates.send_estimate') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status !== 'ACCEPTED'">
<a class="dropdown-item" href="#" @click.self="onMarkAsAccepted(row.id)">
<a class="dropdown-item" href="#/" @click.self="onMarkAsAccepted(row.id)">
<font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
{{ $t('estimates.mark_as_accepted') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status !== 'REJECTED'">
<a class="dropdown-item" href="#" @click.self="onMarkAsRejected(row.id)">
<a class="dropdown-item" href="#/" @click.self="onMarkAsRejected(row.id)">
<font-awesome-icon icon="times-circle" class="dropdown-item-icon" />
{{ $t('estimates.mark_as_rejected') }}
</a>
@ -424,7 +424,7 @@ export default {
let response = await this.markAsAccepted(data)
this.refreshTable()
if (response.data) {
this.filters.status = 'ACCEPTED'
this.filters.status = ''
this.$refs.table.refresh()
window.toastr['success'](this.$tc('estimates.marked_as_accepted_message'))
}
@ -446,7 +446,7 @@ export default {
let response = await this.markAsRejected(data)
this.refreshTable()
if (response.data) {
this.filters.status = 'REJECTED'
this.filters.status = ''
this.$refs.table.refresh()
window.toastr['success'](this.$tc('estimates.marked_as_rejected_message'))
}
@ -512,7 +512,7 @@ export default {
swal({
title: this.$t('general.are_you_sure'),
text: this.$t('estimates.confirm_conversion'),
icon: '/assets/icon/envelope-solid.svg',
icon: '/assets/icon/file-alt-solid.svg',
buttons: true,
dangerMode: true
}).then(async (willConvertInToinvoice) => {

4
resources/assets/js/views/invoices/Index.vue
View File

@ -248,13 +248,13 @@
</router-link>
</v-dropdown-item>
<v-dropdown-item v-if="row.status == 'DRAFT'">
<a class="dropdown-item" href="#" @click="sendInvoice(row.id)" >
<a class="dropdown-item" href="#/" @click="sendInvoice(row.id)" >
<font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
{{ $t('invoices.send_invoice') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status == 'DRAFT'">
<a class="dropdown-item" href="#" @click="markInvoiceAsSent(row.id)">
<a class="dropdown-item" href="#/" @click="markInvoiceAsSent(row.id)">
<font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
{{ $t('invoices.mark_as_sent') }}
</a>

2
resources/assets/js/views/payments/Create.vue
View File

@ -166,7 +166,7 @@ export default {
user_id: null,
payment_number: null,
payment_date: null,
amount: 100,
amount: 0,
payment_mode: null,
invoice_id: null,
notes: null

2
resources/assets/js/views/settings/MailConfig.vue
View File

@ -142,7 +142,7 @@ export default {
data () {
return {
mailConfigData: {
mail_driver: '',
mail_driver: 'smtp',
mail_host: '',
mail_port: null,
mail_username: '',

2
resources/assets/js/views/wizard/EmailConfiguration.vue
View File

@ -148,7 +148,7 @@ export default {
return {
mailConfigData: {
mail_driver: 'smtp',
mail_host: 'mailtrap.io',
mail_host: '',
mail_port: null,
mail_username: null,
mail_password: null,