Summary style fixes
This commit is contained in:
parent
9cb298fb08
commit
2df9579f2c
|
|
@ -261,12 +261,12 @@ export default {
|
||||||
submitBotanicalButton: `${components.vnSubmit}`
|
submitBotanicalButton: `${components.vnSubmit}`
|
||||||
},
|
},
|
||||||
itemSummary: {
|
itemSummary: {
|
||||||
basicData: `vn-item-summary vn-vertical[name="basicData"]`,
|
basicData: `vn-item-summary [name="basicData"]`,
|
||||||
vat: `vn-item-summary vn-vertical[name="tax"]`,
|
vat: `vn-item-summary [name="tax"]`,
|
||||||
tags: `vn-item-summary vn-vertical[name="tags"]`,
|
tags: `vn-item-summary [name="tags"]`,
|
||||||
niche: `vn-item-summary vn-vertical[name="niche"]`,
|
niche: `vn-item-summary [name="niche"]`,
|
||||||
botanical: `vn-item-summary vn-vertical[name="botanical"]`,
|
botanical: `vn-item-summary [name="botanical"]`,
|
||||||
barcode: `vn-item-summary vn-vertical[name="barcode"]`
|
barcode: `vn-item-summary [name="barcode"]`
|
||||||
},
|
},
|
||||||
itemDiary: {
|
itemDiary: {
|
||||||
thirdTicketId: 'vn-item-diary > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(3) > vn-td:nth-child(2) > span',
|
thirdTicketId: 'vn-item-diary > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(3) > vn-td:nth-child(2) > span',
|
||||||
|
|
@ -275,11 +275,11 @@ export default {
|
||||||
warehouseAutocomplete: 'vn-item-diary vn-autocomplete[field="$ctrl.warehouseFk"]',
|
warehouseAutocomplete: 'vn-item-diary vn-autocomplete[field="$ctrl.warehouseFk"]',
|
||||||
},
|
},
|
||||||
ticketSummary: {
|
ticketSummary: {
|
||||||
sale: 'vn-ticket-summary > vn-card > div > vn-vertical > vn-horizontal:nth-child(3) > vn-one > table > tbody > tr',
|
sale: 'vn-ticket-summary [name="sales"] table > tbody > tr',
|
||||||
firstSaleItemId: 'vn-ticket-summary > vn-card > div > vn-vertical > vn-horizontal:nth-child(3) > vn-one > table > tbody > tr > td:nth-child(2) > span',
|
firstSaleItemId: 'vn-ticket-summary [name="sales"] table > tbody > tr > td:nth-child(2) > span',
|
||||||
popoverDiaryButton: 'vn-ticket-summary > vn-item-descriptor-popover vn-item-descriptor vn-icon[icon="icon-transaction"]',
|
popoverDiaryButton: 'vn-ticket-summary vn-item-descriptor-popover vn-item-descriptor vn-icon[icon="icon-transaction"]',
|
||||||
firstSaleQuantity: 'vn-ticket-summary > vn-card > div > vn-vertical > vn-horizontal:nth-child(3) > vn-one > table > tbody > tr > td:nth-child(4)',
|
firstSaleQuantity: 'vn-ticket-summary [name="sales"] table > tbody > tr > td:nth-child(4)',
|
||||||
firstSaleDiscount: 'vn-ticket-summary > vn-card > div > vn-vertical > vn-horizontal:nth-child(3) > vn-one > table > tbody > tr > td:nth-child(6)'
|
firstSaleDiscount: 'vn-ticket-summary [name="sales"] table > tbody > tr > td:nth-child(6)'
|
||||||
},
|
},
|
||||||
ticketsIndex: {
|
ticketsIndex: {
|
||||||
newTicketButton: 'body > vn-app > vn-vertical > vn-vertical > ui-view > vn-ticket-index > a',
|
newTicketButton: 'body > vn-app > vn-vertical > vn-vertical > ui-view > vn-ticket-index > a',
|
||||||
|
|
|
||||||
|
|
@ -35,34 +35,34 @@ describe('Item summary path', () => {
|
||||||
|
|
||||||
it(`should check the item summary preview shows fields from basic data`, async() => {
|
it(`should check the item summary preview shows fields from basic data`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitForTextInElement(selectors.itemSummary.basicData, 'Name: Object1 Gem1 5')
|
.waitForTextInElement(selectors.itemSummary.basicData, 'Object1 Gem1 5')
|
||||||
.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Name: Object1 Gem1 5');
|
expect(result).toContain('Object1 Gem1 5');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should check the item summary preview shows fields from tags`, async() => {
|
it(`should check the item summary preview shows fields from tags`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitForTextInElement(selectors.itemSummary.tags, 'Color: Yellow')
|
.waitForTextInElement(selectors.itemSummary.tags, 'Yellow')
|
||||||
.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Color: Yellow');
|
expect(result).toContain('Yellow');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should check the item summary preview shows fields from niche`, async() => {
|
it(`should check the item summary preview shows fields from niche`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitForTextInElement(selectors.itemSummary.niche, 'Warehouse One: A1')
|
.waitForTextInElement(selectors.itemSummary.niche, 'A1')
|
||||||
.waitToGetProperty(selectors.itemSummary.niche, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.niche, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Warehouse One: A1');
|
expect(result).toContain('A1');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should check the item summary preview shows fields from botanical`, async() => {
|
it(`should check the item summary preview shows fields from botanical`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitForTextInElement(selectors.itemSummary.botanical, 'Botanical: Hedera helix')
|
.waitForTextInElement(selectors.itemSummary.botanical, 'Hedera helix')
|
||||||
.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Botanical: Hedera helix');
|
expect(result).toContain('Hedera helix');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should check the item summary preview shows fields from barcode`, async() => {
|
it(`should check the item summary preview shows fields from barcode`, async() => {
|
||||||
|
|
@ -83,7 +83,7 @@ describe('Item summary path', () => {
|
||||||
|
|
||||||
it('should search for other item', async() => {
|
it('should search for other item', async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.clearInput('body > vn-app > vn-vertical > vn-vertical > ui-view > vn-item-index > div > div > vn-card:nth-child(1) > div > vn-searchbar > form > vn-horizontal > vn-textfield > div > div > div.infix > input')
|
.clearInput('vn-item-index vn-searchbar input')
|
||||||
.click(selectors.itemsIndex.searchButton)
|
.click(selectors.itemsIndex.searchButton)
|
||||||
.type(selectors.itemsIndex.searchItemInput, 'Object2 Gem2 3')
|
.type(selectors.itemsIndex.searchItemInput, 'Object2 Gem2 3')
|
||||||
.click(selectors.itemsIndex.searchButton)
|
.click(selectors.itemsIndex.searchButton)
|
||||||
|
|
@ -109,34 +109,34 @@ describe('Item summary path', () => {
|
||||||
|
|
||||||
it(`should now check the item summary preview shows fields from basic data`, async() => {
|
it(`should now check the item summary preview shows fields from basic data`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitForTextInElement(selectors.itemSummary.basicData, 'Name: Object2 Gem2 3')
|
.waitForTextInElement(selectors.itemSummary.basicData, 'Object2 Gem2 3')
|
||||||
.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Name: Object2 Gem2 3');
|
expect(result).toContain('Object2 Gem2 3');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should now check the item summary preview shows fields from tags`, async() => {
|
it(`should now check the item summary preview shows fields from tags`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitForTextInElement(selectors.itemSummary.tags, 'Color: Red')
|
.waitForTextInElement(selectors.itemSummary.tags, 'Red')
|
||||||
.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Color: Red');
|
expect(result).toContain('Red');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should now check the item summary preview shows fields from niche`, async() => {
|
it(`should now check the item summary preview shows fields from niche`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitForTextInElement(selectors.itemSummary.niche, 'Warehouse One: A4')
|
.waitForTextInElement(selectors.itemSummary.niche, 'A4')
|
||||||
.waitToGetProperty(selectors.itemSummary.niche, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.niche, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Warehouse One: A4');
|
expect(result).toContain('A4');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should now check the item summary preview shows fields from botanical`, async() => {
|
it(`should now check the item summary preview shows fields from botanical`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitForTextInElement(selectors.itemSummary.botanical, 'Botanical: -')
|
.waitForTextInElement(selectors.itemSummary.botanical, '-')
|
||||||
.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Botanical: -');
|
expect(result).toContain('-');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should now check the item summary preview shows fields from barcode`, async() => {
|
it(`should now check the item summary preview shows fields from barcode`, async() => {
|
||||||
|
|
@ -166,31 +166,31 @@ describe('Item summary path', () => {
|
||||||
|
|
||||||
it(`should check the item summary shows fields from basic data section`, async() => {
|
it(`should check the item summary shows fields from basic data section`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitForTextInElement(selectors.itemSummary.basicData, 'Name: Object2 Gem2 3')
|
.waitForTextInElement(selectors.itemSummary.basicData, 'Object2 Gem2 3')
|
||||||
.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Name: Object2 Gem2 3');
|
expect(result).toContain('Object2 Gem2 3');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should check the item summary shows fields from tags section`, async() => {
|
it(`should check the item summary shows fields from tags section`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Color: Red');
|
expect(result).toContain('Red');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should check the item summary shows fields from niches section`, async() => {
|
it(`should check the item summary shows fields from niches section`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitToGetProperty(selectors.itemSummary.niche, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.niche, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Warehouse One: A4');
|
expect(result).toContain('One A4');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should check the item summary shows fields from botanical section`, async() => {
|
it(`should check the item summary shows fields from botanical section`, async() => {
|
||||||
const result = await nightmare
|
const result = await nightmare
|
||||||
.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
|
.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
|
||||||
|
|
||||||
expect(result).toContain('Botanical: -');
|
expect(result).toContain('-');
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should check the item summary shows fields from barcodes section`, async() => {
|
it(`should check the item summary shows fields from barcodes section`, async() => {
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,8 @@
|
||||||
background-color: rgba(0, 0, 0, .6);
|
background-color: rgba(0, 0, 0, .6);
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transition: opacity 300ms ease-in-out;
|
transition: opacity 300ms ease-in-out;
|
||||||
|
padding: 3em;
|
||||||
|
box-sizing: border-box;
|
||||||
|
|
||||||
&.shown {
|
&.shown {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
|
|
@ -25,6 +27,7 @@
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
padding: 2em;
|
padding: 2em;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
max-height: 100%;
|
||||||
|
|
||||||
tpl-body {
|
tpl-body {
|
||||||
display: block;
|
display: block;
|
||||||
|
|
@ -67,50 +70,4 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.dialog-summary {
|
|
||||||
|
|
||||||
vn-card {
|
|
||||||
border: none;
|
|
||||||
box-shadow: none;
|
|
||||||
padding: 0;
|
|
||||||
|
|
||||||
& > div > vn-vertical {
|
|
||||||
padding: 0;
|
|
||||||
margin: 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
& > div > button.close > vn-icon {
|
|
||||||
color: $main-01;
|
|
||||||
}
|
|
||||||
|
|
||||||
& > div {
|
|
||||||
padding: 0
|
|
||||||
}
|
|
||||||
|
|
||||||
tpl-body {
|
|
||||||
width:auto;
|
|
||||||
background-color: transparent;
|
|
||||||
padding: 0 2em
|
|
||||||
}
|
|
||||||
|
|
||||||
.body {
|
|
||||||
overflow: auto;
|
|
||||||
margin-top: 2em;
|
|
||||||
max-height: 700px;
|
|
||||||
}
|
|
||||||
|
|
||||||
form {
|
|
||||||
min-width: 680px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.buttons {
|
|
||||||
margin-top: 2em
|
|
||||||
}
|
|
||||||
|
|
||||||
vn-check label span {
|
|
||||||
font-size: .9em
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
<vn-one>{{::$ctrl.item.name}}</vn-one>
|
<vn-one>{{::$ctrl.item.name}}</vn-one>
|
||||||
<vn-auto>
|
<vn-auto>
|
||||||
<section
|
<section
|
||||||
class="inline-tag ellipsize" ng-class="{'empty': !fetchedTag.value}"
|
class="inline-tag ellipsize"
|
||||||
|
ng-class="::{empty: !fetchedTag.value}"
|
||||||
ng-repeat="fetchedTag in $ctrl.tags track by $index"
|
ng-repeat="fetchedTag in $ctrl.tags track by $index"
|
||||||
vn-tooltip="{{::fetchedTag.name}}: {{::fetchedTag.value}}">
|
vn-tooltip="{{::fetchedTag.name}}: {{::fetchedTag.value}}">
|
||||||
{{::fetchedTag.value}}
|
{{::fetchedTag.value}}
|
||||||
|
|
|
||||||
|
|
@ -4,59 +4,35 @@ vn-fetched-tags {
|
||||||
&.noTitle vn-one {
|
&.noTitle vn-one {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
& > vn-horizontal {
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
@media screen and (max-width: 1600px){
|
@media screen and (max-width: 1600px) {
|
||||||
& vn-horizontal {
|
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
||||||
& > vn-one {
|
& > vn-one {
|
||||||
padding: 0 0 0.2em 0;
|
padding-bottom: .2em;
|
||||||
}
|
|
||||||
|
|
||||||
& > vn-two {
|
|
||||||
text-align: center;
|
|
||||||
margin: 0 auto
|
|
||||||
}
|
|
||||||
|
|
||||||
.inline-tag {
|
|
||||||
font-size: 0.7em;
|
|
||||||
padding: 0.3em
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
& > vn-one {
|
||||||
|
min-width: 12em;
|
||||||
|
}
|
||||||
|
& > vn-auto > .inline-tag {
|
||||||
|
display: inline-block;
|
||||||
|
color: $secondary-font-color;
|
||||||
|
margin-right: .4em;
|
||||||
|
text-align: center;
|
||||||
|
font-size: .8em;
|
||||||
|
height: 1.25em;
|
||||||
|
padding: .1em;
|
||||||
|
border-radius: .1em;
|
||||||
|
width: 4em;
|
||||||
|
border: 1px solid $secondary-font-color;
|
||||||
|
|
||||||
@media screen and (max-width: 1200px){
|
&.empty {
|
||||||
& vn-horizontal {
|
border: 1px solid $main-bg;
|
||||||
.inline-tag {
|
|
||||||
font-size: 0.6em;
|
|
||||||
padding: 0.2em
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
& vn-one {
|
|
||||||
padding-top: 0.2em
|
|
||||||
}
|
|
||||||
|
|
||||||
& vn-two {
|
|
||||||
white-space: nowrap
|
|
||||||
}
|
|
||||||
|
|
||||||
& .inline-tag {
|
|
||||||
background-color: $color-white;
|
|
||||||
display: inline-block;
|
|
||||||
color: $secondary-font-color;
|
|
||||||
margin-right: 0.4em;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 0.8em;
|
|
||||||
height: 1.25em;
|
|
||||||
padding: 0.3em;
|
|
||||||
width: 5em;
|
|
||||||
border: 1px solid $secondary-font-color;
|
|
||||||
}
|
|
||||||
|
|
||||||
& .inline-tag.empty {
|
|
||||||
border: 1px solid $main-bg
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
@ -8,7 +8,7 @@ export default class Controller {
|
||||||
}
|
}
|
||||||
set label(value) {
|
set label(value) {
|
||||||
let label = this.element.querySelector('vn-label');
|
let label = this.element.querySelector('vn-label');
|
||||||
label.textContent = this._.instant(value) + ':';
|
label.textContent = this._.instant(value);
|
||||||
this._label = value;
|
this._label = value;
|
||||||
}
|
}
|
||||||
get label() {
|
get label() {
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,10 @@
|
||||||
vn-label-value > section {
|
vn-label-value > section {
|
||||||
& > vn-label {
|
& > vn-label {
|
||||||
color: $secondary-font-color;
|
color: $secondary-font-color;
|
||||||
|
|
||||||
|
&::after {
|
||||||
|
content: ':';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
& > span {
|
& > span {
|
||||||
color: $main-font-color;
|
color: $main-font-color;
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,22 @@
|
||||||
<div ng-if="$ctrl.state.current.name === 'home'">
|
<div ng-if="$ctrl.$state.current.name === 'home'">
|
||||||
<div class="modules">
|
<div class="modules">
|
||||||
<a
|
<a
|
||||||
ng-repeat="mod in ::$ctrl.modules"
|
ng-repeat="mod in ::$ctrl.modules"
|
||||||
ui-sref="{{::mod.route.state}}"
|
ui-sref="{{::mod.route.state}}"
|
||||||
translate-attr="{title: '{{::mod.name}}'}"
|
translate-attr="::{title: mod.name}"
|
||||||
class="mdl-shadow--4dp">
|
class="mdl-shadow--4dp">
|
||||||
<vn-icon icon="{{::mod.icon}}"></vn-icon>
|
<div>
|
||||||
<h4 translate>{{::mod.name}}</h4>
|
<vn-icon icon="{{::mod.icon || 'photo'}}"></vn-icon>
|
||||||
|
</div>
|
||||||
|
<h4 ng-bind-html="$ctrl.getModuleName(mod)"></h4>
|
||||||
|
<!--
|
||||||
<span
|
<span
|
||||||
ng-show='mod.keyBind'
|
ng-show='mod.keyBind'
|
||||||
vn-tooltip="Ctrl + Alt + {{mod.keyBind}}">
|
vn-tooltip="Ctrl + Alt + {{mod.keyBind}}">
|
||||||
({{::mod.keyBind}})
|
({{::mod.keyBind}})
|
||||||
</span>
|
</span>
|
||||||
<span ng-show='!mod.keyBind'> </span>
|
<span ng-show='!mod.keyBind'> </span>
|
||||||
|
-->
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -3,26 +3,42 @@ import './style.scss';
|
||||||
import keybindings from '../../global-keybindings.yml';
|
import keybindings from '../../global-keybindings.yml';
|
||||||
|
|
||||||
export default class Controller {
|
export default class Controller {
|
||||||
constructor(modulesFactory, $state, $translate, $scope) {
|
constructor(modulesFactory, $state, $translate, $sce) {
|
||||||
this.modules = modulesFactory.getModules();
|
this.modules = modulesFactory.getModules();
|
||||||
this.state = $state;
|
this.$state = $state;
|
||||||
this.$translate = $translate;
|
this._ = $translate;
|
||||||
this.$scope = $scope;
|
this.$sce = $sce;
|
||||||
this.keybindings = keybindings;
|
this.keybindings = keybindings;
|
||||||
}
|
}
|
||||||
$onInit() {
|
$onInit() {
|
||||||
this.modules.map(module => {
|
this.modules.map(mod => {
|
||||||
let keyBind = this.keybindings.find(keyBind => {
|
let keyBind = this.keybindings.find(keyBind => {
|
||||||
return keyBind.sref == module.route.state;
|
return keyBind.sref == mod.route.state;
|
||||||
});
|
});
|
||||||
|
|
||||||
if (keyBind)
|
if (keyBind)
|
||||||
module.keyBind = keyBind.key.toUpperCase();
|
mod.keyBind = keyBind.key.toUpperCase();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
getModuleName(mod) {
|
||||||
|
let getName = mod => {
|
||||||
|
let name = this._.instant(mod.name);
|
||||||
|
let lower = name.toUpperCase();
|
||||||
|
if (!mod.keyBind) return name;
|
||||||
|
let index = lower.indexOf(mod.keyBind);
|
||||||
|
if (index === -1) return name;
|
||||||
|
|
||||||
|
let newName = name.substr(0, index);
|
||||||
|
newName += `<span class="bind-letter">${name.substr(index, 1)}</span>`;
|
||||||
|
newName += name.substr(index + 1);
|
||||||
|
return newName;
|
||||||
|
};
|
||||||
|
|
||||||
|
return this.$sce.trustAsHtml(getName(mod));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Controller.$inject = ['modulesFactory', '$state', '$translate', '$scope'];
|
Controller.$inject = ['modulesFactory', '$state', '$translate', '$sce'];
|
||||||
|
|
||||||
ngModule.component('vnHome', {
|
ngModule.component('vnHome', {
|
||||||
template: require('./home.html'),
|
template: require('./home.html'),
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,8 @@ vn-home {
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
|
max-width: 40em;
|
||||||
|
margin: 0 auto;
|
||||||
|
|
||||||
& > a {
|
& > a {
|
||||||
@extend %clickable-light;
|
@extend %clickable-light;
|
||||||
|
|
@ -30,18 +32,17 @@ vn-home {
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|
||||||
& > vn-icon {
|
& > div {
|
||||||
font-size: 4em;
|
height: 70px;
|
||||||
}
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
|
||||||
& > vn-icon i[class="material-icons"] {
|
& > vn-icon {
|
||||||
line-height: 75px;
|
display: block;
|
||||||
|
font-size: 3.5em;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
& > vn-icon, & > vn-icon i, & > vn-icon i::before {
|
|
||||||
max-height: 75px;
|
|
||||||
}
|
|
||||||
|
|
||||||
& > span {
|
& > span {
|
||||||
font-size: 0.9em;
|
font-size: 0.9em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
@ -53,6 +54,11 @@ vn-home {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
color: white;
|
color: white;
|
||||||
|
margin: 0;
|
||||||
|
|
||||||
|
& > .bind-letter {
|
||||||
|
color: #FD0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
<vn-menu vn-id="apps-menu">
|
<vn-menu vn-id="apps-menu">
|
||||||
<ul pad-small>
|
<ul pad-small>
|
||||||
<li ng-repeat="mod in ::$ctrl.modules" ui-sref="{{::mod.route.state}}">
|
<li ng-repeat="mod in ::$ctrl.modules" ui-sref="{{::mod.route.state}}">
|
||||||
<vn-icon icon="{{::mod.icon}}"></vn-icon>
|
<vn-icon icon="{{::mod.icon || 'photo'}}"></vn-icon>
|
||||||
<span translate>{{::mod.name}}</span>
|
<span translate>{{::mod.name}}</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,8 @@ function modulesFactory(aclService) {
|
||||||
function getMainRoute(routeCollection) {
|
function getMainRoute(routeCollection) {
|
||||||
let cant = routeCollection.length;
|
let cant = routeCollection.length;
|
||||||
for (let i = 0; i < cant; i++) {
|
for (let i = 0; i < cant; i++) {
|
||||||
if (!routeCollection[i].abstract) {
|
if (!routeCollection[i].abstract)
|
||||||
return routeCollection[i];
|
return routeCollection[i];
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
@ -16,7 +15,7 @@ function modulesFactory(aclService) {
|
||||||
for (let file in window.routes) {
|
for (let file in window.routes) {
|
||||||
let card = {
|
let card = {
|
||||||
name: routes[file].name || routes[file].module,
|
name: routes[file].name || routes[file].module,
|
||||||
icon: routes[file].icon || ''
|
icon: routes[file].icon || null
|
||||||
};
|
};
|
||||||
let mainRoute = getMainRoute(window.routes[file].routes);
|
let mainRoute = getMainRoute(window.routes[file].routes);
|
||||||
if (mainRoute && aclService.routeHasPermission(mainRoute)) {
|
if (mainRoute && aclService.routeHasPermission(mainRoute)) {
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,64 @@
|
||||||
@import "./colors";
|
@import "./colors";
|
||||||
|
@import "./margin";
|
||||||
|
@import "./padding";
|
||||||
|
|
||||||
.summary{
|
.summary {
|
||||||
h5:not(.title) {
|
margin: 0 auto;
|
||||||
padding: 7px;
|
max-width: 950px;
|
||||||
background-color: $main-01-03;
|
|
||||||
border-bottom: 2px solid $main-01;
|
& > div {
|
||||||
font-family: unset !important;
|
& > h5 {
|
||||||
text-transform: uppercase;
|
@extend .pad-small;
|
||||||
}
|
border: none;
|
||||||
.title, p.title {
|
background: $main-01;
|
||||||
border: none;
|
color: $color-white;
|
||||||
background: $main-01;
|
margin: 0;
|
||||||
color: $color-white;
|
text-align: center;
|
||||||
margin: 0!important;
|
line-height: 1.3em;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
& > vn-horizontal {
|
||||||
|
flex-wrap: wrap;
|
||||||
|
@extend .pad-medium;
|
||||||
|
|
||||||
|
h4 {
|
||||||
|
@extend .margin-medium-bottom;
|
||||||
|
text-transform: uppercase;
|
||||||
|
font-size: 15pt;
|
||||||
|
line-height: 1;
|
||||||
|
padding: 7px;
|
||||||
|
padding-bottom: 4px; /* Bottom line-height fix */
|
||||||
|
font-family: unset;
|
||||||
|
background-color: $main-01-03;
|
||||||
|
border-bottom: .1em solid $main-01;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
& > * {
|
||||||
|
@extend .margin-small;
|
||||||
|
min-width: 14em;
|
||||||
|
overflow: hidden;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
& > vn-auto {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
vn-label-value > section {
|
||||||
|
margin-bottom: .3em;
|
||||||
|
|
||||||
|
& > vn-label {
|
||||||
|
display: block;
|
||||||
|
font-size: .9em;
|
||||||
|
|
||||||
|
&::after {
|
||||||
|
content: initial;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
p:after {
|
p:after {
|
||||||
content: ' ';
|
content: ' ';
|
||||||
|
|
@ -20,42 +66,50 @@
|
||||||
display: block;
|
display: block;
|
||||||
clear: both
|
clear: both
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
vn-label-value > section {
|
.vn-dialog.dialog-summary {
|
||||||
margin-bottom: .3em
|
vn-card {
|
||||||
|
border: none;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
& > div > button.close {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
& > div {
|
||||||
|
padding: 0
|
||||||
|
}
|
||||||
|
tpl-body {
|
||||||
|
width: auto;
|
||||||
|
}
|
||||||
|
.buttons {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
vn-check label span {
|
||||||
|
font-size: .9em
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.state {
|
.state {
|
||||||
@extend .summary;
|
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
background-color: $main-01;
|
background-color: $main-01;
|
||||||
vn-one:nth-child(1){
|
color: white;
|
||||||
border-right: 1px solid white;
|
|
||||||
}
|
|
||||||
p {
|
p {
|
||||||
font-size: 12px;
|
font-size: 13px;
|
||||||
line-height: 15px!important;
|
line-height: 15px;
|
||||||
padding: 0 0 2px 0;
|
text-align: center;
|
||||||
}
|
margin: .1em 0;
|
||||||
h5 {
|
|
||||||
line-height: 10px!important;
|
&:nth-child(1) {
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
vn-one {
|
vn-one {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
|
||||||
|
|
||||||
vn-one > h5{
|
&:nth-child(1) {
|
||||||
padding-bottom: 7px;
|
border-right: .1em solid white;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
vn-item-descriptor .state{
|
|
||||||
@extend .state;
|
|
||||||
vn-one > p{
|
|
||||||
padding-top: 5px;
|
|
||||||
}
|
|
||||||
vn-one > h5{
|
|
||||||
padding-bottom: 12px;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -26,5 +26,6 @@
|
||||||
"Warehouse cannot be blank": "Warehouse cannot be blank",
|
"Warehouse cannot be blank": "Warehouse cannot be blank",
|
||||||
"Agency cannot be blank": "Agency cannot be blank",
|
"Agency cannot be blank": "Agency cannot be blank",
|
||||||
"The IBAN does not have the correct format": "The IBAN does not have the correct format",
|
"The IBAN does not have the correct format": "The IBAN does not have the correct format",
|
||||||
"You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows"
|
"You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows",
|
||||||
|
"You can't create a ticket for a inactive client": "You can't create a ticket for a inactive client"
|
||||||
}
|
}
|
||||||
|
|
@ -1,167 +1,162 @@
|
||||||
<vn-vertical vn-one>
|
<vn-card class="summary">
|
||||||
<vn-card class="summary" pad-medium compact>
|
<h5>{{$ctrl.summary.claim.id}} - {{$ctrl.summary.claim.client.name}}</h5>
|
||||||
<vn-vertical margin-medium>
|
<vn-horizontal>
|
||||||
<vn-auto>
|
<vn-one>
|
||||||
<h5 text-center pad-small-v class="title">{{$ctrl.summary.claim.id}} - {{$ctrl.summary.claim.client.name}}</h5>
|
<vn-label-value label="Created"
|
||||||
</vn-auto>
|
value="{{$ctrl.summary.claim.created | dateTime: 'dd/MM/yyyy'}}">
|
||||||
<vn-horizontal pad-medium-v>
|
</vn-label-value>
|
||||||
<vn-one>
|
<vn-label-value label="State"
|
||||||
<vn-label-value label="Created"
|
value="{{$ctrl.summary.claim.claimState.description}}">
|
||||||
value="{{$ctrl.summary.claim.created | dateTime: 'dd/MM/yyyy'}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Salesperson"
|
||||||
<vn-label-value label="State"
|
value="{{$ctrl.summary.claim.client.salesPerson.firstName}} {{$ctrl.summary.claim.client.salesPerson.name}}">
|
||||||
value="{{$ctrl.summary.claim.claimState.description}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Attended by"
|
||||||
<vn-label-value label="Salesperson"
|
value="{{$ctrl.summary.claim.worker.firstName}} {{$ctrl.summary.claim.worker.name}}">
|
||||||
value="{{$ctrl.summary.claim.client.salesPerson.firstName}} {{$ctrl.summary.claim.client.salesPerson.name}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
</vn-one>
|
||||||
<vn-label-value label="Attended by"
|
<vn-one>
|
||||||
value="{{$ctrl.summary.claim.worker.firstName}} {{$ctrl.summary.claim.worker.name}}">
|
<vn-textarea
|
||||||
</vn-label-value>
|
vn-three
|
||||||
</vn-one>
|
disabled="true"
|
||||||
<vn-one>
|
label="Observation"
|
||||||
<vn-textarea
|
model="$ctrl.summary.claim.observation">
|
||||||
vn-three
|
</vn-textarea>
|
||||||
disabled="true"
|
</vn-one>
|
||||||
label="Observation"
|
<vn-one>
|
||||||
model="$ctrl.summary.claim.observation">
|
<vn-input-range
|
||||||
</vn-textarea>
|
vn-one
|
||||||
</vn-one>
|
disabled="true"
|
||||||
<vn-one>
|
label="Responsability"
|
||||||
<vn-input-range
|
value="$ctrl.summary.claim.responsibility"
|
||||||
vn-one
|
max="5"
|
||||||
disabled="true"
|
min="1"
|
||||||
label="Responsability"
|
step="1"
|
||||||
value="$ctrl.summary.claim.responsibility"
|
vn-acl="salesAssistant">
|
||||||
max="5"
|
</vn-input-range>
|
||||||
min="1"
|
</vn-one>
|
||||||
step="1"
|
<vn-auto>
|
||||||
vn-acl="salesAssistant">
|
<h4 translate>Detail</h4>
|
||||||
</vn-input-range>
|
<div style="overflow: auto">
|
||||||
</vn-one>
|
<vn-table model="model">
|
||||||
</vn-horizontal>
|
<vn-thead>
|
||||||
<vn-horizontal>
|
<vn-tr>
|
||||||
<vn-one margin-medium-v>
|
<vn-th number>Id</vn-th>
|
||||||
<h5 translate>Detail</h5>
|
<vn-th>Landed</vn-th>
|
||||||
<vn-table model="model">
|
<vn-th number>Quantity</vn-th>
|
||||||
<vn-thead>
|
<vn-th number>Claimed</vn-th>
|
||||||
<vn-tr>
|
<vn-th>Description</vn-th>
|
||||||
<vn-th number>Id</vn-th>
|
<vn-th number>Price</vn-th>
|
||||||
<vn-th number>Landed</vn-th>
|
<vn-th number>Disc.</vn-th>
|
||||||
<vn-th number>Quantity</vn-th>
|
<vn-th number>Total</vn-th>
|
||||||
<vn-th number>Claimed</vn-th>
|
</vn-tr>
|
||||||
<vn-th number>Description</vn-th>
|
</vn-thead>
|
||||||
<vn-th number>Price</vn-th>
|
<vn-tbody>
|
||||||
<vn-th number>Disc.</vn-th>
|
<vn-tr ng-repeat="saleClaimed in $ctrl.summary.salesClaimed">
|
||||||
<vn-th number>Total</vn-th>
|
<vn-td number>
|
||||||
</vn-tr>
|
<span
|
||||||
</vn-thead>
|
ng-click="$ctrl.showDescriptor($event, saleClaimed.sale.itemFk)"
|
||||||
<vn-tbody>
|
pointer class="link">
|
||||||
<vn-tr ng-repeat="saleClaimed in $ctrl.summary.salesClaimed">
|
{{("000000"+saleClaimed.sale.itemFk).slice(-6)}}
|
||||||
<vn-td number>
|
</span>
|
||||||
<span
|
</vn-td>
|
||||||
ng-click="$ctrl.showDescriptor($event, saleClaimed.sale.itemFk)"
|
<vn-td>{{saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
|
||||||
pointer class="link">
|
<vn-td number>{{saleClaimed.sale.quantity}}</vn-td>
|
||||||
{{("000000"+saleClaimed.sale.itemFk).slice(-6)}}
|
<vn-td number>{{saleClaimed.quantity}}</vn-td>
|
||||||
</span>
|
<vn-td>{{saleClaimed.sale.concept}}</vn-td>
|
||||||
</vn-td>
|
<vn-td number>{{saleClaimed.sale.price | currency:'€':2}}</vn-td>
|
||||||
<vn-td number>{{::saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
|
<vn-td number>{{saleClaimed.sale.discount}} %</vn-td>
|
||||||
<vn-td number>{{::saleClaimed.sale.quantity}}</vn-td>
|
<vn-td number>
|
||||||
<vn-td number>{{::saleClaimed.quantity}}</vn-td>
|
{{(saleClaimed.sale.quantity * saleClaimed.sale.price) -
|
||||||
<vn-td number>{{::saleClaimed.sale.concept}}</vn-td>
|
((saleClaimed.sale.discount *
|
||||||
<vn-td number>{{::saleClaimed.sale.price | currency:'€':2}}</vn-td>
|
(saleClaimed.sale.quantity * saleClaimed.sale.price))/100) | currency:'€':2
|
||||||
<vn-td number>{{::saleClaimed.sale.discount}} %</vn-td>
|
}}
|
||||||
<vn-td number>
|
</vn-td>
|
||||||
{{::(saleClaimed.sale.quantity * saleClaimed.sale.price) -
|
</vn-tr>
|
||||||
((saleClaimed.sale.discount *
|
</vn-tbody>
|
||||||
(saleClaimed.sale.quantity * saleClaimed.sale.price))/100) | currency:'€':2
|
<vn-empty-rows ng-if="model.data.length === 0" translate>
|
||||||
}}
|
No results
|
||||||
</vn-td>
|
</vn-empty-rows>
|
||||||
</vn-tr>
|
</vn-table>
|
||||||
</vn-tbody>
|
</div>
|
||||||
<vn-empty-rows ng-if="model.data.length === 0" translate>
|
</vn-auto>
|
||||||
No results
|
<vn-auto>
|
||||||
</vn-empty-rows>
|
<h4 translate>Development</h4>
|
||||||
</vn-table>
|
<div style="overflow: auto">
|
||||||
</vn-one>
|
<vn-table model="model">
|
||||||
</vn-horizontal>
|
<vn-thead>
|
||||||
<vn-horizontal>
|
<vn-tr>
|
||||||
<vn-one margin-medium-v>
|
<vn-th>Reason</vn-th>
|
||||||
<h5 translate>Development</h5>
|
<vn-th>Result</vn-th>
|
||||||
<vn-table model="model">
|
<vn-th>Responsible</vn-th>
|
||||||
<vn-thead>
|
<vn-th>Worker</vn-th>
|
||||||
<vn-tr>
|
<vn-th>Redelivery</vn-th>
|
||||||
<vn-th number>Reason</vn-th>
|
</vn-tr>
|
||||||
<vn-th number>Result</vn-th>
|
</vn-thead>
|
||||||
<vn-th number>Responsible</vn-th>
|
<vn-tbody>
|
||||||
<vn-th number>Worker</vn-th>
|
<vn-tr ng-repeat="development in $ctrl.summary.developments">
|
||||||
<vn-th number>Redelivery</vn-th>
|
<vn-td>{{development.claimReason.description}}</vn-td>
|
||||||
</vn-tr>
|
<vn-td>{{development.claimResult.description}}</vn-td>
|
||||||
</vn-thead>
|
<vn-td>{{development.claimResponsible.description}}</vn-td>
|
||||||
<vn-tbody>
|
<vn-td>{{development.worker.firstName}}</vn-td>
|
||||||
<vn-tr ng-repeat="development in $ctrl.summary.developments">
|
<vn-td>{{development.claimRedelivery.description}}</vn-td>
|
||||||
<vn-td number>{{::development.claimReason.description}}</vn-td>
|
</vn-tr>
|
||||||
<vn-td number>{{::development.claimResult.description}}</vn-td>
|
</vn-tbody>
|
||||||
<vn-td number>{{::development.claimResponsible.description}}</vn-td>
|
<vn-empty-rows ng-if="model.data.length === 0" translate>
|
||||||
<vn-td number>{{::development.worker.firstName}}</vn-td>
|
No results
|
||||||
<vn-td number>{{::development.claimRedelivery.description}}</vn-td>
|
</vn-empty-rows>
|
||||||
</vn-tr>
|
</vn-table>
|
||||||
</vn-tbody>
|
</div>
|
||||||
<vn-empty-rows ng-if="model.data.length === 0" translate>
|
</vn-auto>
|
||||||
No results
|
<vn-auto>
|
||||||
</vn-empty-rows>
|
<h4 translate>Action</h4>
|
||||||
</vn-table>
|
<div style="overflow: auto">
|
||||||
</vn-one>
|
<vn-table model="model">
|
||||||
</vn-horizontal>
|
<vn-thead>
|
||||||
<vn-horizontal>
|
<vn-tr>
|
||||||
<vn-one margin-medium-v>
|
<vn-th number>Id</vn-th>
|
||||||
<h5 translate>Action</h5>
|
<vn-th number>Destination</vn-th>
|
||||||
<vn-table model="model">
|
<vn-th number>Landed</vn-th>
|
||||||
<vn-thead>
|
<vn-th number>Quantity</vn-th>
|
||||||
<vn-tr>
|
<vn-th number>Description</vn-th>
|
||||||
<vn-th number>Id</vn-th>
|
<vn-th number>Price</vn-th>
|
||||||
<vn-th number>Destination</vn-th>
|
<vn-th number>Disc.</vn-th>
|
||||||
<vn-th number>Landed</vn-th>
|
<vn-th number>Total</vn-th>
|
||||||
<vn-th number>Quantity</vn-th>
|
</vn-tr>
|
||||||
<vn-th number>Description</vn-th>
|
</vn-thead>
|
||||||
<vn-th number>Price</vn-th>
|
<vn-tbody>
|
||||||
<vn-th number>Disc.</vn-th>
|
<vn-tr ng-repeat="action in $ctrl.summary.actions">
|
||||||
<vn-th number>Total</vn-th>
|
<vn-td number>
|
||||||
</vn-tr>
|
<span
|
||||||
</vn-thead>
|
ng-click="$ctrl.showDescriptor($event, action.sale.itemFk)"
|
||||||
<vn-tbody>
|
pointer class="link">
|
||||||
<vn-tr ng-repeat="action in $ctrl.summary.actions">
|
{{("000000"+action.sale.itemFk).slice(-6)}}
|
||||||
<vn-td number>
|
</span>
|
||||||
<span
|
</vn-td>
|
||||||
ng-click="$ctrl.showDescriptor($event, action.sale.itemFk)"
|
<vn-td number>{{action.sale.id}}</vn-td>
|
||||||
pointer class="link">
|
<vn-td number>{{action.claimBeggining.description}}</vn-td>
|
||||||
{{("000000"+action.sale.itemFk).slice(-6)}}
|
<vn-td number>{{action.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
|
||||||
</span>
|
<vn-td number>{{action.sale.quantity}}</vn-td>
|
||||||
</vn-td>
|
<vn-td number>{{action.sale.concept}}</vn-td>
|
||||||
<vn-td number>{{::action.sale.id}}</vn-td>
|
<vn-td number>{{action.sale.price}}</vn-td>
|
||||||
<vn-td number>{{::action.claimBeggining.description}}</vn-td>
|
<vn-td number>{{action.sale.discount}} %</vn-td>
|
||||||
<vn-td number>{{::action.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
|
<vn-td number>
|
||||||
<vn-td number>{{::action.sale.quantity}}</vn-td>
|
{{(action.sale.quantity * action.sale.price) -
|
||||||
<vn-td number>{{::action.sale.concept}}</vn-td>
|
((action.sale.discount *
|
||||||
<vn-td number>{{::action.sale.price}}</vn-td>
|
(action.sale.quantity * action.sale.price))/100) | currency:'€':2
|
||||||
<vn-td number>{{::action.sale.discount}} %</vn-td>
|
}}
|
||||||
<vn-td number>
|
</vn-td>
|
||||||
{{::(action.sale.quantity * action.sale.price) -
|
</vn-tr>
|
||||||
((action.sale.discount *
|
</vn-tbody>
|
||||||
(action.sale.quantity * action.sale.price))/100) | currency:'€':2
|
<vn-empty-rows ng-if="model.data.length === 0" translate>
|
||||||
}}
|
No results
|
||||||
</vn-td>
|
</vn-empty-rows>
|
||||||
</vn-tr>
|
</vn-table>
|
||||||
</vn-tbody>
|
</div>
|
||||||
<vn-empty-rows ng-if="model.data.length === 0" translate>
|
</vn-auto>
|
||||||
No results
|
</vn-horizontal>
|
||||||
</vn-empty-rows>
|
</vn-card>
|
||||||
</vn-table>
|
<vn-item-descriptor-popover
|
||||||
</vn-one>
|
vn-id="descriptor"
|
||||||
</vn-horizontal>
|
quicklinks="$ctrl.quicklinks">
|
||||||
</vn-vertical>
|
|
||||||
</vn-card>
|
|
||||||
</vn-vertical>
|
|
||||||
<vn-item-descriptor-popover vn-id="descriptor"
|
|
||||||
quicklinks="$ctrl.quicklinks">
|
|
||||||
</vn-item-descriptor-popover>
|
</vn-item-descriptor-popover>
|
||||||
|
|
@ -33,7 +33,7 @@ List: Listado
|
||||||
New client: Nuevo cliente
|
New client: Nuevo cliente
|
||||||
Summary: Vista previa
|
Summary: Vista previa
|
||||||
Basic data: Datos básicos
|
Basic data: Datos básicos
|
||||||
Fiscal data: Datos Fiscales
|
Fiscal data: Datos fiscales
|
||||||
Pay method: Forma de pago
|
Pay method: Forma de pago
|
||||||
Addresses: Consignatarios
|
Addresses: Consignatarios
|
||||||
New address: Nuevo consignatario
|
New address: Nuevo consignatario
|
||||||
|
|
|
||||||
|
|
@ -1,208 +1,195 @@
|
||||||
<vn-vertical vn-one>
|
<vn-card class="summary">
|
||||||
<vn-card class="summary" pad-medium>
|
<h5>{{$ctrl.summary.name}} - {{$ctrl.summary.id}} - {{$ctrl.summary.salesPerson.firstName}} {{$ctrl.summary.salesPerson.name}}</h5>
|
||||||
<vn-vertical margin-medium>
|
<vn-horizontal>
|
||||||
<vn-auto>
|
<vn-one>
|
||||||
<h5 text-center pad-small-v class="title">{{$ctrl.summary.name}} - {{$ctrl.summary.id}} - {{$ctrl.summary.salesPerson.firstName}} {{$ctrl.summary.salesPerson.name}}</h5>
|
<h4 translate>Basic data</h4>
|
||||||
</vn-auto>
|
<vn-label-value label="Id"
|
||||||
<vn-horizontal vn-one>
|
value="{{$ctrl.summary.id}}">
|
||||||
<vn-one margin-medium>
|
</vn-label-value>
|
||||||
<h5 translate>Basic data</h5>
|
<vn-label-value label="Comercial Name"
|
||||||
<vn-label-value label="Id"
|
value="{{$ctrl.summary.name}}">
|
||||||
value="{{$ctrl.summary.id}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Contact"
|
||||||
<vn-label-value label="Comercial Name"
|
value="{{$ctrl.summary.contact}}">
|
||||||
value="{{$ctrl.summary.name}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Phone"
|
||||||
<vn-label-value label="Contact"
|
value="{{$ctrl.summary.phone}}">
|
||||||
value="{{$ctrl.summary.contact}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Mobile"
|
||||||
<vn-label-value label="Phone"
|
value="{{$ctrl.summary.mobile}}">
|
||||||
value="{{$ctrl.summary.phone}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Email" ellipsize="false"
|
||||||
<vn-label-value label="Mobile"
|
value="{{$ctrl.summary.email}}">
|
||||||
value="{{$ctrl.summary.mobile}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Sales person"
|
||||||
<vn-label-value label="Email" ellipsize="false"
|
value="{{$ctrl.summary.salesPerson.firstName}} {{$ctrl.summary.salesPerson.name}}">
|
||||||
value="{{$ctrl.summary.email}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Channel"
|
||||||
<vn-label-value label="Sales person"
|
value="{{$ctrl.summary.contactChannel.name}}">
|
||||||
value="{{$ctrl.summary.salesPerson.firstName}} {{$ctrl.summary.salesPerson.name}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
</vn-one>
|
||||||
<vn-label-value label="Channel"
|
<vn-one>
|
||||||
value="{{$ctrl.summary.contactChannel.name}}">
|
<h4 translate>Fiscal address</h4>
|
||||||
</vn-label-value>
|
<vn-label-value label="Social name"
|
||||||
</vn-one>
|
value="{{$ctrl.summary.socialName}}">
|
||||||
<vn-one margin-medium>
|
</vn-label-value>
|
||||||
<h5 translate>Fiscal data</h5>
|
<vn-label-value label="NIF / CIF"
|
||||||
<vn-label-value label="Social name"
|
value="{{$ctrl.summary.fi}}">
|
||||||
value="{{$ctrl.summary.socialName}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Street" ellipsize="false"
|
||||||
<vn-label-value label="NIF / CIF"
|
value="{{$ctrl.summary.street}}">
|
||||||
value="{{$ctrl.summary.fi}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="City"
|
||||||
<vn-label-value label="Street" ellipsize="false"
|
value="{{$ctrl.summary.city}}">
|
||||||
value="{{$ctrl.summary.street}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Postcode"
|
||||||
<vn-label-value label="City"
|
value="{{$ctrl.summary.postcode}}">
|
||||||
value="{{$ctrl.summary.city}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Province"
|
||||||
<vn-label-value label="Postcode"
|
value="{{$ctrl.summary.province.name}}">
|
||||||
value="{{$ctrl.summary.postcode}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Country"
|
||||||
<vn-label-value label="Province"
|
value="{{$ctrl.summary.country.country}}">
|
||||||
value="{{$ctrl.summary.province.name}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
</vn-one>
|
||||||
<vn-label-value label="Country"
|
<vn-one>
|
||||||
value="{{$ctrl.summary.country.country}}">
|
<h4 translate>Fiscal data</h4>
|
||||||
</vn-label-value>
|
<vn-vertical>
|
||||||
<vn-vertical>
|
<vn-check
|
||||||
<vn-check vn-one
|
label="Is equalizated"
|
||||||
label="Is equalizated"
|
field="$ctrl.summary.isEqualizated"
|
||||||
field="$ctrl.summary.isEqualizated"
|
disabled="true">
|
||||||
disabled="true">
|
</vn-check>
|
||||||
</vn-check>
|
<vn-check
|
||||||
|
label="Active"
|
||||||
<vn-check vn-one
|
field="$ctrl.summary.isActive"
|
||||||
label="Active"
|
disabled="true">
|
||||||
field="$ctrl.summary.isActive"
|
</vn-check>
|
||||||
disabled="true">
|
<vn-check
|
||||||
</vn-check>
|
label="Invoice by address"
|
||||||
|
field="$ctrl.summary.hasToInvoiceByAddress"
|
||||||
<vn-check vn-one
|
disabled="true">
|
||||||
label="Invoice by address"
|
</vn-check>
|
||||||
field="$ctrl.summary.hasToInvoiceByAddress"
|
<vn-check
|
||||||
disabled="true">
|
label="Verified data"
|
||||||
</vn-check>
|
field="$ctrl.summary.isTaxDataChecked"
|
||||||
|
disabled="true">
|
||||||
<vn-check vn-one
|
</vn-check>
|
||||||
label="Verified data"
|
<vn-check
|
||||||
field="$ctrl.summary.isTaxDataChecked"
|
label="Has to invoice"
|
||||||
disabled="true">
|
field="$ctrl.summary.hasToInvoice"
|
||||||
</vn-check>
|
disabled="true">
|
||||||
|
</vn-check>
|
||||||
<vn-check vn-one
|
<vn-check
|
||||||
label="Has to invoice"
|
label="Invoice by mail"
|
||||||
field="$ctrl.summary.hasToInvoice"
|
field="$ctrl.summary.isToBeMailed"
|
||||||
disabled="true">
|
disabled="true">
|
||||||
</vn-check>
|
</vn-check>
|
||||||
|
<vn-check
|
||||||
<vn-check vn-one
|
label="Vies"
|
||||||
label="Invoice by mail"
|
field="$ctrl.summary.isVies"
|
||||||
field="$ctrl.summary.isToBeMailed"
|
disabled="true">
|
||||||
disabled="true">
|
</vn-check>
|
||||||
</vn-check>
|
</vn-vertical>
|
||||||
|
</vn-one>
|
||||||
<vn-check vn-one
|
<vn-one>
|
||||||
label="Vies"
|
<h4 translate>Pay method</h4>
|
||||||
field="$ctrl.summary.isVies"
|
<vn-label-value label="Pay method"
|
||||||
disabled="true">
|
value="{{$ctrl.summary.payMethod.name}}">
|
||||||
</vn-check>
|
</vn-label-value>
|
||||||
</vn-vertical>
|
<vn-label-value label="IBAN"
|
||||||
</vn-one>
|
value="{{$ctrl.summary.iban}}">
|
||||||
<vn-one margin-medium>
|
</vn-label-value>
|
||||||
<h5 translate>Pay method</h5>
|
<vn-label-value label="Due day"
|
||||||
<vn-label-value label="Pay method"
|
value="{{$ctrl.summary.dueDay}}">
|
||||||
value="{{$ctrl.summary.payMethod.name}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-vertical>
|
||||||
<vn-label-value label="IBAN"
|
<vn-check
|
||||||
value="{{$ctrl.summary.iban}}">
|
label="Received LCR"
|
||||||
</vn-label-value>
|
field="$ctrl.summary.hasLcr"
|
||||||
<vn-label-value label="Due day"
|
disabled="true">
|
||||||
value="{{$ctrl.summary.dueDay}}">
|
</vn-check>
|
||||||
</vn-label-value>
|
<vn-check
|
||||||
<vn-vertical>
|
label="Received core VNL"
|
||||||
<vn-check vn-one
|
field="$ctrl.summary.hasCoreVnl"
|
||||||
label="Received LCR"
|
disabled="true">
|
||||||
field="$ctrl.summary.hasLcr"
|
</vn-check>
|
||||||
disabled="true">
|
<vn-check
|
||||||
</vn-check>
|
label="Received B2B VNL"
|
||||||
|
field="$ctrl.summary.hasSepaVnl"
|
||||||
<vn-check vn-one
|
disabled="true">
|
||||||
label="Received core VNL"
|
</vn-check>
|
||||||
field="$ctrl.summary.hasCoreVnl"
|
</vn-vertical>
|
||||||
disabled="true">
|
</vn-one>
|
||||||
</vn-check>
|
<vn-one>
|
||||||
|
<h4 translate>Default address</h4>
|
||||||
<vn-check vn-one
|
<vn-label-value label="Name"
|
||||||
label="Received B2B VNL"
|
value="{{$ctrl.summary.addresses[0].nickname}}">
|
||||||
field="$ctrl.summary.hasSepaVnl"
|
</vn-label-value>
|
||||||
disabled="true">
|
<vn-label-value label="Street" ellipsize="false"
|
||||||
</vn-check>
|
value="{{$ctrl.summary.addresses[0].street}}">
|
||||||
</vn-vertical>
|
</vn-label-value>
|
||||||
</vn-one>
|
<vn-label-value label="City"
|
||||||
</vn-horizontal>
|
value="{{$ctrl.summary.addresses[0].city}}">
|
||||||
<vn-horizontal vn-one>
|
</vn-label-value>
|
||||||
<vn-one margin-medium>
|
</vn-one>
|
||||||
<h5 translate>Default address</h5>
|
<vn-one>
|
||||||
<vn-label-value label="Name"
|
<h4 translate>Web access</h4>
|
||||||
value="{{$ctrl.summary.addresses[0].nickname}}">
|
<vn-label-value label="User"
|
||||||
</vn-label-value>
|
value="{{$ctrl.summary.account.name}}">
|
||||||
<vn-label-value label="Street" ellipsize="false"
|
</vn-label-value>
|
||||||
value="{{$ctrl.summary.addresses[0].street}}">
|
<vn-vertical>
|
||||||
</vn-label-value>
|
<vn-check
|
||||||
<vn-label-value label="City"
|
label="Enable web access"
|
||||||
value="{{$ctrl.summary.addresses[0].city}}">
|
field="$ctrl.summary.account.active"
|
||||||
</vn-label-value>
|
disabled="true">
|
||||||
</vn-one>
|
</vn-check>
|
||||||
<vn-one margin-medium>
|
</vn-vertical>
|
||||||
<h5 translate>Web access</h5>
|
</vn-one>
|
||||||
<vn-label-value label="User"
|
<vn-one>
|
||||||
value="{{$ctrl.summary.account.name}}">
|
<h4 translate>Business data</h4>
|
||||||
</vn-label-value>
|
<vn-label-value label="Total greuge"
|
||||||
<vn-vertical>
|
value="{{$ctrl.summary.totalGreuge | currency:'€':2}}">
|
||||||
<vn-check vn-one
|
</vn-label-value>
|
||||||
label="Enable web access"
|
<vn-label-value label="Mana"
|
||||||
field="$ctrl.summary.account.active"
|
value="{{$ctrl.summary.mana.mana | currency:'€':2}}">
|
||||||
disabled="true">
|
</vn-label-value>
|
||||||
</vn-check>
|
<vn-label-value label="Rate"
|
||||||
</vn-vertical>
|
value="{{$ctrl.summary.claimsRatio[0].priceIncreasing | percentage}}">
|
||||||
</vn-one>
|
</vn-label-value>
|
||||||
<vn-one margin-medium>
|
<vn-label-value label="Average invoiced"
|
||||||
<h5 translate>Business data</h5>
|
value="{{$ctrl.summary.averageInvoiced.invoiced | currency:'€':2}}">
|
||||||
<vn-label-value label="Total greuge"
|
</vn-label-value>
|
||||||
value="{{$ctrl.summary.totalGreuge | currency:'€ ':2}}">
|
<vn-label-value label="Claims"
|
||||||
</vn-label-value>
|
value="{{$ctrl.summary.claimsRatio[0].claimingRate | percentage}}">
|
||||||
<vn-label-value label="Mana"
|
</vn-label-value>
|
||||||
value="{{$ctrl.summary.mana.mana | currency:'€ ':2}}">
|
</vn-one>
|
||||||
</vn-label-value>
|
<vn-one>
|
||||||
<vn-label-value label="Rate"
|
<h4 translate>Financial information</h4>
|
||||||
value="{{$ctrl.summary.claimsRatio[0].priceIncreasing | percentage}}">
|
<vn-label-value label="Risk"
|
||||||
</vn-label-value>
|
value="{{$ctrl.summary.debt.debt | currency:'€':2}}"
|
||||||
<vn-label-value label="Average invoiced"
|
ng-class="{bold: $ctrl.summary.debt.debt > $ctrl.summary.credit}">
|
||||||
value="{{$ctrl.summary.averageInvoiced.invoiced | currency:'€ ':2}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Credit"
|
||||||
<vn-label-value label="Claims"
|
value="{{$ctrl.summary.credit | currency:'€':2 }} "
|
||||||
value="{{$ctrl.summary.claimsRatio[0].claimingRate | percentage}}">
|
ng-class="{bold: $ctrl.summary.credit > $ctrl.summary.creditInsurance ||
|
||||||
</vn-label-value>
|
($ctrl.summary.credit && $ctrl.summary.creditInsurance == null)}">
|
||||||
</vn-one>
|
</vn-label-value>
|
||||||
<vn-one margin-medium>
|
<vn-label-value label="Secured credit"
|
||||||
<h5 translate>Financial information</h5>
|
value="{{$ctrl.summary.creditInsurance | currency:'€':2}} ({{$ctrl.summary.classifications[0].insurances[0].grade}})">
|
||||||
<vn-label-value label="Risk"
|
</vn-label-value>
|
||||||
value="{{$ctrl.summary.debt.debt | currency:'€ ':2}}"
|
<vn-label-value label="Balance"
|
||||||
ng-class="{bold: $ctrl.summary.debt.debt > $ctrl.summary.credit}">
|
value="{{$ctrl.summary.sumRisk | currency:'€':2}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Credit"
|
<vn-label-value label="Balance due"
|
||||||
value="{{$ctrl.summary.credit | currency:'€ ':2 }} "
|
value="{{$ctrl.summary.defaulters[0].amount | currency:'€':2}}"
|
||||||
ng-class="{bold: $ctrl.summary.credit > $ctrl.summary.creditInsurance ||
|
ng-class="{bold: $ctrl.summary.defaulters[0].amount}">
|
||||||
($ctrl.summary.credit && $ctrl.summary.creditInsurance == null)}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-vertical ng-if="$ctrl.summary.recovery.started">
|
||||||
<vn-label-value label="Secured credit"
|
<vn-label-value label="Recovery since"
|
||||||
value="{{$ctrl.summary.creditInsurance | currency:'€ ':2}} ({{$ctrl.summary.classifications[0].insurances[0].grade}})">
|
value="{{$ctrl.summary.recovery.started | date:'dd/MM/yyyy'}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Balance"
|
|
||||||
value="{{$ctrl.summary.sumRisk | currency:'€ ':2}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="Balance due"
|
|
||||||
value="{{$ctrl.summary.defaulters[0].amount | currency:'€ ':2}}"
|
|
||||||
ng-class="{bold: $ctrl.summary.defaulters[0].amount}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-vertical ng-if="$ctrl.summary.recovery.started">
|
|
||||||
<vn-label-value label="Recovery since"
|
|
||||||
value="{{$ctrl.summary.recovery.started | date:'dd/MM/yyyy'}}">
|
|
||||||
</vn-label-value>
|
|
||||||
</vn-vertical>
|
|
||||||
</vn-one>
|
|
||||||
</vn-horizontal>
|
|
||||||
</vn-vertical>
|
</vn-vertical>
|
||||||
</vn-card>
|
</vn-one>
|
||||||
</vn-vertical>
|
</vn-horizontal>
|
||||||
|
</vn-card>
|
||||||
|
|
@ -11,3 +11,4 @@ Balance due: Saldo vencido
|
||||||
Rate: Tarifa
|
Rate: Tarifa
|
||||||
Business data: Datos comerciales
|
Business data: Datos comerciales
|
||||||
Recovery since: Recobro desde
|
Recovery since: Recobro desde
|
||||||
|
Fiscal address: Dirección fiscal
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,3 @@
|
||||||
vn-dialog {
|
|
||||||
vn-client-summary vn-one {
|
|
||||||
min-width: 10em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
vn-client-summary {
|
vn-client-summary {
|
||||||
.bold {
|
.bold {
|
||||||
font-family: vn-font-bold;
|
font-family: vn-font-bold;
|
||||||
|
|
|
||||||
|
|
@ -31,16 +31,16 @@
|
||||||
</vn-float-button>
|
</vn-float-button>
|
||||||
</a>
|
</a>
|
||||||
</vn-auto>
|
</vn-auto>
|
||||||
<vn-horizontal class="state">
|
<vn-horizontal class="state">
|
||||||
<vn-one>
|
<vn-one>
|
||||||
<p class="title" uppercase text-center>Visible</p>
|
<p translate>Visible</p>
|
||||||
<h5 class="title" text-center>{{$ctrl.item.visible}}</h5>
|
<p>{{$ctrl.item.visible}}</p>
|
||||||
</vn-one>
|
</vn-one>
|
||||||
<vn-one>
|
<vn-one>
|
||||||
<p class="title" uppercase translate text-center>Available</p>
|
<p translate>Available</p>
|
||||||
<h5 text-center class="title">{{$ctrl.item.available}}</h5>
|
<p>{{$ctrl.item.available}}</p>
|
||||||
</vn-one>
|
</vn-one>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-auto pad-medium>
|
<vn-auto pad-medium>
|
||||||
<h5>{{$ctrl.item.id}}</h5>
|
<h5>{{$ctrl.item.id}}</h5>
|
||||||
<vn-label-value label="Name"
|
<vn-label-value label="Name"
|
||||||
|
|
|
||||||
|
|
@ -1,127 +1,110 @@
|
||||||
<vn-card class="summary">
|
<vn-card class="summary">
|
||||||
<vn-vertical pad-medium>
|
<h5>{{$ctrl.item.id}} - {{$ctrl.summary.item.name}}</h5>
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<vn-auto margin-medium>
|
<vn-one>
|
||||||
<vn-vertical>
|
<vn-one>
|
||||||
<vn-one>
|
<img style="width: 100%"
|
||||||
<h5 text-center pad-small-v class="title">{{$ctrl.item.id}}</h5>
|
ng-src="//verdnatura.es/vn-image-data/catalog/200x200/{{$ctrl.item.image}}"
|
||||||
</vn-one>
|
zoom-image="//verdnatura.es/vn-image-data/catalog/1600x900/{{$ctrl.item.image}}" on-error-src/>
|
||||||
<vn-one>
|
|
||||||
<img
|
|
||||||
ng-src="//verdnatura.es/vn-image-data/catalog/200x200/{{$ctrl.item.image}}"
|
|
||||||
zoom-image="//verdnatura.es/vn-image-data/catalog/1600x900/{{$ctrl.item.image}}" on-error-src/>
|
|
||||||
</vn-one>
|
|
||||||
<vn-horizontal class="state">
|
|
||||||
<vn-one>
|
|
||||||
<p class="title" uppercase text-center>Visible</p>
|
|
||||||
<h5 class="title" text-center>{{$ctrl.summary.visible}}</h5>
|
|
||||||
</vn-one>
|
|
||||||
<vn-one>
|
|
||||||
<p class="title" uppercase translate text-center>Available</p>
|
|
||||||
<h5 text-center class="title">{{$ctrl.summary.available}}</h5>
|
|
||||||
</vn-one>
|
|
||||||
</vn-horizontal>
|
|
||||||
</vn-vertical>
|
|
||||||
</vn-auto>
|
|
||||||
<vn-one margin-medium>
|
|
||||||
<vn-vertical name="basicData">
|
|
||||||
<h5 translate>Basic data</h5>
|
|
||||||
<vn-label-value label="Name"
|
|
||||||
value="{{$ctrl.summary.item.name}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="Full name"
|
|
||||||
value="{{$ctrl.summary.item.longName}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="Type"
|
|
||||||
value="{{$ctrl.summary.item.itemType.name}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="Size"
|
|
||||||
value="{{$ctrl.summary.item.itemType.size}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="Origin"
|
|
||||||
value="{{$ctrl.summary.item.origin.name}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="stems"
|
|
||||||
value="{{$ctrl.summary.item.origin.stems}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="Buyer"
|
|
||||||
value="{{$ctrl.summary.item.itemType.worker.firstName}} {{$ctrl.summary.item.itemType.worker.name}}">
|
|
||||||
</vn-label-value>
|
|
||||||
</vn-vertical>
|
|
||||||
</vn-one>
|
</vn-one>
|
||||||
<vn-one margin-medium>
|
<vn-horizontal class="state">
|
||||||
<vn-vertical name="otherData">
|
<vn-one>
|
||||||
<h5 translate>Other data</h5>
|
<p translate>Visible</p>
|
||||||
<vn-label-value label="Intrastat code"
|
<p>{{$ctrl.summary.visible}}</p>
|
||||||
value="{{$ctrl.summary.item.intrastat.id}}">
|
</vn-one>
|
||||||
</vn-label-value>
|
<vn-one>
|
||||||
<vn-label-value label="Intrastat"
|
<p translate>Available</p>
|
||||||
value="{{$ctrl.summary.item.intrastat.description}}">
|
<p>{{$ctrl.summary.available}}</p>
|
||||||
</vn-label-value>
|
</vn-one>
|
||||||
<vn-label-value label="Reference"
|
</vn-horizontal>
|
||||||
value="{{$ctrl.summary.item.comment}}">
|
</vn-one>
|
||||||
</vn-label-value>
|
<vn-one name="basicData">
|
||||||
<vn-label-value label="Relevancy"
|
<h4 translate>Basic data</h4>
|
||||||
value="{{$ctrl.summary.item.relevancy}}">
|
<vn-label-value label="Name"
|
||||||
</vn-label-value>
|
value="{{$ctrl.summary.item.name}}">
|
||||||
<vn-label-value label="Density"
|
</vn-label-value>
|
||||||
value="{{$ctrl.summary.item.density}}">
|
<vn-label-value label="Full name"
|
||||||
</vn-label-value>
|
value="{{$ctrl.summary.item.longName}}">
|
||||||
<vn-label-value label="Compression"
|
</vn-label-value>
|
||||||
value="{{$ctrl.summary.item.compression}}">
|
<vn-label-value label="Type"
|
||||||
</vn-label-value>
|
value="{{$ctrl.summary.item.itemType.name}}">
|
||||||
<vn-label-value label="Expence"
|
</vn-label-value>
|
||||||
value="{{$ctrl.summary.item.expence.name}}">
|
<vn-label-value label="Size"
|
||||||
</vn-label-value>
|
value="{{$ctrl.summary.item.itemType.size}}">
|
||||||
</vn-one>
|
</vn-label-value>
|
||||||
<vn-one margin-medium>
|
<vn-label-value label="Origin"
|
||||||
<vn-vertical name="tags">
|
value="{{$ctrl.summary.item.origin.name}}">
|
||||||
<h5 translate>Tags</h5>
|
</vn-label-value>
|
||||||
<vn-label-value label="{{tag.priority}} {{tag.tag.name}}" ng-repeat="tag in $ctrl.summary.tags track by tag.id"
|
<vn-label-value label="stems"
|
||||||
value="{{tag.value}}">
|
value="{{$ctrl.summary.item.origin.stems}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
</vn-vertical>
|
<vn-label-value label="Buyer"
|
||||||
</vn-one>
|
value="{{$ctrl.summary.item.itemType.worker.firstName}} {{$ctrl.summary.item.itemType.worker.name}}">
|
||||||
</vn-horizontal>
|
</vn-label-value>
|
||||||
<vn-horizontal>
|
</vn-one>
|
||||||
<vn-one margin-medium>
|
<vn-one name="otherData">
|
||||||
<vn-vertical name="tax">
|
<h4 translate>Other data</h4>
|
||||||
<h5 translate>Tax</h5>
|
<vn-label-value label="Intrastat code"
|
||||||
<vn-label-value label="{{tax.country.country}}" ng-repeat="tax in $ctrl.summary.item.taxes"
|
value="{{$ctrl.summary.item.intrastat.id}}">
|
||||||
value="{{tax.taxClass.description}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
<vn-label-value label="Intrastat"
|
||||||
</vn-vertical>
|
value="{{$ctrl.summary.item.intrastat.description}}">
|
||||||
</vn-one>
|
</vn-label-value>
|
||||||
<vn-one margin-medium>
|
<vn-label-value label="Reference"
|
||||||
<vn-vertical name="niche">
|
value="{{$ctrl.summary.item.comment}}">
|
||||||
<h5 translate>Niche</h5>
|
</vn-label-value>
|
||||||
<vn-label-value label="{{niche.warehouse.name}}" ng-repeat="niche in $ctrl.summary.niches"
|
<vn-label-value label="Relevancy"
|
||||||
value="{{niche.code}}">
|
value="{{$ctrl.summary.item.relevancy}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
</vn-vertical>
|
<vn-label-value label="Density"
|
||||||
</vn-one>
|
value="{{$ctrl.summary.item.density}}">
|
||||||
<vn-one margin-medium>
|
</vn-label-value>
|
||||||
<vn-vertical name="botanical">
|
<vn-label-value label="Compression"
|
||||||
<h5 translate>Botanical</h5>
|
value="{{$ctrl.summary.item.compression}}">
|
||||||
<vn-label-value label="Botanical"
|
</vn-label-value>
|
||||||
value="{{$ctrl.summary.botanical.botanical}}">
|
<vn-label-value label="Expence"
|
||||||
</vn-label-value>
|
value="{{$ctrl.summary.item.expence.name}}">
|
||||||
<vn-label-value label="Genus"
|
</vn-label-value>
|
||||||
value="{{$ctrl.summary.botanical.genus.latin_genus_name}}">
|
</vn-one>
|
||||||
</vn-label-value>
|
<vn-one name="tags">
|
||||||
<vn-label-value label="Specie"
|
<h4 translate>Tags</h4>
|
||||||
value="{{$ctrl.summary.botanical.specie.latin_species_name}}">
|
<vn-label-value
|
||||||
</vn-label-value>
|
label="{{tag.priority}} {{tag.tag.name}}"
|
||||||
</vn-vertical>
|
ng-repeat="tag in $ctrl.summary.tags.slice(3, 6) track by tag.id"
|
||||||
</vn-one>
|
value="{{tag.value}}">
|
||||||
<vn-one margin-medium>
|
</vn-label-value>
|
||||||
<vn-vertical name="barcode">
|
</vn-one>
|
||||||
<h5 translate>Barcode</h5>
|
<vn-one name="tax">
|
||||||
<p ng-repeat="barcode in $ctrl.summary.item.itemBarcode track by $index">
|
<h4 translate>Tax</h4>
|
||||||
<b>{{barcode.code}}</b>
|
<vn-label-value label="{{tax.country.country}}"
|
||||||
</p>
|
ng-repeat="tax in $ctrl.summary.item.taxes"
|
||||||
</vn-vertical>
|
value="{{tax.taxClass.description}}">
|
||||||
</vn-one>
|
</vn-label-value>
|
||||||
</vn-horizontal>
|
</vn-one>
|
||||||
</vn-vertical>
|
<vn-one name="niche">
|
||||||
|
<h4 translate>Niche</h4>
|
||||||
|
<vn-label-value label="{{niche.warehouse.name}}"
|
||||||
|
ng-repeat="niche in $ctrl.summary.niches"
|
||||||
|
value="{{niche.code}}">
|
||||||
|
</vn-label-value>
|
||||||
|
</vn-one>
|
||||||
|
<vn-one name="botanical">
|
||||||
|
<h4 translate>Botanical</h4>
|
||||||
|
<vn-label-value label="Botanical"
|
||||||
|
value="{{$ctrl.summary.botanical.botanical}}">
|
||||||
|
</vn-label-value>
|
||||||
|
<vn-label-value label="Genus"
|
||||||
|
value="{{$ctrl.summary.botanical.genus.latin_genus_name}}">
|
||||||
|
</vn-label-value>
|
||||||
|
<vn-label-value label="Specie"
|
||||||
|
value="{{$ctrl.summary.botanical.specie.latin_species_name}}">
|
||||||
|
</vn-label-value>
|
||||||
|
</vn-one>
|
||||||
|
<vn-one name="barcode">
|
||||||
|
<h4 translate>Barcode</h4>
|
||||||
|
<p ng-repeat="barcode in $ctrl.summary.item.itemBarcode track by $index">
|
||||||
|
<b>{{barcode.code}}</b>
|
||||||
|
</p>
|
||||||
|
</vn-one>
|
||||||
|
</vn-horizontal>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
vn-item-summary {
|
vn-item-summary {
|
||||||
p{
|
p {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -10,9 +10,10 @@ class Controller {
|
||||||
this.$translate = $translate;
|
this.$translate = $translate;
|
||||||
this.moreOptions = [
|
this.moreOptions = [
|
||||||
{callback: this.showAddTurnDialog, name: 'Add turn', show: true},
|
{callback: this.showAddTurnDialog, name: 'Add turn', show: true},
|
||||||
{callback: this.showDeleteTicketDialog, name: 'Delete ticket', show: true},
|
{callback: this.showDeleteTicketDialog, name: 'Delete ticket', show: true}/* ,
|
||||||
{callback: this.showAddStowaway, name: 'Add stowaway', show: true},
|
{callback: this.showAddStowaway, name: 'Add stowaway', show: true},
|
||||||
{callback: this.showRemoveStowaway, name: 'Remove stowaway', show: () => this.shouldShowRemoveStowaway()}
|
{callback: this.showRemoveStowaway, name: 'Remove stowaway', show: false}
|
||||||
|
*/
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -109,8 +110,7 @@ class Controller {
|
||||||
tooltip: 'Ship'
|
tooltip: 'Ship'
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
console.log(value.ship);
|
/*
|
||||||
|
|
||||||
if (value.ship.length == 1) {
|
if (value.ship.length == 1) {
|
||||||
links.btnThree = {
|
links.btnThree = {
|
||||||
icon: 'icon-polizon',
|
icon: 'icon-polizon',
|
||||||
|
|
@ -119,7 +119,7 @@ class Controller {
|
||||||
};
|
};
|
||||||
} else if (value.ship.length > 1)
|
} else if (value.ship.length > 1)
|
||||||
this.shipStowaways = value.ship;
|
this.shipStowaways = value.ship;
|
||||||
|
*/
|
||||||
this._quicklinks = links;
|
this._quicklinks = links;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,18 +70,14 @@
|
||||||
</vn-pagination>
|
</vn-pagination>
|
||||||
</div>
|
</div>
|
||||||
<a ui-sref="order.create" vn-bind="+" vn-tooltip="New order" fixed-bottom-right>
|
<a ui-sref="order.create" vn-bind="+" vn-tooltip="New order" fixed-bottom-right>
|
||||||
<vn-float-button icon="add"></vn-float-button>
|
<vn-float-button icon="add"></vn-float-button>
|
||||||
</a>
|
</a>
|
||||||
<vn-client-descriptor-popover vn-id="descriptor"></vn-client-descriptor-popover>
|
<vn-client-descriptor-popover
|
||||||
<vn-dialog class="dialog-summary"
|
vn-id="descriptor">
|
||||||
vn-id="order-summary-dialog">
|
</vn-client-descriptor-popover>
|
||||||
<tpl-body>
|
|
||||||
<vn-order-summary order="$ctrl.order"></vn-order-summary>
|
|
||||||
</tpl-body>
|
|
||||||
</vn-dialog>
|
|
||||||
<vn-dialog
|
<vn-dialog
|
||||||
vn-id="summary"
|
vn-id="summary"
|
||||||
class="dialog-summary summary">
|
class="dialog-summary">
|
||||||
<tpl-body>
|
<tpl-body>
|
||||||
<vn-order-summary order="$ctrl.selectedOrder"></vn-order-summary>
|
<vn-order-summary order="$ctrl.selectedOrder"></vn-order-summary>
|
||||||
</tpl-body>
|
</tpl-body>
|
||||||
|
|
|
||||||
|
|
@ -1,52 +1,45 @@
|
||||||
<vn-card class="summary ticketSummary" pad-medium>
|
<vn-card class="summary">
|
||||||
<vn-vertical margin-medium>
|
<h5>{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}} - {{$ctrl.summary.client.salesPerson.id}}</h5>
|
||||||
|
<vn-horizontal class="ticketSummary__data">
|
||||||
|
<vn-one>
|
||||||
|
<vn-label-value label="Id"
|
||||||
|
value="{{$ctrl.summary.id}}">
|
||||||
|
</vn-label-value>
|
||||||
|
<vn-label-value label="Nickname"
|
||||||
|
value="{{$ctrl.summary.address.nickname}}">
|
||||||
|
</vn-label-value>
|
||||||
|
<vn-label-value label="Confirmed"
|
||||||
|
value="{{$ctrl.summary.isConfirmed}}">
|
||||||
|
</vn-label-value>
|
||||||
|
<vn-label-value label="Warehouse"
|
||||||
|
value="{{$ctrl.summary.sourceApp}}">
|
||||||
|
</vn-label-value>
|
||||||
|
</vn-one>
|
||||||
|
<vn-one>
|
||||||
|
<vn-label-value label="Created"
|
||||||
|
value="{{$ctrl.summary.created | date: 'dd/MM/yyyy HH:mm'}}">
|
||||||
|
</vn-label-value>
|
||||||
|
<vn-label-value label="Confirmed"
|
||||||
|
value="{{$ctrl.summary.confirmed | date: 'dd/MM/yyyy'}}">
|
||||||
|
</vn-label-value>
|
||||||
|
<vn-label-value label="Address"
|
||||||
|
value="{{$ctrl.formattedAddress}}">
|
||||||
|
<vn-label-value label="Phone"
|
||||||
|
value="{{$ctrl.summary.address.phone}}">
|
||||||
|
</vn-label-value>
|
||||||
|
</vn-one>
|
||||||
|
<vn-one>
|
||||||
|
<vn-label-value label="{{'Notes'}}"
|
||||||
|
value="{{$ctrl.summary.note}}">
|
||||||
|
</vn-label-value>
|
||||||
|
</vn-one>
|
||||||
|
<vn-one class="taxes">
|
||||||
|
<p><vn-label translate>Subtotal</vn-label> {{$ctrl.summary.subTotal | currency:' €':2}}</p>
|
||||||
|
<p><vn-label translate>VAT</vn-label> {{$ctrl.summary.VAT | currency:' €':2}}</p>
|
||||||
|
<p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.summary.total | currency:' €':2}}</strong></p>
|
||||||
|
</vn-one>
|
||||||
<vn-auto>
|
<vn-auto>
|
||||||
<h5 text-center pad-small-v class="title">{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}} - {{$ctrl.summary.client.salesPerson.id}}</h5>
|
<div style="overflow: auto">
|
||||||
</vn-auto>
|
|
||||||
<vn-horizontal class="ticketSummary__data" pad-medium-v>
|
|
||||||
<vn-one>
|
|
||||||
<vn-label-value label="Id"
|
|
||||||
value="{{$ctrl.summary.id}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="Nickname"
|
|
||||||
value="{{$ctrl.summary.address.nickname}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="Confirmed"
|
|
||||||
value="{{$ctrl.summary.isConfirmed}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="Warehouse"
|
|
||||||
value="{{$ctrl.summary.sourceApp}}">
|
|
||||||
</vn-label-value>
|
|
||||||
</vn-one>
|
|
||||||
|
|
||||||
<vn-one>
|
|
||||||
<vn-label-value label="Created"
|
|
||||||
value="{{$ctrl.summary.created | date: 'dd/MM/yyyy HH:mm'}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="Confirmed"
|
|
||||||
value="{{$ctrl.summary.confirmed | date: 'dd/MM/yyyy'}}">
|
|
||||||
</vn-label-value>
|
|
||||||
<vn-label-value label="Address"
|
|
||||||
value="{{$ctrl.formattedAddress}}">
|
|
||||||
<vn-label-value label="Phone"
|
|
||||||
value="{{$ctrl.summary.address.phone}}">
|
|
||||||
</vn-label-value>
|
|
||||||
</vn-one>
|
|
||||||
|
|
||||||
<vn-one>
|
|
||||||
<vn-label-value label="{{'Notes'}}"
|
|
||||||
value="{{$ctrl.summary.note}}">
|
|
||||||
</vn-label-value>
|
|
||||||
</vn-one>
|
|
||||||
<vn-one class="ticketSummary__taxes">
|
|
||||||
<section>
|
|
||||||
<p><vn-label translate>Subtotal</vn-label> {{$ctrl.summary.subTotal | currency:' €':2}}</p>
|
|
||||||
<p><vn-label translate>VAT</vn-label> {{$ctrl.summary.VAT | currency:' €':2}}</p>
|
|
||||||
<p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.summary.total | currency:' €':2}}</strong></p>
|
|
||||||
</section>
|
|
||||||
</vn-one>
|
|
||||||
</vn-horizontal>
|
|
||||||
<vn-horizontal>
|
|
||||||
<table class="vn-grid">
|
<table class="vn-grid">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -86,9 +79,11 @@
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</vn-horizontal>
|
</div>
|
||||||
</vn-vertical>
|
</vn-auto>
|
||||||
|
</vn-horizontal>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
<vn-item-descriptor-popover vn-id="descriptor"
|
<vn-item-descriptor-popover
|
||||||
|
vn-id="descriptor"
|
||||||
quicklinks="$ctrl.quicklinks">
|
quicklinks="$ctrl.quicklinks">
|
||||||
</vn-item-descriptor-popover>
|
</vn-item-descriptor-popover>
|
||||||
|
|
|
||||||
|
|
@ -1,31 +1,14 @@
|
||||||
vn-dialog {
|
vn-order-summary .summary > div > vn-horizontal > vn-one {
|
||||||
vn-order-summary vn-one {
|
min-width: 10em !important;
|
||||||
min-width: 10em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.ticketSummary {
|
&.taxes {
|
||||||
.ticketSummary__data {
|
border: .1em solid #CCC;
|
||||||
vn-one {
|
text-align: right;
|
||||||
padding-right: 20px
|
padding: .5em !important;
|
||||||
}
|
|
||||||
|
|
||||||
vn-one:last-child {
|
& > p {
|
||||||
padding-right: 0
|
font-size: 1.2em;
|
||||||
}
|
margin: .2em;
|
||||||
}
|
|
||||||
|
|
||||||
.ticketSummary__notes {
|
|
||||||
max-width: 18em
|
|
||||||
}
|
|
||||||
|
|
||||||
.ticketSummary__taxes {
|
|
||||||
max-width: 15em;
|
|
||||||
|
|
||||||
& section {
|
|
||||||
border: 1px solid #CCC;
|
|
||||||
text-align: right;
|
|
||||||
padding: 10px
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -7,9 +7,9 @@ class Controller {
|
||||||
this.filter = {
|
this.filter = {
|
||||||
include: [
|
include: [
|
||||||
{relation: 'warehouse', scope: {fields: ['name']}},
|
{relation: 'warehouse', scope: {fields: ['name']}},
|
||||||
{relation: 'ship'},
|
// {relation: 'ship'},
|
||||||
{relation: 'agencyMode', scope: {fields: ['name']}},
|
{relation: 'agencyMode', scope: {fields: ['name']}},
|
||||||
{relation: 'stowaway'},
|
// {relation: 'stowaway'},
|
||||||
{
|
{
|
||||||
relation: 'client',
|
relation: 'client',
|
||||||
scope: {
|
scope: {
|
||||||
|
|
|
||||||
|
|
@ -1,59 +1,55 @@
|
||||||
<vn-card class="summary ticketSummary" pad-medium>
|
<vn-card class="summary">
|
||||||
<vn-vertical margin-medium>
|
<h5 >{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}} - {{$ctrl.summary.nickname}}</h5>
|
||||||
<vn-auto>
|
<vn-horizontal>
|
||||||
<h5 text-center pad-small-v class="title">{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}} - {{$ctrl.summary.nickname}}</h5>
|
<vn-one>
|
||||||
</vn-auto>
|
<vn-label-value label="State"
|
||||||
<vn-horizontal class="ticketSummary__data" pad-medium-v>
|
value="{{$ctrl.summary.state.state.name}}">
|
||||||
<vn-one>
|
</vn-label-value>
|
||||||
<vn-label-value label="State"
|
<vn-label-value label="Comercial Name"
|
||||||
value="{{$ctrl.summary.state.state.name}}">
|
value="{{$ctrl.summary.client.salesPerson.firstName}} {{$ctrl.summary.client.salesPerson.name}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Comercial Name"
|
<vn-label-value label="Agency"
|
||||||
value="{{$ctrl.summary.client.salesPerson.firstName}} {{$ctrl.summary.client.salesPerson.name}}">
|
value="{{$ctrl.summary.agencyMode.name}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Agency"
|
<vn-label-value label="Warehouse"
|
||||||
value="{{$ctrl.summary.agencyMode.name}}">
|
value="{{$ctrl.summary.warehouse.name}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Warehouse"
|
<vn-label-value label="Package size"
|
||||||
value="{{$ctrl.summary.warehouse.name}}">
|
value="{{$ctrl.summary.packages}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Package size"
|
</vn-one>
|
||||||
value="{{$ctrl.summary.packages}}">
|
<vn-one>
|
||||||
</vn-label-value>
|
<vn-label-value label="Shipped"
|
||||||
</vn-one>
|
value="{{$ctrl.summary.shipped | date: 'dd/MM/yyyy HH:mm'}}">
|
||||||
<vn-one>
|
</vn-label-value>
|
||||||
<vn-label-value label="Shipped"
|
<vn-label-value label="Landed"
|
||||||
value="{{$ctrl.summary.shipped | date: 'dd/MM/yyyy HH:mm'}}">
|
value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy'}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Landed"
|
<vn-label-value label="Route"
|
||||||
value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy'}}">
|
value="{{$ctrl.summary.routeFk}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Route"
|
<vn-label-value label="Address"
|
||||||
value="{{$ctrl.summary.routeFk}}">
|
value="{{$ctrl.formattedAddress}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Address"
|
<vn-label-value label="Phone"
|
||||||
value="{{$ctrl.formattedAddress}}">
|
value="{{$ctrl.summary.address.phone}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Phone"
|
</vn-one>
|
||||||
value="{{$ctrl.summary.address.phone}}">
|
<vn-one class="notes">
|
||||||
</vn-label-value>
|
<vn-label-value
|
||||||
</vn-one>
|
label="{{note.observationType.description}}"
|
||||||
<vn-one class="ticketSummary__notes">
|
ng-repeat="note in $ctrl.summary.notes track by note.id"
|
||||||
<vn-label-value label="{{note.observationType.description}}" ng-repeat="note in $ctrl.summary.notes track by note.id"
|
value="{{note.description}}">
|
||||||
value="{{note.description}}">
|
</vn-label-value>
|
||||||
</vn-label-value>
|
</vn-one>
|
||||||
</vn-one>
|
<vn-one class="taxes">
|
||||||
<vn-one class="ticketSummary__taxes">
|
<p><vn-label translate>Subtotal</vn-label> {{$ctrl.summary.subTotal | currency:' €':2}}</p>
|
||||||
<section>
|
<p><vn-label translate>VAT</vn-label> {{$ctrl.summary.VAT | currency:' €':2}}</p>
|
||||||
<p><vn-label translate>Subtotal</vn-label> {{$ctrl.summary.subTotal | currency:' €':2}}</p>
|
<p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.summary.total | currency:' €':2}}</strong></p>
|
||||||
<p><vn-label translate>VAT</vn-label> {{$ctrl.summary.VAT | currency:' €':2}}</p>
|
</vn-one>
|
||||||
<p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.summary.total | currency:' €':2}}</strong></p>
|
<vn-auto name="sales">
|
||||||
</section>
|
<h4 translate>Sale</h4>
|
||||||
</vn-one>
|
<div style="overflow: auto">
|
||||||
</vn-horizontal>
|
|
||||||
<vn-horizontal>
|
|
||||||
<vn-one margin-medium-v>
|
|
||||||
<h5 translate>Sale</h5>
|
|
||||||
<table class="vn-grid">
|
<table class="vn-grid">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -89,7 +85,7 @@
|
||||||
<span
|
<span
|
||||||
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
|
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
|
||||||
class="link" pointer>
|
class="link" pointer>
|
||||||
{{("000000"+sale.itemFk).slice(-6)}}
|
{{sale.itemFk | zeroFill:6}}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td><vn-fetched-tags max-length="6" item="sale.item"/></td>
|
<td><vn-fetched-tags max-length="6" item="sale.item"/></td>
|
||||||
|
|
@ -103,11 +99,11 @@
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</vn-one>
|
</div>
|
||||||
</vn-horizontal>
|
</vn-auto>
|
||||||
<vn-horizontal>
|
<vn-one ng-if="$ctrl.summary.packagings.length != 0">
|
||||||
<vn-one margin-medium-v ng-if="$ctrl.summary.packagings.length != 0">
|
<h4 translate>Packages</h4>
|
||||||
<h5 translate>Packages</h5>
|
<div style="overflow: auto">
|
||||||
<vn-table model="model">
|
<vn-table model="model">
|
||||||
<vn-thead>
|
<vn-thead>
|
||||||
<vn-tr>
|
<vn-tr>
|
||||||
|
|
@ -127,9 +123,11 @@
|
||||||
No results
|
No results
|
||||||
</vn-empty-rows>
|
</vn-empty-rows>
|
||||||
</vn-table>
|
</vn-table>
|
||||||
</vn-one>
|
</div>
|
||||||
<vn-one margin-medium ng-if="$ctrl.summary.services.length != 0">
|
</vn-one>
|
||||||
<h5 translate>Service</h5>
|
<vn-one ng-if="$ctrl.summary.services.length != 0">
|
||||||
|
<h4 translate>Service</h4>
|
||||||
|
<div style="overflow: auto">
|
||||||
<vn-table model="model">
|
<vn-table model="model">
|
||||||
<vn-thead>
|
<vn-thead>
|
||||||
<vn-tr>
|
<vn-tr>
|
||||||
|
|
@ -153,11 +151,11 @@
|
||||||
No results
|
No results
|
||||||
</vn-empty-rows>
|
</vn-empty-rows>
|
||||||
</vn-table>
|
</vn-table>
|
||||||
</vn-one>
|
</div>
|
||||||
</vn-horizontal>
|
</vn-one>
|
||||||
<vn-horizontal ng-if="$ctrl.summary.requests.length != 0">
|
<vn-auto ng-if="$ctrl.summary.requests.length != 0">
|
||||||
<vn-one margin-medium-v>
|
<h4 translate>Purchase request</h4>
|
||||||
<h5 translate>Purchase request</h5>
|
<div style="overflow: auto">
|
||||||
<vn-table model="model">
|
<vn-table model="model">
|
||||||
<vn-thead>
|
<vn-thead>
|
||||||
<vn-tr>
|
<vn-tr>
|
||||||
|
|
@ -199,10 +197,11 @@
|
||||||
No results
|
No results
|
||||||
</vn-empty-rows>
|
</vn-empty-rows>
|
||||||
</vn-table>
|
</vn-table>
|
||||||
</vn-one>
|
</div>
|
||||||
</vn-horizontal>
|
</vn-auto>
|
||||||
</vn-vertical>
|
|
||||||
</vn-card>
|
</vn-card>
|
||||||
<vn-item-descriptor-popover vn-id="descriptor"
|
<vn-item-descriptor-popover
|
||||||
|
vn-id="descriptor"
|
||||||
quicklinks="$ctrl.quicklinks">
|
quicklinks="$ctrl.quicklinks">
|
||||||
</vn-item-descriptor-popover>
|
</vn-item-descriptor-popover>
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,14 @@
|
||||||
.ticketSummary {
|
vn-ticket-summary .summary > div > vn-horizontal > vn-one {
|
||||||
.ticketSummary__data {
|
min-width: 10em !important;
|
||||||
vn-one {
|
|
||||||
padding-right: 20px
|
|
||||||
}
|
|
||||||
|
|
||||||
vn-one:last-child {
|
&.taxes {
|
||||||
padding-right: 0
|
border: .1em solid #CCC;
|
||||||
}
|
text-align: right;
|
||||||
}
|
padding: .5em !important;
|
||||||
|
|
||||||
.ticketSummary__notes {
|
& > p {
|
||||||
max-width: 18em
|
font-size: 1.2em;
|
||||||
}
|
margin: .2em;
|
||||||
|
|
||||||
.ticketSummary__taxes {
|
|
||||||
max-width: 15em;
|
|
||||||
|
|
||||||
& section {
|
|
||||||
border: 1px solid #CCC;
|
|
||||||
text-align: right;
|
|
||||||
padding: 10px
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
"module": "travel",
|
"module": "travel",
|
||||||
"name": "Travels",
|
"name": "Travels",
|
||||||
"icon": "icon-travels",
|
|
||||||
"validations": true,
|
"validations": true,
|
||||||
"routes": [
|
"routes": [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue