diff --git a/debian/changelog b/debian/changelog index 0d916c8a..9081966f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.201-1) stable; urgency=low +hedera-web (1.205-1) stable; urgency=low * Initial Release. diff --git a/debian/cron.d b/debian/cron.d index ef478fc9..2a9461b4 100644 --- a/debian/cron.d +++ b/debian/cron.d @@ -1,2 +1,2 @@ MAILTO=webmaster -*/4 * * * * root cd /usr/share/hedera-web/tpv && php5 imap.php +*/4 * * * * www-data php5 /usr/share/hedera-web/tpv/imap.php diff --git a/lib/vn/tpv/tpv.php b/lib/vn/tpv/tpv.php index ca83e773..083bfc28 100755 --- a/lib/vn/tpv/tpv.php +++ b/lib/vn/tpv/tpv.php @@ -4,7 +4,6 @@ namespace Vn; require_once ('vn/hedera/init.php'); require_once ('vn/db/db.php'); -require_once ('vn/lib/log.php'); require_once ('vn/tpv/soap-method.php'); use Vn\Lib\Log; @@ -19,6 +18,9 @@ class Tpv static function init () { global $conf; + + ini_set ('log_errors', TRUE); + ini_set ('error_log', Hedera\_LOG_DIR .'/hedera-web.log'); self::$conn = new Db\Conn (); self::$conn->open ( @@ -42,7 +44,6 @@ class Tpv **/ static function getFromMailbox () { - Log::init (Hedera\_LOG_DIR .'/hedera-web.log'); self::init (); $imap = NULL; @@ -101,14 +102,14 @@ class Tpv $folder = sprintf ('INBOX.%s', $folder); if (!imap_mail_move ($imap, $msg, $folder)) - Log::write ('TPV: IMAP: Can\'t move message to %s: %s' + error_log ('TPV: IMAP: Can\'t move message to %s: %s' ,$folder ,imap_last_error () ); } if ($inbox && ($count = count ($inbox)) > 0) - Log::write ('TPV: %d mails processed.', $count); + error_log ('TPV: %d mails processed.', $count); imap_expunge ($imap); @@ -137,16 +138,15 @@ class Tpv $deleted += count ($messages); } - Log::write ('TPV: Cleaner: %d mails deleted.', $deleted); + error_log ('TPV: Cleaner: %d mails deleted.', $deleted); } imap_close ($imap); } else - Log::write ('TPV: IMAP: %s', imap_last_error ()); + error_log ('TPV: IMAP: %s', imap_last_error ()); self::deinit (); - Log::close (); } /** @@ -207,7 +207,7 @@ class Tpv } catch (\Exception $e) { - Log::write ("TPV: DB: %s", $e->getMessage ()); + error_log ("TPV: DB: %s", $e->getMessage ()); } } diff --git a/web/forms/ecomerce/basket/basket.js b/web/forms/ecomerce/basket/basket.js index b8c9166a..9ca00bdf 100755 --- a/web/forms/ecomerce/basket/basket.js +++ b/web/forms/ecomerce/basket/basket.js @@ -30,6 +30,11 @@ Vn.Basket = new Class this.hash.set ({'form': 'ecomerce/checkout'}); } + ,onCatalogClick: function () + { + this.hash.set ({'form': 'ecomerce/catalog'}); + } + ,onCheckoutClick: function () { this.hash.set ({'form': 'ecomerce/confirm'}); diff --git a/web/forms/ecomerce/basket/style.css b/web/forms/ecomerce/basket/style.css index d668432a..8d29e153 100755 --- a/web/forms/ecomerce/basket/style.css +++ b/web/forms/ecomerce/basket/style.css @@ -21,6 +21,10 @@ color: white; text-align: right; } +.basket .config +{ + margin: 0; +} /* Rows */ @@ -28,4 +32,12 @@ { background-color: #FCC; } +.basket .icon +{ + width: 8em; +} +.basket .icon > img +{ + border-radius: 50%; +} diff --git a/web/forms/ecomerce/basket/ui.xml b/web/forms/ecomerce/basket/ui.xml index 2675029d..089e28b5 100755 --- a/web/forms/ecomerce/basket/ui.xml +++ b/web/forms/ecomerce/basket/ui.xml @@ -4,9 +4,12 @@