Ahora se muestra la fecha y la agencia en el catalogo

debian/changelog

@@ -1,4 +1,4 @@
-hedera-web (1.225-deb8) stable; urgency=low
+hedera-web (1.227-deb8) stable; urgency=low
 
   * Initial Release.
 

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');

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;
+}

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,
+.right-panel button.basket,
-button.configure
+.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);
 }

web/forms/ecomerce/catalog/ui.xml

@@ -59,6 +59,14 @@
 			ORDER BY warehouse_id, grouping;
 		<sql-batch property="batch" id="lots-batch"/>
 	</db-model>
+	<db-form id="basket" on-ready="onBasketReady">
+		<db-model>
+			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
+		</db-model>
+	</db-form>
 </vn-group>
 <div id="form" class="catalog">
 	<div class="center">
@@ -107,12 +115,21 @@
 		</div>
 		</div>
 	</div>
-	<div id="menu" class="menu" on-click="onMenuClick">
+	<div id="menu" class="right-panel" on-click="onMenuClick">
-		<button class="basket" on-click="onBasketClick">
+		<button class="basket" on-click="onBasketClick" title="Shopping basket">
 			<t>Basket</t>
-		</button><button class="configure" on-click="onConfigClick">
+		</button><button class="configure" on-click="onConfigClick" title="_Configure shopping basket">
-			<t>Configuration</t>
+			<t>Configure</t>
 		</button>
+		<div class="basket-info">
+			<p>
+				<htk-text form="basket" column="date_send" format="_%A, %e of %B"/>
+			</p>
+			<p>
+				<span id="method"/> 
+				<htk-text form="basket" column="agency"/>
+			</p>
+		</div>
 		<htk-repeater
 			model="realms-model"
 			form-id="realm-form"

web/forms/ecomerce/checkout/ui.xml

@@ -34,7 +34,7 @@
 	</db-model>
 	<db-model property="model" id="warehouses" auto-load="false" result-index="1" on-status-changed="onWarehousesReady">
 		CALL agency_list_from_date (#date, #address);
-		SELECT a.Id_Agencia, SUBSTR(a.description, 5) description
+		SELECT a.Id_Agencia, a.description
 			FROM t_agency t
 				JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id
 				JOIN vn2008.Vistas v ON a.Vista = v.vista_id

web/locale/ca/forms/ecomerce/catalog.json

@@ -10,10 +10,19 @@
 	,"StartOrder": "Començar encàrrec"
 	,"ShoppingBasket": "Cistella de la compra"
 
+	,"StartOrder": "Començar encàrrec"
+	,"Basket": "Cistella"
+	,"Shopping basket": "Cistella de la compra"
+	,"Configure": "Configurar"
+	,"Configure shopping basket": "Configurar cistella de la compra"
+	,"Date": "Data"
+	,"%A, %e of %B": "%A, %e de %B"
+	,"Delivery": "Lliurament"
+	,"Warehouse": "Magatzem"
+	,"Agency": "Agència"
+	
 	,"Realm": "Família"
 	,"Subtype": "Subtipus"
-	,"Date:": "Data:"
-	,"Warehouse:": "Magatzem:"
 	,"Search:": "Cercar:"
 	,"GeneralSearch": "Cerca general"
 

web/locale/ca/forms/ecomerce/checkout.json

@@ -26,6 +26,6 @@
 	,"OrderStarted": "Comanda començada"
 	,"OrderUpdated": "Comanda actualitzada"
 	
-	,"NoAgeciesAvailableForDate": "No hi ha agències disponibles per a la data i el consignatari seleccionats, modifica la data d'enviament de la comanda"
+	,"NoAgeciesAvailableForDate": "No hi ha agències disponibles per a la data i el consignatari seleccionats, modifica la data de recepció de la comanda"
 	,"NoWarehousesAvailableForDate": "No hi ha magatzems disponibles per a la data seleccionada, modifica la data de recollida de la comanda"
 }

web/locale/es/forms/ecomerce/catalog.json

@@ -8,12 +8,18 @@
 	,"ArticleNotAvailable": "Artículo no disponible"
 
 	,"StartOrder": "Empezar pedido"
-	,"ShoppingBasket": "Cesta de la compra"
+	,"Basket": "Cesta"
+	,"Shopping basket": "Cesta de la compra"
+	,"Configure": "Configurar"
+	,"Configure shopping basket": "Configurar cesta de la compra"
+	,"Date": "Fecha"
+	,"%A, %e of %B": "%A, %e de %B"
+	,"Delivery": "Entrega"
+	,"Warehouse": "Almacén"
+	,"Agency": "Agencia"
 	
 	,"Realm": "Familia"
 	,"Subtype": "Subtipo"
-	,"Date:": "Fecha:"
-	,"Warehouse:": "Almacén:"
 	,"Search:": "Buscar:"
 	,"GeneralSearch": "Búsqueda general"
 

web/locale/es/forms/ecomerce/checkout.json

@@ -26,6 +26,6 @@
 	,"OrderStarted": "Pedido empezado"
 	,"OrderUpdated": "Pedido actualizado"
 	
-	,"NoAgeciesAvailableForDate": "No hay agencias disponibles para la fecha y el consignatario seleccionados, modifica la fecha de envío del pedido"
+	,"NoAgeciesAvailableForDate": "No hay agencias disponibles para la fecha y el consignatario seleccionados, modifica la fecha de recepción del pedido"
 	,"NoWarehousesAvailableForDate": "No hay almacenes disponibles para la fecha seleccionada, modifica la fecha de recogida del pedido"
 }

web/locale/fr/forms/ecomerce/catalog.json

@@ -7,6 +7,17 @@
 	,"ArticleNotFound": "Article pas trouvé"
 	,"ArticleNotAvailable": "Article pas disponible"
 
+	,"StartOrder": "Acheter"
+	,"Basket": "Panier"
+	,"Shopping basket": "Mon panier"
+	,"Configure": "Configurar"
+	,"Configure shopping basket": "Configurez panier"
+	,"Date": "Date"
+	,"%A, %e of %B": "%A, %e de %B"
+	,"Delivery": "Accouchement"
+	,"Warehouse": "Entrepôt"
+	,"Agency": "Agence"
+
 	,"StartOrder": "Acheter"
 	,"ShoppingBasket": "Mon panier"
 	

web/locale/fr/forms/ecomerce/checkout.json

@@ -26,6 +26,6 @@
 	,"OrderStarted": "Ordre a commencé"
 	,"OrderUpdated": "Mise à jour Ordre"
 	
-	,"NoAgeciesAvailableForDate": "Aucun agences disponibles pour la date et le destinataire sélectionné, changer la date d'envoi de l'ordre"
+	,"NoAgeciesAvailableForDate": "Aucun agences disponibles pour la date et le destinataire sélectionné, changer la date de réception de l'ordre"
 	,"NoWarehousesAvailableForDate": "Pas de magasins disponibles à la date sélectionnée, changer la date de la collecte de l'ordre"
 }