diff --git a/debian/changelog b/debian/changelog index 02f5c7b0..9531da28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.83) stable; urgency=low +hedera-web (1.405.84) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/catalog/catalog.js b/forms/ecomerce/catalog/catalog.js index a7c57dd5..c0923b64 100644 --- a/forms/ecomerce/catalog/catalog.js +++ b/forms/ecomerce/catalog/catalog.js @@ -32,7 +32,7 @@ Hedera.Catalog = new Class { document.body.appendChild (this.$('right-panel')); - this.$('items-model').setInfo ('i', 'item', 'vn', ['itemFk']); + this.$('items-model').setInfo ('i', 'item', 'vn', ['id']); if (localStorage.getItem ('hederaView')) this.setView (parseInt (localStorage.getItem ('hederaView'))); @@ -269,7 +269,7 @@ Hedera.Catalog = new Class this.onEraseClick (); this.$('card').row = form.row; - this.$('card-item').value = form.get ('itemFk'); + this.$('card-item').value = form.get ('id'); this.$('card-popup').show (button.node); } diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index 1df805b8..01fc8017 100644 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -60,8 +60,8 @@ JOIN vn.itemType t ON t.id = i.typeFk WHERE #filter; CALL bionic_calc; - SELECT i.id itemFk, i.description, b.available, b.price, - b.producer, i.image, i.name item, i.category, i.size, + SELECT i.id, i.description, i.image, i.name item, i.category, i.size, + b.producer, b.available, b.price, IF(i.stems > 1, i.stems, NULL) stems, c.name color, o.name origin, t.tag1, t.val1, t.tag2, t.val2, t.tag3, t.val3 FROM tmp.bionic_item b @@ -397,7 +397,7 @@

- @ + @

diff --git a/package.json b/package.json index 410470c2..da880f56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.405.83", + "version": "1.405.84", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/utils/deploy b/utils/deploy index a6526e28..cbb15060 100755 --- a/utils/deploy +++ b/utils/deploy @@ -27,9 +27,9 @@ fi if [ -f "$srcDir/debian/changelog" ] then echo "Cleaning last build." - rm -f "$buildDir/*.deb" - rm -f "$buildDir/*.changes" - rm -f "$buildDir/*.build" + rm -f $buildDir/*.deb + rm -f $buildDir/*.changes + rm -f $buildDir/*.build (cd "$srcDir" && debian/rules clean >> "$logFile") echo "Building Debian packages."