Merge branch 'refactor-master' into 'master'

refactor payment view and mutation

See merge request mohit.panjvani/crater-web!151
This commit is contained in:
Mohit Panjwani
2020-01-06 16:08:53 +00:00
3 changed files with 17 additions and 14 deletions

View File

@ -125,7 +125,7 @@
<div class="left">
<div class="inv-name">{{ estimate.user.name }}</div>
<div class="inv-number">{{ estimate.estimate_number }}</div>
<div :class="'est-status-'+estimate.status.toLowerCase()"class="inv-status">{{ estimate.status }}</div>
<div :class="'est-status-'+estimate.status.toLowerCase()" class="inv-status">{{ estimate.status }}</div>
</div>
<div class="right">
<div class="inv-amount" v-html="$utils.formatMoney(estimate.total, estimate.user.currency)" />

View File

@ -125,19 +125,17 @@
v-for="(invoice,index) in invoices"
:to="`/admin/invoices/${invoice.id}/view`"
:key="index"
class="side-invoice"
class="side-invoice"
>
<div class="left">
<div class="inv-name">{{ invoice.user.name }}</div>
<div class="inv-number">{{ invoice.invoice_number }}</div>
<div :class="'inv-status-'+invoice.status.toLowerCase()" class="inv-status">{{ invoice.status }}</div>
</div>
<div class="right">
<div class="inv-amount" v-html="$utils.formatMoney(invoice.due_amount, invoice.user.currency)" />
<div class="inv-date">{{ invoice.formattedInvoiceDate }}</div>
</div>
<div class="left">
<div class="inv-name">{{ invoice.user.name }}</div>
<div class="inv-number">{{ invoice.invoice_number }}</div>
<div :class="'inv-status-'+invoice.status.toLowerCase()" class="inv-status">{{ invoice.status }}</div>
</div>
<div class="right">
<div class="inv-amount" v-html="$utils.formatMoney(invoice.due_amount, invoice.user.currency)" />
<div class="inv-date">{{ invoice.formattedInvoiceDate }}</div>
</div>
</router-link>
<p v-if="!invoices.length" class="no-result">
{{ $t('invoices.no_matching_invoices') }}
@ -187,7 +185,7 @@ export default {
shareableLink () {
return `/invoices/pdf/${this.invoice.unique_hash}`
}
},
},
watch: {
$route (to, from) {
this.loadInvoice()

View File

@ -32,6 +32,11 @@
margin-bottom: 98px;
}
&.router-link-exact-active {
border-left: 3px solid $ls-color-primary;
background-color: $ls-color-gray--very-light;
}
&:hover {
background-color: $ls-color-gray--very-light;
}