diff --git a/package/DEBIAN/control b/package/DEBIAN/control index 6c9a7389..b9e7477c 100644 --- a/package/DEBIAN/control +++ b/package/DEBIAN/control @@ -1,5 +1,5 @@ Package: hedera-web -Version: 1.0-36 +Version: 1.0-40 Architecture: all Maintainer: Juan Ferrer Toribio Depends: apache2, php5-mysql, php-vn-web diff --git a/package/usr/share/hedera-web/forms/admin/photos/photos.js b/package/usr/share/hedera-web/forms/admin/photos/photos.js index 8b0c7e45..9390216b 100755 --- a/package/usr/share/hedera-web/forms/admin/photos/photos.js +++ b/package/usr/share/hedera-web/forms/admin/photos/photos.js @@ -21,6 +21,8 @@ Vn.Photos = new Class ,onImageUpload: function (iframe) { + var toast = new Htk.Toast (); + this.gui.loaderPop (); this.$('submit').disabled = false; @@ -32,10 +34,10 @@ Vn.Photos = new Class { this.$('photo-id').value = ''; this.$('photo-id').focus (); - alert (_('ImageUploaded')); + toast.showMessage (_('ImageUploaded')); } else - alert (response.error.message +' ('+ response.error.code +')'); + toast.showError (response.error.message +' ('+ response.error.code +')'); } catch (e) {} } diff --git a/package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js b/package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js index dd89717a..e4777508 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js +++ b/package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js @@ -136,7 +136,7 @@ Vn.Catalog = new Class { event.stopPropagation (); this.gui.showBackground (); - this.$('catalog-menu').style.display = 'block'; + this.$('menu').style.display = 'block'; this.hideMenuCallback = this.hideMenu.bind (this); document.addEventListener ('click', this.hideMenuCallback); } @@ -144,7 +144,7 @@ Vn.Catalog = new Class ,hideMenu: function () { this.gui.hideBackground (); - this.$('catalog-menu').style.display = 'none'; + this.$('menu').style.display = 'none'; document.removeEventListener ('click', this.hideMenuCallback); this.hideMenuCallback = null; } diff --git a/package/usr/share/hedera-web/forms/ecomerce/catalog/mobile.css b/package/usr/share/hedera-web/forms/ecomerce/catalog/mobile.css index a2279cba..804c7e9e 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/catalog/mobile.css +++ b/package/usr/share/hedera-web/forms/ecomerce/catalog/mobile.css @@ -1,13 +1,13 @@ -#catalog-menu-button +.catalog button.menu { display: block; -} -#catalog-menu +} +.catalog div.menu { display: none; } -#catalog-center +.catalog div.center { right: 0; } diff --git a/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css b/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css index c8ecb0c0..bcb075a5 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css +++ b/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css @@ -5,7 +5,7 @@ height: 100%; min-height: 25em; } -.catalog .center +.catalog div.center { position: absolute; top: 0; @@ -16,7 +16,7 @@ /* Main */ -.catalog .main +.catalog div.main { position: absolute; top: 0; @@ -26,7 +26,7 @@ overflow: auto; padding: 1em; } -.catalog .main .box +.catalog div.main .box { margin: 0 auto; min-width: 52em; @@ -90,7 +90,7 @@ /* Menu */ -.catalog .menu +.catalog div.menu { position: absolute; z-index: 20; diff --git a/package/usr/share/hedera-web/forms/ecomerce/orders/orders.js b/package/usr/share/hedera-web/forms/ecomerce/orders/orders.js index aaa3e915..1bef8347 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/orders/orders.js +++ b/package/usr/share/hedera-web/forms/ecomerce/orders/orders.js @@ -68,10 +68,14 @@ Vn.Orders = new Class ,debtConditionalFunc: function (field, value) { + var className = 'debt-amount '; + if (value > 0) - field.node.className = 'positive-debt'; + className += 'positive-debt'; else - field.node.className = 'negative-debt'; + className += 'negative-debt'; + + field.node.className = className; } ,onPayButtonClick: function () diff --git a/package/usr/share/hedera-web/forms/ecomerce/orders/ui.xml b/package/usr/share/hedera-web/forms/ecomerce/orders/ui.xml index 3a986f60..85dcda8d 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/orders/ui.xml +++ b/package/usr/share/hedera-web/forms/ecomerce/orders/ui.xml @@ -29,7 +29,7 @@

ConfirmedOrdersDesc

PendingBalance: - + Info diff --git a/package/usr/share/hedera-web/forms/ecomerce/ticket/ticket.js b/package/usr/share/hedera-web/forms/ecomerce/ticket/ticket.js index 7f2bde74..7327d774 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/ticket/ticket.js +++ b/package/usr/share/hedera-web/forms/ecomerce/ticket/ticket.js @@ -14,7 +14,7 @@ Vn.Ticket = new Class { var report = window.open ('', 'report', 'resizable=yes,height=600,width=750,scrollbars=yes,menubar=no'); - report.document.body.innerHTML = document.getElementById ('ticket-report').innerHTML; + report.document.body.innerHTML = this.$('report').innerHTML; report.print (); } diff --git a/package/usr/share/hedera-web/forms/ecomerce/ticket/ui.xml b/package/usr/share/hedera-web/forms/ecomerce/ticket/ui.xml index ff4e46ef..4f571c5f 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/ticket/ui.xml +++ b/package/usr/share/hedera-web/forms/ecomerce/ticket/ui.xml @@ -29,7 +29,7 @@
-
+
diff --git a/package/usr/share/php/vn/hedera/web.php b/package/usr/share/php/vn/hedera/web.php index 4d72831a..9dc88f3b 100755 --- a/package/usr/share/php/vn/hedera/web.php +++ b/package/usr/share/php/vn/hedera/web.php @@ -97,7 +97,7 @@ class Web **/ static function getVersion () { - return (int) filemtime (__FILE__); + return (int) filectime (__FILE__); } static function login () diff --git a/package/usr/share/php/vn/rest/service.php b/package/usr/share/php/vn/rest/service.php index 36463cb8..c8bbe5df 100755 --- a/package/usr/share/php/vn/rest/service.php +++ b/package/usr/share/php/vn/rest/service.php @@ -56,8 +56,6 @@ class Service static function errorHandler ($code, $message, $file, $line, $context) { self::setError ('PHP', 'error', "$file:$line:$message"); - self::sendReply (); - return TRUE; }