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

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

Revision: 6042
          http://sourceforge.net/p/web-erp/reponame/6042
Author:   tehonu
Date:     2013-07-02 03:22:26 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Added 2 configuration flags to web store: ShopShowOnlyAvailableItems, ShopShowQOHColumn

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

Modified: trunk/ShopParameters.php
===================================================================
--- trunk/ShopParameters.php	2013-07-02 02:41:28 UTC (rev 6041)
+++ trunk/ShopParameters.php	2013-07-02 03:22:26 UTC (rev 6042)
@@ -64,6 +64,14 @@
 			$SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopBranchCode']."' WHERE confname = 'ShopBranchCode'";
 		}
 
+		if ($_SESSION['ShopShowOnlyAvailableItems'] != $_POST['X_ShopShowOnlyAvailableItems'] ) {
+			$SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopShowOnlyAvailableItems']."' WHERE confname = 'ShopShowOnlyAvailableItems'";
+		}
+
+		if ($_SESSION['ShopShowQOHColumn'] != $_POST['X_ShopShowQOHColumn'] ) {
+			$SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopShowQOHColumn']."' WHERE confname = 'ShopShowQOHColumn'";
+		}
+
 		if ($_SESSION['ShopAllowSurcharges'] != $_POST['X_ShopAllowSurcharges'] ) {
 			$SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopAllowSurcharges']."' WHERE confname = 'ShopAllowSurcharges'";
 		}
@@ -234,10 +242,40 @@
 		<td><textarea name="X_ShopFreightPolicy" rows="8" cols="60">' . stripslashes($_SESSION['ShopFreightPolicy']) . '</textarea></td>
 		<td>' . _('This text will appear on the web-store page that spells out the freight policy of the web-shop') . '</td>
 	</tr>';
+
 echo '<tr>
+		<td>' . _('Show Only Items With Available Stock') . ':</td>
+		<td><select name="X_ShopShowOnlyAvailableItems">';
+if ($_SESSION['ShopShowOnlyAvailableItems'] == '1') {
+	echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
+	echo '<option value="0">' . _('No') . '</option>';
+} else {
+	echo '<option selected="selected" value="0">' . _('No') . '</option>';
+	echo '<option value="1">' . _('Yes') . '</option>';
+}
+echo '</select></td>
+		<td>' . _('Shows only items with QOH > 0 thus avoiding the Arriving Soon items.') . '</td>
+	</tr>';
+
+echo '<tr>
+		<td>' . _('Show/Hide QOH column') . ':</td>
+		<td><select name="X_ShopShowQOHColumn">';
+if ($_SESSION['ShopShowQOHColumn'] == '1') {
+	echo '<option selected="selected" value="1">' . _('Show') . '</option>';
+	echo '<option value="0">' . _('Hide') . '</option>';
+} else {
+	echo '<option selected="selected" value="0">' . _('Hide') . '</option>';
+	echo '<option value="1">' . _('Show') . '</option>';
+}
+echo '</select></td>
+		<td>' . _('Shows / Hides the QOH column Select Hide if you do not want customers to know how many stock do you currently hold.') . '</td>
+	</tr>';
+	
+	
+echo '<tr>
 		<td>' . _('Allow Payment Surcharges') . ':</td>
 		<td><select name="X_ShopAllowSurcharges">';
-if ($_SESSION['ShopAllowSurcharges'] ==1) {
+if ($_SESSION['ShopAllowSurcharges'] == '1') {
 	echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
 	echo '<option value="0">' . _('No') . '</option>';
 } else {

Modified: trunk/sql/mysql/upgrade4.10-4.11.sql
===================================================================
--- trunk/sql/mysql/upgrade4.10-4.11.sql	2013-07-02 02:41:28 UTC (rev 6041)
+++ trunk/sql/mysql/upgrade4.10-4.11.sql	2013-07-02 03:22:26 UTC (rev 6042)
@@ -159,5 +159,8 @@
 INSERT INTO config VALUES ('ShopMode','test');
 INSERT INTO config VALUES ('ShopContactUs','');
 
+INSERT INTO config VALUES ('ShopShowOnlyAvailableItems','0');
+INSERT INTO config VALUES ('ShopShowQOHColumn','1');
+
 UPDATE config SET confvalue='4.11.0' WHERE confname='VersionNumber';