Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
db30ac3175
|
@ -97,7 +97,6 @@ vn-table {
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
}
|
}
|
||||||
&[vn-fetched-tags] {
|
&[vn-fetched-tags] {
|
||||||
width: 235px;
|
|
||||||
min-width: 155px;
|
min-width: 155px;
|
||||||
& > vn-one {
|
& > vn-one {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
<vn-table model="model">
|
<vn-table model="model">
|
||||||
<vn-thead>
|
<vn-thead>
|
||||||
<vn-tr>
|
<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="nickname">Client</vn-th>
|
||||||
<vn-th field="salesPersonFk" class="expendable" shrink>Salesperson</vn-th>
|
<vn-th field="salesPersonFk" class="expendable" shrink>Salesperson</vn-th>
|
||||||
<vn-th field="shipped" shrink-date>Date</vn-th>
|
<vn-th field="shipped" shrink-date>Date</vn-th>
|
||||||
|
@ -50,7 +50,7 @@
|
||||||
<a ng-repeat="ticket in model.data"
|
<a ng-repeat="ticket in model.data"
|
||||||
class="clickable vn-tr search-result"
|
class="clickable vn-tr search-result"
|
||||||
ui-sref="ticket.card.summary({id: {{::ticket.id}}})" target="_blank">
|
ui-sref="ticket.card.summary({id: {{::ticket.id}}})" target="_blank">
|
||||||
<vn-td class="icon-field">
|
<vn-td class="icon-field" shrink>
|
||||||
<vn-icon
|
<vn-icon
|
||||||
ng-show="::ticket.isTaxDataChecked === 0"
|
ng-show="::ticket.isTaxDataChecked === 0"
|
||||||
translate-attr="{title: 'No verified data'}"
|
translate-attr="{title: 'No verified data'}"
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
@import "variables";
|
||||||
|
|
||||||
vn-monitor-sales-tickets {
|
vn-monitor-sales-tickets {
|
||||||
@media screen and (max-width: 1440px) {
|
@media screen and (max-width: 1440px) {
|
||||||
.expendable {
|
.expendable {
|
||||||
|
@ -24,4 +26,8 @@ vn-monitor-sales-tickets {
|
||||||
vn-table.scrollable.lg {
|
vn-table.scrollable.lg {
|
||||||
height: 736px
|
height: 736px
|
||||||
}
|
}
|
||||||
|
|
||||||
|
vn-tbody a[ng-repeat].vn-tr:focus {
|
||||||
|
background-color: $color-primary-light
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -18,4 +18,8 @@ vn-ticket-index {
|
||||||
margin-left: 3px;
|
margin-left: 3px;
|
||||||
margin-right: 3px;
|
margin-right: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
vn-tbody a[ng-repeat].vn-tr:focus {
|
||||||
|
background-color: $color-primary-light
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -59,10 +59,10 @@
|
||||||
</vn-th>
|
</vn-th>
|
||||||
<vn-th shrink></vn-th>
|
<vn-th shrink></vn-th>
|
||||||
<vn-th shrink></vn-th>
|
<vn-th shrink></vn-th>
|
||||||
<vn-th number shrink>Available</vn-th>
|
<vn-th shrink>Available</vn-th>
|
||||||
<vn-th shrink id="ticketId">Id</vn-th>
|
<vn-th>Id</vn-th>
|
||||||
<vn-th shrink>Quantity</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>Price</vn-th>
|
||||||
<vn-th number>Disc</vn-th>
|
<vn-th number>Disc</vn-th>
|
||||||
<vn-th number>Amount</vn-th>
|
<vn-th number>Amount</vn-th>
|
||||||
|
@ -112,14 +112,14 @@
|
||||||
zoom-image="{{::$root.imagePath('catalog', '1600x900', sale.itemFk)}}"
|
zoom-image="{{::$root.imagePath('catalog', '1600x900', sale.itemFk)}}"
|
||||||
on-error-src/>
|
on-error-src/>
|
||||||
</vn-td>
|
</vn-td>
|
||||||
<vn-td number shrink>
|
<vn-td shrink>
|
||||||
<vn-chip
|
<vn-chip
|
||||||
class="transparent"
|
class="transparent"
|
||||||
ng-class="{'alert': sale.available < 0}">
|
ng-class="{'alert': sale.available < 0}">
|
||||||
{{::sale.available}}
|
{{::sale.available}}
|
||||||
</vn-chip>
|
</vn-chip>
|
||||||
</vn-td>
|
</vn-td>
|
||||||
<vn-td shrink>
|
<vn-td>
|
||||||
<span class="link" ng-if="sale.id"
|
<span class="link" ng-if="sale.id"
|
||||||
ng-click="itemDescriptor.show($event, sale.itemFk, sale.id)">
|
ng-click="itemDescriptor.show($event, sale.itemFk, sale.id)">
|
||||||
{{sale.itemFk}}
|
{{sale.itemFk}}
|
||||||
|
@ -149,7 +149,7 @@
|
||||||
</vn-input-number>
|
</vn-input-number>
|
||||||
</field>
|
</field>
|
||||||
</vn-td-editable>
|
</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>
|
<text>
|
||||||
<vn-one title="{{sale.concept}}">{{sale.concept}}</vn-one>
|
<vn-one title="{{sale.concept}}">{{sale.concept}}</vn-one>
|
||||||
<vn-one ng-if="::sale.subName">
|
<vn-one ng-if="::sale.subName">
|
||||||
|
|
|
@ -30,7 +30,6 @@ vn-ticket-sale {
|
||||||
& vn-one {
|
& vn-one {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
font-size: 0.75rem;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
& vn-one:nth-child(2) h3 {
|
& vn-one:nth-child(2) h3 {
|
||||||
|
@ -72,7 +71,7 @@ vn-ticket-sale {
|
||||||
padding: 0!important;
|
padding: 0!important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ticketId {
|
vn-autocomplete {
|
||||||
min-width: 150px
|
min-width: 150px
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue