verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2021-06-28 08:58:27 +02:00
parent 888e2cc4bf e7dcb54efb
commit 65ac3fc205
9 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
front/core/components/table/style.scss
View File

@ -97,7 +97,6 @@ vn-table {
min-width: 0;
}
&[vn-fetched-tags] {
width: 235px;
min-width: 155px;
& > vn-one {
overflow: hidden;

4
modules/client/front/summary/index.html
View File

@ -292,7 +292,7 @@
<vn-thead>
<vn-tr>
<vn-th field="id" number>Id</vn-th>
<vn-th field="nickname" expand>Client</vn-th>
<vn-th field="nickname" expand>Nickname</vn-th>
<vn-th field="packages" shrink>Packages</vn-th>
<vn-th field="shipped" shrink-date>Date</vn-th>
<vn-th>State</vn-th>
@ -325,7 +325,7 @@
<span
ng-show="::ticket.refFk"
title="{{::ticket.refFk}}"
vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)"
vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOut.id)"
class="link">
{{::ticket.refFk}}
</span>

10
modules/client/front/summary/index.js
View File

@ -7,7 +7,8 @@ class Controller extends Summary {
super($element, $);
this.ticketFilter = {
include: {
include: [
{
relation: 'ticketState',
scope: {
fields: ['stateFk', 'code', 'alertLevel'],
@ -15,7 +16,14 @@ class Controller extends Summary {
relation: 'state'
}
}
},
{
relation: 'invoiceOut',
scope: {
fields: ['id']
}
}
]
};
}

4
modules/monitor/front/index/tickets/index.html
View File

@ -33,7 +33,7 @@
<vn-table model="model">
<vn-thead>
<vn-tr>
<vn-th class="icon-field"></vn-th>
<vn-th class="icon-field" shrink></vn-th>
<vn-th field="nickname">Client</vn-th>
<vn-th field="salesPersonFk" class="expendable" shrink>Salesperson</vn-th>
<vn-th field="shipped" shrink-date>Date</vn-th>
@ -50,7 +50,7 @@
<a ng-repeat="ticket in model.data"
class="clickable vn-tr search-result"
ui-sref="ticket.card.summary({id: {{::ticket.id}}})" target="_blank">
<vn-td class="icon-field">
<vn-td class="icon-field" shrink>
<vn-icon
ng-show="::ticket.isTaxDataChecked === 0"
translate-attr="{title: 'No verified data'}"

6
modules/monitor/front/index/tickets/style.scss
View File

@ -1,3 +1,5 @@
@import "variables";
vn-monitor-sales-tickets {
@media screen and (max-width: 1440px) {
.expendable {
@ -24,4 +26,8 @@ vn-monitor-sales-tickets {
vn-table.scrollable.lg {
height: 736px
}
vn-tbody a[ng-repeat].vn-tr:focus {
background-color: $color-primary-light
}
}

4
modules/ticket/front/index/style.scss
View File

@ -18,4 +18,8 @@ vn-ticket-index {
margin-left: 3px;
margin-right: 3px;
}
vn-tbody a[ng-repeat].vn-tr:focus {
background-color: $color-primary-light
}
}

12
modules/ticket/front/sale/index.html
View File

@ -59,10 +59,10 @@
</vn-th>
<vn-th shrink></vn-th>
<vn-th shrink></vn-th>
<vn-th number shrink>Available</vn-th>
<vn-th shrink id="ticketId">Id</vn-th>
<vn-th shrink>Available</vn-th>
<vn-th>Id</vn-th>
<vn-th shrink>Quantity</vn-th>
<vn-th>Item</vn-th>
<vn-th expand>Item</vn-th>
<vn-th number>Price</vn-th>
<vn-th number>Disc</vn-th>
<vn-th number>Amount</vn-th>
@ -112,14 +112,14 @@
zoom-image="{{::$root.imagePath('catalog', '1600x900', sale.itemFk)}}"
on-error-src/>
</vn-td>
<vn-td number shrink>
<vn-td shrink>
<vn-chip
class="transparent"
ng-class="{'alert': sale.available < 0}">
{{::sale.available}}
</vn-chip>
</vn-td>
<vn-td shrink>
<vn-td>
<span class="link" ng-if="sale.id"
ng-click="itemDescriptor.show($event, sale.itemFk, sale.id)">
{{sale.itemFk}}
@ -149,7 +149,7 @@
</vn-input-number>
</field>
</vn-td-editable>
<vn-td-editable vn-fetched-tags wide disabled="!sale.id || !$ctrl.isEditable">
<vn-td-editable vn-fetched-tags expand disabled="!sale.id || !$ctrl.isEditable">
<text>
<vn-one title="{{sale.concept}}">{{sale.concept}}</vn-one>
<vn-one ng-if="::sale.subName">

3
modules/ticket/front/sale/style.scss
View File

@ -30,7 +30,6 @@ vn-ticket-sale {
& vn-one {
overflow: hidden;
text-overflow: ellipsis;
font-size: 0.75rem;
}
& vn-one:nth-child(2) h3 {
@ -72,7 +71,7 @@ vn-ticket-sale {
padding: 0!important;
}
}
#ticketId {
vn-autocomplete {
min-width: 150px
}
}

4
modules/ticket/front/summary/index.html
View File

@ -126,6 +126,7 @@
<vn-th number>Price</vn-th>
<vn-th number>Discount</vn-th>
<vn-th number>Amount</vn-th>
<vn-th shrink>Packing</vn-th>
</vn-tr>
</vn-thead>
<vn-tbody>
@ -190,6 +191,9 @@
<vn-td number>{{::sale.price | currency: 'EUR':2}}</vn-td>
<vn-td number>{{::sale.discount}} %</vn-td>
<vn-td number>{{::sale.quantity * sale.price * ((100 - sale.discount) / 100) | currency: 'EUR':2}}</vn-td>
<vn-td shrink>
{{::sale.item.itemPackingTypeFk | dashIfEmpty}}
</vn-td>
</vn-tr>
</vn-tbody>
</vn-table>