web-erp-svn

[Web-erp-svn] SF.net SVN: web-erp:[6507] trunk/PriceMatrix.php

[<ex...@us...>]

Revision: 6507
          http://sourceforge.net/p/web-erp/reponame/6507
Author:   exsonqu
Date:     2013-12-22 01:21:47 +0000 (Sun, 22 Dec 2013)
Log Message:
-----------
22/12/2013 Exson: Modify the stock select element to a combox box which autocomplete the limited stock ID options to 300. Otherwise, users have to input an stock ID themselves. To avoid a too long stock list as pointed by Tim.

Modified Paths:
--------------
    trunk/PriceMatrix.php

Modified: trunk/PriceMatrix.php
===================================================================
--- trunk/PriceMatrix.php	2013-12-21 09:45:05 UTC (rev 6506)
+++ trunk/PriceMatrix.php	2013-12-22 01:21:47 UTC (rev 6507)
@@ -103,21 +103,18 @@
 echo '</select></td></tr>';
 
 
-$sql = "SELECT stockid FROM stockmaster WHERE stockid <>''";
+$sql = "SELECT stockid FROM stockmaster WHERE stockid <>'' LIMIT 300";//if the quantity is over, users have to input it himselves
 $result = DB_query($sql, $db);
 if (DB_num_rows($result) > 0) {
 	echo '<tr>
-			<td>' .  _('Stock Code') .': </td>
-			<td><select name="StockID">';
+		<td>' .  _('Stock Code') .': </td>
+		<td><input type="text" name="StockID" list="StockList" /></td>';
+	echo	'<datalist id="StockList">';
 
 	while ($myrow = DB_fetch_array($result)){
-		if ($myrow['stockid']==$_POST['DiscCat']){
-			echo '<option selected="selected" value="' . $myrow['stockid'] . '">' . $myrow['stockid'] . '</option>';
-		} else {
 			echo '<option value="' . $myrow['stockid'] . '">' . $myrow['stockid'] . '</option>';
-		}
 	}
-	echo '</select></td></tr>';
+		echo '</datalist>';
 } else {
 	echo '<tr><td><input type="hidden" name="StockID" value="" /></td></tr>';
 }

[Web-erp-svn] SF.net SVN: web-erp:[7376] trunk/PriceMatrix.php

[<ex...@us...>]

Revision: 7376
          http://sourceforge.net/p/web-erp/reponame/7376
Author:   exsonqu
Date:     2015-11-03 01:50:36 +0000 (Tue, 03 Nov 2015)
Log Message:
-----------
3/11/15 Exson: Fixed typo in PriceMatrix.php.

Modified Paths:
--------------
    trunk/PriceMatrix.php

Modified: trunk/PriceMatrix.php
===================================================================
--- trunk/PriceMatrix.php	2015-10-31 06:37:46 UTC (rev 7375)
+++ trunk/PriceMatrix.php	2015-11-03 01:50:36 UTC (rev 7376)
@@ -60,9 +60,9 @@
 			WHERE stockid='".$StockID."'
 			AND startdate='".$SQLStartDate."'
 			AND enddate='".$SQLEndDate."'
-		        AND salestype='".$_POST['TypeAbbrev']."'
-			AND currabrev='".$_POST['currabrev']."'
-			AND quantitybreak='".$_POST['quantitybreak']."'";
+		        AND salestype='".$_POST['SalesType']."'
+			AND currabrev='".$_POST['CurrAbrev']."'
+			AND quantitybreak='".$_POST['QuantityBreak']."'";
 	$result = DB_query($sql);
 	$myrow = DB_fetch_row($result);
 	if ($myrow[0]!=0 AND !isset($_POST['OldTypeAbbrev']) AND !isset($_POST['OldCurrAbrev'])){
@@ -167,7 +167,7 @@
 	<td><select name="CurrAbrev">';
 while ($myrow = DB_fetch_array($result)){
 	echo '<option';
-	if ($myrow['currabrev']==$_POST['CurrAbrev']){
+	if (isset($_POST['CurrAbrev']) AND $myrow['currabrev']==$_POST['CurrAbrev']){
 		echo ' selected="selected"';
 	}
 	echo ' value="' . $myrow['currabrev'] . '">' . $CurrencyName[$myrow['currabrev']] . '</option>';
@@ -210,6 +210,12 @@
 if (!isset($_POST['EndDate'])){
 	$_POST['EndDate'] = GetMySQLMaxDate();
 }
+if (!isset($_POST['QuantityBreak'])) {
+	$_POST['QuantityBreak'] = 0;
+}
+if (!isset($_POST['Price'])) {
+	$_POST['Price'] = 0;
+}
 echo '<tr><td>'. _('Price Effective From Date') . ':</td>
 	<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="StartDate" required="required" size="10" maxlength="10" title="' . _('Enter the date from which this price should take effect.') . '" value="' . $_POST['StartDate'] . '" /></td></tr>';
 echo '<tr><td>' . _('Price Effective To Date') . ':</td>
@@ -240,7 +246,7 @@
 			price,
 			currencies.currabrev,
 			currencies.currency,
-			currencies.decimalplaces AS currdecimalplace
+			currencies.decimalplaces AS currdecimalplaces
 		FROM pricematrix INNER JOIN salestypes
 			ON pricematrix.salestype=salestypes.typeabbrev
 		INNER JOIN currencies
@@ -382,4 +388,4 @@
 
 } // end function ReSequenceEffectiveDates
 
-?>
\ No newline at end of file
+?>