From 343ac581e9c5d018f9bd91a43e34902b19580908 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Thu, 24 Sep 2015 13:50:27 +0200
Subject: [PATCH] Commit para cambiar de rama

---
 web/forms/admin/photos/photos.js   |  2 ++
 web/forms/admin/photos/ui.xml      |  2 +-
 web/forms/ecomerce/checkout/ui.xml |  3 ++-
 web/js/htk/image-editor.js         |  9 ++++++++-
 web/js/htk/image-editor.xml        |  4 ++--
 web/js/vn/vn.js                    | 31 ++++++++++++++++++++++++++++++
 6 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/web/forms/admin/photos/photos.js b/web/forms/admin/photos/photos.js
index dca40fbf..9f067aa7 100755
--- a/web/forms/admin/photos/photos.js
+++ b/web/forms/admin/photos/photos.js
@@ -8,6 +8,8 @@ Vn.Photos = new Class
 		this.$('schema').value = 'catalog';
 		this.$('photo-size').value = 10 /* MB */ * 1048576;
 		this.$('photo-id').focus ();
+		this.$('html-form').action =
+			'//'+ Vn.Config['image_host'] +'/hedera-web/rest.php?action=image';
 	}
 
 	,onFormSubmit: function ()
diff --git a/web/forms/admin/photos/ui.xml b/web/forms/admin/photos/ui.xml
index b19d92d8..2b50b154 100755
--- a/web/forms/admin/photos/ui.xml
+++ b/web/forms/admin/photos/ui.xml
@@ -6,9 +6,9 @@
 	<div class="box">
 		<div class="body">
 			<form
+				id="html-form"
 				method="post"
 				enctype="multipart/form-data"
-				action="rest.php?action=image"
 				target="photos-iframe"
 				on-submit="onFormSubmit">
 				<div class="form-group">
diff --git a/web/forms/ecomerce/checkout/ui.xml b/web/forms/ecomerce/checkout/ui.xml
index f6e858c2..b00d21ee 100755
--- a/web/forms/ecomerce/checkout/ui.xml
+++ b/web/forms/ecomerce/checkout/ui.xml
@@ -33,7 +33,7 @@
 		</sql-batch>
 	</db-model>
 	<db-model property="model" id="warehouses" auto-load="false" result-index="1" on-status-changed="onWarehousesReady">
-		CALL agency_list_from_date (#date, NULL);
+		CALL agency_list_from_date (#date, #address);
 		SELECT a.Id_Agencia, SUBSTR(a.description, 5) description
 			FROM t_agency t
 				JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id
@@ -43,6 +43,7 @@
 			ORDER BY a.description;
 		DROP TEMPORARY TABLE t_agency;
 		<sql-batch property="batch">
+			<item name="address" param="address"/>
 			<item name="date" param="date"/>
 		</sql-batch>
 	</db-model>
diff --git a/web/js/htk/image-editor.js b/web/js/htk/image-editor.js
index f04b66a2..7b322460 100755
--- a/web/js/htk/image-editor.js
+++ b/web/js/htk/image-editor.js
@@ -1,3 +1,8 @@
+/*
+Vn.include (['js/htk/widget.js']);
+Vn.resource (['js/htk/widget.js']);
+Vn.define (function () {
+*/
 /**
  * A form to handle the image database, it allows to add new images or replace it
  **/
@@ -11,7 +16,8 @@ Htk.ImageEditor = new Class
 		this.parent (props)
 		this.builderInit (this.constructor.Xml);
 		this.$('max-size').value = 10 /* MB */ * 1048576;
-		this.$('form').action = '//'+ Vn.Config['image_host'] +'/rest.php?action=image'
+		this.$('form').action =
+			'//'+ Vn.Config['image_host'] +'/hedera-web/rest.php?action=image'
 	}
 	
 	,onNameChange: function ()
@@ -52,3 +58,4 @@ Htk.ImageEditor = new Class
 	}
 });
 
+//});
diff --git a/web/js/htk/image-editor.xml b/web/js/htk/image-editor.xml
index 7ca9ffbb..c7508f97 100644
--- a/web/js/htk/image-editor.xml
+++ b/web/js/htk/image-editor.xml
@@ -2,11 +2,11 @@
 <div id="main" class="htk-image-editor">
 	<h2><t>UpdateImage</t></h2>
 	<form
+		id="form"
 		method="post"
 		target="image-editor"
 		enctype="multipart/form-data"
-		on-submit="onFormSubmit"
-		id="form">
+		on-submit="onFormSubmit">
 		<div class="form-group">
 			<label for="name"><t>FileName</t></label>
 			<input id="name" type="text" name="name" on-change="onNameChange"/>
diff --git a/web/js/vn/vn.js b/web/js/vn/vn.js
index 3ed107c8..b62edd52 100755
--- a/web/js/vn/vn.js
+++ b/web/js/vn/vn.js
@@ -26,6 +26,35 @@ var Vn =
 		}
 	}
 	
+	,onScriptLoad: function ()
+	{
+//		console.log (document.currentScript.src);
+		
+/*		var scripts = document.getElementsByTagName( 'script' );
+		var me = scripts[ scripts.length - 1 ];
+		console.log (me.src);
+*/
+	}
+	
+	,tmpIncludes: null
+	,tmpResources: null
+	,tmpDefine: null
+	
+	,include: function (includes)
+	{
+		this.tmpIncludes = includes;
+	}
+
+	,resource: function (resources)
+	{
+		this.tmpResources = resources;
+	}
+	
+	,define: function (calback)
+	{
+		this.tmpDefine = callback;
+	}
+	
 	/**
 	 * Includes a new Javascript in the current document, if the script
 	 * is already included, does nothing and calls the callback.
@@ -91,6 +120,8 @@ var Vn =
 	{
 		if (includeData.loaded)
 			return;
+			
+		console.log (includeData.script.src);
 	
 		for (var i = 0; i < includeData.callbacks.length; i++)
 			includeData.callbacks[i] (success);