-
+
SELECT title, text, image, id FROM news
WHERE tag != 'course'
@@ -21,15 +21,15 @@
diff --git a/forms/ecomerce/checkout/checkout.js b/forms/ecomerce/checkout/checkout.js
index defd2fe2..1021bf16 100644
--- a/forms/ecomerce/checkout/checkout.js
+++ b/forms/ecomerce/checkout/checkout.js
@@ -1,3 +1,22 @@
+(function () {
+
+var methodsData = {
+ AGENCY: {
+ steps: ['method', 'date', 'address', 'agency', 'confirm'],
+ isDelivery: true,
+ textId: 'agencyText'
+ },
+ DELIVERY: {
+ steps: ['method', 'date', 'address', null, 'confirm'],
+ isDelivery: true,
+ textId: 'deliveryText'
+ },
+ PICKUP: {
+ steps: ['method', 'date', 'address', 'pickup', 'confirm'],
+ isDelivery: false,
+ textId: 'pickupText'
+ }
+};
Hedera.Checkout = new Class
({
@@ -28,7 +47,7 @@ Hedera.Checkout = new Class
if (orderForm.numRows > 0)
{
var i = orderForm;
- date = i.get ('date_send');
+ date = i.$.date_send;
}
else
var i = defaultsForm;
@@ -37,7 +56,7 @@ Hedera.Checkout = new Class
{
date = new Date ();
- if (i.get('delivery_method') != 'PICKUP')
+ if (i.$.delivery_method != 'PICKUP')
date.setDate (date.getDate () + 1);
date.setHours (0, 0, 0, 0);
@@ -45,18 +64,16 @@ Hedera.Checkout = new Class
this.$.lot.assign ({
date: date,
- method: i.get ('delivery_method'),
- agency: i.get ('agency_id'),
- address: i.get ('address_id')
+ method: i.$.delivery_method,
+ agency: i.$.agency_id,
+ address: i.$.address_id
});
this.autoStepLocked = false;
}
,disableButtons: function (disable)
{
- this.$.confirmAgency.disabled = disable;
- this.$.confirmDelivery.disabled = disable;
- this.$.confirmPickup.disabled = disable;
+ this.$.confirmButton.disabled = disable;
}
,onConfirmClick: function ()
@@ -75,10 +92,8 @@ Hedera.Checkout = new Class
if (!resultSet.fetchResult ())
return;
- if (this.$.orderForm.numRows > 0)
- Htk.Toast.showMessage (_('OrderUpdated'));
- else
- Htk.Toast.showMessage (_('OrderStarted'));
+ var isUpdated = this.$.orderForm.numRows > 0;
+ Htk.Toast.showMessage (_(isUpdated ? 'OrderUpdated' : 'OrderStarted'));
this.hash.setAll ({form: 'ecomerce/catalog'});
}
@@ -88,55 +103,45 @@ Hedera.Checkout = new Class
if (this.$.orderForm.numRows > 0)
window.history.back();
else
- this.hash.setAll ({'form': 'ecomerce/orders'});
+ this.hash.setAll ({form: 'ecomerce/orders'});
}
- ,agencySteps: ['method', 'date', 'address', 'agency', 'confirm-agency']
- ,deliverySteps: ['method', 'date', 'address', null, 'confirm-delivery']
- ,pickupSteps: ['method', 'date', 'address', 'pickup', 'confirm-pickup']
-
,stepFunc: function (stepIndex)
{
- var steps;
- var isDelivery;
-
- switch (this.$.rgMethod.value)
- {
- case 'AGENCY':
- steps = this.agencySteps;
- isDelivery = true;
- break;
- case 'DELIVERY':
- steps = this.deliverySteps;
- isDelivery = true;
- break;
- case 'PICKUP':
- default:
- steps = this.pickupSteps;
- isDelivery = false;
- break;
- }
+ var method = this.$.rgMethod.value;
+ var methodData = methodsData[method];
+ var stepName;
- var stepId = steps[stepIndex];
-
- if (!stepId)
+ if (methodData !== undefined)
+ stepName = methodData.steps[stepIndex];
+ else
+ stepName = 'method';
+
+ if (!stepName)
return null;
- switch (stepId)
+ switch (stepName)
{
case 'date':
- Vn.Node.setText (this.$.dateQuestion, isDelivery ?
- _('OrderDateDeliveryQuestion'):
- _('OrderDatePickupQuestion'));
+ var dateQuestion = methodData.isDelivery ?
+ 'OrderDateDeliveryQuestion' : 'OrderDatePickupQuestion';
+ Vn.Node.setText (_(dateQuestion));
this.$.calendar.goToSelectedMonth ();
break;
case 'agency':
case 'pickup':
this.$.agencies.refresh ();
break;
+ case 'confirm':
+ for (var myMethod in methodsData)
+ {
+ var display = myMethod == method ? 'block': 'none';
+ this.$[methodsData[myMethod].textId].style.display = display;
+ }
+ break;
}
- return this.$[stepId +'Step'];
+ return stepName;
}
,onFieldChange: function ()
@@ -153,7 +158,7 @@ Hedera.Checkout = new Class
,addressRenderer: function (builder, form)
{
builder.$.address.addEventListener ('click',
- this.onAddressClick.bind (this, form.get ('id')));
+ this.onAddressClick.bind (this, form.$.id));
}
,onAddressClick: function (addressId)
@@ -167,7 +172,7 @@ Hedera.Checkout = new Class
if (this.selectedNode)
Vn.Node.removeClass (this.selectedNode, 'selected');
- var row = this.$.addresses.search ('id', this.$.lot.get ('address'));
+ var row = this.$.addresses.search ('id', this.$.lot.$.address);
if (row != -1)
{
@@ -198,3 +203,4 @@ Hedera.Checkout = new Class
}
});
+})();
diff --git a/forms/ecomerce/checkout/style.css b/forms/ecomerce/checkout/style.css
index 69afe227..37ed975d 100644
--- a/forms/ecomerce/checkout/style.css
+++ b/forms/ecomerce/checkout/style.css
@@ -71,15 +71,11 @@
.thin-calendar
{
width: inherit;
- max-width: 24em;
+ max-width: 22em;
margin: 0 auto;
box-shadow: 0 0.1em 0.3em #ccc;
font-size: .7em;
}
-.thin-calendar tr > th
-{
- color: white;
-}
.htk-assistant .thin
{
float: right;
diff --git a/forms/ecomerce/checkout/ui.xml b/forms/ecomerce/checkout/ui.xml
index b0ee96e6..25c71ca3 100755
--- a/forms/ecomerce/checkout/ui.xml
+++ b/forms/ecomerce/checkout/ui.xml
@@ -14,6 +14,15 @@
JOIN vn.deliveryMethod d ON d.id = o.delivery_method_id
+
+
+ SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country
+ FROM address_view a
+ LEFT JOIN vn2008.province p ON a.province_id = p.province_id
+ JOIN vn2008.Paises c ON c.Id = p.Paises_Id
+ WHERE active != FALSE
+
+
+
+
diff --git a/forms/ecomerce/confirm/ui.xml b/forms/ecomerce/confirm/ui.xml
index 273cb0b0..4ef9d95e 100755
--- a/forms/ecomerce/confirm/ui.xml
+++ b/forms/ecomerce/confirm/ui.xml
@@ -38,20 +38,18 @@
-
{{title}}
+{{new.title}}
-
+
\ No newline at end of file
diff --git a/forms/cms/location/location.js b/forms/cms/location/location.js
index 5d0e7b3c..aaef15b8 100644
--- a/forms/cms/location/location.js
+++ b/forms/cms/location/location.js
@@ -1,5 +1,8 @@
+var infoTpl = require (__dirname +'/info.xml');
+
var gmapsIsLoaded = false;
+var gmapsLoadedCallback;
Hedera.Location = new Class
({
@@ -10,6 +13,9 @@ Hedera.Location = new Class
,activate: function ()
{
this.gui.loaderPush ();
+
+ this.infoBuilder = new Vn.Builder();
+ this.infoBuilder.compileString (infoTpl);
var sql = 'SELECT lat, lng, title, address, postcode, city, province, phone, language FROM location';
this.conn.execQuery (sql, this.onLocationsDone.bind (this));
@@ -26,7 +32,7 @@ Hedera.Location = new Class
,onLocationsDone: function (resultSet)
{
- this.locations = resultSet.fetchResult ();
+ this.locations = resultSet.fetchArray ();
this.allLoaded ();
}
@@ -50,40 +56,20 @@ Hedera.Location = new Class
var div = this.$.form;
var gmap = new google.maps.Map (div, options);
- var row;
- while (row = this.locations.fetchObject ())
- this.createMarker (row, gmap);
+ locations.forEach (function (location) {
+ this.createMarker (location, gmap);
+ }, this);
}
- ,createMarker: function (row, gmap)
+ ,createMarker: function (location, gmap)
{
- var div = document.createElement ('div');
- div.className = 'marker';
-
- var h = document.createElement ('h3');
- h.appendChild (document.createTextNode (row.title));
- div.appendChild (h);
-
- var p = document.createElement ('p');
- p.appendChild (document.createTextNode (row.address));
- div.appendChild (p);
-
- var p = document.createElement ('p');
- p.appendChild (document.createTextNode (row.postcode +' '+ row.city));
- div.appendChild (p);
-
- var p = document.createElement ('p');
- p.appendChild (document.createTextNode (row.province));
- div.appendChild (p);
-
- var p = document.createElement ('p');
- p.appendChild (document.createTextNode (row.phone));
- div.appendChild (p);
+ var scope = this.infoBuilder.load (this.doc, this, null, null, location);
+ var div = scope.getMain ();
var lat = new google.maps.LatLng (
- row.lat,
- row.lng
+ location.lat,
+ location.lng
);
var marker = new google.maps.Marker ({
@@ -100,7 +86,7 @@ Hedera.Location = new Class
this.openInfoWindow.bind (this, infoWindow, gmap, marker));
if (Vn.Locale.language
- && Vn.Locale.language == row.language)
+ && Vn.Locale.language == location.language)
this.openInfoWindow (infoWindow, gmap, marker);
}
diff --git a/forms/ecomerce/basket/basket.js b/forms/ecomerce/basket/basket.js
index 7ae1bf06..4a8d6cb6 100644
--- a/forms/ecomerce/basket/basket.js
+++ b/forms/ecomerce/basket/basket.js
@@ -26,17 +26,17 @@ Hedera.Basket = new Class
,onConfigureClick: function ()
{
Htk.Toast.showWarning (_('RememberReconfiguringImpact'));
- this.hash.setAll ({'form': 'ecomerce/checkout'});
+ this.hash.setAll ({form: 'ecomerce/checkout'});
}
,onCatalogClick: function ()
{
- this.hash.setAll ({'form': 'ecomerce/catalog'});
+ this.hash.setAll ({form: 'ecomerce/catalog'});
}
,onCheckoutClick: function ()
{
- this.hash.setAll ({'form': 'ecomerce/confirm'});
+ this.hash.setAll ({form: 'ecomerce/confirm'});
}
,repeaterFunc: function (res, form)
diff --git a/forms/ecomerce/catalog/catalog.js b/forms/ecomerce/catalog/catalog.js
index 3823e653..2b261668 100644
--- a/forms/ecomerce/catalog/catalog.js
+++ b/forms/ecomerce/catalog/catalog.js
@@ -52,7 +52,7 @@ Hedera.Catalog = new Class
,deactivate: function ()
{
this.hideMenu ();
- this.gui.$.topBar.style.backgroundColor = '';
+ this.gui.$.navbar.style.backgroundColor = '';
Vn.Node.remove (this.$.rightPanel);
}
@@ -161,7 +161,7 @@ Hedera.Catalog = new Class
color = '#'+ realms.get (row, 'color');
}
- this.gui.$.topBar.style.backgroundColor = color;
+ this.gui.$.navbar.style.backgroundColor = color;
}
,refreshTitle: function ()
diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml
index ebdf0cdf..0459ce51 100755
--- a/forms/ecomerce/catalog/ui.xml
+++ b/forms/ecomerce/catalog/ui.xml
@@ -137,29 +137,28 @@
full-dir="900x900"/>
{{title}}
++ {{address}} +
++ {{postcode}} {{city}} +
++ {{province}} +
++ {{phone}} +
+{{Article}}
+{{item.Article}}
- {{producer}} + {{item.producer}}
- @{{item_id}} + @{{item.item_id}}
- _Size
- _Color
-
-
+
-
-
-
- _Size
- _Color
- _Origin
-
-
-
+ step-func="stepFunc">
+
_PickupInStore
- _DeliveryOrPickupQuestion
+
+
- _OrderDateDeliveryQuestion
+
+
-
- SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country
- FROM address_view a
- LEFT JOIN vn2008.province p ON a.province_id = p.province_id
- JOIN vn2008.Paises c ON c.Id = p.Paises_Id
- WHERE active != FALSE
-
+ renderer="addressRenderer"
+ model="addresses">
-
- _AddressQuestion
-
-
-
+
+
- _AgencyQuestion
+
+
- _PickupWarehouseQuestion
+
+
-
- _ConfirmToAccessCatalog
_Arrival
-
- _Agency
+ _Agency {{agency.description}}
- - -
-
- _ConfirmToAccessCatalog
-
-
-
- _Arrival
-
+
_ReceiveThroughtRoute
-
-
- _ConfirmToAccessCatalog
-
-
-
- _Pickup
- _Warehouse
- _Agency
-