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

fix translation issues in french and fix issues in estimate action

Browse Source
This commit is contained in:
bansarishukla
2019-11-13 19:33:31 +05:30
parent 2030ce603b
commit 35a12fd4d1
6 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,13 +261,13 @@
{{ $t('estimates.send_estimate') }}
</a>
</v-dropdown-item>
<v-dropdown-item v-if="row.status === 'DRAFT' || row.status === 'REJECTED'">
<v-dropdown-item v-if="row.status !== 'ACCEPTED'">
<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 === 'ACCEPTED' || row.status === 'DRAFT'">
<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') }}
@ -514,8 +514,8 @@ export default {
icon: '/assets/icon/envelope-solid.svg',
buttons: true,
dangerMode: true
}).then(async (willDelete) => {
if (willDelete) {
}).then(async (willConvertInToinvoice) => {
if (willConvertInToinvoice) {
let res = await this.convertToInvoice(id)
if (res.data) {
window.toastr['success'](this.$t('estimates.conversion_message'))
@ -562,8 +562,8 @@ export default {
icon: '/assets/icon/check-circle-solid.svg',
buttons: true,
dangerMode: true
}).then(async (willDelete) => {
if (willDelete) {
}).then(async (willMarkAsSent) => {
if (willMarkAsSent) {
const data = {
id: id
}
@ -582,8 +582,8 @@ export default {
icon: '/assets/icon/paper-plane-solid.svg',
buttons: true,
dangerMode: true
}).then(async (sendEstimate) => {
if (sendEstimate) {
}).then(async (willSendEstimate) => {
if (willSendEstimate) {
const data = {
id: id
}