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

Merge branch 'refactor-master' into 'master'

Browse Source 
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
parent 09e335a8a7 00548ea908
commit 0176a854b8
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/views/estimates/View.vue
View File

@ -125,7 +125,7 @@
<div class="left"> <div class="left">
<div class="inv-name">{{ estimate.user.name }}</div> <div class="inv-name">{{ estimate.user.name }}</div>
<div class="inv-number">{{ estimate.estimate_number }}</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>
<div class="right"> <div class="right">
<div class="inv-amount" v-html="$utils.formatMoney(estimate.total, estimate.user.currency)" /> <div class="inv-amount" v-html="$utils.formatMoney(estimate.total, estimate.user.currency)" />

24
resources/assets/js/views/invoices/View.vue
View File

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

5
resources/assets/sass/pages/payment-view.scss vendored
View File

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