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

Merge branch 'dev' of http://git.verdnatura.es/salix into dev

This commit is contained in:
Carlos Jimenez 2018-02-21 11:05:33 +01:00
parent 2f0f7a0ff2 26b8bcfe94
commit a88834ad56
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/item/routes.json
View File

@ -35,8 +35,9 @@
},
"menu": {
"description": "Basic data",
"icon": "folder",
"icon": "folder"
},
"acl": ["buyer"]
},
{
"url" : "/tags",
@ -48,7 +49,8 @@
"menu": {
"description": "Tags",
"icon": "folder"
}
},
"acl": ["buyer"]
},
{
"url" : "/history",
@ -72,7 +74,8 @@
"menu": {
"description": "Niche",
"icon": "folder"
}
},
"acl": ["buyer","replenisher"]
},
{
"url" : "/botanical",
@ -84,7 +87,8 @@
"menu": {
"description": "Botanical",
"icon": "folder"
}
},
"acl": ["buyer"]
},{
"url" : "/barcode",
"state": "item.card.itemBarcode",
@ -95,7 +99,8 @@
"menu": {
"description": "Barcode",
"icon": "folder"
}
},
"acl": ["buyer","replenisher"]
},{
"url" : "/summary",
"state": "item.card.summary",

4
client/item/src/list/item-product.html
View File

@ -1,9 +1,9 @@
<vn-horizontal pad-medium border-solid-bottom>
<vn-auto margin-medium-right ui-sref="item.card.data({ id: {{$ctrl.item.id}} })">
<vn-auto margin-medium-right ui-sref="item.card.summary({ id: {{$ctrl.item.id}} })">
<img ng-src="http://verdnatura.es/vn-image-data/catalog/200x200/{{$ctrl.item.image}}" on-error-src/>
</vn-auto>
<vn-one ui-sref="item.card.data({ id: {{$ctrl.item.id}} })">
<vn-one ui-sref="item.card.summary({ id: {{$ctrl.item.id}} })">
<div><span translate>Id</span>: <b>{{$ctrl.item.id}}</b></div>
<div><span translate>Name</span>: <b>{{$ctrl.item.name}}</b></div>
<div><span translate>Description</span>: <b>{{$ctrl.item.description}}</b></div>