[TEP-COMMIT] [CVS admin] update to the template structure

anonymous-OfajU3CKLf1/[email protected] 22 Jul 2004 23:29:53 -0000
Newsgroups gmane.comp.web.oscommerce.cvs
Message-ID <[email protected]>
Commit in admin/admin on MAIN

orders.php +61 -405 1.114 -> 1.115

templates/pages/orders.php +133 added 1.1

/orders_edit.php +223 added 1.1

+417 -405

2 added + 1 modified, total 3 files

update to the template structure

----------

admin /admin

orders.php 1.114 -> 1.115

diff -u -r1.114 -r1.115
--- orders.php 2004/04/03 10:28:43 1.114
+++ orders.php 2004/07/22 23:29:47 1.115
@@ -5,16 +5,22 @@

osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com

- Copyright (c) 2003 osCommerce

+ Copyright (c) 2004 osCommerce

Released under the GNU General Public License
*/

require('includes/application_top.php');

- require(DIR_WS_CLASSES . 'currencies.php');
- $currencies = new currencies();

+ $selected_box = 'customers';

+ $action = (isset($_GET['action']) ? $_GET['action'] : '');
+ $section = (isset($_GET['section']) ? $_GET['section'] : '');
+
+ if (!isset($_GET['page']) || (isset($_GET['page']) && !is_numeric($_GET['page']))) {
+ $_GET['page'] = 1;
+ }
+

$orders_statuses = array();
$orders_status_array = array();
$orders_status_query = tep_db_query("select orders_status_id, orders_status_name from " . TABLE_ORDERS_STATUS . " where language_id = '" . (int)$languages_id . "'");

@@ -24,425 +30,75 @@

$orders_status_array[$orders_status['orders_status_id']] = $orders_status['orders_status_name'];
}

- $action = (isset($HTTP_GET_VARS['action']) ? $HTTP_GET_VARS['action'] : '');
-
- if (tep_not_null($action)) {

+ if (!empty($action)) {

switch ($action) {
case 'update_order':

- $oID = tep_db_prepare_input($HTTP_GET_VARS['oID']);
- $status = tep_db_prepare_input($HTTP_POST_VARS['status']);
- $comments = tep_db_prepare_input($HTTP_POST_VARS['comments']);
-
- $order_updated = false;
- $check_status_query = tep_db_query("select customers_name, customers_email_address, orders_status, date_purchased from " . TABLE_ORDERS . " where orders_id = '" . (int)$oID . "'");
- $check_status = tep_db_fetch_array($check_status_query);
-
- if ( ($check_status['orders_status'] != $status) || tep_not_null($comments)) {
- tep_db_query("update " . TABLE_ORDERS . " set orders_status = '" . tep_db_input($status) . "', last_modified = now() where orders_id = '" . (int)$oID . "'");
-
- $customer_notified = '0';
- if (isset($HTTP_POST_VARS['notify']) && ($HTTP_POST_VARS['notify'] == 'on')) {
- $notify_comments = '';
- if (isset($HTTP_POST_VARS['notify_comments']) && ($HTTP_POST_VARS['notify_comments'] == 'on')) {
- $notify_comments = sprintf(EMAIL_TEXT_COMMENTS_UPDATE, $comments) . "\n\n";

+ if (isset($_GET['oID']) && is_numeric($_GET['oID'])) {
+ $Qorder = $osC_Database->query('select customers_name, customers_email_address, orders_status, date_purchased from :table_orders where orders_id = :orders_id');
+ $Qorder->bindTable(':table_orders', TABLE_ORDERS);
+ $Qorder->bindInt(':orders_id', $_GET['oID']);
+ $Qorder->execute();
+
+ if ($Qorder->numberOfRows() === 1) {
+ if (($_POST['status'] != $Qorder->valueInt('orders_status')) || !empty($_POST['comment'])) {
+ $Qupdate = $osC_Database->query('update :table_orders set orders_status = :orders_status, last_modified = now() where orders_id = :orders_id');
+ $Qupdate->bindTable(':table_orders', TABLE_ORDERS);
+ $Qupdate->bindInt(':orders_status', $_POST['status']);
+ $Qupdate->bindInt(':orders_id', $_GET['oID']);
+ $Qupdate->execute();
+
+ if ($Qupdate->affectedRows()) {
+ if (isset($_POST['notify_customer']) && ($_POST['notify_customer'] == 'on')) {
+ $email_body = STORE_NAME . "\n" . EMAIL_SEPARATOR . "\n" . EMAIL_TEXT_ORDER_NUMBER . ' ' . $oID . "\n" . EMAIL_TEXT_INVOICE_URL . ' ' . tep_catalog_href_link(FILENAME_CATALOG_ACCOUNT_HISTORY_INFO, 'order_id=' . $oID, 'SSL') . "\n" . EMAIL_TEXT_DATE_ORDERED . ' ' . tep_date_long($Qorder->value('date_purchased')) . "\n\n";
+
+ if (isset($_POST['append_comment']) && ($_POST['append_comment'] == 'on')) {
+ $email_body .= sprintf(EMAIL_TEXT_COMMENTS_UPDATE, $_POST['comment']) . "\n\n";
+ }
+
+ $email_body .= sprintf(EMAIL_TEXT_STATUS_UPDATE, $orders_status_array[$_POST['status']]);
+
+ tep_mail($Qorder->value('customers_name'), $Qorder->value('customers_email_address'), EMAIL_TEXT_SUBJECT, $email_body, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
+ }
+
+ $Qupdate = $osC_Database->query('insert into :table_orders_status_history (orders_id, orders_status_id, date_added, customer_notified, comments) values (:orders_id, :orders_status_id, now(), :customer_notified, :comments)');
+ $Qupdate->bindTable(':table_orders_status_history', TABLE_ORDERS_STATUS_HISTORY);
+ $Qupdate->bindInt(':orders_id', $_GET['oID']);
+ $Qupdate->bindInt(':orders_status_id', $_POST['status']);
+ $Qupdate->bindInt(':customer_notified', (isset($_POST['notify_customer']) && ($_POST['notify_customer'] == 'on') ? '1' : '0'));
+ $Qupdate->bindValue(':comments', $_POST['comment']);
+ $Qupdate->execute();
+
+ $messageStack->add_session(SUCCESS_DB_ROWS_UPDATED, 'success');
+ } else {
+ $messageStack->add_session(ERROR_DB_ROWS_NOT_UPDATED, 'error');
+ }
+ } else {
+ $messageStack->add_session(WARNING_DB_ROWS_NOT_UPDATED, 'warning');

}

-
- $email = STORE_NAME . "\n" . EMAIL_SEPARATOR . "\n" . EMAIL_TEXT_ORDER_NUMBER . ' ' . $oID . "\n" . EMAIL_TEXT_INVOICE_URL . ' ' . tep_catalog_href_link(FILENAME_CATALOG_ACCOUNT_HISTORY_INFO, 'order_id=' . $oID, 'SSL') . "\n" . EMAIL_TEXT_DATE_ORDERED . ' ' . tep_date_long($check_status['date_purchased']) . "\n\n" . $notify_comments . sprintf(EMAIL_TEXT_STATUS_UPDATE, $orders_status_array[$status]);
-
- tep_mail($check_status['customers_name'], $check_status['customers_email_address'], EMAIL_TEXT_SUBJECT, $email, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
-
- $customer_notified = '1';

}

-
- tep_db_query("insert into " . TABLE_ORDERS_STATUS_HISTORY . " (orders_id, orders_status_id, date_added, customer_notified, comments) values ('" . (int)$oID . "', '" . tep_db_input($status) . "', now(), '" . tep_db_input($customer_notified) . "', '" . tep_db_input($comments) . "')");
-
- $order_updated = true;
- }
-
- if ($order_updated == true) {
- $messageStack->add_session(SUCCESS_ORDER_UPDATED, 'success');
- } else {
- $messageStack->add_session(WARNING_ORDER_NOT_UPDATED, 'warning');

}

- tep_redirect(tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('action')) . 'action=edit'));

+ tep_redirect(tep_href_link(FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page'] . '&oID=' . $_GET['oID'] . '&action=oEdit&section=statusHistory'));

break;
case 'deleteconfirm':

- $oID = tep_db_prepare_input($HTTP_GET_VARS['oID']);

+ tep_remove_order($_GET['oID'], (isset($_POST['restock']) && ($_POST['restock'] == 'on') ? true : false));

- tep_remove_order($oID, $HTTP_POST_VARS['restock']);
-
- tep_redirect(tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action'))));

+ tep_redirect(tep_href_link(FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page']));

break;
}
}

- if (($action == 'edit') && isset($HTTP_GET_VARS['oID'])) {
- $oID = tep_db_prepare_input($HTTP_GET_VARS['oID']);

+ require('../includes/classes/currencies.php');
+ $osC_Currencies = new osC_Currencies();

- $orders_query = tep_db_query("select orders_id from " . TABLE_ORDERS . " where orders_id = '" . (int)$oID . "'");
- $order_exists = true;
- if (!tep_db_num_rows($orders_query)) {
- $order_exists = false;
- $messageStack->add(sprintf(ERROR_ORDER_DOES_NOT_EXIST, $oID), 'error');
- }
- }
-
- include(DIR_WS_CLASSES . 'order.php');
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="includes/stylesheet.css">
-<script language="javascript" src="includes/general.js"></script>
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0" bgcolor="#FFFFFF">
-<!-- header //-->
-<?php
- require(DIR_WS_INCLUDES . 'header.php');
-?>
-<!-- header_eof //-->

+ require('includes/classes/order.php');

-<!-- body //-->
-<table border="0" width="100%" cellspacing="2" cellpadding="2">
- <tr>
- <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="1" cellpadding="1" class="columnLeft">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
- </table></td>
-<!-- body_text //-->
- <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
-<?php
- if (($action == 'edit') && ($order_exists == true)) {
- $order = new order($oID);
-?>
- <tr>
- <td width="100%"><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_draw_separator('pixel_trans.gif', 1, HEADING_IMAGE_HEIGHT); ?></td>
- <td class="pageHeading" align="right"><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('action'))) . '">' . tep_image_button('button_back.gif', IMAGE_BACK) . '</a>'; ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table width="100%" border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td colspan="3"><?php echo tep_draw_separator(); ?></td>
- </tr>
- <tr>
- <td valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main" valign="top"><b><?php echo ENTRY_CUSTOMER; ?></b></td>
- <td class="main"><?php echo tep_address_format($order->customer['format_id'], $order->customer, 1, '', '<br>'); ?></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '5'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo ENTRY_TELEPHONE_NUMBER; ?></b></td>
- <td class="main"><?php echo $order->customer['telephone']; ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo ENTRY_EMAIL_ADDRESS; ?></b></td>
- <td class="main"><?php echo '<a href="mailto:' . $order->customer['email_address'] . '"><u>' . $order->customer['email_address'] . '</u></a>'; ?></td>
- </tr>
- </table></td>
- <td valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main" valign="top"><b><?php echo ENTRY_SHIPPING_ADDRESS; ?></b></td>
- <td class="main"><?php echo tep_address_format($order->delivery['format_id'], $order->delivery, 1, '', '<br>'); ?></td>
- </tr>
- </table></td>
- <td valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main" valign="top"><b><?php echo ENTRY_BILLING_ADDRESS; ?></b></td>
- <td class="main"><?php echo tep_address_format($order->billing['format_id'], $order->billing, 1, '', '<br>'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo ENTRY_PAYMENT_METHOD; ?></b></td>
- <td class="main"><?php echo $order->info['payment_method']; ?></td>
- </tr>
-<?php
- if (tep_not_null($order->info['cc_type']) || tep_not_null($order->info['cc_owner']) || tep_not_null($order->info['cc_number'])) {
-?>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_CREDIT_CARD_TYPE; ?></td>
- <td class="main"><?php echo $order->info['cc_type']; ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_CREDIT_CARD_OWNER; ?></td>
- <td class="main"><?php echo $order->info['cc_owner']; ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_CREDIT_CARD_NUMBER; ?></td>
- <td class="main"><?php echo $order->info['cc_number']; ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_CREDIT_CARD_EXPIRES; ?></td>
- <td class="main"><?php echo $order->info['cc_expires']; ?></td>
- </tr>
-<?php
- }
-?>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr class="dataTableHeadingRow">
- <td class="dataTableHeadingContent" colspan="2"><?php echo TABLE_HEADING_PRODUCTS; ?></td>
- <td class="dataTableHeadingContent"><?php echo TABLE_HEADING_PRODUCTS_MODEL; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_TAX; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_PRICE_EXCLUDING_TAX; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_PRICE_INCLUDING_TAX; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_TOTAL_EXCLUDING_TAX; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_TOTAL_INCLUDING_TAX; ?></td>
- </tr>
-<?php
- for ($i=0, $n=sizeof($order->products); $i<$n; $i++) {
- echo ' <tr class="dataTableRow">' . "\n" .
- ' <td class="dataTableContent" valign="top" align="right">' . $order->products[$i]['qty'] . '&nbsp;x</td>' . "\n" .
- ' <td class="dataTableContent" valign="top">' . $order->products[$i]['name'];
-
- if (isset($order->products[$i]['attributes']) && (sizeof($order->products[$i]['attributes']) > 0)) {
- for ($j = 0, $k = sizeof($order->products[$i]['attributes']); $j < $k; $j++) {
- echo '<br><nobr><small>&nbsp;<i> - ' . $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'];
- if ($order->products[$i]['attributes'][$j]['price'] != '0') echo ' (' . $order->products[$i]['attributes'][$j]['prefix'] . $currencies->format($order->products[$i]['attributes'][$j]['price'] * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . ')';
- echo '</i></small></nobr>';
- }
- }
-
- echo ' </td>' . "\n" .
- ' <td class="dataTableContent" valign="top">' . $order->products[$i]['model'] . '</td>' . "\n" .
- ' <td class="dataTableContent" align="right" valign="top">' . tep_display_tax_value($order->products[$i]['tax']) . '%</td>' . "\n" .
- ' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .
- ' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']), true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .
- ' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'] * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .
- ' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']) * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n";
- echo ' </tr>' . "\n";
- }
-?>
- <tr>
- <td align="right" colspan="8"><table border="0" cellspacing="0" cellpadding="2">
-<?php
- for ($i = 0, $n = sizeof($order->totals); $i < $n; $i++) {
- echo ' <tr>' . "\n" .
- ' <td align="right" class="smallText">' . $order->totals[$i]['title'] . '</td>' . "\n" .
- ' <td align="right" class="smallText">' . $order->totals[$i]['text'] . '</td>' . "\n" .
- ' </tr>' . "\n";
- }
-?>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><table border="1" cellspacing="0" cellpadding="5">
- <tr>
- <td class="smallText" align="center"><b><?php echo TABLE_HEADING_DATE_ADDED; ?></b></td>
- <td class="smallText" align="center"><b><?php echo TABLE_HEADING_CUSTOMER_NOTIFIED; ?></b></td>
- <td class="smallText" align="center"><b><?php echo TABLE_HEADING_STATUS; ?></b></td>
- <td class="smallText" align="center"><b><?php echo TABLE_HEADING_COMMENTS; ?></b></td>
- </tr>
-<?php
- $orders_history_query = tep_db_query("select orders_status_id, date_added, customer_notified, comments from " . TABLE_ORDERS_STATUS_HISTORY . " where orders_id = '" . tep_db_input($oID) . "' order by date_added");
- if (tep_db_num_rows($orders_history_query)) {
- while ($orders_history = tep_db_fetch_array($orders_history_query)) {
- echo ' <tr>' . "\n" .
- ' <td class="smallText" align="center">' . tep_datetime_short($orders_history['date_added']) . '</td>' . "\n" .
- ' <td class="smallText" align="center">';
- if ($orders_history['customer_notified'] == '1') {
- echo tep_image(DIR_WS_ICONS . 'tick.gif', ICON_TICK) . "</td>\n";
- } else {
- echo tep_image(DIR_WS_ICONS . 'cross.gif', ICON_CROSS) . "</td>\n";
- }
- echo ' <td class="smallText">' . $orders_status_array[$orders_history['orders_status_id']] . '</td>' . "\n" .
- ' <td class="smallText">' . nl2br(tep_db_output($orders_history['comments'])) . '&nbsp;</td>' . "\n" .
- ' </tr>' . "\n";
- }
- } else {
- echo ' <tr>' . "\n" .
- ' <td class="smallText" colspan="5">' . TEXT_NO_ORDER_HISTORY . '</td>' . "\n" .
- ' </tr>' . "\n";
- }
-?>
- </table></td>
- </tr>
- <tr>
- <td class="main"><br><b><?php echo TABLE_HEADING_COMMENTS; ?></b></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '5'); ?></td>
- </tr>
- <tr><?php echo tep_draw_form('status', FILENAME_ORDERS, tep_get_all_get_params(array('action')) . 'action=update_order'); ?>
- <td class="main"><?php echo tep_draw_textarea_field('comments', 'soft', '60', '5'); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo ENTRY_STATUS; ?></b> <?php echo tep_draw_pull_down_menu('status', $orders_statuses, $order->info['orders_status']); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo ENTRY_NOTIFY_CUSTOMER; ?></b> <?php echo tep_draw_checkbox_field('notify', '', true); ?></td>
- <td class="main"><b><?php echo ENTRY_NOTIFY_COMMENTS; ?></b> <?php echo tep_draw_checkbox_field('notify_comments', '', true); ?></td>
- </tr>
- </table></td>
- <td valign="top"><?php echo tep_image_submit('button_update.gif', IMAGE_UPDATE); ?></td>
- </tr>
- </table></td>
- </form></tr>
- <tr>
- <td colspan="2" align="right"><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS_INVOICE, 'oID=' . $HTTP_GET_VARS['oID']) . '" TARGET="_blank">' . tep_image_button('button_invoice.gif', IMAGE_ORDERS_INVOICE) . '</a> <a href="' . tep_href_link(FILENAME_ORDERS_PACKINGSLIP, 'oID=' . $HTTP_GET_VARS['oID']) . '" TARGET="_blank">' . tep_image_button('button_packingslip.gif', IMAGE_ORDERS_PACKINGSLIP) . '</a> <a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('action'))) . '">' . tep_image_button('button_back.gif', IMAGE_BACK) . '</a>'; ?></td>
- </tr>
-<?php
- } else {
-?>
- <tr>
- <td width="100%"><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_draw_separator('pixel_trans.gif', 1, HEADING_IMAGE_HEIGHT); ?></td>
- <td align="right"><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr><?php echo tep_draw_form('orders', FILENAME_ORDERS, '', 'get'); ?>
- <td class="smallText" align="right"><?php echo HEADING_TITLE_SEARCH . ' ' . tep_draw_input_field('oID', '', 'size="12"') . tep_draw_hidden_field('action', 'edit'); ?></td>
- </form></tr>
- <tr><?php echo tep_draw_form('status', FILENAME_ORDERS, '', 'get'); ?>
- <td class="smallText" align="right"><?php echo HEADING_TITLE_STATUS . ' ' . tep_draw_pull_down_menu('status', array_merge(array(array('id' => '', 'text' => TEXT_ALL_ORDERS)), $orders_statuses), '', 'onChange="this.form.submit();"'); ?></td>
- </form></tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr class="dataTableHeadingRow">
- <td class="dataTableHeadingContent"><?php echo TABLE_HEADING_CUSTOMERS; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_ORDER_TOTAL; ?></td>
- <td class="dataTableHeadingContent" align="center"><?php echo TABLE_HEADING_DATE_PURCHASED; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_STATUS; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_ACTION; ?>&nbsp;</td>
- </tr>
-<?php
- if (isset($HTTP_GET_VARS['cID'])) {
- $cID = tep_db_prepare_input($HTTP_GET_VARS['cID']);
- $orders_query_raw = "select o.orders_id, o.customers_name, o.customers_id, o.customers_ip_address, o.payment_method, o.date_purchased, o.last_modified, o.currency, o.currency_value, s.orders_status_name, ot.text as order_total from " . TABLE_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_ORDERS_STATUS . " s where o.customers_id = '" . (int)$cID . "' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' and ot.class = 'ot_total' order by orders_id DESC";
- } elseif ((isset($HTTP_GET_VARS['status'])) && (tep_not_null($HTTP_GET_VARS['status']))) {
- $status = tep_db_prepare_input($HTTP_GET_VARS['status']);
- $orders_query_raw = "select o.orders_id, o.customers_ip_address, o.customers_name, o.payment_method, o.date_purchased, o.last_modified, o.currency, o.currency_value, s.orders_status_name, ot.text as order_total from " . TABLE_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_ORDERS_STATUS . " s where o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' and s.orders_status_id = '" . (int)$status . "' and ot.class = 'ot_total' order by o.orders_id DESC";
- } else {
- $orders_query_raw = "select o.orders_id, o.customers_ip_address, o.customers_name, o.payment_method, o.date_purchased, o.last_modified, o.currency, o.currency_value, s.orders_status_name, ot.text as order_total from " . TABLE_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_ORDERS_STATUS . " s where o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' and ot.class = 'ot_total' order by o.orders_id DESC";
- }
- $orders_split = new splitPageResults($HTTP_GET_VARS['page'], MAX_DISPLAY_SEARCH_RESULTS, $orders_query_raw, $orders_query_numrows);
- $orders_query = tep_db_query($orders_query_raw);
- while ($orders = tep_db_fetch_array($orders_query)) {
- if ((!isset($HTTP_GET_VARS['oID']) || (isset($HTTP_GET_VARS['oID']) && ($HTTP_GET_VARS['oID'] == $orders['orders_id']))) && !isset($oInfo)) {
- $oInfo = new objectInfo($orders);
- }
-
- if (isset($oInfo) && is_object($oInfo) && ($orders['orders_id'] == $oInfo->orders_id)) {
- echo ' <tr id="defaultSelected" class="dataTableRowSelected" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="document.location.href=\'' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $oInfo->orders_id . '&action=edit') . '\'">' . "\n";
- } else {
- echo ' <tr class="dataTableRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="document.location.href=\'' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID')) . 'oID=' . $orders['orders_id']) . '\'">' . "\n";
- }
-?>
- <td class="dataTableContent"><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $orders['orders_id'] . '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'preview.gif', ICON_PREVIEW) . '</a>&nbsp;' . $orders['customers_name']; ?></td>
- <td class="dataTableContent" align="right"><?php echo strip_tags($orders['order_total']); ?></td>
- <td class="dataTableContent" align="center"><?php echo tep_datetime_short($orders['date_purchased']); ?></td>
- <td class="dataTableContent" align="right"><?php echo $orders['orders_status_name']; ?></td>
- <td class="dataTableContent" align="right"><?php if (isset($oInfo) && is_object($oInfo) && ($orders['orders_id'] == $oInfo->orders_id)) { echo tep_image(DIR_WS_IMAGES . 'icon_arrow_right.gif', ''); } else { echo '<a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID')) . 'oID=' . $orders['orders_id']) . '">' . tep_image(DIR_WS_IMAGES . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>&nbsp;</td>
- </tr>
-<?php
- }
-?>
- <tr>
- <td colspan="5"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="smallText" valign="top"><?php echo $orders_split->display_count($orders_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $HTTP_GET_VARS['page'], TEXT_DISPLAY_NUMBER_OF_ORDERS); ?></td>
- <td class="smallText" align="right"><?php echo $orders_split->display_links($orders_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $HTTP_GET_VARS['page'], tep_get_all_get_params(array('page', 'oID', 'action'))); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
-<?php
- $heading = array();
- $contents = array();
-

switch ($action) {

- case 'delete':
- $heading[] = array('text' => '<b>' . TEXT_INFO_HEADING_DELETE_ORDER . '</b>');
-
- $contents = array('form' => tep_draw_form('orders', FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $oInfo->orders_id . '&action=deleteconfirm'));
- $contents[] = array('text' => TEXT_INFO_DELETE_INTRO . '<br><br><b>' . $cInfo->customers_firstname . ' ' . $cInfo->customers_lastname . '</b>');
- $contents[] = array('text' => '<br>' . tep_draw_checkbox_field('restock') . ' ' . TEXT_INFO_RESTOCK_PRODUCT_QUANTITY);
- $contents[] = array('align' => 'center', 'text' => '<br>' . tep_image_submit('button_delete.gif', IMAGE_DELETE) . ' <a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $oInfo->orders_id) . '">' . tep_image_button('button_cancel.gif', IMAGE_CANCEL) . '</a>');
- break;
- default:
- if (isset($oInfo) && is_object($oInfo)) {
- $heading[] = array('text' => '<b>[' . $oInfo->orders_id . ']&nbsp;&nbsp;' . tep_datetime_short($oInfo->date_purchased) . '</b>');
-
- $contents[] = array('align' => 'center', 'text' => '<a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $oInfo->orders_id . '&action=edit') . '">' . tep_image_button('button_edit.gif', IMAGE_EDIT) . '</a> <a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $oInfo->orders_id . '&action=delete') . '">' . tep_image_button('button_delete.gif', IMAGE_DELETE) . '</a>');
- $contents[] = array('align' => 'center', 'text' => '<a href="' . tep_href_link(FILENAME_ORDERS_INVOICE, 'oID=' . $oInfo->orders_id) . '" TARGET="_blank">' . tep_image_button('button_invoice.gif', IMAGE_ORDERS_INVOICE) . '</a> <a href="' . tep_href_link(FILENAME_ORDERS_PACKINGSLIP, 'oID=' . $oInfo->orders_id) . '" TARGET="_blank">' . tep_image_button('button_packingslip.gif', IMAGE_ORDERS_PACKINGSLIP) . '</a>');
- $contents[] = array('text' => '<br>' . TEXT_DATE_ORDER_CREATED . ' ' . tep_date_short($oInfo->date_purchased));
- if (tep_not_null($oInfo->last_modified)) $contents[] = array('text' => TEXT_DATE_ORDER_LAST_MODIFIED . ' ' . tep_date_short($oInfo->last_modified));
- $contents[] = array('text' => '<br>' . TEXT_INFO_PAYMENT_METHOD . ' ' . $oInfo->payment_method);
- $contents[] = array('text' => '<br>' . TEXT_IP_ADDRESS . ' ' . $oInfo->customers_ip_address);
- }
- break;

+ case 'oEdit': $page_contents = 'orders_edit.php'; break;
+ default: $page_contents = 'orders.php';

}

-
- if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) {
- echo ' <td width="25%" valign="top">' . "\n";

- $box = new box;
- echo $box->infoBox($heading, $contents);

+ require('templates/default.php');

- echo ' </td>' . "\n";
- }
-?>
- </tr>
- </table></td>
- </tr>
-<?php
- }

+ require('includes/application_bottom.php');

?>

- </table></td>
-<!-- body_text_eof //-->
- </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>

----------

admin /admin /templates /pages

orders.php added at 1.1

diff -N orders.php
--- /dev/null Fri Jul 23 01:29:33 2004
+++ /tmp/cvsAAA9jaaOd Fri Jul 23 01:29:48 2004
@@ -0,0 +1,133 @@

+<?php
+/*
+ $Id$
+
+ osCommerce, Open Source E-Commerce Solutions
+ http://www.oscommerce.com
+
+ Copyright (c) 2004 osCommerce
+
+ Released under the GNU General Public License
+*/
+?>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td><h1><?php echo HEADING_TITLE; ?></h1></td>
+ <td class="smallText" align="right">
+<?php
+ echo tep_draw_form('orders', FILENAME_ORDERS, '', 'get') .
+ SEARCH_ORDER_ID . ' ' . osc_draw_input_field('oID') .
+ SEARCH_CUSTOMER_ID . ' ' . osc_draw_input_field('cID') .
+ SEARCH_STATUS . ' ' . osc_draw_pull_down_menu('status', array_merge(array(array('id' => '', 'text' => TEXT_ALL_ORDERS)), $orders_statuses)) .
+ '<input type="submit" value="GO" class="operationButton"></form>';
+?>
+ </td>
+ </tr>
+</table>
+
+<div id="infoBox_oDefault" <?php if (!empty($action)) { echo 'style="display: none;"'; } ?>>
+ <table border="0" width="100%" cellspacing="0" cellpadding="2" class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo TABLE_HEADING_CUSTOMERS; ?></th>
+ <th><?php echo TABLE_HEADING_ORDER_TOTAL; ?></th>
+ <th><?php echo TABLE_HEADING_DATE_PURCHASED; ?></th>
+ <th><?php echo TABLE_HEADING_STATUS; ?></th>
+ <th><?php echo TABLE_HEADING_ACTION; ?></th>
+ </tr>
+ </thead>
+ <tbody>
+<?php
+ $Qorders = $osC_Database->query('select o.orders_id, o.customers_ip_address, o.customers_name, o.payment_method, o.date_purchased, o.last_modified, o.currency, o.currency_value, s.orders_status_name, ot.text as order_total from :table_orders o, :table_orders_total ot, :table_orders_status s where o.orders_id = ot.orders_id and ot.class = "ot_total" and o.orders_status = s.orders_status_id and s.language_id = :language_id');
+ if (isset($_GET['oID']) && is_numeric($_GET['oID'])) {
+ $Qorders->appendQuery('and o.orders_id = :orders_id');
+ $Qorders->bindInt(':orders_id', $_GET['oID']);
+ }
+ if (isset($_GET['cID']) && is_numeric($_GET['cID'])) {
+ $Qorders->appendQuery('and o.customers_id = :customers_id');
+ $Qorders->bindInt(':customers_id', $_GET['cID']);
+ }
+ if (isset($_GET['status']) && is_numeric($_GET['status'])) {
+ $Qorders->appendQuery('and s.orders_status_id = :orders_status_id');
+ $Qorders->bindInt(':orders_status_id', $_GET['status']);
+ }
+ $Qorders->appendQuery('order by o.last_modified desc, o.date_purchased desc, o.orders_id desc');
+ $Qorders->bindTable(':table_orders', TABLE_ORDERS);
+ $Qorders->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL);
+ $Qorders->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
+ $Qorders->bindInt(':language_id', $osC_Session->value('languages_id'));
+ $Qorders->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
+ $Qorders->execute();
+
+ while ($Qorders->next()) {
+ if (!isset($oInfo) && (!isset($_GET['oID']) || (isset($_GET['oID']) && empty($_GET['oID'])) || (isset($_GET['oID']) && ($_GET['oID'] == $Qorders->valueInt('orders_id'))))) {
+ $oInfo = new objectInfo($Qorders->toArray());
+ }
+
+ if (isset($oInfo) && ($Qorders->valueInt('orders_id') == $oInfo->orders_id)) {
+ echo ' <tr class="selected">' . "\n";
+ } else {
+ echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);" onClick="document.location.href=\'' . tep_href_link(FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page'] . '&oID=' . $Qorders->valueInt('orders_id')) . '\';">' . "\n";
+ }
+?>
+ <td><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page'] . '&oID=' . $Qorders->valueInt('orders_id') . '&action=oEdit') . '">' . tep_image(DIR_WS_ICONS . 'preview.gif', ICON_PREVIEW) . '&nbsp;' . $Qorders->valueProtected('customers_name') . '</a>'; ?></td>
+ <td><?php echo strip_tags($Qorders->value('order_total')); ?></td>
+ <td><?php echo tep_datetime_short($Qorders->value('date_purchased')); ?></td>
+ <td><?php echo $Qorders->value('orders_status_name'); ?></td>
+ <td align="right">
+<?php
+ echo '<a href="#" onClick="document.location.href=\'' . tep_href_link(FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page'] . '&oID=' . $Qorders->valueInt('orders_id') . '&action=oEdit') . '\';">' . tep_image('templates/' . $template . '/images/icons/16x16/configure.png', IMAGE_EDIT, '16', '16') . '</a>&nbsp;';
+
+ if (isset($oInfo) && ($Qorders->valueInt('orders_id') == $oInfo->orders_id)) {
+ echo '<a href="#" onClick="toggleInfoBox(\'oDelete\');">' . tep_image('templates/' . $template . '/images/icons/16x16/trash.png', IMAGE_DELETE, '16', '16') . '</a>';
+ } else {
+ echo '<a href="' . tep_href_link(FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page'] . '&oID=' . $Qorders->valueInt('orders_id') . '&action=oDelete') . '">' . tep_image('templates/' . $template . '/images/icons/16x16/trash.png', IMAGE_DELETE, '16', '16') . '</a>';
+ }
+?>
+ </td>
+ </tr>
+<?php
+ }
+?>
+ </tbody>
+ </table>
+
+ <table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td class="smallText"><?php echo $Qorders->displayBatchLinksTotal(TEXT_DISPLAY_NUMBER_OF_ORDERS); ?></td>
+ <td class="smallText" align="right"><?php echo $Qorders->displayBatchLinksPullDown(); ?></td>
+ </tr>
+ </table>
+
+<?php
+ if ( (isset($_GET['oID']) && !empty($_GET['oID'])) || (isset($_GET['cID']) && !empty($_GET['cID'])) || (isset($_GET['status']) && !empty($_GET['status'])) ) {
+?>
+ <p align="right"><?php echo '<input type="button" value="' . IMAGE_RESET . '" class="operationButton" onClick="document.location.href=\'' . tep_href_link(FILENAME_ORDERS) . '\';"> '; ?></p>
+<?php
+ }
+?>
+
+</div>
+
+<?php
+ if (isset($oInfo)) {
+?>
+<div id="infoBox_oDelete" <?php if ($action != 'oDelete') { echo 'style="display: none;"'; } ?>>
+ <div class="infoBoxHeading"><?php echo tep_image('templates/' . $template . '/images/icons/16x16/trash.png', IMAGE_DELETE, '16', '16') . ' [#' . $oInfo->orders_id . '] ' . $oInfo->customers_name; ?></div>
+ <div class="infoBoxContent">
+ <?php echo tep_draw_form('oDelete', FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page'] . '&oID=' . $oInfo->orders_id . '&action=deleteconfirm'); ?>
+
+ <p><?php echo TEXT_INFO_DELETE_INTRO; ?></p>
+ <p><?php echo '<b>' . $oInfo->customers_name . '</b>'; ?></p>
+ <p><?php echo osc_draw_checkbox_field('restock', array(array('id' => '', 'text' => TEXT_INFO_RESTOCK_PRODUCT_QUANTITY))); ?></p>
+
+ <p align="center"><?php echo '<input type="submit" value="' . IMAGE_DELETE . '" class="operationButton"> <input type="button" value="' . IMAGE_CANCEL . '" onClick="toggleInfoBox(\'oDefault\');" class="operationButton">'; ?></p>
+
+ </form>
+ </div>
+</div>
+
+<?php
+ }
+?>

----------

admin /admin /templates /pages

orders_edit.php added at 1.1

diff -N orders_edit.php
--- /dev/null Fri Jul 23 01:29:33 2004
+++ /tmp/cvsAAAXnaqOd Fri Jul 23 01:29:48 2004
@@ -0,0 +1,223 @@

+<?php
+/*
+ $Id$
+
+ osCommerce, Open Source E-Commerce Solutions
+ http://www.oscommerce.com
+
+ Copyright (c) 2004 osCommerce
+
+ Released under the GNU General Public License
+*/
+
+ $osC_Order = new osC_Order($_GET['oID']);
+?>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td><h1><?php echo HEADING_TITLE; ?></h1></td>
+ <td class="smallText" align="right"><?php echo '<input type="button" value="' . IMAGE_BACK . '" onClick="document.location.href=\'' . tep_href_link(FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page'] . '&oID=' . $_GET['oID']) . '\';" class="operationButton">'; ?></td>
+ </tr>
+</table>
+
+<?php
+ if ($osC_Order->isValid() === false) {
+ $messageStack->add(sprintf(ERROR_ORDER_DOES_NOT_EXIST, $_GET['oID']), 'error');
+ echo $messageStack->output();
+ } else {
+?>
+
+<p>
+ <input type="button" value="Summary" class="sectionButton" onClick="toggleDivBlocks('section', 'sectionSummary');"> <input type="button" value="Products" class="sectionButton" onClick="toggleDivBlocks('section', 'sectionProducts');"> <input type="button" value="Status History" class="sectionButton" onClick="toggleDivBlocks('section', 'sectionStatusHistory');">
+ <input type="button" value="<?php echo IMAGE_ORDERS_INVOICE; ?>" onClick="window.open('<?php echo tep_href_link(FILENAME_ORDERS_INVOICE, 'oID=' . $_GET['oID']); ?>');" class="infoBoxButton"> <input type="button" value="<?php echo IMAGE_ORDERS_PACKINGSLIP; ?>" onClick="window.open('<?php echo tep_href_link(FILENAME_ORDERS_PACKINGSLIP, 'oID=' . $_GET['oID']); ?>');" class="infoBoxButton">
+</p>
+
+<div id="sectionSummary" <?php if (!empty($section)) { echo 'style="display: none;"'; } ?>>
+ <table border="0" width="100%" cellspacing="0" cellpadding="0" class="infoBoxContent">
+ <tr>
+ <td width="33%" valign="top">
+ <div class="infoBoxHeading"><?php echo tep_image('templates/' . $template . '/images/icons/16x16/personal.png', ENTRY_CUSTOMER, '16', '16') . ' ' . ENTRY_CUSTOMER; ?></div>
+ <div class="infoBoxContent">
+ <p><?php echo tep_address_format($osC_Order->getCustomer('format_id'), $osC_Order->getCustomer(), 1, '', '<br>'); ?></p>
+ <p><?php echo tep_image('templates/' . $template . '/images/icons/16x16/telephone.png', ENTRY_TELEPHONE_NUMBER, '16', '16') . ' ' . $osC_Order->getCustomer('telephone') . '<br>' . tep_image('templates/' . $template . '/images/icons/16x16/write.png', ENTRY_EMAIL_ADDRESS, '16', '16') . ' ' . $osC_Order->getCustomer('email_address'); ?></p>
+ </div>
+ </td>
+ <td width="33%" valign="top">
+ <div class="infoBoxHeading"><?php echo tep_image('templates/' . $template . '/images/icons/16x16/home.png', ENTRY_SHIPPING_ADDRESS, '16', '16') . ' ' . ENTRY_SHIPPING_ADDRESS; ?></div>
+ <div class="infoBoxContent">
+ <p><?php echo tep_address_format($osC_Order->getDelivery('format_id'), $osC_Order->getDelivery(), 1, '', '<br>'); ?></p>
+ </div>
+ </td>
+ <td width="33%" valign="top">
+ <div class="infoBoxHeading"><?php echo tep_image('templates/' . $template . '/images/icons/16x16/bill.png', ENTRY_BILLING_ADDRESS, '16', '16') . ' ' . ENTRY_BILLING_ADDRESS; ?></div>
+ <div class="infoBoxContent">
+ <p><?php echo tep_address_format($osC_Order->getBilling('format_id'), $osC_Order->getBilling(), 1, '', '<br>'); ?></p>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+ <br>
+
+ <table border="0" width="100%" cellspacing="0" cellpadding="0" class="infoBoxContent">
+ <tr>
+ <td width="33%" valign="top">
+ <div class="infoBoxHeading"><?php echo tep_image('templates/' . $template . '/images/icons/16x16/payment.png', ENTRY_PAYMENT_METHOD, '16', '16') . ' ' . ENTRY_PAYMENT_METHOD; ?></div>
+ <div class="infoBoxContent">
+ <p><?php echo $osC_Order->getPaymentMethod(); ?></p>
+<?php
+ if ($osC_Order->isValidCreditCard()) {
+?>
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td class="smallText"><?php echo ENTRY_CREDIT_CARD_TYPE; ?></td>
+ <td class="smallText"><?php echo $osC_Order->getCreditCardDetails('type'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><?php echo ENTRY_CREDIT_CARD_OWNER; ?></td>
+ <td class="smallText"><?php echo $osC_Order->getCreditCardDetails('owner'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><?php echo ENTRY_CREDIT_CARD_NUMBER; ?></td>
+ <td class="smallText"><?php echo $osC_Order->getCreditCardDetails('number'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><?php echo ENTRY_CREDIT_CARD_EXPIRES; ?></td>
+ <td class="smallText"><?php echo $osC_Order->getCreditCardDetails('expires'); ?></td>
+ </tr>
+ </table>
+<?php
+ }
+?>
+ </div>
+ </td>
+ <td width="33%" valign="top">
+ <div class="infoBoxHeading"><?php echo tep_image('templates/' . $template . '/images/icons/16x16/history.png', ENTRY_STATUS, '16', '16') . ' ' . ENTRY_STATUS; ?></div>
+ <div class="infoBoxContent">
+ <p><?php echo $osC_Order->getStatus() . '<br>' . ($osC_Order->getDateLastModified() > $osC_Order->getDateCreated() ? tep_datetime_short($osC_Order->getDateLastModified()) : tep_datetime_short($osC_Order->getDateCreated())); ?></p>
+ <p><?php echo 'Comments: ' . $osC_Order->getNumberOfComments(); ?></p>
+ </div>
+ </td>
+ <td width="33%" valign="top">
+ <div class="infoBoxHeading"><?php echo tep_image('templates/' . $template . '/images/icons/16x16/calculator.png', ENTRY_TOTAL, '16', '16') . ' ' . ENTRY_TOTAL; ?></div>
+ <div class="infoBoxContent">
+ <p><?php echo $osC_Order->getTotal(); ?></p>
+ <p><?php echo 'Products: ' . $osC_Order->getNumberOfProducts() . '<br>Items: ' . $osC_Order->getNumberOfItems(); ?></p>
+ </div>
+ </td>
+ </tr>
+ </table>
+</div>
+
+<div id="sectionProducts" <?php if ($section != 'products') { echo 'style="display: none;"'; } ?>>
+ <table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr class="dataTableHeadingRow">
+ <td class="dataTableHeadingContent" colspan="2"><?php echo TABLE_HEADING_PRODUCTS; ?></td>
+ <td class="dataTableHeadingContent"><?php echo TABLE_HEADING_PRODUCTS_MODEL; ?></td>
+ <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_TAX; ?></td>
+ <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_PRICE_EXCLUDING_TAX; ?></td>
+ <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_PRICE_INCLUDING_TAX; ?></td>
+ <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_TOTAL_EXCLUDING_TAX; ?></td>
+ <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_TOTAL_INCLUDING_TAX; ?></td>
+ </tr>
+<?php
+ foreach ($osC_Order->getProducts() as $products) {
+?>
+ <tr class="dataTableRow">
+ <td class="dataTableContent" valign="top" align="right"><?php echo $products['quantity'] . '&nbsp;x'; ?></td>
+ <td class="dataTableContent" valign="top">
+<?php
+ echo $products['name'];
+
+ if (isset($products['attributes']) && is_array($products['attributes']) && (sizeof($products['attributes']) > 0)) {
+ foreach ($products['attributes'] as $attributes) {
+ echo '<br><nobr><small>&nbsp;<i> - ' . $attributes['option'] . ': ' . $attributes['value'];
+
+ if ($attributes['price'] != '0') {
+ echo ' (' . $attributes['prefix'] . $osC_Currencies->format($attributes['price'] * $products['quantity'], $osC_Order->getCurrency(), $osC_Order->getCurrencyValue()) . ')';
+ }
+
+ echo '</i></small></nobr>';
+ }
+ }
+?>
+ </td>
+ <td class="dataTableContent" valign="top"><?php echo $products['model']; ?></td>
+ <td class="dataTableContent" valign="top" align="right"><?php echo tep_display_tax_value($products['tax']) . '%'; ?></td>
+ <td class="dataTableContent" valign="top" align="right"><?php echo '<b>' . $osC_Currencies->format($products['final_price'], $osC_Order->getCurrency(), $osC_Order->getCurrencyValue()) . '</b>'; ?></td>
+ <td class="dataTableContent" valign="top" align="right"><?php echo '<b>' . $osC_Currencies->format(tep_add_tax($products['final_price'], $products['tax']), $osC_Order->getCurrency(), $osC_Order->getCurrencyValue()) . '</b>'; ?></td>
+ <td class="dataTableContent" valign="top" align="right"><?php echo '<b>' . $osC_Currencies->format($products['final_price'] * $products['quantity'], $osC_Order->getCurrency(), $osC_Order->getCurrencyValue()) . '</b>'; ?></td>
+ <td class="dataTableContent" valign="top" align="right"><?php echo '<b>' . $osC_Currencies->format(tep_add_tax($products['final_price'], $products['tax']) * $products['quantity'], $osC_Order->getCurrency(), $osC_Order->getCurrencyValue()) . '</b>'; ?></td>
+ </tr>
+<?php
+ }
+?>
+ </table>
+
+ <table border="0" cellspacing="0" cellpadding="2" align="right">
+<?php
+ foreach ($osC_Order->getTotals() as $totals) {
+?>
+ <tr>
+ <td class="smallText" align="right"><?php echo $totals['title']; ?></td>
+ <td class="smallText" align="right"><?php echo $totals['text']; ?></td>
+ </tr>
+<?php
+ }
+?>
+ </table>
+</div>
+
+<div id="sectionStatusHistory" <?php if ($section != 'statusHistory') { echo 'style="display: none;"'; } ?>>
+ <table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr class="dataTableHeadingRow">
+ <td class="dataTableHeadingContent"><?php echo TABLE_HEADING_DATE_ADDED; ?></td>
+ <td class="dataTableHeadingContent"><?php echo TABLE_HEADING_STATUS; ?></td>
+ <td class="dataTableHeadingContent"><?php echo TABLE_HEADING_COMMENTS; ?></td>
+ <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_CUSTOMER_NOTIFIED; ?></td>
+ </tr>
+<?php
+ foreach ($osC_Order->getStatusHistory() as $status_history) {
+?>
+ <tr class="dataTableRow">
+ <td class="dataTableContent" valign="top"><?php echo tep_datetime_short($status_history['date_added']); ?></td>
+ <td class="dataTableContent" valign="top"><?php echo $status_history['status']; ?></td>
+ <td class="dataTableContent" valign="top"><?php echo nl2br($status_history['comment']); ?></td>
+ <td class="dataTableContent" align="right" valign="top"><?php echo tep_image('templates/' . $template . '/images/icons/' . (($status_history['customer_notified'] === 1) ? 'checkbox_ticked.gif' : 'checkbox_crossed.gif')); ?></td>
+ </tr>
+<?php
+ }
+?>
+ </table>
+
+ <br>
+
+ <?php echo tep_draw_form('status', FILENAME_ORDERS, (isset($_GET['search']) ? 'search=' . $_GET['search'] . '&' : '') . (isset($_GET['status']) ? 'status=' . $_GET['status'] . '&' : '') . (isset($_GET['cID']) ? 'cID=' . $_GET['cID'] . '&' : '') . 'page=' . $_GET['page'] . '&oID=' . $_GET['oID'] . '&action=update_order'); ?>
+
+ <table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td class="main"><?php echo ENTRY_STATUS; ?></td>
+ <td class="main"><?php echo osc_draw_pull_down_menu('status', $orders_statuses, $osC_Order->getStatusID()); ?></td>
+ </tr>
+ <tr>
+ <td class="main" valign="top"><?php echo ENTRY_NEW_COMMENT; ?></td>
+ <td class="main"><?php echo tep_draw_textarea_field('comment', 'soft', '60', '5', '', 'style="width: 100%"'); ?></td>
+ </tr>
+ <tr>
+ <td class="main"><?php echo ENTRY_NOTIFY_CUSTOMER; ?></td>
+ <td class="main"><?php echo osc_draw_checkbox_field('notify_customer', '', true); ?></td>
+ </tr>
+ <td class="main"><?php echo ENTRY_NOTIFY_COMMENTS; ?></td>
+ <td class="main"><?php echo osc_draw_checkbox_field('append_comment', '', true); ?></td>
+ </tr>
+ <tr>
+ <td colspan="2" class="main" align="right"><?php echo '<input type="submit" value="' . IMAGE_UPDATE . '" class="operationButton">'; ?></td>
+ </tr>
+ </table>
+
+ </form>
+</div>
+
+<?php
+ }
+?>

CVSspam 0.2.8

-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click