[Web-erp-svn] SF.net SVN: web-erp:[6117] trunk

[<te...@us...>]

Revision: 6117
          http://sourceforge.net/p/web-erp/reponame/6117
Author:   tehonu
Date:     2013-07-20 11:31:59 +0000 (Sat, 20 Jul 2013)
Log Message:
-----------
added webSHOP manager email

Modified Paths:
--------------
    trunk/ShopParameters.php
    trunk/sql/mysql/upgrade4.10-4.11.sql

Modified: trunk/ShopParameters.php
===================================================================
--- trunk/ShopParameters.php	2013-07-20 02:09:20 UTC (rev 6116)
+++ trunk/ShopParameters.php	2013-07-20 11:31:59 UTC (rev 6117)
@@ -31,6 +31,9 @@
 		if ($_SESSION['ShopTitle'] != $_POST['X_ShopTitle'] ) {
 			$SQL[] = "UPDATE config SET confvalue = '" . DB_escape_string($_POST['X_ShopTitle']) ."' WHERE confname = 'ShopTitle'";
 		}
+		if ($_SESSION['ShopManagerEmail'] != $_POST['X_ShopManagerEmail'] ) {
+			$SQL[] = "UPDATE config SET confvalue = '" . DB_escape_string($_POST['X_ShopManagerEmail']) ."' WHERE confname = 'ShopManagerEmail'";
+		}
 		if ($_SESSION['ShopPrivacyStatement'] != $_POST['X_ShopPrivacyStatement'] ) {
 			$SQL[] = "UPDATE config SET confvalue = '" . DB_escape_string($_POST['X_ShopPrivacyStatement']) ."' WHERE confname = 'ShopPrivacyStatement'";
 		}
@@ -232,6 +235,13 @@
 		<td><input type="text" name="X_ShopTitle" required size="40" maxlength="40" value="' . $_SESSION['ShopTitle'] . '" /></td>
 		<td>' . _('Enter the title of the shop that will be displayed on the main webSHOP page. Useful for SEO purposes.') . '</td>
 	</tr>';
+
+//Shop Manager Email
+echo '<tr>
+		<td>' . _('Shop Manager Email') . ':</td>
+		<td><input type="text" name="X_ShopManagerEmail" required size="50" maxlength="50" value="' . $_SESSION['ShopManagerEmail'] . '" /></td>
+		<td>' . _('Enter the email address of the webSHOP manager.') . '</td>
+	</tr>';
 	
 // Shop Customer
 echo '<tr>

Modified: trunk/sql/mysql/upgrade4.10-4.11.sql
===================================================================
--- trunk/sql/mysql/upgrade4.10-4.11.sql	2013-07-20 02:09:20 UTC (rev 6116)
+++ trunk/sql/mysql/upgrade4.10-4.11.sql	2013-07-20 11:31:59 UTC (rev 6117)
@@ -182,5 +182,7 @@
 
 ALTER TABLE  `salescat` ADD  `active` INT NOT NULL DEFAULT  '1' COMMENT  '1 if active 0 if inactive';
 
+INSERT INTO config VALUES ('ShopManagerEmail','');
+
 UPDATE config SET confvalue='4.11.0' WHERE confname='VersionNumber';