Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix to packingslip.php and minor version change. #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix to packingslip.php and minor version change. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
068525c
Update super_orders_readme.html
retched Jan 10, 2016
23979a0
Update packingslip.php
retched Jan 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 2a_Modified_Core_Files/YOUR_ADMIN/packingslip.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
echo ' <tr>' . "\n" .
' <td class="smallText" valign="top" align="left">' . zen_datetime_short($orders_history->fields['date_added']) . '</td>' . "\n";
echo ' <td class="smallText" valign="top" align="left">' . $orders_status_array[$orders_history->fields['orders_status_id']] . '</td>' . "\n";
echo ' <td class="smallText" valign="top" align="left">' . ($orders_history->fields['comments'] == '' ? TEXT_NONE : nl2br(zen_db_output($orders_history->fields['comments']))) . '&nbsp;</td>' . "\n" .
echo ' <td class="smallText" valign="top" align="left">' . ($orders_history->fields['comments'] == '' ? TEXT_NONE : nl2br(zen_db_output(stripslashes($orders_history->fields['comments'])))) . '&nbsp;</td>' . "\n" .
' </tr>' . "\n";
$orders_history->MoveNext();

Expand Down Expand Up @@ -408,4 +408,4 @@

<?php // AJB 2012-05-31 - end (4) // ?>

<?php require_once(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
<?php require_once(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
19 changes: 14 additions & 5 deletions readme/super_orders_readme.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<meta name="description" content=
"Super Orders is exactly what its name implies: Zen Cart order management on steroids" />

<title>Super Orders 4.0.10</title>
<title>Super Orders 4.0.11</title>
<link rel="stylesheet" type="text/css" href="includes/css/stylesheet.css" />
<script type="text/javascript" src="includes/jscript/jscript_tabs.js">
</script>
Expand All @@ -34,7 +34,7 @@

<body>
<div id="wrapper">
<h2>Super Orders 4.0.10</h2>
<h2>Super Orders 4.0.11</h2>
<!--<p>Support thread: <a href="http://www.zen-cart.com/forum/showthread.php?t=44668" target="_blank">http://www.zen-cart.com/forum/showthread.php?p=886839</a><br>
Download link: <a href="http://www.zen-cart.com/index.php?main_page=product_contrib_info&amp;products_id=257" target="_blank">http://www.zen-cart.com/index.php?main_page=product_contrib_info&amp;products_id=743</a></p>-->

Expand Down Expand Up @@ -136,11 +136,11 @@ <h3>PURPOSE &amp; AIM</h3>
<p>Ready to get started? Just follow the installation instructions</p>

<div class="boldemphasis">
SUPER ORDERS v4.0.10 IS NOT COMPATIBLE WITH VERSIONS OF ZEN CART PRIOR TO ZEN
SUPER ORDERS v4.0.11 IS NOT COMPATIBLE WITH VERSIONS OF ZEN CART PRIOR TO ZEN
CART 1.5.X!!<br />
<br />
There will be NO SUPPORT PROVIDED for Zen Cart versions prior to v1.5 with
v4.0.10 of Super Orders.<br />
v4.0.11 of Super Orders.<br />
<small>(if you are still running an older version of Zen Cart we strongly
recommend that you upgrade as there have been many security enhancements made
in Zen Cart v1.5.)</small>
Expand Down Expand Up @@ -1267,6 +1267,15 @@ <h3>CREDITS &amp; HISTORY</h3>Based on Super Orders 2.0 - By Frank Koehl - PM:

<fieldset>
<legend>Change Log</legend>
<h3>v4.0.11</h3>

<ul>
<li>Removed extra slashes that appeared in packingslip.php's comments fields.
(This tends to happen on servers where the field isn't auto
escaped.)
</li>
</ul>

<h3>v4.0.10</h3>

<ul>
Expand Down Expand Up @@ -1762,4 +1771,4 @@ <h3>LICENSE</h3>
<br />
</div>
</body>
</html>
</html>