diff --git a/forms/ecomerce/basket/basket.js b/forms/ecomerce/basket/basket.js
index 66f9fe08..2f1239ac 100644
--- a/forms/ecomerce/basket/basket.js
+++ b/forms/ecomerce/basket/basket.js
@@ -20,23 +20,23 @@ Hedera.Basket = new Class
,activate: function ()
{
- this.$('items').setInfo ('i', 'basket_item', 'hedera');
+ this.$('items').setInfo ('bi', 'myBasketItem', 'hedera');
}
,onConfigureClick: function ()
{
Htk.Toast.showWarning (_('RememberReconfiguringImpact'));
- this.hash.set ({'form': 'ecomerce/checkout'});
+ this.hash.set ({form: 'ecomerce/checkout'});
}
,onCatalogClick: function ()
{
- this.hash.set ({'form': 'ecomerce/catalog'});
+ this.hash.set ({form: 'ecomerce/catalog'});
}
,onCheckoutClick: function ()
{
- this.hash.set ({'form': 'ecomerce/confirm'});
+ this.hash.set ({form: 'ecomerce/confirm'});
}
,repeaterFunc: function (res, form)
diff --git a/forms/ecomerce/basket/style.css b/forms/ecomerce/basket/style.css
index 7893b0dc..2b0d1889 100644
--- a/forms/ecomerce/basket/style.css
+++ b/forms/ecomerce/basket/style.css
@@ -42,7 +42,7 @@
.basket .line > .delete
{
margin: -0.5em;
- margin-top: .3em;
+ margin-top: 1em;
margin-right: .5em;
float: left;
}
@@ -51,14 +51,28 @@
margin-right: 1em;
float: left;
border-radius: 50%;
- height: 3.2em;
- width: 3.2em;
+ height: 4.25em;
+ width: 4.25em;
}
-.basket .line > p
+.basket .line > .info
{
- margin: .1em 0;
margin-left: 7.5em;
}
+.basket .line > .info > h2
+{
+ font-size: 1em;
+ font-weight: normal;
+ padding: 0;
+ padding-bottom: .1em;
+}
+.basket .line > .info > p
+{
+ margin: 0;
+}
+.basket .line > .info > .tags
+{
+ color: #777;
+}
.basket .line .subtotal
{
float: right;
diff --git a/forms/ecomerce/basket/ui.xml b/forms/ecomerce/basket/ui.xml
index 5975f8e2..1c9eeed6 100644
--- a/forms/ecomerce/basket/ui.xml
+++ b/forms/ecomerce/basket/ui.xml
@@ -29,42 +29,48 @@
-
- SELECT i.id, i.amount, i.price, a.Article, a.Categoria,
- a.Medida, a.Tallos, a.Color, o.Abreviatura, a.Foto
- FROM basket_item i
- JOIN vn2008.Articles a ON a.Id_Article = i.item_id
- LEFT JOIN vn2008.Origen o ON a.id_origen = o.id
-
+ SELECT bi.id, bi.amount, bi.price, i.name item, i.image
+ t.tag1, t.val1, t.tag2, t.val2, t.tag3, t.val3
+ FROM myBasketItem bi
+ JOIN vn.item i ON i.id = bi.itemFk
+ LEFT JOIN vn.itemTagArranged t ON t.itemFk = i.id
-
-
-
-
-
-
- x
-
-
-
-
-
+
+
+
+
+
+
+ ,
+
+ ,
+
+
+
+
+ x
+
+
+
+
+
+
diff --git a/forms/ecomerce/ticket/style.css b/forms/ecomerce/ticket/style.css
index 3d6b08c7..850f6bfd 100644
--- a/forms/ecomerce/ticket/style.css
+++ b/forms/ecomerce/ticket/style.css
@@ -50,27 +50,42 @@
/* Lines */
+.ticket .line
+{
+ padding: .5em 0;
+}
.ticket .line > .photo
{
margin-right: 1em;
float: left;
border-radius: 50%;
- height: 3.2em;
- width: 3.2em;
+ height: 4.25em;
+ width: 4.25em;
}
-.ticket .line
+.ticket .line > .info
{
- padding: .5em 0;
+ margin-left: 5.25em;
}
-.ticket .line p
+.ticket .line > .info > h2
{
- margin: .1em 0;
+ font-size: 1em;
+ font-weight: normal;
+ padding: 0;
+ padding-bottom: .1em;
}
-.ticket .amount
+.ticket .line > .info > p
+{
+ margin: 0;
+}
+.ticket .line > .info > .tags
+{
+ color: #777;
+}
+.ticket .line > .info > .amount
{
float: left;
}
-.ticket .subtotal
+.ticket .line > .info > .subtotal
{
float: right;
}
diff --git a/forms/ecomerce/ticket/ui.xml b/forms/ecomerce/ticket/ui.xml
index fb4af84a..955b8796 100644
--- a/forms/ecomerce/ticket/ui.xml
+++ b/forms/ecomerce/ticket/ui.xml
@@ -9,9 +9,7 @@
-
- CALL myTicketGet (#ticket)
-
+ CALL myTicketGet (#ticket)
@@ -67,9 +65,7 @@
property="model"
id="movements"
batch="batch">
-
- CALL myTicketGetRows (#ticket)
-
+ CALL myTicketGetRows (#ticket)
@@ -80,18 +76,26 @@
directory="catalog"
subdir="200x200"
full-dir="900x900"/>
-
-
-
-
-
-
- x
-
-
-
-
-
+
+
+
+
+
+
+ ,
+
+ ,
+
+
+
+
+ x
+
+
+
+
+
+
@@ -101,9 +105,7 @@
property="model"
on-status-changed="onPackagesChanged"
batch="batch">
-
- CALL myTicketGetPackages (#ticket)
-
+ CALL myTicketGetPackages (#ticket)
diff --git a/reports/delivery-note/ui.xml b/reports/delivery-note/ui.xml
index c3352706..b8f0c2af 100644
--- a/reports/delivery-note/ui.xml
+++ b/reports/delivery-note/ui.xml
@@ -2,9 +2,7 @@
-
- CALL myTicketGet (#ticket)
-
+ CALL myTicketGet (#ticket)
@@ -37,9 +35,7 @@
-
- CALL myTicketGetRows (#ticket)
-
+ CALL myTicketGetRows (#ticket)
@@ -64,9 +60,7 @@
conn="conn"
batch="batch"
on-status-changed="onPackagesChanged">
-
- CALL myTicketGetPackages (#ticket)
-
+ CALL myTicketGetPackages (#ticket)