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

fetched tags not sowing title and displaying wrong fixed
gitea/salix/dev This commit looks good Details

This commit is contained in:
Gerard 2019-02-20 12:12:16 +01:00
parent b97cb52abe
commit 23e08331fc
9 changed files with 60 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/order/front/line/index.html
View File

@ -36,15 +36,21 @@
<vn-td number> <vn-td number>
<span ng-click="$ctrl.showDescriptor($event, row.itemFk)" <span ng-click="$ctrl.showDescriptor($event, row.itemFk)"
class="link"> class="link">
{{row.itemFk | zeroFill:6}} {{::row.itemFk | zeroFill:6}}
</span> </span>
</vn-td> </vn-td>
<vn-td expand><vn-fetched-tags max-length="6" item="row.item"/></vn-td> <vn-td expand>
<vn-td>{{row.warehouse.name}}</vn-td> <vn-fetched-tags
<vn-td>{{row.shipped | date: 'dd/MM/yyyy'}}</vn-td> max-length="6"
<vn-td number>{{row.quantity}}</vn-td> item="::row.item"
title="::row.item.name">
</vn-fetched-tags>
</vn-td>
<vn-td>{{::row.warehouse.name}}</vn-td>
<vn-td>{{::row.shipped | date: 'dd/MM/yyyy'}}</vn-td>
<vn-td number>{{::row.quantity}}</vn-td>
<vn-td number> <vn-td number>
{{row.price | currency: 'EUR':2}} {{::row.price | currency: 'EUR':2}}
</vn-td> </vn-td>
<vn-td shrink ng-if="!$ctrl.order.isConfirmed"> <vn-td shrink ng-if="!$ctrl.order.isConfirmed">
<vn-icon-button <vn-icon-button

10
modules/order/front/summary/index.html
View File

@ -65,10 +65,16 @@
<span <span
ng-click="$ctrl.showDescriptor($event, row.itemFk)" ng-click="$ctrl.showDescriptor($event, row.itemFk)"
class="link"> class="link">
{{row.itemFk | zeroFill:6}} {{::row.itemFk | zeroFill:6}}
</span> </span>
</vn-td> </vn-td>
<vn-td expand><vn-fetched-tags max-length="6" item="row.item"/></vn-td> <vn-td expand>
<vn-fetched-tags
max-length="6"
item="::row.item"
title="::row.item.name">
</vn-fetched-tags>
</vn-td>
<vn-td number>{{::row.quantity}}</vn-td> <vn-td number>{{::row.quantity}}</vn-td>
<vn-td number>{{::row.price | currency: 'EUR':2}}</vn-td> <vn-td number>{{::row.price | currency: 'EUR':2}}</vn-td>
<vn-td number>{{::row.quantity * row.price | currency: 'EUR':2}}</vn-td> <vn-td number>{{::row.quantity * row.price | currency: 'EUR':2}}</vn-td>

8
modules/order/front/volume/index.html
View File

@ -38,7 +38,13 @@
{{::row.itemFk}} {{::row.itemFk}}
</span> </span>
</vn-td> </vn-td>
<vn-td><vn-fetched-tags max-length="6" item="row.item"/></vn-td> <vn-td expand>
<vn-fetched-tags
max-length="6"
item="::row.item"
title="::row.item.name">
</vn-fetched-tags>
</vn-td>
<vn-td number>{{::row.quantity}}</vn-td> <vn-td number>{{::row.quantity}}</vn-td>
<vn-td number>{{::row.volume | number:3}}</vn-td> <vn-td number>{{::row.volume | number:3}}</vn-td>
</vn-tr> </vn-tr>

6
modules/ticket/front/component/index.html
View File

@ -48,7 +48,11 @@
</span> </span>
</td> </td>
<td rowspan="{{::sale.components.length + 1}}"> <td rowspan="{{::sale.components.length + 1}}">
<vn-fetched-tags max-length="6" item="sale.item"/> <vn-fetched-tags
max-length="6"
item="::sale.item"
title="::sale.concept">
</vn-fetched-tags>
</td> </td>
<td rowspan="{{::sale.components.length + 1}}" number> <td rowspan="{{::sale.components.length + 1}}" number>
{{::sale.quantity}} {{::sale.quantity}}

8
modules/ticket/front/data/step-two/index.html
View File

@ -15,7 +15,13 @@
<tbody> <tbody>
<tr ng-repeat="sale in $ctrl.ticket.sale.items track by sale.id"> <tr ng-repeat="sale in $ctrl.ticket.sale.items track by sale.id">
<td number>{{("000000"+sale.itemFk).slice(-6)}}</td> <td number>{{("000000"+sale.itemFk).slice(-6)}}</td>
<td><vn-fetched-tags max-length="6" item="sale.item"/></td> <td expand>
<vn-fetched-tags
max-length="6"
item="::sale.item"
title="::sale.concept">
</vn-fetched-tags>
</td>
<td number>{{::sale.quantity}}</td> <td number>{{::sale.quantity}}</td>
<td number>{{::sale.price | currency: 'EUR': 2}}</td> <td number>{{::sale.price | currency: 'EUR': 2}}</td>
<td number>{{::sale.component.newPrice | currency: 'EUR': 2}}</td> <td number>{{::sale.component.newPrice | currency: 'EUR': 2}}</td>

10
modules/ticket/front/sale-checked/index.html
View File

@ -30,10 +30,16 @@
<span <span
ng-click="$ctrl.showDescriptor($event, sale.itemFk)" ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
class="link"> class="link">
{{sale.itemFk | zeroFill:6}} {{::sale.itemFk | zeroFill:6}}
</span> </span>
</vn-td> </vn-td>
<vn-td><vn-fetched-tags max-length="6" item="sale.item"/></vn-td> <vn-td expand>
<vn-fetched-tags
max-length="6"
item="::sale.item"
title="::sale.concept">
</vn-fetched-tags>
</vn-td>
<vn-td number>{{::sale.quantity}}</vn-td> <vn-td number>{{::sale.quantity}}</vn-td>
</vn-tr> </vn-tr>
</vn-tbody> </vn-tbody>

8
modules/ticket/front/sale-tracking/index.html
View File

@ -37,7 +37,13 @@
{{sale.itemFk | zeroFill:6}} {{sale.itemFk | zeroFill:6}}
</span> </span>
</vn-td> </vn-td>
<vn-td><vn-fetched-tags max-length="6" item="sale.item"/></vn-td> <vn-td expand>
<vn-fetched-tags
max-length="6"
item="::sale.item"
title="::sale.concept">
</vn-fetched-tags>
</vn-td>
<vn-td>{{::sale.quantity}}</vn-td> <vn-td>{{::sale.quantity}}</vn-td>
<vn-td>{{::sale.originalQuantity}}</vn-td> <vn-td>{{::sale.originalQuantity}}</vn-td>
<vn-td expand> <vn-td expand>

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

@ -108,7 +108,11 @@
</span> </span>
</vn-td> </vn-td>
<vn-td expand> <vn-td expand>
<vn-fetched-tags max-length="6" item="sale.tags" title="sale.concept"/> <vn-fetched-tags
max-length="6"
item="::sale.tags"
title="::sale.concept">
</vn-fetched-tags>
</vn-td> </vn-td>
<vn-td ng-if="!$ctrl.isEditable" number>{{sale.quantity}}</vn-td> <vn-td ng-if="!$ctrl.isEditable" number>{{sale.quantity}}</vn-td>
<vn-td ng-if="$ctrl.isEditable" number> <vn-td ng-if="$ctrl.isEditable" number>

2
modules/ticket/front/volume/index.html
View File

@ -38,7 +38,7 @@
{{sale.itemFk | zeroFill:6}} {{sale.itemFk | zeroFill:6}}
</span> </span>
</vn-td> </vn-td>
<vn-td expand><vn-fetched-tags max-length="6" item="sale.item"/></vn-td> <vn-td expand><vn-fetched-tags max-length="6" item="::sale.item" title="::sale.concept"/></vn-td>
<vn-td number>{{::sale.quantity}}</vn-td> <vn-td number>{{::sale.quantity}}</vn-td>
<vn-td number>{{::sale.volume.m3 | number:3}}</vn-td> <vn-td number>{{::sale.volume.m3 | number:3}}</vn-td>
</vn-tr> </vn-tr>