Skip to content

Commit

Permalink
Merge pull request opencart#116 from ocshop/master
Browse files Browse the repository at this point in the history 
догоняем оригинал
  • Loading branch information
@ocshop
ocshop committed Jul 3, 2015
2 parents bc7b5f6 + 7087ac4 commit 2ccdd4f
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 88 deletions.
31 changes: 14 additions & 17 deletions upload/admin/language/english/sale/order.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,23 @@
$_['text_order_id'] = 'Order ID:';
$_['text_invoice_no'] = 'Invoice No.:';
$_['text_invoice_date'] = 'Invoice Date:';
$_['text_store_name'] = 'Store Name:';
$_['text_store_url'] = 'Store Url:';
$_['text_email'] = 'E-Mail:';
$_['text_telephone'] = 'Telephone:';
$_['text_fax'] = 'Fax:';
$_['text_website'] = 'Web Site:';
$_['text_affiliate'] = 'Affiliate';
$_['text_reward'] = 'Reward Points';
$_['text_order_status'] = 'Order Status:';
$_['text_email'] = 'E-Mail:';
$_['text_telephone'] = 'Telephone:';
$_['text_fax'] = 'Fax:';
$_['text_website'] = 'Web Site:';
$_['text_affiliate'] = 'Affiliate';
$_['text_reward'] = 'Reward Points';
$_['text_order_status'] = 'Order Status:';

$_['text_comment'] = 'Customer Comment';
$_['text_commission'] = 'Commission';
$_['text_comment'] = 'Customer Comment';
$_['text_commission'] = 'Commission';


$_['text_ip'] = 'IP Address:';
$_['text_forwarded_ip'] = 'Forwarded IP:';
$_['text_user_agent'] = 'User Agent:';
$_['text_accept_language'] = 'Accept Language:';
$_['text_date_added'] = 'Date Added:';
$_['text_date_modified'] = 'Date Modified:';
$_['text_ip'] = 'IP Address:';
$_['text_forwarded_ip'] = 'Forwarded IP:';
$_['text_user_agent'] = 'User Agent:';
$_['text_accept_language'] = 'Accept Language:';
$_['text_date_added'] = 'Date Added:';

$_['text_invoice'] = 'Invoice';

Expand Down
154 changes: 83 additions & 71 deletions upload/admin/view/template/sale/order_info.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,83 @@
</div>
<div class="panel-body">
<div class="row">
<div class="col-sm-3"><i class="fa fa-shopping-cart fa-fw"></i> <a href="<?php echo $store_url; ?>" target="_blank"><?php echo $store_name; ?></a><br />
<i class="fa fa-calendar fa-fw"></i> <?php echo $date_added; ?><br />
<?php if ($customer) { ?>
<i class="fa fa-user fa-fw"></i> <a href="<?php echo $customer; ?>" target="_blank"><?php echo $firstname; ?> <?php echo $lastname; ?></a><br />
<?php } else { ?>
<i class="fa fa-user fa-fw"></i> <?php echo $firstname; ?> <?php echo $lastname; ?><br />
<?php } ?>
<?php if ($customer_group) { ?>
<i class="fa fa-group fa-fw"></i> <?php echo $customer_group; ?><br />
<?php } ?>
<i class="fa fa-envelope-o fa-fw"></i> <a href="mailto:<?php echo $email; ?>"><?php echo $email; ?></a><br />
<i class="fa fa-phone fa-fw"></i> <?php echo $telephone; ?><br />
<i class="fa fa-truck fa-fw"></i> <?php echo $shipping_method; ?><br />
<i class="fa fa-credit-card fa-fw"></i> <?php echo $payment_method; ?></div>
<div class="col-md-8">
<table class="table table-bordered">
<thead>
<tr>
<td colspan="2">Order Details</td>
</tr>
</thead>
<tbody>
<tr>
<td><?php if ($customer) { ?>
<i class="fa fa-user fa-fw"></i> <a href="<?php echo $customer; ?>" target="_blank"><?php echo $firstname; ?> <?php echo $lastname; ?></a><br />
<?php } else { ?>
<i class="fa fa-user fa-fw"></i> <?php echo $firstname; ?> <?php echo $lastname; ?><br />
<?php } ?>
<?php if ($customer_group) { ?>
<i class="fa fa-group fa-fw"></i> <?php echo $customer_group; ?><br />
<?php } ?>
<i class="fa fa-envelope-o fa-fw"></i> <a href="mailto:<?php echo $email; ?>"><?php echo $email; ?></a><br />
<i class="fa fa-phone fa-fw"></i> <?php echo $telephone; ?><br /></td>
<td><i class="fa fa-shopping-cart fa-fw"></i> <a href="<?php echo $store_url; ?>" target="_blank"><?php echo $store_name; ?></a><br />
<i class="fa fa-calendar fa-fw"></i> <?php echo $date_added; ?><br />
<i class="fa fa-truck fa-fw"></i> <?php echo $shipping_method; ?><br />
<i class="fa fa-credit-card fa-fw"></i> <?php echo $payment_method; ?></td>
</tr>
</tbody>
</table>
</div>
<div class="col-md-4">
<table class="table table-bordered">
<thead>
<tr>
<td colspan="3">Options</td>
</tr>
</thead>
<tbody>
<tr>
<td style="width: 1%;" class="text-center"><?php if (!$invoice_no) { ?>
<button id="button-invoice" data-loading-text="<?php echo $text_loading; ?>" data-toggle="tooltip" title="<?php echo $button_generate; ?>" class="btn btn-success btn-xs"><i class="fa fa-cog"></i></button>
<?php } else { ?>
<button disabled="disabled" class="btn btn-success btn-xs"><i class="fa fa-cog"></i></button>
<?php } ?></td>
<td>Invoice</td>
<td id="invoice" class="text-right"><?php echo $invoice_no; ?></td>
</tr>
<tr>
<td class="text-center"><?php if ($customer && $reward) { ?>
<?php if (!$reward_total) { ?>
<button id="button-reward-add" data-loading-text="<?php echo $text_loading; ?>" data-toggle="tooltip" title="<?php echo $button_reward_add; ?>" class="btn btn-success btn-xs"><i class="fa fa-plus-circle"></i></button>
<?php } else { ?>
<button id="button-reward-remove" data-loading-text="<?php echo $text_loading; ?>" data-toggle="tooltip" title="<?php echo $button_reward_remove; ?>" class="btn btn-danger btn-xs"><i class="fa fa-minus-circle"></i></button>
<?php } ?>
<?php } else { ?>
<button disabled="disabled" class="btn btn-success btn-xs"><i class="fa fa-plus-circle"></i></button>
<?php } ?></td>
<td><?php echo $text_reward; ?></td>
<td class="text-right"><?php echo $reward; ?></td>
</tr>
<tr>
<td class="text-center"><?php if ($affiliate) { ?>
<?php if (!$commission_total) { ?>
<button id="button-commission-add" data-loading-text="<?php echo $text_loading; ?>" data-toggle="tooltip" title="<?php echo $button_commission_add; ?>" class="btn btn-success btn-xs"><i class="fa fa-plus-circle"></i></button>
<?php } else { ?>
<button id="button-commission-remove" data-loading-text="<?php echo $text_loading; ?>" data-toggle="tooltip" title="<?php echo $button_commission_remove; ?>" class="btn btn-danger btn-xs"><i class="fa fa-minus-circle"></i></button>
<?php } ?>
<?php } else { ?>
<button disabled="disabled" class="btn btn-success btn-xs"><i class="fa fa-plus-circle"></i></button>
<?php } ?></td>
<td><?php echo $text_affiliate; ?>
<?php if ($affiliate) { ?>
(<a href="<?php echo $affiliate; ?>"><?php echo $affiliate_firstname; ?> <?php echo $affiliate_lastname; ?></a>)
<?php } ?></td>
<td class="text-right"><?php echo $commission; ?></td>
</tr>
</tbody>
</table>
</div>
</div>
<br />
<table class="table table-bordered">
<thead>
<tr>
Expand Down Expand Up @@ -113,57 +174,6 @@
<?php } ?>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><i class="fa fa-info-circle"></i> <?php echo $text_order; ?></h3>
</div>
<div class="panel-body">
<table class="table table-bordered">
<thead>
<tr>
<td class="text-center">Invoice</td>
<td class="text-center"><?php echo $text_reward; ?></td>
<td class="text-center"><?php echo $text_affiliate; ?>
<?php if ($affiliate) { ?>
(<a href="<?php echo $affiliate; ?>"><?php echo $affiliate_firstname; ?> <?php echo $affiliate_lastname; ?></a>)
<?php } ?></td>
</tr>
</thead>
<tbody>
<tr>
<td class="text-center"><?php if (!$invoice_no) { ?>
<button id="button-invoice" data-loading-text="<?php echo $text_loading; ?>" data-toggle="tooltip" title="<?php echo $button_generate; ?>" class="btn btn-success btn-lg"><i class="fa fa-cog fa-3x"></i></button>
<?php } else { ?>
<button disabled="disabled" class="btn btn-success btn-lg"><i class="fa fa-cog fa-3x"></i></button>
<?php } ?></td>
<td class="text-center"><?php if ($customer && $reward) { ?>
<?php if (!$reward_total) { ?>
<button id="button-reward-add" data-loading-text="<?php echo $text_loading; ?>" data-toggle="tooltip" title="<?php echo $button_reward_add; ?>" class="btn btn-success btn-lg"><i class="fa fa-plus-circle fa-3x"></i></button>
<?php } else { ?>
<button id="button-reward-remove" data-loading-text="<?php echo $text_loading; ?>" data-toggle="tooltip" title="<?php echo $button_reward_remove; ?>" class="btn btn-danger btn-lg"><i class="fa fa-minus-circle fa-3x"></i></button>
<?php } ?>
<?php } else { ?>
<button disabled="disabled" class="btn btn-success btn-lg"><i class="fa fa-plus-circle fa-3x"></i></button>
<?php } ?></td>
<td class="text-center"><?php if ($affiliate) { ?>
<?php if (!$commission_total) { ?>
<button id="button-commission-add" data-loading-text="<?php echo $text_loading; ?>" data-toggle="tooltip" title="<?php echo $button_commission_add; ?>" class="btn btn-success btn-lg"><i class="fa fa-plus-circle fa-3x"></i></button>
<?php } else { ?>
<button id="button-commission-remove" data-loading-text="<?php echo $text_loading; ?>" data-toggle="tooltip" title="<?php echo $button_commission_remove; ?>" class="btn btn-danger btn-lg"><i class="fa fa-minus-circle fa-3x"></i></button>
<?php } ?>
<?php } else { ?>
<button disabled="disabled" class="btn btn-success btn-lg"><i class="fa fa-plus-circle fa-3x"></i></button>
<?php } ?></td>
</tr>
<tr>
<td id="invoice" class="text-center"><?php echo $invoice_no; ?></td>
<td class="text-center"><?php echo $reward; ?></td>
<td class="text-center"><?php echo $commission; ?></td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><i class="fa fa-list"></i> Order History</h3>
Expand Down Expand Up @@ -295,8 +305,8 @@
</tbody>
</table>
</div>
<?php foreach ($tabs as $fraud) { ?>
<div class="tab-pane" id="tab-<?php echo $fraud['code']; ?>"> <?php echo $fraud['content']; ?></div>
<?php foreach ($tabs as $tab) { ?>
<div class="tab-pane" id="tab-<?php echo $tab['code']; ?>"> <?php echo $tab['content']; ?></div>
<?php } ?>
</div>
</div>
Expand All @@ -322,6 +332,8 @@ $(document).delegate('#button-invoice', 'click', function() {
if (json['invoice_no']) {
$('#invoice').html(json['invoice_no']);
$('#button-invoice').replaceWith('<button disabled="disabled" class="btn btn-success btn-xs"><i class="fa fa-minus-circle"></i></button>');
}
},
error: function(xhr, ajaxOptions, thrownError) {
Expand Down Expand Up @@ -351,7 +363,7 @@ $(document).delegate('#button-reward-add', 'click', function() {
if (json['success']) {
$('#content > .container-fluid').prepend('<div class="alert alert-success"><i class="fa fa-check-circle"></i> ' + json['success'] + '</div>');
$('#button-reward-add').replaceWith('<button id="button-reward-remove" data-toggle="tooltip" title="<?php echo $button_reward_remove; ?>" class="btn btn-danger btn-lg"><i class="fa fa-minus-circle"></i></button>');
$('#button-reward-add').replaceWith('<button id="button-reward-remove" data-toggle="tooltip" title="<?php echo $button_reward_remove; ?>" class="btn btn-danger btn-xs"><i class="fa fa-minus-circle"></i></button>');
}
},
error: function(xhr, ajaxOptions, thrownError) {
Expand Down Expand Up @@ -411,7 +423,7 @@ $(document).delegate('#button-commission-add', 'click', function() {
if (json['success']) {
$('#content > .container-fluid').prepend('<div class="alert alert-success"><i class="fa fa-check-circle"></i> ' + json['success'] + '</div>');
$('#button-commission-add').replaceWith('<button id="button-commission-remove" data-toggle="tooltip" title="<?php echo $button_commission_remove; ?>" class="btn btn-danger btn-lg"><i class="fa fa-minus-circle"></i></button>');
$('#button-commission-add').replaceWith('<button id="button-commission-remove" data-toggle="tooltip" title="<?php echo $button_commission_remove; ?>" class="btn btn-danger btn-xs"><i class="fa fa-minus-circle"></i></button>');
}
},
error: function(xhr, ajaxOptions, thrownError) {
Expand Down Expand Up @@ -442,7 +454,7 @@ $(document).delegate('#button-commission-remove', 'click', function() {
if (json['success']) {
$('#content > .container-fluid').prepend('<div class="alert alert-success"><i class="fa fa-check-circle"></i> ' + json['success'] + '</div>');
$('#button-commission-remove').replaceWith('<button id="button-commission-add" data-toggle="tooltip" title="<?php echo $button_commission_add; ?>" class="btn btn-success btn-lg"><i class="fa fa-plus-circle"></i></button>');
$('#button-commission-remove').replaceWith('<button id="button-commission-add" data-toggle="tooltip" title="<?php echo $button_commission_add; ?>" class="btn btn-success btn-xs"><i class="fa fa-plus-circle"></i></button>');
}
},
error: function(xhr, ajaxOptions, thrownError) {
Expand Down

0 comments on commit 2ccdd4f

Please sign in to comment.