diff --git a/front/core/components/calendar/index.html b/front/core/components/calendar/index.html index 4291af674..2a5f369fb 100644 --- a/front/core/components/calendar/index.html +++ b/front/core/components/calendar/index.html @@ -1,9 +1,11 @@
- @@ -13,7 +15,9 @@ - diff --git a/front/core/components/table/index.html b/front/core/components/table/index.html index 281c6866c..b0a63bdf3 100644 --- a/front/core/components/table/index.html +++ b/front/core/components/table/index.html @@ -1 +1,8 @@ -
\ No newline at end of file +
+ + Enter a new search + + + No results + +
\ No newline at end of file diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss index 58cce2a08..f05c6f4e1 100644 --- a/front/core/components/table/style.scss +++ b/front/core/components/table/style.scss @@ -1,4 +1,5 @@ @import "effects"; +@import "variables"; vn-table { display: block; @@ -10,55 +11,49 @@ vn-table { display: table; border-collapse: collapse; - vn-thead { + & > vn-thead { display: table-header-group; + border-bottom: .15em solid $color-spacer; vn-th[field] { position: relative; - cursor: pointer - } - vn-th[field] > * { - padding-right: 20px - } - vn-th[field] > :after { - font-family: 'Material Icons'; - content: 'arrow_drop_down'; - position: absolute; - padding-left: 2px; - color: $color-spacer; - opacity: 0 - } - vn-th[field] > :hover:after { - opacity: 1 - } - vn-th[field].active > :after { - color: $color-font; - opacity: 1 - } - vn-th[field].desc > :after { - content: 'arrow_drop_down'; - } - vn-th[field].asc > :after { - content: 'arrow_drop_up'; + overflow: visible; + cursor: pointer; + + &.active > :after { + color: $color-font; + opacity: 1; + } + &.desc > :after { + content: 'arrow_drop_down'; + } + &.asc > :after { + content: 'arrow_drop_up'; + } + & > :after { + font-family: 'Material Icons'; + content: 'arrow_drop_down'; + position: absolute; + color: $color-spacer; + opacity: 0; + } + &:hover > :after { + opacity: 1; + } } } - vn-tbody { - display: table-row-group + & > vn-tbody { + display: table-row-group; } - vn-tfoot { + & > vn-tfoot { + border-top: .15em solid $color-spacer; display: table-footer-group } vn-tr, a.vn-tr { display: table-row } - vn-empty-rows { - display: table-caption; - caption-side: bottom; - text-align: center; - padding: 10px - } vn-thead, vn-tbody, vn-tfoot { - vn-tr, a.vn-tr { + & > * { display: table-row; vn-th { @@ -68,7 +63,11 @@ vn-table { vertical-align: middle; display: table-cell; text-align: left; - padding: 10px; + padding: .6em .5em; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 6em; &[number] { text-align: right; @@ -76,41 +75,87 @@ vn-table { &[center] { text-align: center; } + &[shrink] { + width: 1px; + text-align: center; + } + &[expand] { + max-width: 40em; + min-width: 0; + } vn-icon.bright, i.bright { color: #f7931e; } } + vn-th { + font-weight: bold; + padding-top: 1em; + padding-bottom: .8em; + } + & > :last-child { + padding-right: 1em; + } + & > :first-child { + padding-left: 1em; + } } a.vn-tr { color: inherit; } } - vn-thead, vn-tbody, vn-empty-rows { - border-bottom: 3px solid $color-spacer; - } - vn-tbody > vn-tr, vn-tbody > a.vn-tr{ - border-bottom: 1px solid $color-spacer; - transition: background-color 200ms ease-in-out; + vn-tbody > * { + border-bottom: .1em solid $color-spacer-light; + &, + & > vn-td, + & > vn-td > .chip { + transition: background-color 200ms ease-in-out; + } + &:last-child { + border-bottom: none; + } &.clickable { @extend %clickable; } - &.success, & > vn-td.success, & > vn-td-editable.success { - background-color: rgba(163, 209, 49, 0.3); - - &:hover { - background-color: rgba(163, 209, 49, 0.5); - } + & > vn-td > .chip { + padding: .3em; + border-radius: .3em; } - &.warning, & > vn-td.warning, & > vn-td-editable.warning { - background-color: rgba(247, 147, 30, 0.3); - - &:hover { - background-color: rgba(247, 147, 30, 0.5); - } + &.notice, + & > .notice, + & > vn-td > .notice { + color: white; + background-color: $color-notice; + } + &.success, + & > .success, + & > vn-td > .success { + color: white; + background-color: $color-success; + } + &.warning, + & > .warning, + & > vn-td > .warning { + color: white; + background-color: $color-main; + } + &.alert, + & > .alert, + & > vn-td > .alert { + color: white; + background-color: $color-alert; } } } + vn-empty-rows { + display: table-caption; + caption-side: bottom; + text-align: center; + padding: 1.5em; + width: 100%; + box-sizing: border-box; + color: $color-font-secondary; + } vn-autocomplete { div.mdl-textfield { padding: 0px !important; diff --git a/front/core/components/th/index.html b/front/core/components/th/index.html index 5f2b7bac6..3d3293b27 100644 --- a/front/core/components/th/index.html +++ b/front/core/components/th/index.html @@ -1,3 +1,3 @@ -
+
\ No newline at end of file diff --git a/front/core/components/th/index.js b/front/core/components/th/index.js index 4b3716080..76778ae86 100644 --- a/front/core/components/th/index.js +++ b/front/core/components/th/index.js @@ -4,9 +4,10 @@ export default class Th { constructor($element) { this._order = 'ASC'; this.column = $element[0]; + $element.on('click', () => this.onToggleOrder()); } -/** + /** * Changes the order if the cell has a field and defaultOrder property */ $onInit() { @@ -31,46 +32,46 @@ export default class Th { return this.column.getAttribute('field'); } -/** + /** * Toggle order ASC/DESC */ toggleOrder() { - if (this.order === 'ASC') { + if (this.order === 'ASC') this.order = 'DESC'; - } else { + else this.order = 'ASC'; - } + } -/** + /** * Applies a new filter order to the model and * updates the cell arrow */ onToggleOrder() { if (!this.field) return; - if (this.table.field == this.field) { + if (this.table.field == this.field) this.toggleOrder(); - } else { + else this.table.setOrder(this.field, this.order); - } + this.updateArrow(); this.table.applyOrder(this.field, this.order); } -/** + /** * Set cell class to asc/desc */ updateArrow() { this.column.classList.remove('asc', 'desc'); - if (this.order === 'DESC') { + if (this.order === 'DESC') this.column.classList.add('desc'); - } else { + else this.column.classList.add('asc'); - } + } } diff --git a/front/salix/styles/misc.scss b/front/salix/styles/misc.scss index d377fc5a4..d0b3ff02f 100644 --- a/front/salix/styles/misc.scss +++ b/front/salix/styles/misc.scss @@ -18,15 +18,16 @@ input[type=reset]::-moz-focus-inner { -ms-user-select: none; user-select: none; } -a { + +a , .link{ color: $color-main; text-decoration: none; } .link { - text-decoration: underline; cursor: pointer; - &:hover{ - color: $color-main!important; + + &:hover { + text-decoration: underline; } } @@ -206,15 +207,10 @@ fieldset[disabled] .mdl-textfield .mdl-textfield__label, .counter { @extend %active; - display: inline-block; - text-align: center; - border-radius: 3px; - min-width: 1.5em; - padding: 5px -} -.counter.small { - font-size: 0.7em + &.small { + font-size: 0.7em + } } .vn-grid { diff --git a/front/salix/styles/variables.scss b/front/salix/styles/variables.scss index 29d83a5d0..3bb607fb8 100644 --- a/front/salix/styles/variables.scss +++ b/front/salix/styles/variables.scss @@ -39,6 +39,7 @@ $color-success: #a3d131; $color-notice: #32b1ce; $color-alert: #f42121; $color-spacer: #9b9b9b; +$color-spacer-light: #ddd; $color-input-underline: rgba(0, 0, 0, .12); $color-shadow: rgba(0, 0, 0, .2); $color-hightlight: rgba(0, 0, 0, .15); @@ -71,6 +72,7 @@ $color-success: #a3d131; $color-notice: #32b1ce; $color-alert: #f42121; $color-spacer: #9b9b9b; +$color-spacer-light: #ddd; $color-input-underline: rgba(255, 255, 255, .12); $color-shadow: rgba(0, 0, 0, .2); $color-hightlight: rgba(255, 255, 255, .15); diff --git a/modules/agency/front/index/index.html b/modules/agency/front/index/index.html index 9ee708672..f1b866843 100644 --- a/modules/agency/front/index/index.html +++ b/modules/agency/front/index/index.html @@ -17,7 +17,7 @@
- + @@ -47,9 +47,6 @@ - - Enter a new search - @@ -61,7 +58,6 @@ - \ No newline at end of file diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html index 8ca94e9a2..7b8042d6a 100644 --- a/modules/claim/front/action/index.html +++ b/modules/claim/front/action/index.html @@ -43,21 +43,23 @@ Id Destination - Landed + Landed Quantity - Description + Description Price Disc. Total - + - {{("000000"+saleClaimed.sale.itemFk).slice(-6)}} + class="link"> + {{saleClaimed.sale.itemFk | zeroFill:6}} @@ -72,18 +74,16 @@ on-change="$ctrl.setClaimDestination(saleClaimed.id, value)"> - {{saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} {{saleClaimed.sale.quantity}} - {{saleClaimed.sale.concept}} + {{saleClaimed.sale.concept}} {{saleClaimed.sale.price | currency: 'EUR':2}} {{saleClaimed.sale.discount}} % - {{(saleClaimed.sale.quantity * saleClaimed.sale.price) - - ((saleClaimed.sale.discount * - (saleClaimed.sale.quantity * saleClaimed.sale.price))/100) | currency: 'EUR':2 - }} + {{saleClaimed.sale.quantity * saleClaimed.sale.price * + ((100 - saleClaimed.sale.discount) / 100) | currency: 'EUR':2}} - + - - No results - @@ -114,43 +111,40 @@ --> - +

Claimable sales from ticket

{{$ctrl.claim.ticketFk}}

Id - Landed + Landed Quantity - Description + Description Price Disc. Total - + {{sale.saleFk}} - {{sale.landed | dateTime: 'dd/MM/yyyy'}} + {{sale.landed | dateTime: 'dd/MM/yyyy'}} {{sale.quantity}} - {{sale.concept}} + {{sale.concept}} {{sale.price | currency: 'EUR':2}} {{sale.discount}} % - {{(sale.quantity * sale.price) - ((sale.discount * (sale.quantity * sale.price))/100) | currency: 'EUR':2}} + {{sale.quantity * sale.price * ((100 - sale.discount) * / 100) | currency: 'EUR':2}} - - No results - - - + class="clickable" + ng-repeat="ticket in lastTickets" + ng-click="$ctrl.importTicketLines(ticket.id)"> {{::ticket.id}} {{::ticket.shipped | date: 'dd/MM/yyyy'}} {{::ticket.agencyMode.name}} @@ -183,6 +177,7 @@
- + \ No newline at end of file diff --git a/modules/claim/front/detail/index.html b/modules/claim/front/detail/index.html index 40b7f9c10..f64009e99 100644 --- a/modules/claim/front/detail/index.html +++ b/modules/claim/front/detail/index.html @@ -23,13 +23,14 @@ Id - Landed + Landed Quantity - Claimed + Claimed Description Price Disc. Total + @@ -37,13 +38,13 @@ + class="link"> {{::saleClaimed.sale.itemFk | zeroFill:6}} - {{::saleClaimed.sale.ticket.landed | dateTime:'dd/MM/yyyy'}} + {{::saleClaimed.sale.ticket.landed | dateTime:'dd/MM/yyyy'}} {{::saleClaimed.sale.quantity}} - + - {{::saleClaimed.sale.concept}} + {{::saleClaimed.sale.concept}} {{::saleClaimed.sale.price | currency: 'EUR':2}} {{::saleClaimed.sale.discount}} % {{::$ctrl.getSaleTotal(saleClaimed.sale) | currency: 'EUR':2}} - + - - No results - diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html index 271bb862e..69b191ad0 100644 --- a/modules/claim/front/index/index.html +++ b/modules/claim/front/index/index.html @@ -18,13 +18,13 @@ - + Id Client - Created + Created Worker State @@ -36,15 +36,19 @@ class="{{::$ctrl.compareDate(ticket.shipped)}} clickable vn-tr searchResult" ui-sref="claim.card.summary({id: claim.id})"> {{::claim.id}} - + {{::claim.client.name}} - {{::claim.created | date:'dd/MM/yyyy'}} - {{::claim.worker.user.nickname}} - {{::claim.claimState.description}} + {{::claim.created | date:'dd/MM/yyyy'}} + {{::claim.worker.user.nickname}} + + {{::claim.claimState.description}} + + + - {{("000000"+saleClaimed.sale.itemFk).slice(-6)}} + class="link"> + {{saleClaimed.sale.itemFk | zeroFill:6}} {{saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} {{saleClaimed.sale.quantity}} {{saleClaimed.quantity}} - {{saleClaimed.sale.concept}} + {{saleClaimed.sale.concept}} {{saleClaimed.sale.price | currency: 'EUR':2}} {{saleClaimed.sale.discount}} % - {{(saleClaimed.sale.quantity * saleClaimed.sale.price) - - ((saleClaimed.sale.discount * - (saleClaimed.sale.quantity * saleClaimed.sale.price))/100) | currency: 'EUR':2 - }} + {{saleClaimed.sale.quantity * saleClaimed.sale.price * + ((100 - saleClaimed.sale.discount) / 100) | currency: 'EUR':2}} - - No results - @@ -99,9 +94,6 @@ {{development.claimRedelivery.description}} - - No results - @@ -110,10 +102,10 @@ Id - Destination + Destination Landed Quantity - Description + Description Price Disc. Total @@ -124,28 +116,23 @@ - {{("000000"+action.sale.itemFk).slice(-6)}} + class="link"> + {{action.sale.itemFk | zeroFill:6}} {{action.sale.id}} - {{action.claimBeggining.description}} + {{action.claimBeggining.description}} {{action.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} {{action.sale.quantity}} - {{action.sale.concept}} + {{action.sale.concept}} {{action.sale.price}} {{action.sale.discount}} % - {{(action.sale.quantity * action.sale.price) - - ((action.sale.discount * - (action.sale.quantity * action.sale.price))/100) | currency: 'EUR':2 - }} + {{action.sale.quantity * action.sale.price * + ((100 - action.sale.discount) / 100) | currency: 'EUR':2}} - - No results - diff --git a/modules/client/front/address/edit/index.html b/modules/client/front/address/edit/index.html index 79aa713a9..ea5aedde4 100644 --- a/modules/client/front/address/edit/index.html +++ b/modules/client/front/address/edit/index.html @@ -91,7 +91,6 @@ + data="sales" + auto-load="false"> - - - - - - - - - Date - Id - State - Reference - Client - In - Out - Balance - - - - - - {{::sale.date | date:'dd/MM/yyyy' }} - - - - {{::sale.origin | dashIfEmpty}} - - - {{::sale.stateName | dashIfEmpty}} - {{::sale.reference | dashIfEmpty}} - - - {{::sale.name | dashIfEmpty}} - - - {{::sale.in | dashIfEmpty}} - {{::sale.out | dashIfEmpty}} - - - {{::sale.balance | dashIfEmpty}} - - - - - - No results - - - + + + + + + + + + Date + Id + State + Reference + Client + In + Out + Balance + + + + + + + {{::sale.date | date:'dd/MM/yyyy' }} + + + + + {{::sale.origin | dashIfEmpty}} + + + {{::sale.stateName | dashIfEmpty}} + {{::sale.reference | dashIfEmpty}} + + + {{::sale.name | dashIfEmpty}} + + + {{::sale.in | dashIfEmpty}} + {{::sale.out | dashIfEmpty}} + + + {{::sale.balance | dashIfEmpty}} + + + + + + - \ No newline at end of file diff --git a/modules/item/front/diary/style.scss b/modules/item/front/diary/style.scss index 34a68712c..e8d261ec2 100644 --- a/modules/item/front/diary/style.scss +++ b/modules/item/front/diary/style.scss @@ -4,23 +4,22 @@ vn-item-diary { & > vn-vertical { display: block; } - & vn-horizontal { + vn-horizontal { justify-content: center; } - & vn-autocomplete > div{ + vn-autocomplete > div { width: 400px; } .balanceNegative .balance { color: $color-alert; - font-weight: bold; } .isIn .in { color: $color-success; font-weight: bold; } - .isToday .date{ - background-color: rgba(247, 147, 30, 0.5); - font-weight: bold; + .isToday .date { + color: white; + background-color: $color-main; } .truncate { max-width: 250px; diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html index bca5b8177..8d921e118 100644 --- a/modules/item/front/last-entries/index.html +++ b/modules/item/front/last-entries/index.html @@ -2,70 +2,72 @@ vn-id="model" url="/item/api/Items/getLastEntries" filter="::$ctrl.filter" - data="entries" auto-load="false"> + data="entries" + auto-load="false"> - - - - - - - - - Ig - Warehouse - Landed - Entry - P.P.U - P.P.P - Label - Packing - Grouping - Stems - Quantity - Cost - Cube - Provider - - - - - - - - - {{entry.warehouse| dashIfEmpty}} - {{entry.landed | date:'dd/MM/yyyy HH:mm'}} - {{entry.entryFk | dashIfEmpty}} - {{entry.price2 | dashIfEmpty}} - {{entry.price3 | dashIfEmpty}} - {{entry.stickers | dashIfEmpty}} - -
{{entry.packing | dashIfEmpty}}
- - - {{entry.grouping | dashIfEmpty}} - - {{entry.stems | dashIfEmpty}} - {{entry.quantity}} - {{entry.buyingValue | dashIfEmpty}} - {{entry.packageFk | dashIfEmpty}} - {{entry.supplier | dashIfEmpty}} - - - - No results - - + + + + + + + + + Ig + Warehouse + Landed + Entry + P.P.U + P.P.P + Label + Packing + Grouping + Stems + Quantity + Cost + Cube + Provider + + + + + + + + + {{entry.warehouse| dashIfEmpty}} + {{entry.landed | date:'dd/MM/yyyy HH:mm'}} + {{entry.entryFk | dashIfEmpty}} + {{entry.price2 | dashIfEmpty}} + {{entry.price3 | dashIfEmpty}} + {{entry.stickers | dashIfEmpty}} + + + {{entry.packing | dashIfEmpty}} + + + + + {{entry.grouping | dashIfEmpty}} + + + {{entry.stems | dashIfEmpty}} + {{entry.quantity}} + {{entry.buyingValue | dashIfEmpty}} + {{entry.packageFk | dashIfEmpty}} + {{entry.supplier | dashIfEmpty}} + + + diff --git a/modules/order/front/catalog/index.html b/modules/order/front/catalog/index.html index 819afca79..8fda4bd70 100644 --- a/modules/order/front/catalog/index.html +++ b/modules/order/front/catalog/index.html @@ -43,7 +43,7 @@ + on-error-src/> diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index 8d7d2cf95..e3680cd4b 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -17,41 +17,41 @@ - + - Id + Id Client Sales person - Confirmed + Confirmed Created from - Created - Landed + Created + Landed Company - {{::order.id}} - + {{::order.id}} + {{::order.client.name}} {{::order.client.salesPerson.user.nickname}} - + {{::order.sourceApp}} - {{::order.created | date:'dd/MM/yyyy HH:mm'}} - {{::order.landed | date:'dd/MM/yyyy'}} + {{::order.created | date:'dd/MM/yyyy HH:mm'}} + {{::order.landed | date:'dd/MM/yyyy'}} {{::order.company.code}} - +
- Subtotal - {{$ctrl.subtotal | currency: 'EUR':2}} + Subtotal + {{$ctrl.subtotal | currency: 'EUR':2}}

VAT {{$ctrl.VAT | currency: 'EUR':2}}

- Total - {{$ctrl.order.total | currency: 'EUR':2}} + Total + {{$ctrl.order.total | currency: 'EUR':2}}
- Item - ID + + Id Description Warehouse Shipped @@ -32,26 +32,26 @@ - + - + - {{("000000"+row.itemFk).slice(-6)}} + class="link"> + {{row.itemFk | zeroFill:6}} - + {{row.warehouse.name}} {{row.shipped | date: 'dd/MM/yyyy'}} {{row.quantity}} {{row.price | currency: 'EUR':2}} - + - - No results - @@ -74,11 +71,9 @@ - - Total {{$ctrl.summary.total | currency: 'EUR':2}}

- - - - - - - - - - - - - - - - - - - - - - - - + + + {{::row.quantity}} + {{::row.price | currency: 'EUR':2}} + {{::row.quantity * row.price | currency: 'EUR':2}} + +
ItemDescriptionQuantityPriceAmount
+ + + + + Item + Description + Quantity + Price + Amount + + + + + - + + - {{("000000"+row.itemFk).slice(-6)}} + class="link"> + {{row.itemFk | zeroFill:6}} - {{::row.quantity}}{{::row.price | currency: 'EUR':2}}{{::row.quantity * row.price | currency: 'EUR':2}}
No results
diff --git a/modules/order/front/volume/index.html b/modules/order/front/volume/index.html index b8d1789da..c06642836 100644 --- a/modules/order/front/volume/index.html +++ b/modules/order/front/volume/index.html @@ -34,7 +34,7 @@ + class="link"> {{::row.itemFk}} diff --git a/modules/ticket/front/component/index.html b/modules/ticket/front/component/index.html index d6cc4e240..165d3addb 100644 --- a/modules/ticket/front/component/index.html +++ b/modules/ticket/front/component/index.html @@ -8,78 +8,76 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ItemDescriptionQuantitySerieComponentsImportTotal import
- Base {{$ctrl.base() | currency: 'EUR':3}} -
- Margin {{$ctrl.profitMargin() | currency: 'EUR':3}} -
- Total {{$ctrl.total() | currency: 'EUR':3}} -
- - {{("000000"+sale.itemFk).slice(-6)}} - - {{::sale.quantity}}
{{::component.componentRate.componentType.type}}{{::component.componentRate.name}}{{::component.value | currency: 'EUR':3}}{{::sale.quantity * component.value | currency: 'EUR':3}}
No results
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ItemDescriptionQuantitySerieComponentsImportTotal import
+ Base {{$ctrl.base() | currency: 'EUR':3}} +
+ Margin {{$ctrl.profitMargin() | currency: 'EUR':3}} +
+ Total {{$ctrl.total() | currency: 'EUR':3}} +
+ + {{sale.itemFk | zeroFill:6}} + + + + + {{::sale.quantity}} +
+ {{::component.componentRate.componentType.type}} + + {{::component.componentRate.name}} + + {{::component.value | currency: 'EUR':3}} + + {{::sale.quantity * component.value | currency: 'EUR':3}} +
No results
+ - \ No newline at end of file diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html index 681889fd6..1adb2ae04 100644 --- a/modules/ticket/front/expedition/index.html +++ b/modules/ticket/front/expedition/index.html @@ -1,4 +1,5 @@ - {{expedition.itemFk | zeroFill:6}} @@ -44,9 +45,6 @@ {{::expedition.created | date:'dd/MM/yyyy HH:mm'}} - - No results - diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index 9d36ea8ef..6e2038ea6 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -10,13 +10,12 @@
- - - - + +
- + @@ -48,21 +47,26 @@ - - - + + {{::ticket.id}} {{::ticket.userNickname | dashIfEmpty}} - - {{::ticket.shipped | dateTime: 'dd/MM/yyyy'}} + + + {{::ticket.shipped | dateTime: 'dd/MM/yyyy'}} + {{::ticket.shipped | dateTime: 'HH:mm'}} - + @@ -70,11 +74,15 @@ {{::ticket.province}} - {{::ticket.state}} + + + {{::ticket.state}} + + {{::ticket.agencyMode}} {{::ticket.warehouse}} {{::ticket.total | currency: 'EUR': 2}} - + - - No results - - - Enter a new search - diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js index 89e8f25d2..ab65c702d 100644 --- a/modules/ticket/front/index/index.js +++ b/modules/ticket/front/index/index.js @@ -79,13 +79,13 @@ export default class Controller { stateColor(ticket) { if (ticket.alertLevelCode === 'OK') - return 'alertOk'; + return 'success'; else if (ticket.alertLevelCode === 'FREE') - return 'alertFree'; + return 'notice'; else if (ticket.alertLevel === 1) - return 'alert1'; + return 'warning'; else if (ticket.alertLevel === 0) - return 'alert0'; + return 'alert'; } showDescriptor(event, clientFk) { diff --git a/modules/ticket/front/index/style.scss b/modules/ticket/front/index/style.scss index 7e64180f8..2ad2ad042 100644 --- a/modules/ticket/front/index/style.scss +++ b/modules/ticket/front/index/style.scss @@ -11,30 +11,34 @@ vn-ticket-index{ } .alert1 { + color: white; background-color: $color-main-light; - &:hover { - background-color: $color-main-medium; - } + } + vn-tr:hover .alert1 { + background-color: $color-main-medium; } .alertOk { + color: white; background-color: $color-success-light; - &:hover { - background-color: $color-success-medium; - } + } + vn-tr:hover .alertOk { + background-color: $color-success-medium; } .alertFree { + color: white; background-color: $color-notice-light; - &:hover { - background-color: $color-notice-medium; - } + } + vn-tr:hover .alertFree { + background-color: $color-notice-medium; } .alert0 { + color: white; background-color: $color-alert-light; - &:hover { - background-color: $color-alert-medium; - } + } + vn-tr:hover .alert0 { + background-color: $color-alert-medium; } } \ No newline at end of file diff --git a/modules/ticket/front/note/index.html b/modules/ticket/front/note/index.html index eafe0173e..ce177b4cb 100644 --- a/modules/ticket/front/note/index.html +++ b/modules/ticket/front/note/index.html @@ -46,7 +46,7 @@ + on-error-src/> diff --git a/modules/ticket/front/request/index/index.html b/modules/ticket/front/request/index/index.html index ff2b3c8d1..9b7cdfe68 100644 --- a/modules/ticket/front/request/index/index.html +++ b/modules/ticket/front/request/index/index.html @@ -1,4 +1,5 @@ -
- - - - - Id - Description - Created - Requester - Atender - Quantity - Price - Sale id - Ok - - - - - {{::request.id}} - {{::request.description}} - {{::request.created | dateTime: 'dd/MM/yyyy'}} - {{::request.requester.user.nickname}} - {{::request.atender.user.nickname}} - {{::request.quantity}} - {{::request.price | currency: 'EUR': 2}} - - - {{("000000"+request.saleFk).slice(-6)}} - - - - - - - - - - - - - - No results - - - + + + + + Id + Description + Created + Requester + Atender + Quantity + Price + Sale id + Ok + + + + + {{::request.id}} + {{::request.description}} + {{::request.created | dateTime: 'dd/MM/yyyy'}} + {{::request.requester.user.nickname}} + {{::request.atender.user.nickname}} + {{::request.quantity}} + {{::request.price | currency: 'EUR': 2}} + + + {{request.saleFk | zeroFill:6}} + + + + + + + + + + + + + + - + - - + \ No newline at end of file diff --git a/modules/ticket/front/sale-checked/index.html b/modules/ticket/front/sale-checked/index.html index 91ca333cb..4ba6caf7c 100644 --- a/modules/ticket/front/sale-checked/index.html +++ b/modules/ticket/front/sale-checked/index.html @@ -29,8 +29,8 @@ - {{("000000"+sale.itemFk).slice(-6)}} + class="link"> + {{sale.itemFk | zeroFill:6}} diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html index b19a1a74e..182cf0793 100644 --- a/modules/ticket/front/sale-tracking/index.html +++ b/modules/ticket/front/sale-tracking/index.html @@ -33,8 +33,8 @@ - {{("000000"+sale.itemFk).slice(-6)}} + class="link"> + {{sale.itemFk | zeroFill:6}} diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index c804357bf..aa1881752 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -103,11 +103,13 @@ + class="link"> {{::sale.itemFk | zeroFill:6}} - + + + {{sale.quantity}} {{sale.price | currency: 'EUR':2}} @@ -131,7 +132,6 @@ ng-if="$ctrl.isEditable" class="link" ng-click="$ctrl.showEditPopover($event, sale)" - pointer vn-tooltip="Edit discount"> {{sale.discount}} %
@@ -241,14 +241,12 @@ type="number"> diff --git a/modules/ticket/front/services/index.html b/modules/ticket/front/services/index.html index 7f4ffd900..797a8ace6 100644 --- a/modules/ticket/front/services/index.html +++ b/modules/ticket/front/services/index.html @@ -51,8 +51,7 @@ - + class="link"> {{sale.itemFk | zeroFill:6}} - + {{::sale.quantity}} {{::sale.price | currency: 'EUR':2}} {{::sale.discount}} % {{::sale.quantity * sale.price | currency: 'EUR':2}} - - No results - @@ -117,9 +114,6 @@ {{package.quantity}} - - No results - @@ -137,15 +131,12 @@ {{::service.id}} - {{::service.description}} + {{::service.description}} {{::service.quantity}} {{::service.price}} {{::service.taxClass.description}} - - No results - @@ -165,7 +156,7 @@ - {{::request.description}} + {{::request.description}} {{::request.created | dateTime: 'dd/MM/yyyy'}} {{::request.requester.user.name}} {{::request.atender.user.name}} @@ -175,8 +166,8 @@ - {{("000000"+request.saleFk).slice(-6)}} + class="link"> + {{request.saleFk | zeroFill:6}} @@ -187,12 +178,9 @@ - - No results - - + - {{("000000"+sale.itemFk).slice(-6)}} + class="link"> + {{sale.itemFk | zeroFill:6}} - + {{::sale.quantity}} {{::sale.volume.m3 | number:3}} - - No results - diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html index 0b4f19362..21750fa8b 100644 --- a/modules/travel/front/index/index.html +++ b/modules/travel/front/index/index.html @@ -17,7 +17,7 @@ - + @@ -25,25 +25,25 @@ Reference Agency Warehouse Out - Shipped - Delivered + Shipped + Delivered Warehouse In - Landed - Received + Landed + Received {{::travel.id}} - {{::travel.ref}} - {{::travel.agency.name}} - {{::travel.warehouseOut.name}} - {{::travel.shipped | date:'dd/MM/yyyy'}} + {{::travel.ref}} + {{::travel.agency.name}} + {{::travel.warehouseOut.name}} + {{::travel.shipped | date:'dd/MM/yyyy'}} {{::travel.warehouseIn.name}} - {{::travel.landed | date:'dd/MM/yyyy'}} - + {{::travel.landed | date:'dd/MM/yyyy'}} +