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

hex color now displayed on catalog
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2020-09-10 16:35:32 +02:00
parent 270e665291
commit 42abeecede
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/order/back/methods/order/catalogFilter.js
View File

@ -109,11 +109,11 @@ module.exports = Self => {
w.lastName AS lastName, w.lastName AS lastName,
w.firstName, w.firstName,
tci.priceKg, tci.priceKg,
vn.ink.name AS inkName ink.hex
FROM tmp.ticketCalculateItem tci FROM tmp.ticketCalculateItem tci
JOIN vn.item i ON i.id = tci.itemFk JOIN vn.item i ON i.id = tci.itemFk
JOIN vn.itemType it ON it.id = i.typeFk JOIN vn.itemType it ON it.id = i.typeFk
LEFT JOIN vn.ink ON ink.id = i.inkFk JOIN vn.ink ON ink.id = i.inkFk
JOIN vn.worker w on w.id = it.workerFk`); JOIN vn.worker w on w.id = it.workerFk`);
// Apply order by tag // Apply order by tag

4
modules/order/front/catalog-view/index.html
View File

@ -4,8 +4,8 @@
<section ng-repeat="item in $ctrl.model.data" class="product"> <section ng-repeat="item in $ctrl.model.data" class="product">
<vn-card> <vn-card>
<div class="image"> <div class="image">
<div ng-if="::item.inkName != null" class="item-color-background"> <div ng-if="::item.hex != null" class="item-color-background">
<div class="item-color" style="background-color: {{::item.inkName}}"></div> <div class="item-color" style="background-color: #{{::item.hex}}"></div>
</div> </div>
<img <img
ng-src="{{::$root.imagePath}}/catalog/200x200/{{::item.image}}" ng-src="{{::$root.imagePath}}/catalog/200x200/{{::item.image}}"