Pointer master moved

debian/conf/config.php

@@ -13,7 +13,7 @@
  *  - http://www.mydomain.org -> config.www.php
  *  - http://test.mydomain.org -> config.test.php
  **/
-$conf = [
+return [
 
 /**
  * Database parameters.

lib/vn/hedera/web.php

@@ -138,7 +138,7 @@ class Web
 		else
 			$confFile = _CONFIG_DIR .'/config.php';
 			
-		require ($confFile);
+		$conf = require ($confFile);
 		self::$confIncluded = TRUE;
 	}
 

web/forms/ecomerce/catalog/catalog.js

@@ -46,7 +46,7 @@ Vn.Catalog = new Class
 		this.gui.$('top-bar').style.backgroundColor = '';
 		Vn.Node.remove (this.$('right-panel'));
 	}
-
+	
 	,setView: function (view)
 	{
 		if (view === Vn.Catalog.View.GRID)
@@ -248,7 +248,7 @@ Vn.Catalog = new Class
 		else
 			Htk.Toast.showError (_('YouMustBeLoggedIn'));
 	}
-
+	
 	,onConfigureClick: function ()
 	{
 		if (!Vn.Cookie.check ('hedera_guest'))

web/forms/ecomerce/catalog/mobile.css

@@ -1,13 +0,0 @@
-
-.catalog button.menu
-{
-	display: block;
-}
-.catalog div.center
-{
-	right: 0;
-}
-.right-panel
-{
-	display: none;
-}

web/forms/ecomerce/catalog/ui.xml

@@ -177,60 +177,8 @@
 				</p>
 			</div>
 		</div>
-<<<<<<< HEAD
-	</div>
-	<div id="menu" class="right-panel" on-click="onMenuClick">
-		<button class="basket" on-click="onBasketClick" title="Shopping basket">
-			<t>Basket</t>
-		</button><button class="configure" on-click="onConfigClick" title="_Configure shopping basket">
-			<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"
-			renderer="realmRenderer"
-			class="realms-box">
-			<db-model id="realms-model" on-status-changed="onTypeChange">
-				SELECT id, reino, color FROM vn2008.reinos
-					WHERE display != FALSE ORDER BY reino
-			</db-model>
-			<template>
-				<a id="link">
-					<img id="image"/>
-				</a>
-			</template>
-		</htk-repeater>
-		<htk-repeater
-			model="types-model"
-			form-id="type-form"
-			renderer="typeRenderer"
-			empty-message="_SelectFamily"
-			class="types-box">
-			<db-model id="types-model" on-status-changed="refreshTitle">
-				CALL type_list (#realm)
-				<sql-batch property="batch">
-					<item name="realm" param="realm"/>
-				</sql-batch>
-			</db-model>
-			<template>
-				<a id="link">
-					<htk-text form="type-form" column="Tipo"/>
-				</a>
-			</template>
-		</htk-repeater>
-=======
 		</custom>
 	</htk-repeater>
->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	</div>
 </div>
 <div id="right-panel" class="right-panel" on-click="onRightPanelClick">

web/forms/ecomerce/checkout/checkout.js

@@ -196,7 +196,8 @@ Vn.Checkout = new Class
 	
 	,calendarRestrict: function (date)
 	{
-		return date.getTime () >= this.today.getTime ();
+		return date.getTime () >= this.today.getTime ()
+			&& date.getDay () != 0;
 	}
 });
 

web/forms/ecomerce/confirm/ui.xml

@@ -187,7 +187,7 @@
 										<htk-text form="iter" column="iban"/> 
 										<htk-text form="iter" column="entity_id"/> 
 										<htk-text form="iter" column="office"/> 
-										<htk-text form="iter" column="DC"/> 
+										<htk-text form="iter" column="dc"/> 
 										<htk-text form="iter" column="number"/>
 									</p>
 								</div>