refactor template and deshboard invoice table

This commit is contained in:
Jay_Makwana
2019-11-12 20:55:51 +05:30
parent 4decc56b7c
commit bc69046f3b
9 changed files with 36 additions and 5 deletions

View File

@ -1,5 +1,5 @@
<template>
<div id="app" class="main-content">
<div id="app" class="main-content dashboard">
<div class="row">
<div class="dash-item col-sm-6">
<router-link slot="item-title" to="/admin/invoices">
@ -177,7 +177,7 @@
<table-column
:sortable="false"
:filterable="false"
cell-class="action-dropdown no-click"
cell-class="action-dropdown dashboard-recent-invoice-options no-click"
>
<template slot-scope="row">
<v-dropdown>

View File

@ -417,7 +417,7 @@ export default {
if (response.data) {
this.filters.status = 'ACCEPTED'
this.$refs.table.refresh()
window.toastr['success'](this.$tc('estimates.marked_as_rejected_message'))
window.toastr['success'](this.$tc('estimates.marked_as_accepted_message'))
}
},
async onMarkAsRejected (id) {

View File

@ -1,6 +1,23 @@
// Dashboard
// -------------------------
.dashboard {
.dashboard-table
.table-component {
.dashboard-recent-invoice-options {
.dropdown-container {
margin: 10px 5px 0 -75px;
}
}
}
}
.dashbox {
background-color: $white;
box-shadow: $shadow;
@ -364,5 +381,7 @@
justify-content: center;
}
}
}
}

View File

@ -182,6 +182,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 160px;
}
.ship-user-phone {
font-style: normal;
@ -229,6 +230,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 160px;
}
.bill-user-phone {

View File

@ -142,6 +142,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 170px;
}
.bill-user-phone {
font-style: normal;
@ -190,6 +191,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 170px;
}
.ship-user-phone {

View File

@ -146,6 +146,7 @@
line-height: 15px;
color: #595959;
margin: 0px;
width: 160px;
}
.ship-user-phone {
@ -184,6 +185,7 @@
line-height: 15px;
color: #595959;
margin: 0px;
width: 160px;
}
.bill-user-phone {

View File

@ -182,6 +182,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 160px;
}
.ship-user-phone {
font-style: normal;
@ -229,6 +230,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 160px;
}
.bill-user-phone {

View File

@ -142,6 +142,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 170px;
}
.bill-user-phone {
font-style: normal;
@ -190,6 +191,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 170px;
}
.ship-user-phone {
@ -435,7 +437,7 @@
@include('app.pdf.invoice.partials.billing-address')
</div>
</div>
@include('app.pdf.invoice.partials.table')
@include('app.pdf.invoice.partials.table')
@include('app.pdf.invoice.partials.notes')
</div>
</body>

View File

@ -89,7 +89,7 @@
}
.bill-add {
display: inline;
display: block;
float:left;
width:40%;
padding: 0 0 0 30px;
@ -146,6 +146,7 @@
line-height: 15px;
color: #595959;
margin: 0px;
width: 160px;
}
.ship-user-phone {
@ -184,6 +185,7 @@
line-height: 15px;
color: #595959;
margin:0px;
width: 160px;
}
.bill-user-phone {