diff --git a/debian/changelog b/debian/changelog
index 00ca32b8..a0d4f088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.225-deb8) stable; urgency=low
+hedera-web (1.227-deb8) stable; urgency=low
* Initial Release.
diff --git a/web/forms/ecomerce/catalog/catalog.js b/web/forms/ecomerce/catalog/catalog.js
index bfe38473..14d4daf6 100755
--- a/web/forms/ecomerce/catalog/catalog.js
+++ b/web/forms/ecomerce/catalog/catalog.js
@@ -42,6 +42,14 @@ Vn.Catalog = new Class
this.$('items-model').setInfo ('a', 'Articles', 'vn2008', ['item_id']);
}
+ ,onBasketReady: function (form)
+ {
+ if (form.get ('method') != 'PICKUP')
+ Vn.Node.setText (this.$('method'), _('Agency'));
+ else
+ Vn.Node.setText (this.$('method'), _('Warehouse'));
+ }
+
,typeRenderer: function (builder, form)
{
var link = builder.$('link');
diff --git a/web/forms/ecomerce/catalog/mobile.css b/web/forms/ecomerce/catalog/mobile.css
index 804c7e9e..1d690fb5 100755
--- a/web/forms/ecomerce/catalog/mobile.css
+++ b/web/forms/ecomerce/catalog/mobile.css
@@ -3,11 +3,11 @@
{
display: block;
}
-.catalog div.menu
-{
- display: none;
-}
.catalog div.center
{
right: 0;
}
+.right-panel
+{
+ display: none;
+}
diff --git a/web/forms/ecomerce/catalog/style.css b/web/forms/ecomerce/catalog/style.css
index c9fe1889..d11de58c 100755
--- a/web/forms/ecomerce/catalog/style.css
+++ b/web/forms/ecomerce/catalog/style.css
@@ -88,7 +88,7 @@
/* Right panel */
-.catalog div.menu
+.right-panel
{
position: absolute;
z-index: 20;
@@ -99,8 +99,8 @@
background-color: white;
box-shadow: 0 0.2em 0.2em #AAA;
}
-button.basket,
-button.configure
+.right-panel button.basket,
+.right-panel button.configure
{
width: 100%;
height: 3em;
@@ -113,56 +113,69 @@ button.configure
margin: 0;
padding: 0;
}
-button.basket:hover
+.right-panel button.basket:hover
{
background-color: #0AB;
}
-button.configure
+.right-panel button.configure
{
background-color: #0097A7;
}
-button.configure:hover
+.right-panel button.configure:hover
{
background-color: #00838F;
}
-.realms-box
+.right-panel .basket-info > p
+{
+ margin: 1em 1.2em;
+ color: #555;
+ font-size: 1.2em;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+}
+.right-panel .basket-info span
+{
+ font-size: 1em;
+}
+.right-panel .realms-box
{
box-shadow: 0 0 0.4em #AAA;
background-color: rgba(1, 1, 1, .1);
}
-.realms-box a
+.right-panel .realms-box a
{
display: block;
float: left;
line-height: 0;
width: 33.3%;
}
-.realms-box a > img
+.right-panel .realms-box a > img
{
width: 100%;
border: 0;
padding: 0;
cursor: pointer;
}
-.realms-box img:hover
+.right-panel .realms-box img:hover
{
opacity: 0.85;
}
-.types-box
+.right-panel .types-box
{
position: absolute;
- top: 14.6em;
+ top: 21.6em;
bottom: 0;
right: 0;
left: 0;
overflow: auto;
}
-.types-box a
+.right-panel .types-box a
{
padding: .5em 1.5em;
display: block;
}
-.types-box a:hover
+.right-panel .types-box a:hover
{
background-color: rgba(1, 1, 1, .1);
}
diff --git a/web/forms/ecomerce/catalog/ui.xml b/web/forms/ecomerce/catalog/ui.xml
index eb0c0e9f..d30454fc 100755
--- a/web/forms/ecomerce/catalog/ui.xml
+++ b/web/forms/ecomerce/catalog/ui.xml
@@ -59,6 +59,14 @@
ORDER BY warehouse_id, grouping;
+
+
+ SELECT o.id, o.date_send, ag.description agency, v.code method
+ FROM basket o
+ JOIN vn2008.Agencias ag ON ag.Id_Agencia = o.agency_id
+ JOIN vn2008.Vistas v ON v.vista_id = o.delivery_method_id
+
+
-