wbuezas
/
hedera-web-mindshore
forked from verdnatura/hedera-web
0
1
Fork 0
Code Pull Requests Activity

Errores arreglados

This commit is contained in:
Juan Ferrer Toribio 2015-03-07 01:56:24 +01:00
parent d87695fd99
commit fe120f5196
11 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/DEBIAN/control
View File

@ -1,5 +1,5 @@
Package: hedera-web Package: hedera-web
Version: 1.0-36 Version: 1.0-40
Architecture: all Architecture: all
Maintainer: Juan Ferrer Toribio <juan@verdnatura.es> Maintainer: Juan Ferrer Toribio <juan@verdnatura.es>
Depends: apache2, php5-mysql, php-vn-web Depends: apache2, php5-mysql, php-vn-web

6
package/usr/share/hedera-web/forms/admin/photos/photos.js
View File

@ -21,6 +21,8 @@ Vn.Photos = new Class
,onImageUpload: function (iframe) ,onImageUpload: function (iframe)
{ {
var toast = new Htk.Toast ();
this.gui.loaderPop (); this.gui.loaderPop ();
this.$('submit').disabled = false; this.$('submit').disabled = false;
@ -32,10 +34,10 @@ Vn.Photos = new Class
{ {
this.$('photo-id').value = ''; this.$('photo-id').value = '';
this.$('photo-id').focus (); this.$('photo-id').focus ();
alert (_('ImageUploaded')); toast.showMessage (_('ImageUploaded'));
} }
else else
alert (response.error.message +' ('+ response.error.code +')'); toast.showError (response.error.message +' ('+ response.error.code +')');
} }
catch (e) {} catch (e) {}
} }

4
package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js
View File

@ -136,7 +136,7 @@ Vn.Catalog = new Class
{ {
event.stopPropagation (); event.stopPropagation ();
this.gui.showBackground (); this.gui.showBackground ();
this.$('catalog-menu').style.display = 'block'; this.$('menu').style.display = 'block';
this.hideMenuCallback = this.hideMenu.bind (this); this.hideMenuCallback = this.hideMenu.bind (this);
document.addEventListener ('click', this.hideMenuCallback); document.addEventListener ('click', this.hideMenuCallback);
} }
@ -144,7 +144,7 @@ Vn.Catalog = new Class
,hideMenu: function () ,hideMenu: function ()
{ {
this.gui.hideBackground (); this.gui.hideBackground ();
this.$('catalog-menu').style.display = 'none'; this.$('menu').style.display = 'none';
document.removeEventListener ('click', this.hideMenuCallback); document.removeEventListener ('click', this.hideMenuCallback);
this.hideMenuCallback = null; this.hideMenuCallback = null;
} }

8
package/usr/share/hedera-web/forms/ecomerce/catalog/mobile.css
View File

@ -1,13 +1,13 @@
#catalog-menu-button .catalog button.menu
{ {
display: block; display: block;
} }
#catalog-menu .catalog div.menu
{ {
display: none; display: none;
} }
#catalog-center .catalog div.center
{ {
right: 0; right: 0;
} }

8
package/usr/share/hedera-web/forms/ecomerce/catalog/style.css
View File

@ -5,7 +5,7 @@
height: 100%; height: 100%;
min-height: 25em; min-height: 25em;
} }
.catalog .center .catalog div.center
{ {
position: absolute; position: absolute;
top: 0; top: 0;
@ -16,7 +16,7 @@
/* Main */ /* Main */
.catalog .main .catalog div.main
{ {
position: absolute; position: absolute;
top: 0; top: 0;
@ -26,7 +26,7 @@
overflow: auto; overflow: auto;
padding: 1em; padding: 1em;
} }
.catalog .main .box .catalog div.main .box
{ {
margin: 0 auto; margin: 0 auto;
min-width: 52em; min-width: 52em;
@ -90,7 +90,7 @@
/* Menu */ /* Menu */
.catalog .menu .catalog div.menu
{ {
position: absolute; position: absolute;
z-index: 20; z-index: 20;

8
package/usr/share/hedera-web/forms/ecomerce/orders/orders.js
View File

@ -68,10 +68,14 @@ Vn.Orders = new Class
,debtConditionalFunc: function (field, value) ,debtConditionalFunc: function (field, value)
{ {
var className = 'debt-amount ';
if (value > 0) if (value > 0)
field.node.className = 'positive-debt'; className += 'positive-debt';
else else
field.node.className = 'negative-debt'; className += 'negative-debt';
field.node.className = className;
} }
,onPayButtonClick: function () ,onPayButtonClick: function ()

2
package/usr/share/hedera-web/forms/ecomerce/orders/ui.xml
View File

@ -29,7 +29,7 @@
<h1><t>ConfirmedOrdersDesc</t></h1> <h1><t>ConfirmedOrdersDesc</t></h1>
<div class="debt"> <div class="debt">
<t>PendingBalance:</t> <t>PendingBalance:</t>
<htk-label format="%.2d€" id="debt-amount" class="debt-amount"> <htk-label format="%.2d€" id="debt-amount">
<db-calc-sum model="balance" column-name="amount"/> <db-calc-sum model="balance" column-name="amount"/>
</htk-label> </htk-label>
<img src="image/dark/info.svg" title="_PaymentInfo" class="debt-info" alt="Info"/> <img src="image/dark/info.svg" title="_PaymentInfo" class="debt-info" alt="Info"/>

2
package/usr/share/hedera-web/forms/ecomerce/ticket/ticket.js
View File

@ -14,7 +14,7 @@ Vn.Ticket = new Class
{ {
var report = window.open ('', 'report', var report = window.open ('', 'report',
'resizable=yes,height=600,width=750,scrollbars=yes,menubar=no'); '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 (); report.print ();
} }

2
package/usr/share/hedera-web/forms/ecomerce/ticket/ui.xml
View File

@ -29,7 +29,7 @@
</button> </button>
</div> </div>
</div> </div>
<div id="ticket-report"> <div id="report">
<table class="form"> <table class="form">
<tbody> <tbody>
<tr> <tr>

2
package/usr/share/php/vn/hedera/web.php
View File

@ -97,7 +97,7 @@ class Web
**/ **/
static function getVersion () static function getVersion ()
{ {
return (int) filemtime (__FILE__); return (int) filectime (__FILE__);
} }
static function login () static function login ()

2
package/usr/share/php/vn/rest/service.php
View File

@ -56,8 +56,6 @@ class Service
static function errorHandler ($code, $message, $file, $line, $context) static function errorHandler ($code, $message, $file, $line, $context)
{ {
self::setError ('PHP', 'error', "$file:$line:$message"); self::setError ('PHP', 'error', "$file:$line:$message");
self::sendReply ();
return TRUE; return TRUE;
} }