Merge

.eslintrc.yml

@@ -1,4 +1,8 @@
 extends: eslint:recommended
+env:
+    es6: true
+parserOptions:
+    sourceType: module
 rules:
     no-undef: 0
     no-redeclare: 0

conf/apache.conf

@@ -2,12 +2,9 @@
 # Alias /image-db /var/lib/hedera-web/image-db/
 
 <Directory /usr/share/hedera-web/>
-
 	Options -Indexes -FollowSymLinks
 	AllowOverride None
-
-	Order Allow,Deny
-	Allow From All
+	Require all granted
 	
 	<FilesMatch "\.(css|js|json|php|xml|html|svg)$">
 		SetOutputFilter DEFLATE
@@ -18,17 +15,11 @@
 		Header set Access-Control-Allow-Origin "*"
 		</IfModule>
 	</FilesMatch>
-
 </Directory>
 
 <Directory /var/lib/hedera-web/image-db/>
-
 	Options Indexes FollowSymLinks MultiViews
 	AllowOverride FileInfo Options
-
-	Order Allow,Deny
-	Allow From All
 	Require all granted
-	
 </Directory>
 

debian/control

@@ -5,13 +5,14 @@ Build-Depends: build-essential, debhelper, nodejs
 Standards-Version: 3.9.3
 Section: misc
 Homepage: http://www.verdnatura.es
-Vcs-Git: git://www.verdnatura.es/var/git/hedera-web
+Vcs-Git: https://git.verdnatura.es/hedera-web
 
 Package: hedera-web
 Architecture: all
-Depends: apache2, php5-mysql, php5-mcrypt, php5-ldap, php5-ssh2, php5-apcu, php-vn-lib, nodejs
+Depends: apache2 | httpd, nodejs, php5-cli, php5-mysql, php5-mcrypt, php5-ldap, php5-ssh2, php5-apcu, php-vn-lib
 Suggests: php-text-captcha, php5-imap
 Section: misc
 Priority: optional
 Description: Verdnatura's web page
- Verdnatura's web page.
+ Web page used by Verdnatura, it includes user authetication, a simple CMS and 
+ a webpshop.

debian/install

@@ -10,8 +10,7 @@ reports                     usr/share/hedera-web
 rest                        usr/share/hedera-web
 index.php                   usr/share/hedera-web
 package.json                usr/share/hedera-web
-manifest.json               usr/share/hedera-web
-LICENSE                     usr/share/hedera-web
+build                       usr/share/hedera-web
 README.md                   usr/share/hedera-web
 webpack.config.json         usr/share/hedera-web
 build                       usr/share/hedera-web

debian/postinst

@@ -1,8 +1,15 @@
 #!/bin/bash
 
-cd /usr/share/hedera-web && npm install --production
-a2enconf hedera-web
-service apache2 reload
+set -e
+
+(cd /usr/share/hedera-web && npm install --production)
+
+if [ -e /usr/share/apache2/apache2-maintscript-helper ]
+then
+    . /usr/share/apache2/apache2-maintscript-helper
+    apache2_invoke enconf hedera-web.conf
+fi
+
 service php5-fpm restart
 service cron restart
 

debian/postrm

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+set -e
+
+if [ -e /usr/share/apache2/apache2-maintscript-helper ]
+then
+    . /usr/share/apache2/apache2-maintscript-helper
+    apache2_invoke disconf hedera-web.conf
+fi
+
 rm -rf /usr/share/hedera-web/node_modules
-service apache2 reload
 service cron restart

forms/account/address-list/address-list.js

@@ -5,8 +5,8 @@ Hedera.AddressList = new Class
 
 	,activate: function ()
 	{
-		this.$.userModel.setInfo ('c', 'customer_view', 'hedera');
-		this.$.addresses.setInfo ('a', 'address_view', 'hedera');
+		this.$.userModel.setInfo ('c', 'myClient', 'hedera');
+		this.$.addresses.setInfo ('a', 'myAddress', 'hedera');
 	}
 	
 	,onAddAddressClick: function ()

forms/account/address-list/ui.xml

@@ -2,17 +2,17 @@
 <vn-group>
 	<db-form id="user-form">
 		<db-model property="model" id="user-model" updatable="true">
-			SELECT user_id, default_address
-				FROM customer_view c
+			SELECT id, defaultAddressFk
+				FROM myClient
 		</db-model>
 	</db-form>
 	<db-model id="addresses" updatable="true">
-		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
+		SELECT a.id, a.nickname, p.name province, a.postalCode,
+				a.city, a.street, a.active, c.country
+			FROM myAddress a
+				LEFT JOIN vn.province p ON p.id = a.provinceFk
+				JOIN vn.country c ON c.id = p.countryFk
+			WHERE a.active
 	</db-model>
 </vn-group>
 <h1 id="title">
@@ -29,7 +29,7 @@
 		<htk-radio-group
 			id="default-address"
 			lot="user-form"
-			name="default_address"/>
+			name="defaultAddressFk"/>
 		<htk-repeater model="addresses">
 			<custom>
 			<a
@@ -50,13 +50,13 @@
 						on-click="onRemoveAddressClick"/>
 				</div>
 				<p class="important">
-					{{consignee}}
+					{{nickname}}
 				</p>
 				<p>
-					{{name}}
+					{{street}}
 				</p>
 				<p>
-					{{zip_code}}, {{city}}
+					{{postalCode}}, {{city}}
 				</p>
 			</a>
 			</custom>

forms/account/address/address.js

@@ -5,8 +5,8 @@ Hedera.Address = new Class
 
 	,activate: function ()
 	{
-		this.$.model.setInfo ('a', 'address_view', 'hedera', ['id'], 'id');
-		this.$.model.setDefault ('customer_id', 'a',
+		this.$.model.setInfo ('a', 'myAddress', 'hedera', ['id'], 'id');
+		this.$.model.setDefault ('clientFk', 'a',
 			new Sql.Function ({schema: 'account', name: 'userGetId'}));
 	}
 	

forms/account/address/ui.xml

@@ -11,11 +11,12 @@
 			mode="ON_DEMAND"
 			lot="params"
 			on-operations-done="onOperationsDone">
-			SELECT a.id, a.name, a.consignee, a.city, a.zip_code, a.province_id, c.Id country
-				FROM address_view a
-					LEFT JOIN vn2008.province p ON p.province_id = a.province_id
-					JOIN vn2008.Paises c ON c.Id = p.Paises_Id
-				WHERE active != FALSE AND a.id = #address
+			SELECT a.id, a.street, a.nickname, a.city,
+					a.postalCode, a.provinceFk, c.id countryFk
+				FROM myAddress a
+					LEFT JOIN vn.province p ON p.id = a.provinceFk
+					JOIN vn.country c ON c.id = p.countryFk
+				WHERE a.active AND a.id = #address
 		</db-model>
 	</db-form>
 </vn-group>
@@ -36,11 +37,11 @@
 	<div class="card form">
 		<div>
 			<label>_Name</label>
-			<htk-entry lot="iter" name="consignee"/>
+			<htk-entry lot="iter" name="nickname"/>
 		</div>
 		<div>
 			<label>_Address</label>
-			<htk-entry lot="iter" name="name"/>
+			<htk-entry lot="iter" name="street"/>
 		</div>
 		<div>
 			<label>_City</label>
@@ -48,7 +49,7 @@
 		</div>
 		<div>
 			<label>_ZipCode</label>
-			<htk-entry lot="iter" name="zip_code"/>
+			<htk-entry lot="iter" name="postalCode"/>
 		</div>
 		<div>
 			<label>_Country</label>
@@ -60,8 +61,8 @@
 					name="country"
 					one-way="true"/>
 				<db-model property="model">
-					SELECT Id, Pais FROM vn2008.Paises
-						ORDER BY Pais
+					SELECT id, country FROM vn.country
+						ORDER BY country
 				</db-model>
 			</htk-combo>
 		</div>
@@ -69,8 +70,8 @@
 			<label>_Province</label>
 			<htk-combo lot="iter" name="province_id">
 				<db-model property="model" lot="iter">
-					SELECT province_id, name FROM vn2008.province
-						WHERE Paises_Id = #country
+					SELECT id, name FROM vn.province
+						WHERE countryFk = #country
 						ORDER BY name
 				</db-model>
 			</htk-combo>

forms/account/conf/conf.js

@@ -5,7 +5,7 @@ Hedera.Conf = new Class
 
 	,activate: function ()
 	{
-		this.$.userModel.setInfo ('c', 'customer_view', 'hedera');
+		this.$.userModel.setInfo ('c', 'myClient', 'hedera');
 
 		if (this.hash.$.changePass)
 			this.onPassChangeClick ();

forms/account/conf/ui.xml

@@ -7,10 +7,10 @@
 	<db-form id="user">
 		<db-model property="model" id="user-model" updatable="true">
 			SELECT u.id, u.name, u.email, u.recoverPass,
-					u.nickname, u.lang, c.mail, c.user_id
+					u.nickname, u.lang, c.isToBeMailed, c.id clientFk
 				FROM account.userView u
-					LEFT JOIN customer_view c
-						ON u.id = c.user_id
+					LEFT JOIN myClient c
+						ON u.id = c.id
 		</db-model>
 	</db-form>
 </vn-group>
@@ -52,7 +52,7 @@
 		</div>
 		<div>
 			<span>
-				<htk-check id="mail" lot="user" name="mail"/> 
+				<htk-check id="mail" lot="user" name="isToBeMailed"/> 
 				<label for="mail">_Receive invoices by email</label>
 			</span>
 		</div>

forms/admin/photos/ui.xml

@@ -8,7 +8,7 @@
 			<label>_Collection</label>
 			<htk-combo id="schema">
 				<db-model property="model">
-					SELECT name, `desc` FROM image_schema ORDER BY `desc`
+					SELECT name, `desc` FROM imageCollection ORDER BY `desc`
 				</db-model>
 			</htk-combo>
 		</div>