[Weberp-svn] SF.net SVN: weberp:[9571] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[9571] trunk
|
From: <tim...@us...> - 2012-08-27 12:53:40
|
Revision: 9571
http://weberp.svn.sourceforge.net/weberp/?rev=9571&view=rev
Author: tim_schofield
Date: 2012-08-27 12:53:29 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Replace <a tags with new InternalLink() function
Modified Paths:
--------------
trunk/EDIMessageFormat.php
trunk/EmailConfirmation.php
trunk/EmailCustTrans.php
trunk/Factors.php
Modified: trunk/EDIMessageFormat.php
===================================================================
--- trunk/EDIMessageFormat.php 2012-08-27 12:32:57 UTC (rev 9570)
+++ trunk/EDIMessageFormat.php 2012-08-27 12:53:29 UTC (rev 9571)
@@ -144,19 +144,12 @@
}
- printf('<td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td><a href="%sSelectedMessageLine=%s">' . _('Edit') . '</a></td>
- <td><a href="%sdelete=%s">' . _('Delete') . '</a></td>
- </tr>',
- $myrow[1],
- $myrow[2],
- $myrow[3],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow[0],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow[0]);
+ echo '<td>' . $myrow[1] . '</td>
+ <td class="number">' . $myrow[2] . '</td>
+ <td>' . $myrow[3] . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedMessageLine=' . $myrow[0], _('Edit')) . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?delete=' . $myrow[0], _('Delete')) . '</td>
+ </tr>';
} //END WHILE LIST LOOP
echo '</table><br />';
@@ -189,7 +182,7 @@
$_POST['SequenceNo'] = $myrow['sequenceno'];
$_POST['LineText'] = $myrow['linetext'];
- echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?MessageType=INVOIC&PartnerCode=' . $myrow['partnercode'] . '">' . _('Review Message Lines') . '</a></div>';
+ echo '<div class="centre">' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?MessageType=INVOIC&PartnerCode=' . $myrow['partnercode'], _('Review Message Lines')) . '</div>';
echo '<input type="hidden" name="SelectedMessageLine" value="' . $SelectedMessageLine . '" />';
echo '<input type="hidden" name="MessageType" value="' . $myrow['messagetype'] . '" />';
Modified: trunk/EmailConfirmation.php
===================================================================
--- trunk/EmailConfirmation.php 2012-08-27 12:32:57 UTC (rev 9570)
+++ trunk/EmailConfirmation.php 2012-08-27 12:53:29 UTC (rev 9571)
@@ -6,16 +6,16 @@
include('includes/SQL_CommonFunctions.inc');
//Get Out if we have no order number to work with
if (!isset($_GET['TransNo']) OR $_GET['TransNo']==""){
- $title = _('Select Order To Print');
- include('includes/header.inc');
- echo '<div class="centre"><br /><br /><br />';
- prnMsg( _('Select an Order Number to Print before calling this page') , 'error');
- echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br /><br /><br />';
- include('includes/footer.inc');
- exit();
+ $title = _('Select Order To Print');
+ include('includes/header.inc');
+ echo '<div class="centre"><br /><br /><br />';
+ prnMsg( _('Select an Order Number to Print before calling this page') , 'error');
+ echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item">
+ <li>' . InternalLink($rootpath, 'SelectSalesOrder.php', _('Outstanding Sales Orders')) . '</li>
+ <li>' . InternalLink($rootpath, 'SelectCompletedOrder.php', _('Completed Sales Orders')) . '</li>
+ </td></tr></table></div><br /><br /><br />';
+ include('includes/footer.inc');
+ exit();
}
$MailTo = $_GET['EMail'];
@@ -62,46 +62,45 @@
//If there are no rows, there's a problem.
if (DB_num_rows($result)==0){
- $title = _('Print Packing Slip Error');
- include('includes/header.inc');
- echo '<div class="centre"><br /><br /><br />';
- prnMsg( _('Unable to Locate Order Number') . ' : ' . $_GET['TransNo'] . ' ', 'error');
- echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br /><br /><br />';
- include('includes/footer.inc');
- exit();
+ $title = _('Print Packing Slip Error');
+ include('includes/header.inc');
+ echo '<div class="centre"><br /><br /><br />';
+ prnMsg( _('Unable to Locate Order Number') . ' : ' . $_GET['TransNo'] . ' ', 'error');
+ echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item">
+ <li>' . InternalLink($rootpath, 'SelectSalesOrder.php', _('Outstanding Sales Orders')) . '</li>
+ <li>' . InternalLink($rootpath, 'SelectCompletedOrder.php', _('Completed Sales Orders')) . '</li>
+ </td></tr></table></div><br /><br /><br />';
+ include('includes/footer.inc');
+ exit();
} elseif (DB_num_rows($result)==1){ /*There is only one order header returned - thats good! */
- $myrow = DB_fetch_array($result);
- /* Place the deliver blind variable into a hold variable to used when
- producing the packlist */
- $DeliverBlind = $myrow['deliverblind'];
- $DeliveryDate = $myrow['salesorders.deliverydate'];
- if ($myrow['printedpackingslip']==1 AND ($_GET['Reprint']!='OK' OR !isset($_GET['Reprint']))){
- $title = _('Print Packing Slip Error');
- include('includes/header.inc');
- echo '<br />';
- prnMsg( _('The packing slip for order number') . ' ' . $_GET['TransNo'] . ' ' .
- _('has previously been printed') . '. ' . _('It was printed on'). ' ' . ConvertSQLDate($myrow['datepackingslipprinted']) .
- '<br />' . _('This check is there to ensure that duplicate packing slips are not produced and dispatched more than once to the customer'), 'warn' );
- echo '<p><a href="' . $rootpath . '/PrintCustOrder.php?TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'
- . _('Do a Re-Print') . ' (' . _('On Pre-Printed Stationery') . ') ' . _('Even Though Previously Printed') . '</a></p>' .
- '<a href="' . $rootpath. '/PrintCustOrder_generic.php?TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'. _('Do a Re-Print') . ' (' . _('Plain paper') . ' - ' . _('A4') . ' ' . _('landscape') . ') ' . _('Even Though Previously Printed'). '</a>';
+ $myrow = DB_fetch_array($result);
+ /* Place the deliver blind variable into a hold variable to used when
+ producing the packlist */
+ $DeliverBlind = $myrow['deliverblind'];
+ $DeliveryDate = $myrow['salesorders.deliverydate'];
+ if ($myrow['printedpackingslip']==1 AND ($_GET['Reprint']!='OK' OR !isset($_GET['Reprint']))){
+ $title = _('Print Packing Slip Error');
+ include('includes/header.inc');
+ echo '<br />';
+ prnMsg( _('The packing slip for order number') . ' ' . $_GET['TransNo'] . ' ' .
+ _('has previously been printed') . '. ' . _('It was printed on'). ' ' . ConvertSQLDate($myrow['datepackingslipprinted']) .
+ '<br />' . _('This check is there to ensure that duplicate packing slips are not produced and dispatched more than once to the customer'), 'warn' );
+ echo '<p>' . InternalLink($rootpath, 'PrintCustOrder.php?TransNo=' . $_GET['TransNo'] . '&Reprint=OK', _('Do a Re-Print') . ' (' . _('On Pre-Printed Stationery') . ') ' . _('Even Though Previously Printed')) . '</p>' .
+ InternalLink($rootpath, 'PrintCustOrder_generic.php?TransNo=' . $_GET['TransNo'] . '&Reprint=OK', _('Do a Re-Print') . ' (' . _('Plain paper') . ' - ' . _('A4') . ' ' . _('landscape') . ') ' . _('Even Though Previously Printed'));
- echo '<br /><br /><br />';
- echo _('Or select another Order Number to Print');
- echo '<table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br /><br /><br />';
+ echo '<br /><br /><br />';
+ echo _('Or select another Order Number to Print');
+ echo '<table class="table_index"><tr><td class="menu_group_item">
+ <li>'. InternalLink($rootpath, 'SelectSalesOrder.php', _('Outstanding Sales Orders')) . '</li>
+ <li>'. InternalLink($rootpath, 'SelectCompletedOrder.php', _('Completed Sales Orders')) . '</li>
+ </td></tr></table></div>';
- include('includes/footer.inc');
- exit;
- }//packing slip has been printed.
- $MailSubject = "Order Confirmation-Sales Order " . $_GET['TransNo'] . " - Your PO " .
- $myrow['customerref'] ;
+ include('includes/footer.inc');
+ exit;
+ }//packing slip has been printed.
+ $MailSubject = "Order Confirmation-Sales Order " . $_GET['TransNo'] . " - Your PO " .
+ $myrow['customerref'] ;
}
/*retrieve the order details from the database to print */
@@ -111,8 +110,8 @@
LETS GO */
$MailMessage = "<html><head><title>Email Confirmation</title></head><body>" .
- "<table cellpadding='2' cellspacing='2'><tr>" .
- "<td align='center' colspan='4'><h1>" . $_SESSION['CompanyRecord']['coyname'] . "</h1>" ;
+ "<table cellpadding='2' cellspacing='2'><tr>" .
+ "<td align='center' colspan='4'><h1>" . $_SESSION['CompanyRecord']['coyname'] . "</h1>" ;
$MailMessage = $MailMessage . "</td></tr>";
$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
$_SESSION['CompanyRecord']['regoffice1'] . "</b></td></tr>";
@@ -126,9 +125,9 @@
$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
$_SESSION['CompanyRecord']['email'] . "</b><br /><br /><br /></td></tr>";
$MailMessage = $MailMessage . "<table><tr><td align='center' colspan='4'>
- <h2> Order Acknowledgement</h2></td></tr>";
+ <h2> Order Acknowledgement</h2></td></tr>";
$MailMessage = $MailMessage . "<tr><td align='center' colspan='4'> <b>Order Number " .
- $_GET['TransNo'] . "</b><br /><br /><br /></td></tr>";
+ $_GET['TransNo'] . "</b><br /><br /><br /></td></tr>";
$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>Delivered To:</b></td></tr>";
$MailMessage = $MailMessage . "<tr><td colspan='4'> <b>" .
$myrow['deliverto'] . "</b></td></tr>";
@@ -136,14 +135,14 @@
$myrow['deladd1'] . "</b></td></tr>";
if(mb_strlen(trim($myrow['deladd2'])))
{
- $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd2'] . "</b></td></tr>";
- $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd3'] .
- ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']. "</b><br /><br /><br /></td></tr>";
+ $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd2'] . "</b></td></tr>";
+ $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd3'] .
+ ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']. "</b><br /><br /><br /></td></tr>";
}
else
{
- $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd3'] . ' ' .
- $myrow['deladd4'] . ' ' . $myrow['deladd5'] . "</b><br /><br /><br /></td></tr>";
+ $MailMessage = $MailMessage . "<tr><td> <b>" . $myrow['deladd3'] . ' ' .
+ $myrow['deladd4'] . ' ' . $myrow['deladd5'] . "</b><br /><br /><br /></td></tr>";
}
$MailMessage = $MailMessage . "</table><table border='1' width='50%'><tr>";
if($_REQUEST['POLine'] == 1){
@@ -152,7 +151,7 @@
$MailMessage = $MailMessage . "<td>Stock Code</td>
<td>Description</td>
<td>Quantity Ordered</td>
- <td>Due Date</td></tr>";
+ <td>Due Date</td></tr>";
$sql = "SELECT salesorderdetails.stkcode,
@@ -178,18 +177,18 @@
$DisplayQty = locale_number_format($myrow2['quantity'],$myrow2['decimalplaces']);
$DisplayPrevDel = locale_number_format($myrow2['qtyinvoiced'],$myrow2['decimalplaces']);
$DisplayQtySupplied = locale_number_format($myrow2['quantity'] - $myrow2['qtyinvoiced'],$myrow2['decimalplaces']);
- $StkCode[$i] = $myrow2['stkcode'];
- $DscCode[$i] = $myrow2['description'];
- $QtyCode[$i] = $DisplayQty ;
- $POLine[$i] = $myrow2['poline'];
- if($myrow2['itemdue'] =='')
- {
- $ItemDue[$i] = date('M d, Y',strtotime($DeliveryDate));
- }
- else
- {
- $ItemDue[$i] = date('M d, Y',strtotime($myrow2['itemdue']));
- }
+ $StkCode[$i] = $myrow2['stkcode'];
+ $DscCode[$i] = $myrow2['description'];
+ $QtyCode[$i] = $DisplayQty ;
+ $POLine[$i] = $myrow2['poline'];
+ if($myrow2['itemdue'] =='')
+ {
+ $ItemDue[$i] = date('M d, Y',strtotime($DeliveryDate));
+ }
+ else
+ {
+ $ItemDue[$i] = date('M d, Y',strtotime($myrow2['itemdue']));
+ }
$MailMessage = $MailMessage . '<tr>';
if($_REQUEST['POLine'] == 1){
$MailMessage = $MailMessage . '<td align="right">' . $POLine[$i] . '</td>';
@@ -200,7 +199,7 @@
<td align="center">' . $ItemDue[$i] . '</td>
</tr>';
- $i = $i + 1;
+ $i = $i + 1;
} //end while there are line items to print out
Modified: trunk/EmailCustTrans.php
===================================================================
--- trunk/EmailCustTrans.php 2012-08-27 12:32:57 UTC (rev 9570)
+++ trunk/EmailCustTrans.php 2012-08-27 12:53:29 UTC (rev 9571)
@@ -19,11 +19,11 @@
if ($_SESSION['InvoicePortraitFormat']==0){
echo '<meta http-equiv="Refresh" content=\'0; url=' . $rootpath . '/PrintCustTrans.php?FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . "'>";
- prnMsg(_('The transaction should have been emailed off') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ')' . '<a href="' . $rootpath . '/PrintCustTrans.php?FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer transaction'),'success');
+ prnMsg(_('The transaction should have been emailed off') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ')' . InternalLink($rootpath, 'PrintCustTrans.php?FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'], _('click here')) . _('to email the customer transaction'),'success');
} else {
echo '<meta http-equiv="Refresh" content=\'0; url=' . $rootpath . '/PrintCustTransPortrait.php?FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">';
- prnMsg(_('The transaction should have been emailed off. If this does not happen (perhaps the browser does not support META Refresh)') . '<a href="' . $rootpath . '/PrintCustTransPortrait.php?FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer transaction'),'success');
+ prnMsg(_('The transaction should have been emailed off. If this does not happen (perhaps the browser does not support META Refresh)') . InternalLink($rootpath, 'PrintCustTransPortrait.php?FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'], _('click here')) . _('to email the customer transaction'),'success');
}
exit;
} elseif (isset($_POST['DoIt'])) {
Modified: trunk/Factors.php
===================================================================
--- trunk/Factors.php 2012-08-27 12:32:57 UTC (rev 9570)
+++ trunk/Factors.php 2012-08-27 12:53:29 UTC (rev 9571)
@@ -202,7 +202,7 @@
echo '<td>' . $myrow['telephone'].'</td>';
echo '<td>' . $myrow['fax'].'</td>';
echo '<td>' . $myrow['email'].'</td>';
- echo '<td><a href="'.$rootpath . '/Factors.php?FactorID='.$myrow['id'].'">'._('Edit').'</a></td></tr>';
+ echo '<td>' . InternalLink($rootpath, 'Factors.php?FactorID='.$myrow['id'], _('Edit')) . '</td></tr>';
}
echo '</table><br /><div class="centre">';
echo '<br /><button tabindex="3" type="submit" name="Create">' . _('Create New Factor') . '</button>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
