Skip to content
This repository has been archived by the owner on Jun 7, 2024. It is now read-only.

Commit

Permalink
Merge pull request #903 from gburton/1.0.4.5
Browse files Browse the repository at this point in the history 
1.0.4.5
  • Loading branch information
@gburton
gburton authored Feb 4, 2020
2 parents 184db49 + 7c44757 commit 661c021
Show file tree
Hide file tree
Showing 26 changed files with 528 additions and 1,528 deletions.
9 changes: 5 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ CE Phoenix is packed with many first class utilities as standard but its modular

CE Phoenix is the official Community Version of osCommerce. Check out what you can do with CE Phoenix at the demo site;

Base Demo | Supporters Demo
------------ | -------------
https://template.me.uk/phoenix/index.php | https://template.me.uk/supporters/index.php
# Demo Sites

https://template.me.uk/index.php

# Certified Developers
# Certified Service Providers

Name | URL | Services Offered
------------ | ------------- | -------------
Expand Down Expand Up @@ -71,6 +71,7 @@ Language | URL | Credit & Thanks
------------ | ------------- | -------------
German | https://github.com/cupidare/OsCommerce-CE-Phoenix-German-language-Deutsches-Sprachpaket | @cupidare
Spanish | https://github.com/raiwa/OSCOM-CE-Phoenix-Spanish-language-idioma-espanol | @raiwa
Russian | https://github.com/Agrosheriff/CE-Phoenix-1.0.4.3_RU | @Fredi

### Image Credits

Expand Down
8 changes: 4 additions & 4 deletions account_history.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
$history_query = tep_db_query($history_split->sql_query);
?>
<div class="table-responsive">
<table class="table table-hover">
<table class="table table-hover table-striped">
<caption class="sr-only"><?php echo $history_split->display_count(TEXT_DISPLAY_NUMBER_OF_ORDERS); ?></caption>
<thead class="thead-light">
<thead class="thead-dark">
<tr>
<th scope="col"><?php echo TEXT_ORDER_NUMBER; ?></th>
<th scope="col" class="d-none d-md-table-cell"><?php echo TEXT_ORDER_STATUS; ?></th>
Expand Down Expand Up @@ -92,8 +92,8 @@
}
?>

<div class="buttonSet">
<?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'fas fa-angle-left', tep_href_link('account.php', '', 'SSL')); ?>
<div class="buttonSet my-2">
<?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'fas fa-angle-left', tep_href_link('account.php', '', 'SSL'), null, null, 'btn-light'); ?>
</div>
</div>

Expand Down
187 changes: 83 additions & 104 deletions account_history_info.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,136 +39,115 @@
require('includes/template_top.php');
?>

<h1 class="display-4"><?php echo HEADING_TITLE; ?></h1>
<div class="row">
<div class="col-7"><h1 class="display-4"><?php echo HEADING_TITLE; ?></h1></div>
<div class="col text-right">
<h4><?php echo sprintf(HEADING_ORDER_NUMBER, $_GET['order_id']) . ' <span class="badge badge-secondary">' . $order->info['orders_status'] . '</span></h4>'; ?>
<p><?php echo '<strong>' . HEADING_ORDER_DATE . '</strong> ' . tep_date_long($order->info['date_purchased']); ?></p>
</div>
</div>

<div class="contentContainer">

<h4><?php echo sprintf(HEADING_ORDER_NUMBER, $_GET['order_id']) . ' <span class="badge badge-secondary">' . $order->info['orders_status'] . '</span></h4>'; ?>
<p><?php echo '<strong>' . HEADING_ORDER_DATE . '</strong> ' . tep_date_long($order->info['date_purchased']); ?></p>

<table class="table table-hover table-bordered">
<thead>
<?php
if (sizeof($order->info['tax_groups']) > 1) {
?>
<tr>
<th colspan="2"><?php echo HEADING_PRODUCTS; ?></th>
<th class="text-right"><?php echo HEADING_TAX; ?></th>
<th class="text-right"><?php echo HEADING_TOTAL; ?></th>
</tr>
<?php
} else {
?>
<tr>
<th colspan="2"><?php echo HEADING_PRODUCTS; ?></th>
<th class="text-right"><?php echo HEADING_TOTAL; ?></th>
</tr>
<?php
}

echo '</thead>';

for ($i=0, $n=sizeof($order->products); $i<$n; $i++) {
echo '<tr>' . "\n" .
'<td align="right" valign="top" width="30">' . $order->products[$i]['qty'] . '</td>' . "\n" .
'<td valign="top">' . $order->products[$i]['name'];

if ( (isset($order->products[$i]['attributes'])) && (sizeof($order->products[$i]['attributes']) > 0) ) {
for ($j=0, $n2=sizeof($order->products[$i]['attributes']); $j<$n2; $j++) {
echo '<br /><nobr><small>&nbsp;<i> - ' . $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'] . '</i></small></nobr>';
}
}

echo '</td>' . "\n";

if (sizeof($order->info['tax_groups']) > 1) {
echo '<td valign="top" class="text-right">' . tep_display_tax_value($order->products[$i]['tax']) . '%</td>' . "\n";
}

echo '<td valign="top" class="text-right">' . $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']) . '</td>' . "\n" .
'</tr>' . "\n";
}
?>


<?php
for ($i=0, $n=sizeof($order->totals); $i<$n; $i++) {
echo '<tr><td colspan="4" class="text-right">' . $order->totals[$i]['title'] . ' ' . $order->totals[$i]['text'] . '</td></tr>';
}
?>
</table>

<table class="table">
<thead>
<tr>
<div class="row">
<div class="col-sm-7">
<table class="table table-hover table-bordered">
<thead class="thead-dark">
<?php
if ($order->delivery != false) {
echo '<th>' . HEADING_DELIVERY_ADDRESS . '</th>';
if (sizeof($order->info['tax_groups']) > 1) {
?>
<tr>
<th colspan="2"><?php echo HEADING_PRODUCTS; ?></th>
<th class="text-right"><?php echo HEADING_TAX; ?></th>
<th class="text-right"><?php echo HEADING_TOTAL; ?></th>
</tr>
<?php
} else {
?>
<tr>
<th colspan="2"><?php echo HEADING_PRODUCTS; ?></th>
<th class="text-right"><?php echo HEADING_TOTAL; ?></th>
</tr>
<?php
}
echo '<th>' . HEADING_BILLING_ADDRESS . '</th>';
?>
</tr>
</thead>
<tbody>
<tr>
</thead>
<tbody>
<?php
if ($order->delivery != false) {
echo '<td>' . tep_address_format($order->delivery['format_id'], $order->delivery, 1, ' ', '<br />') . '</td>';
for ($i=0, $n=sizeof($order->products); $i<$n; $i++) {
echo '<tr>';
echo '<td align="right" width="30">' . $order->products[$i]['qty'] . '</td>';
echo '<td>' . $order->products[$i]['name'];
if ( (isset($order->products[$i]['attributes'])) && (sizeof($order->products[$i]['attributes']) > 0) ) {
for ($j=0, $n2=sizeof($order->products[$i]['attributes']); $j<$n2; $j++) {
echo '<br><small><i> - ' . $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'] . '</i></small>';
}
}
echo '</td>';

if (sizeof($order->info['tax_groups']) > 1) {
echo '<td valign="top" class="text-right">' . tep_display_tax_value($order->products[$i]['tax']) . '%</td>' . "\n";
}

echo '<td class="text-right">' . $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']) . '</td>';
echo '</tr>';
}
echo '<td>' . tep_address_format($order->billing['format_id'], $order->billing, 1, ' ', '<br />') . '</td>';
?>
</tr>
</tbody>
</table>

<table class="table">
<thead>
<tr>
<?php
if ($order->info['shipping_method']) {
echo '<th scope="col">' . HEADING_SHIPPING_METHOD . '</th>';
for ($i=0, $n=sizeof($order->totals); $i<$n; $i++) {
echo '<tr>';
echo '<td colspan="4" class="text-right">' . $order->totals[$i]['title'] . ' ' . $order->totals[$i]['text'] . '</td>';
echo '</tr>';
}
echo '<th scope="col">' . HEADING_PAYMENT_METHOD . '</th>';
?>
</tr>
</thead>
<tbody>
<tr>
<?php
if ($order->info['shipping_method']) {
echo '<td scope="row">' . $order->info['shipping_method'] . '</td>';
}
echo '<td scope="row">' . $order->info['payment_method'] . '</td>';
?>
</tr>
</tbody>
</table>
<tbody>
</table>
</div>
<div class="col">
<div class="border">
<ul class="list-group list-group-flush">
<?php
if ($order->delivery != false) {
echo '<li class="list-group-item">';
echo SHIPPING_FA_ICON;
echo '<b>' . HEADING_DELIVERY_ADDRESS . '</b><br>';
echo tep_address_format($order->delivery['format_id'], $order->delivery, 1, ' ', '<br>');
echo '</li>';
}
?>
<li class="list-group-item">
<?php
echo PAYMENT_FA_ICON;
echo '<b>' . HEADING_BILLING_ADDRESS . '</b><br>';
echo tep_address_format($order->billing['format_id'], $order->billing, 1, ' ', '<br>');
?>
</li>
</ul>
</div>
</div>
</div>

<h4><?php echo HEADING_ORDER_HISTORY; ?></h4>

<ul class="list-group">
<?php
$statuses_query = tep_db_query("select os.orders_status_name, osh.date_added, osh.comments from orders_status os, orders_status_history osh where osh.orders_id = '" . (int)$_GET['order_id'] . "' and osh.orders_status_id = os.orders_status_id and os.language_id = '" . (int)$languages_id . "' and os.public_flag = '1' order by osh.date_added");
while ($statuses = tep_db_fetch_array($statuses_query)) {

echo '<li class="list-group-item d-flex justify-content-between align-items-center">';
echo '<h6>' . $statuses['orders_status_name'] . '</h6>';
echo (empty($statuses['comments']) ? '' : '<p>' . nl2br(tep_output_string_protected($statuses['comments'])) . '</p>');
echo '<span class="badge badge-primary badge-pill"><i class="far fa-clock"></i> ' . $statuses['date_added'] . '</span>';
echo '<span class="badge badge-secondary badge-pill"><i class="far fa-clock mr-1"></i>' . $statuses['date_added'] . '</span>';
echo '</li>';
}
?>
</ul>

<?php
<?php
if (DOWNLOAD_ENABLED == 'true') include('includes/modules/downloads.php');
?>
?>

<br>
<div class="buttonSet">
<?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'fas fa-angle-left', tep_href_link('account_history.php', tep_get_all_get_params(array('order_id')), 'SSL')); ?>
<div class="buttonSet my-2">
<?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'fas fa-angle-left', tep_href_link('account_history.php', tep_get_all_get_params(array('order_id')), 'SSL'), null, null, 'btn-light'); ?>
</div>

</div>

<?php
Expand Down
Binary file removed admin/images/ani_send_email.gif
View file
Binary file not shown.
8 changes: 1 addition & 7 deletions admin/includes/application_top.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,6 @@
// entry/item info classes
require('includes/classes/object_info.php');

// email classes
require('includes/classes/mime.php');
require('includes/classes/email.php');

// file uploading class
require('includes/classes/upload.php');

Expand All @@ -224,6 +220,4 @@
require('includes/classes/cfg_modules.php');
$cfgModules = new cfg_modules();

$OSCOM_Hooks->register('siteWide');

$OSCOM_Hooks->register(basename($PHP_SELF, '.php'));
$OSCOM_Hooks->register_page();
Loading

0 comments on commit 661c021

Please sign in to comment.