Skip to content

Commit

Permalink
Merge pull request #8088 from condor2/3.0.x.x_Maintenance
Browse files Browse the repository at this point in the history 
[3.0.x.x_Maintenance] Added more fixes
  • Loading branch information
@danielkerr
danielkerr committed Jul 20, 2020
2 parents b4ce660 + aaa9ed3 commit e9522c4
Show file tree
Hide file tree
Showing 215 changed files with 35 additions and 15,878 deletions.
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/dashboard/chart.php
View file
Expand Up @@ -47,7 +47,7 @@ public function index() {
if (isset($this->request->post['dashboard_chart_width'])) {
$data['dashboard_chart_width'] = $this->request->post['dashboard_chart_width'];
} else {
$data['dashboard_chart_width'] = $this->config->get('dashboardchart_width');
$data['dashboard_chart_width'] = $this->config->get('dashboard_chart_width');
}

$data['columns'] = array();
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/amazon_login_pay.php
View file
Expand Up @@ -392,7 +392,7 @@ public function order() {
$data['amazon_login_pay_order'] = $amazon_login_pay_order;

$data['order_id'] = $this->request->get['order_id'];
$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/amazon_login_pay_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/bluepay_hosted.php
View file
Expand Up @@ -186,7 +186,7 @@ public function order() {
$data['bluepay_hosted_order'] = $bluepay_hosted_order;

$data['order_id'] = $this->request->get['order_id'];
$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/bluepay_hosted_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/bluepay_redirect.php
View file
Expand Up @@ -169,7 +169,7 @@ public function order() {
$data['bluepay_redirect_order'] = $bluepay_redirect_order;

$data['order_id'] = $this->request->get['order_id'];
$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/bluepay_redirect_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/cardconnect.php
View file
Expand Up @@ -287,7 +287,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/cardconnect_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/eway.php
View file
Expand Up @@ -231,7 +231,7 @@ public function order() {
$data['text_empty_capture'] = $this->language->get('text_empty_capture');

$data['eway_order'] = $eway_order;
$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];
$data['order_id'] = $this->request->get['order_id'];

return $this->load->view('extension/payment/eway_order', $data);
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/firstdata.php
View file
Expand Up @@ -283,7 +283,7 @@ public function order() {
$data['text_confirm_capture'] = $this->language->get('text_confirm_capture');

$data['order_id'] = $this->request->get['order_id'];
$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/firstdata_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/firstdata_remote.php
View file
Expand Up @@ -311,7 +311,7 @@ public function order() {
$data['button_void'] = $this->language->get('button_void');

$data['order_id'] = $this->request->get['order_id'];
$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/firstdata_remote_order', $data);
}
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/controller/extension/payment/free_checkout.php
View file
Expand Up @@ -44,10 +44,10 @@ public function index() {

$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=payment', true);

if (isset($this->request->post['free_checkout_order_status_id'])) {
$data['free_checkout_order_status_id'] = $this->request->post['free_checkout_order_status_id'];
if (isset($this->request->post['payment_free_checkout_order_status_id'])) {
$data['payment_free_checkout_order_status_id'] = $this->request->post['payment_free_checkout_order_status_id'];
} else {
$data['free_checkout_order_status_id'] = $this->config->get('free_checkout_order_status_id');
$data['payment_free_checkout_order_status_id'] = $this->config->get('payment_free_checkout_order_status_id');
}

$this->load->model('localisation/order_status');
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/g2apay.php
View file
Expand Up @@ -214,7 +214,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/g2apay_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/globalpay.php
View file
Expand Up @@ -245,7 +245,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/globalpay_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/globalpay_remote.php
View file
Expand Up @@ -216,7 +216,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/globalpay_remote_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/pilibaba.php
View file
Expand Up @@ -269,7 +269,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/pilibaba_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/pp_payflow_iframe.php
View file
Expand Up @@ -402,7 +402,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

$data['transactions'] = array();

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/realex.php
View file
Expand Up @@ -245,7 +245,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/realex_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/realex_remote.php
View file
Expand Up @@ -215,7 +215,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/realex_remote_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/sagepay_direct.php
View file
Expand Up @@ -177,7 +177,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/sagepay_direct_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/sagepay_server.php
View file
Expand Up @@ -178,7 +178,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/sagepay_server_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/securetrading_pp.php
View file
Expand Up @@ -262,7 +262,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/securetrading_pp_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/securetrading_ws.php
View file
Expand Up @@ -353,7 +353,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/securetrading_ws_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/worldpay.php
View file
Expand Up @@ -221,7 +221,7 @@ public function order() {

$data['order_id'] = $this->request->get['order_id'];

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/worldpay_order', $data);
}
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/controller/extension/total/sub_total.php
View file
Expand Up @@ -50,10 +50,10 @@ public function index() {
$data['total_sub_total_status'] = $this->config->get('total_sub_total_status');
}

if (isset($this->request->post['sub_total_sort_order'])) {
$data['sub_total_sort_order'] = $this->request->post['sub_total_sort_order'];
if (isset($this->request->post['total_sub_total_sort_order'])) {
$data['total_sub_total_sort_order'] = $this->request->post['total_sub_total_sort_order'];
} else {
$data['sub_total_sort_order'] = $this->config->get('sub_total_sort_order');
$data['total_sub_total_sort_order'] = $this->config->get('total_sub_total_sort_order');
}

$data['header'] = $this->load->controller('common/header');
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/sale/recurring.php
View file
Expand Up @@ -306,7 +306,7 @@ public function info() {

$this->document->setTitle($this->language->get('heading_title'));

$data['user_token'] = $this->request->get['user_token'];
$data['user_token'] = $this->session->data['user_token'];

$url = '';

Expand Down
4 changes: 2 additions & 2 deletions upload/admin/view/template/extension/payment/free_checkout.twig
View file
Expand Up @@ -28,9 +28,9 @@
<div class="form-group">
<label class="col-sm-2 control-label" for="input-order-status">{{ entry_order_status }}</label>
<div class="col-sm-10">
<select name="free_checkout_order_status_id" id="input-order-status" class="form-control">
<select name="payment_free_checkout_order_status_id" id="input-order-status" class="form-control">
{% for order_status in order_statuses %}
{% if order_status.order_status_id == free_checkout_order_status_id %}
{% if order_status.order_status_id == payment_free_checkout_order_status_id %}
<option value="{{ order_status.order_status_id }}" selected="selected">{{ order_status.name }}</option>
{% else %}
<option value="{{ order_status.order_status_id }}">{{ order_status.name }}</option>
Expand Down
4 changes: 2 additions & 2 deletions upload/admin/view/template/extension/total/sub_total.twig
View file
Expand Up @@ -42,12 +42,12 @@
<div class="form-group">
<label class="col-sm-2 control-label" for="input-sort-order">{{ entry_sort_order }}</label>
<div class="col-sm-10">
<input type="text" name="sub_total_sort_order" value="{{ sub_total_sort_order }}" placeholder="{{ entry_sort_order }}" id="input-sort-order" class="form-control" />
<input type="text" name="total_sub_total_sort_order" value="{{ total_sub_total_sort_order }}" placeholder="{{ entry_sort_order }}" id="input-sort-order" class="form-control" />
</div>
</div>
</form>
</div>
</div>
</div>
</div>
{{ footer }}
{{ footer }}
2 changes: 1 addition & 1 deletion upload/catalog/model/extension/total/sub_total.php
View file
Expand Up @@ -15,7 +15,7 @@ public function getTotal($total) {
'code' => 'sub_total',
'title' => $this->language->get('text_sub_total'),
'value' => $sub_total,
'sort_order' => $this->config->get('sub_total_sort_order')
'sort_order' => $this->config->get('total_sub_total_sort_order')
);

$total['total'] += $sub_total;
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/view/theme/default/template/extension/payment/firstdata.twig
View file
Expand Up @@ -40,7 +40,7 @@
{% set i = i + 1 %}
{% endfor %}
<p>
<input type="radio" name="hosteddataid" value="{{ new_hosted_id }}" {% set i == 1 %} checked="checked"{% endif %} />
<input type="radio" name="hosteddataid" value="{{ new_hosted_id }}" {% if i == 1 %} checked="checked"{% endif %} />
Use a new card</p>
{% else %}
<input type="hidden" name="hosteddataid" value="{{ new_hosted_id }}" />
Expand Down
2 changes: 1 addition & 1 deletion upload/install/opencart.sql
View file
Expand Up @@ -3452,7 +3452,7 @@ INSERT INTO `oc_setting` (`store_id`, `code`, `key`, `value`, `serialized`) VALU
(0, 'shipping_flat', 'shipping_flat_tax_class_id', '9', 0),
(0, 'shipping_flat', 'shipping_flat_cost', '5.00', 0),
(0, 'total_shipping', 'total_shipping_sort_order', '3', 0),
(0, 'total_sub_total', 'sub_total_sort_order', '1', 0),
(0, 'total_sub_total', 'total_sub_total_sort_order', '1', 0),
(0, 'total_sub_total', 'total_sub_total_status', '1', 0),
(0, 'total_tax', 'total_tax_status', '1', 0),
(0, 'total_total', 'total_total_sort_order', '9', 0),
Expand Down
2 changes: 1 addition & 1 deletion upload/system/library/session/file.php
View file
Expand Up @@ -45,7 +45,7 @@ public function destroy($session_id) {
$file = DIR_SESSION . '/sess_' . basename($session_id);

if (is_file($file)) {
unset($file);
unlink($file);
}
}

Expand Down
54 changes: 0 additions & 54 deletions upload/system/library/template/Twig/Autoloader.php
View file

This file was deleted.

62 changes: 0 additions & 62 deletions upload/system/library/template/Twig/BaseNodeVisitor.php
View file

This file was deleted.

0 comments on commit e9522c4

Please sign in to comment.