diff --git a/debian/changelog b/debian/changelog index b81ab942..c416cac7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.406.48) stable; urgency=low +hedera-web (1.406.49) stable; urgency=low * Initial Release. diff --git a/forms/admin/items/items.js b/forms/admin/items/items.js index 9f8e66e7..63a56c8c 100644 --- a/forms/admin/items/items.js +++ b/forms/admin/items/items.js @@ -3,6 +3,6 @@ Hedera.Items = new Class({ Extends: Hedera.Form, activate: function() { - this.$('items').setInfo('item', 'item', 'vn', ['id']); + this.$('items').setInfo('i', 'item', 'vn', ['id']); } }); diff --git a/forms/admin/items/style.css b/forms/admin/items/style.css index c702ed05..0c32d69c 100644 --- a/forms/admin/items/style.css +++ b/forms/admin/items/style.css @@ -19,9 +19,9 @@ { margin-right: 1em; float: left; - border-radius: 50%; - height: 3.2em; - width: 3.2em; + border-radius: 3%; + height: 5.5em; + width: 5.5em; } .items .row > p { diff --git a/forms/admin/items/ui.xml b/forms/admin/items/ui.xml index b09cc9c0..acd3aba4 100644 --- a/forms/admin/items/ui.xml +++ b/forms/admin/items/ui.xml @@ -13,12 +13,16 @@
- SELECT id, longName, size, category, image, - value5, value6, value7 - FROM vn.item - WHERE longName LIKE CONCAT('%', #filter, '%') - OR id = #filter - ORDER BY longName LIMIT 50 + SELECT i.id, i.longName, i.size, i.category, + i.value5, i.value6, i.value7, + i.image, im.updated + FROM vn.item i + LEFT JOIN image im + ON im.collectionFk = 'catalog' + AND im.name = i.image + WHERE i.longName LIKE CONCAT('%', #filter, '%') + OR i.id = #filter + ORDER BY i.longName LIMIT 50 @@ -30,6 +34,7 @@ - SELECT bi.id, bi.amount, bi.price, i.longName item, i.image, - i.tag5, i.value5, i.tag6, i.value6, i.tag7, i.value7 + SELECT bi.id, bi.amount, bi.price, i.longName item, + i.tag5, i.value5, i.tag6, i.value6, i.tag7, i.value7, + i.image, im.updated FROM myBasketItem bi JOIN vn.item i ON i.id = bi.itemFk + LEFT JOIN image im + ON im.collectionFk = 'catalog' + AND im.name = i.image
@@ -46,6 +50,7 @@ 0 ORDER BY i.relevancy DESC, i.name, i.size LIMIT 400; @@ -113,6 +116,7 @@ subdir="200x200" form="item" column="image" + stamp-column="updated" full-dir="1600x900"/>
diff --git a/forms/ecomerce/ticket/ui.xml b/forms/ecomerce/ticket/ui.xml index b0a962b4..02347ef6 100644 --- a/forms/ecomerce/ticket/ui.xml +++ b/forms/ecomerce/ticket/ui.xml @@ -75,6 +75,7 @@ query ($query, [ + 'collection' => $collection, + 'name' => $name + ]); + imagedestroy($image); unlink($tmpName); return TRUE; } } -