TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -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

10
.env.example
View File

@ -21,11 +21,11 @@ REDIS_PASSWORD=null
REDIS_PORT=6379 REDIS_PORT=6379
MAIL_DRIVER=smtp MAIL_DRIVER=smtp
MAIL_HOST=mailtrap.io MAIL_HOST=
MAIL_PORT=2525 MAIL_PORT=
MAIL_USERNAME=null MAIL_USERNAME=
MAIL_PASSWORD=null MAIL_PASSWORD=
MAIL_ENCRYPTION=null MAIL_ENCRYPTION=
PUSHER_APP_ID= PUSHER_APP_ID=
PUSHER_KEY= PUSHER_KEY=

13
public/assets/icon/file-alt-solid.svg Normal file
View File

@ -0,0 +1,13 @@
<svg
aria-hidden="true"
focusable="false"
data-prefix="fas"
data-icon="file-alt"
class="svg-inline--fa fa-file-alt fa-w-12"
role="img" xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 384 512">
<path
fill="#55547A"
d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm64 236c0 6.6-5.4 12-12 12H108c-6.6 0-12-5.4-12-12v-8c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12v8zm0-64c0 6.6-5.4 12-12 12H108c-6.6 0-12-5.4-12-12v-8c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12v8zm0-72v8c0 6.6-5.4 12-12 12H108c-6.6 0-12-5.4-12-12v-8c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12zm96-114.1v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z">
</path>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 764 B

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

@ -190,7 +190,7 @@
> >
<template slot-scope="row"> <template slot-scope="row">
<v-dropdown> <v-dropdown>
<a slot="activator" href="#"> <a slot="activator" href="#/">
<dot-icon /> <dot-icon />
</a> </a>
<v-dropdown-item> <v-dropdown-item>
@ -203,14 +203,14 @@
{{ $t('invoices.view') }} {{ $t('invoices.view') }}
</router-link> </router-link>
</v-dropdown-item> </v-dropdown-item>
<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="envelope" class="dropdown-item-icon" /> <font-awesome-icon icon="envelope" class="dropdown-item-icon" />
{{ $t('invoices.send_invoice') }} {{ $t('invoices.send_invoice') }}
</a> </a>
</v-dropdown-item> </v-dropdown-item>
<v-dropdown-item v-if="row.status === 'DRAFT'"> <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" /> <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
{{ $t('invoices.mark_as_sent') }} {{ $t('invoices.mark_as_sent') }}
</a> </a>
@ -272,7 +272,7 @@
> >
<template slot-scope="row"> <template slot-scope="row">
<v-dropdown> <v-dropdown>
<a slot="activator" href="#"> <a slot="activator" href="#/">
<dot-icon /> <dot-icon />
</a> </a>
<v-dropdown-item> <v-dropdown-item>
@ -294,31 +294,31 @@
</router-link> </router-link>
</v-dropdown-item> </v-dropdown-item>
<v-dropdown-item> <v-dropdown-item>
<a class="dropdown-item" href="#" @click="convertInToinvoice(row.id)"> <a class="dropdown-item" href="#/" @click="convertInToinvoice(row.id)">
<font-awesome-icon icon="envelope" class="dropdown-item-icon" /> <font-awesome-icon icon="file-alt" class="dropdown-item-icon" />
{{ $t('estimates.convert_to_invoice') }} {{ $t('estimates.convert_to_invoice') }}
</a> </a>
</v-dropdown-item> </v-dropdown-item>
<v-dropdown-item v-if="row.status === 'DRAFT'"> <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" /> <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
{{ $t('estimates.mark_as_sent') }} {{ $t('estimates.mark_as_sent') }}
</a> </a>
</v-dropdown-item> </v-dropdown-item>
<v-dropdown-item v-if="row.status !== 'SENT'"> <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" /> <font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
{{ $t('estimates.send_estimate') }} {{ $t('estimates.send_estimate') }}
</a> </a>
</v-dropdown-item> </v-dropdown-item>
<v-dropdown-item v-if="row.status !== 'ACCEPTED'"> <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" /> <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
{{ $t('estimates.mark_as_accepted') }} {{ $t('estimates.mark_as_accepted') }}
</a> </a>
</v-dropdown-item> </v-dropdown-item>
<v-dropdown-item v-if="row.status !== 'REJECTED'"> <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" /> <font-awesome-icon icon="times-circle" class="dropdown-item-icon" />
{{ $t('estimates.mark_as_rejected') }} {{ $t('estimates.mark_as_rejected') }}
</a> </a>
@ -459,7 +459,7 @@ export default {
swal({ swal({
title: this.$t('general.are_you_sure'), title: this.$t('general.are_you_sure'),
text: this.$t('estimates.confirm_conversion'), text: this.$t('estimates.confirm_conversion'),
icon: '/assets/icon/envelope-solid.svg', icon: '/assets/icon/file-alt-solid.svg',
buttons: true, buttons: true,
dangerMode: true dangerMode: true
}).then(async (willDelete) => { }).then(async (willDelete) => {

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

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

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

@ -248,13 +248,13 @@
</router-link> </router-link>
</v-dropdown-item> </v-dropdown-item>
<v-dropdown-item v-if="row.status == 'DRAFT'"> <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" /> <font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
{{ $t('invoices.send_invoice') }} {{ $t('invoices.send_invoice') }}
</a> </a>
</v-dropdown-item> </v-dropdown-item>
<v-dropdown-item v-if="row.status == 'DRAFT'"> <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" /> <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
{{ $t('invoices.mark_as_sent') }} {{ $t('invoices.mark_as_sent') }}
</a> </a>

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

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

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

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

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

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