Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6720] trunk/SelectOrderItems.php
|
From: <ex...@us...> - 2014-05-19 09:06:20
|
Revision: 6720
http://sourceforge.net/p/web-erp/reponame/6720
Author: exsonqu
Date: 2014-05-19 09:06:18 +0000 (Mon, 19 May 2014)
Log Message:
-----------
19/5/14 Exson: Tidy up code of SelectOrderItems.php.
Modified Paths:
--------------
trunk/SelectOrderItems.php
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2014-05-18 17:36:42 UTC (rev 6719)
+++ trunk/SelectOrderItems.php 2014-05-19 09:06:18 UTC (rev 6720)
@@ -424,33 +424,8 @@
$_SESSION['Items'.$identifier]->CurrDecimalPlaces = $myrow['decimalplaces'];
# the branch was also selected from the customer selection so default the delivery details from the customer branches table CustBranch. The order process will ask for branch details later anyway
+ $result = GetCustBranchDetails($identifier);
- $sql = "SELECT custbranch.brname,
- custbranch.braddress1,
- custbranch.braddress2,
- custbranch.braddress3,
- custbranch.braddress4,
- custbranch.braddress5,
- custbranch.braddress6,
- custbranch.phoneno,
- custbranch.email,
- custbranch.defaultlocation,
- custbranch.defaultshipvia,
- custbranch.deliverblind,
- custbranch.specialinstructions,
- custbranch.estdeliverydays,
- locations.locationname,
- custbranch.salesman
- FROM custbranch
- INNER JOIN locations
- ON custbranch.defaultlocation=locations.loccode
- WHERE custbranch.branchcode='" . $_SESSION['Items'.$identifier]->Branch . "'
- AND custbranch.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
-
- $ErrMsg = _('The customer branch record of the customer selected') . ': ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('cannot be retrieved because');
- $DbgMsg = _('SQL used to retrieve the branch details was') . ':';
- $result =DB_query($sql,$db,$ErrMsg,$DbgMsg);
-
if (DB_num_rows($result)==0){
prnMsg(_('The branch details for branch code') . ': ' . $_SESSION['Items'.$identifier]->Branch . ' ' . _('against customer code') . ': ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('could not be retrieved') . '. ' . _('Check the set up of the customer and branch'),'error');
@@ -549,30 +524,7 @@
// the branch would be set in the user data so default delivery details as necessary. However,
// the order process will ask for branch details later anyway
- $sql = "SELECT custbranch.brname,
- custbranch.branchcode,
- custbranch.braddress1,
- custbranch.braddress2,
- custbranch.braddress3,
- custbranch.braddress4,
- custbranch.braddress5,
- custbranch.braddress6,
- custbranch.phoneno,
- custbranch.email,
- custbranch.defaultlocation,
- custbranch.deliverblind,
- custbranch.estdeliverydays,
- locations.locationname,
- custbranch.salesman
- FROM custbranch INNER JOIN locations
- ON custbranch.defaultlocation=locations.loccode
- WHERE custbranch.branchcode='" . $_SESSION['Items'.$identifier]->Branch . "'
- AND custbranch.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
-
- $ErrMsg = _('The customer branch record of the customer selected') . ': ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('cannot be retrieved because');
- $DbgMsg = _('SQL used to retrieve the branch details was');
- $result =DB_query($sql,$db,$ErrMsg, $DbgMsg);
-
+ $result = GetCustBranchDetails($identifier);
$myrow = DB_fetch_array($result);
$_SESSION['Items'.$identifier]->DeliverTo = $myrow['brname'];
$_SESSION['Items'.$identifier]->DelAdd1 = $myrow['braddress1'];
@@ -767,40 +719,27 @@
} elseif ($_POST['Keywords']=='' AND $_POST['StockCode']=='') {
$msg='<div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>';
}
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.longdescription,
+ stockmaster.units
+ FROM stockmaster INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
+ AND stockmaster.mbflag <>'G'
+ AND stockmaster.discontinued=0 ";
if (isset($_POST['Keywords']) AND mb_strlen($_POST['Keywords'])>0) {
//insert wildcard characters in spaces
$_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
if ($_POST['StockCat']=='All'){
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- custitem.cust_part,
- custitem.cust_description
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
- AND stockmaster.mbflag <>'G'
- AND stockmaster.description " . LIKE . " '" . $SearchString . "'
- AND stockmaster.discontinued=0
- ORDER BY stockmaster.stockid";
+ $SQL .= "AND stockmaster.description " . LIKE . " '" . $SearchString . "'
+ ORDER BY stockmaster.stockid";
} else {
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- custitem.cust_part,
- custitem.cust_description
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
- AND stockmaster.mbflag <>'G'
- AND stockmaster.discontinued=0
- AND stockmaster.description " . LIKE . " '" . $SearchString . "'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid";
+ $SQL .= "AND stockmaster.description " . LIKE . " '" . $SearchString . "'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ ORDER BY stockmaster.stockid";
}
} elseif (mb_strlen($_POST['StockCode'])>0){
@@ -809,64 +748,20 @@
$SearchString = '%' . $_POST['StockCode'] . '%';
if ($_POST['StockCat']=='All'){
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- custitem.cust_part,
- custitem.cust_description
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
- AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
- AND stockmaster.mbflag <>'G'
- AND stockmaster.discontinued=0
- ORDER BY stockmaster.stockid";
+ $SQL .= "AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
+ ORDER BY stockmaster.stockid";
} else {
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- custitem.cust_part,
- custitem.cust_description
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
- AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
- AND stockmaster.mbflag <>'G'
- AND stockmaster.discontinued=0
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid";
+ $SQL .= "AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ ORDER BY stockmaster.stockid";
}
} else {
if ($_POST['StockCat']=='All'){
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- custitem.cust_part,
- custitem.cust_description
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
- AND stockmaster.mbflag <>'G'
- AND stockmaster.discontinued=0
- ORDER BY stockmaster.stockid";
+ $SQL .= "ORDER BY stockmaster.stockid";
} else {
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- custitem.cust_part,
- custitem.cust_description
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
- AND stockmaster.mbflag <>'G'
- AND stockmaster.discontinued=0
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid";
+ $SQL .= "AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ ORDER BY stockmaster.stockid";
}
}
@@ -1957,4 +1852,35 @@
}#end of else not selecting a customer
include('includes/footer.inc');
+
+function GetCustBranchDetails($identifier) {
+ global $db;
+ $sql = "SELECT custbranch.brname,
+ custbranch.branchcode,
+ custbranch.braddress1,
+ custbranch.braddress2,
+ custbranch.braddress3,
+ custbranch.braddress4,
+ custbranch.braddress5,
+ custbranch.braddress6,
+ custbranch.phoneno,
+ custbranch.email,
+ custbranch.defaultlocation,
+ custbranch.defaultshipvia,
+ custbranch.deliverblind,
+ custbranch.specialinstructions,
+ custbranch.estdeliverydays,
+ locations.locationname,
+ custbranch.salesman
+ FROM custbranch
+ INNER JOIN locations
+ ON custbranch.defaultlocation=locations.loccode
+ WHERE custbranch.branchcode='" . $_SESSION['Items'.$identifier]->Branch . "'
+ AND custbranch.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
+
+ $ErrMsg = _('The customer branch record of the customer selected') . ': ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('cannot be retrieved because');
+ $DbgMsg = _('SQL used to retrieve the branch details was') . ':';
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
+ return $result;
+}
?>
\ No newline at end of file
|
