From 37fc03526c2d08718f49426e3edfedc2fcb4f970 Mon Sep 17 00:00:00 2001 From: TheCartpenter Date: Sun, 19 May 2024 10:33:22 -0400 Subject: [PATCH] More status prefixes work --- .../extension/payment/firstdata.php | 6 ++--- .../extension/payment/firstdata_remote.php | 12 ++++----- .../extension/payment/globalpay.php | 22 ++++++++-------- .../extension/payment/globalpay_remote.php | 22 ++++++++-------- .../controller/extension/payment/realex.php | 22 ++++++++-------- .../extension/payment/realex_remote.php | 22 ++++++++-------- .../extension/payment/securetrading_pp.php | 2 +- .../en-gb/extension/payment/globalpay.php | 6 ++--- .../extension/payment/globalpay_remote.php | 6 ++--- .../en-gb/extension/payment/realex.php | 6 ++--- .../en-gb/extension/payment/realex_remote.php | 6 ++--- .../template/extension/payment/firstdata.twig | 12 ++++----- .../extension/payment/firstdata_remote.twig | 8 +++--- .../template/extension/payment/globalpay.twig | 26 +++++++++---------- .../extension/payment/globalpay_remote.twig | 26 +++++++++---------- .../template/extension/payment/realex.twig | 26 +++++++++---------- .../extension/payment/realex_remote.twig | 26 +++++++++---------- .../extension/payment/amazon_login_pay.php | 16 ++++++------ .../extension/payment/firstdata.php | 2 +- .../extension/payment/globalpay.php | 10 +++---- .../controller/extension/payment/realex.php | 10 +++---- .../extension/payment/sagepay_server.php | 6 ++--- .../extension/payment/amazon_login_pay.php | 8 +++--- .../extension/payment/globalpay_remote.php | 10 +++---- .../model/extension/payment/realex_remote.php | 10 +++---- 25 files changed, 164 insertions(+), 164 deletions(-) diff --git a/upload/admin/controller/extension/payment/firstdata.php b/upload/admin/controller/extension/payment/firstdata.php index 485fb8e7f..0447e9387 100644 --- a/upload/admin/controller/extension/payment/firstdata.php +++ b/upload/admin/controller/extension/payment/firstdata.php @@ -161,10 +161,10 @@ public function index(): void { $data['payment_firstdata_success_unsettled_status_id'] = (int)$this->config->get('payment_firstdata_success_unsettled_status_id'); } - if (isset($this->request->post['payment_firstdata_decline_status_id'])) { - $data['payment_firstdata_decline_id'] = (int)$this->request->post['payment_firstdata_decline_status_id']; + if (isset($this->request->post['payment_firstdata_declined_status_id'])) { + $data['payment_firstdata_declined_id'] = (int)$this->request->post['payment_firstdata_declined_status_id']; } else { - $data['payment_firstdata_decline_id'] = (int)$this->config->get('payment_firstdata_decline_status_id'); + $data['payment_firstdata_declined_id'] = (int)$this->config->get('payment_firstdata_declined_status_id'); } if (isset($this->request->post['payment_firstdata_void_status_id'])) { diff --git a/upload/admin/controller/extension/payment/firstdata_remote.php b/upload/admin/controller/extension/payment/firstdata_remote.php index f1a09e01b..c0c306187 100644 --- a/upload/admin/controller/extension/payment/firstdata_remote.php +++ b/upload/admin/controller/extension/payment/firstdata_remote.php @@ -189,16 +189,16 @@ public function index(): void { $data['payment_firstdata_remote_auto_settle'] = 1; } - if (isset($this->request->post['payment_firstdata_remote_order_status_success_settled_status_id'])) { - $data['payment_firstdata_remote_order_status_success_settled_status_id'] = (int)$this->request->post['payment_firstdata_remote_order_status_success_settled_status_id']; + if (isset($this->request->post['payment_firstdata_remote_success_settled_status_id'])) { + $data['payment_firstdata_remote_success_settled_status_id'] = (int)$this->request->post['payment_firstdata_remote_success_settled_status_id']; } else { - $data['payment_firstdata_remote_order_status_success_settled_status_id'] = (int)$this->config->get('payment_firstdata_remote_order_status_success_settled_status_id'); + $data['payment_firstdata_remote_success_settled_status_id'] = (int)$this->config->get('payment_firstdata_remote_success_settled_status_id'); } - if (isset($this->request->post['payment_firstdata_remote_order_status_success_unsettled_status_id'])) { - $data['payment_firstdata_remote_order_status_success_unsettled_status_id'] = (int)$this->request->post['payment_firstdata_remote_order_status_success_unsettled_status_id']; + if (isset($this->request->post['payment_firstdata_remote_success_unsettled_status_id'])) { + $data['payment_firstdata_remote_success_unsettled_status_id'] = (int)$this->request->post['payment_firstdata_remote_success_unsettled_status_id']; } else { - $data['payment_firstdata_remote_order_status_success_unsettled_status_id'] = (int)$this->config->get('payment_firstdata_remote_order_status_success_unsettled_status_id'); + $data['payment_firstdata_remote_success_unsettled_status_id'] = (int)$this->config->get('payment_firstdata_remote_success_unsettled_status_id'); } if (isset($this->request->post['payment_firstdata_remote_declined_status_id'])) { diff --git a/upload/admin/controller/extension/payment/globalpay.php b/upload/admin/controller/extension/payment/globalpay.php index ff3bbb2a8..c4d4feaba 100644 --- a/upload/admin/controller/extension/payment/globalpay.php +++ b/upload/admin/controller/extension/payment/globalpay.php @@ -179,27 +179,27 @@ public function index(): void { } if (isset($this->request->post['payment_globalpay_declined_status_id'])) { - $data['payment_globalpay_decline_id'] = (int)$this->request->post['payment_globalpay_declined_status_id']; + $data['payment_globalpay_declined_id'] = (int)$this->request->post['payment_globalpay_declined_status_id']; } else { - $data['payment_globalpay_decline_id'] = (int)$this->config->get('payment_globalpay_declined_status_id'); + $data['payment_globalpay_declined_id'] = (int)$this->config->get('payment_globalpay_declined_status_id'); } - if (isset($this->request->post['payment_globalpay_decline_pending_id'])) { - $data['payment_globalpay_decline_pending_id'] = (int)$this->request->post['payment_globalpay_decline_pending_id']; + if (isset($this->request->post['payment_globalpay_declined_pending_status_id'])) { + $data['payment_globalpay_declined_pending_status_id'] = (int)$this->request->post['payment_globalpay_declined_pending_status_id']; } else { - $data['payment_globalpay_decline_pending_id'] = (int)$this->config->get('payment_globalpay_decline_pending_id'); + $data['payment_globalpay_declined_pending_status_id'] = (int)$this->config->get('payment_globalpay_declined_pending_status_id'); } - if (isset($this->request->post['payment_globalpay_decline_stolen_id'])) { - $data['payment_globalpay_decline_stolen_id'] = (int)$this->request->post['payment_globalpay_decline_stolen_id']; + if (isset($this->request->post['payment_globalpay_declined_stolen_status_id'])) { + $data['payment_globalpay_declined_stolen_status_id'] = (int)$this->request->post['payment_globalpay_declined_stolen_status_id']; } else { - $data['payment_globalpay_decline_stolen_id'] = (int)$this->config->get('payment_globalpay_decline_stolen_id'); + $data['payment_globalpay_declined_stolen_status_id'] = (int)$this->config->get('payment_globalpay_declined_stolen_status_id'); } - if (isset($this->request->post['payment_globalpay_decline_bank_id'])) { - $data['payment_globalpay_decline_bank_id'] = (int)$this->request->post['payment_globalpay_decline_bank_id']; + if (isset($this->request->post['payment_globalpay_declined_bank_status_id'])) { + $data['payment_globalpay_declined_bank_status_id'] = (int)$this->request->post['payment_globalpay_declined_bank_status_id']; } else { - $data['payment_globalpay_decline_bank_id'] = (int)$this->config->get('payment_globalpay_decline_bank_id'); + $data['payment_globalpay_declined_bank_status_id'] = (int)$this->config->get('payment_globalpay_declined_bank_status_id'); } // Order Statuses diff --git a/upload/admin/controller/extension/payment/globalpay_remote.php b/upload/admin/controller/extension/payment/globalpay_remote.php index 7c3ab7752..17329020c 100644 --- a/upload/admin/controller/extension/payment/globalpay_remote.php +++ b/upload/admin/controller/extension/payment/globalpay_remote.php @@ -171,27 +171,27 @@ public function index(): void { } if (isset($this->request->post['payment_globalpay_remote_declined_status_id'])) { - $data['payment_globalpay_remote_decline_id'] = (int)$this->request->post['payment_globalpay_remote_declined_status_id']; + $data['payment_globalpay_remote_declined_id'] = (int)$this->request->post['payment_globalpay_remote_declined_status_id']; } else { - $data['payment_globalpay_remote_decline_id'] = (int)$this->config->get('payment_globalpay_remote_declined_status_id'); + $data['payment_globalpay_remote_declined_id'] = (int)$this->config->get('payment_globalpay_remote_declined_status_id'); } - if (isset($this->request->post['payment_globalpay_remote_decline_pending_id'])) { - $data['payment_globalpay_remote_decline_pending_id'] = (int)$this->request->post['payment_globalpay_remote_decline_pending_id']; + if (isset($this->request->post['payment_globalpay_remote_declined_pending_status_id'])) { + $data['payment_globalpay_remote_declined_pending_status_id'] = (int)$this->request->post['payment_globalpay_remote_declined_pending_status_id']; } else { - $data['payment_globalpay_remote_decline_pending_id'] = (int)$this->config->get('payment_globalpay_remote_decline_pending_id'); + $data['payment_globalpay_remote_declined_pending_status_id'] = (int)$this->config->get('payment_globalpay_remote_declined_pending_status_id'); } - if (isset($this->request->post['payment_globalpay_remote_decline_stolen_id'])) { - $data['payment_globalpay_remote_decline_stolen_id'] = (int)$this->request->post['payment_globalpay_remote_decline_stolen_id']; + if (isset($this->request->post['payment_globalpay_remote_declined_stolen_status_id'])) { + $data['payment_globalpay_remote_declined_stolen_status_id'] = (int)$this->request->post['payment_globalpay_remote_declined_stolen_status_id']; } else { - $data['payment_globalpay_remote_decline_stolen_id'] = (int)$this->config->get('payment_globalpay_remote_decline_stolen_id'); + $data['payment_globalpay_remote_declined_stolen_status_id'] = (int)$this->config->get('payment_globalpay_remote_declined_stolen_status_id'); } - if (isset($this->request->post['payment_globalpay_remote_decline_bank_id'])) { - $data['payment_globalpay_remote_decline_bank_id'] = (int)$this->request->post['payment_globalpay_remote_decline_bank_id']; + if (isset($this->request->post['payment_globalpay_remote_declined_bank_status_id'])) { + $data['payment_globalpay_remote_declined_bank_status_id'] = (int)$this->request->post['payment_globalpay_remote_declined_bank_status_id']; } else { - $data['payment_globalpay_remote_decline_bank_id'] = (int)$this->config->get('payment_globalpay_remote_decline_bank_id'); + $data['payment_globalpay_remote_declined_bank_status_id'] = (int)$this->config->get('payment_globalpay_remote_declined_bank_status_id'); } // Order Statuses diff --git a/upload/admin/controller/extension/payment/realex.php b/upload/admin/controller/extension/payment/realex.php index 0e327e792..ddf500c31 100644 --- a/upload/admin/controller/extension/payment/realex.php +++ b/upload/admin/controller/extension/payment/realex.php @@ -179,27 +179,27 @@ public function index(): void { } if (isset($this->request->post['payment_realex_declined_status_id'])) { - $data['payment_realex_decline_id'] = (int)$this->request->post['payment_realex_declined_status_id']; + $data['payment_realex_declined_id'] = (int)$this->request->post['payment_realex_declined_status_id']; } else { - $data['payment_realex_decline_id'] = (int)$this->config->get('payment_realex_declined_status_id'); + $data['payment_realex_declined_id'] = (int)$this->config->get('payment_realex_declined_status_id'); } - if (isset($this->request->post['payment_realex_decline_pending_id'])) { - $data['payment_realex_decline_pending_id'] = (int)$this->request->post['payment_realex_decline_pending_id']; + if (isset($this->request->post['payment_realex_declined_pending_status_id'])) { + $data['payment_realex_declined_pending_status_id'] = (int)$this->request->post['payment_realex_declined_pending_status_id']; } else { - $data['payment_realex_decline_pending_id'] = (int)$this->config->get('payment_realex_decline_pending_id'); + $data['payment_realex_declined_pending_status_id'] = (int)$this->config->get('payment_realex_declined_pending_status_id'); } - if (isset($this->request->post['payment_realex_decline_stolen_id'])) { - $data['payment_realex_decline_stolen_id'] = (int)$this->request->post['payment_realex_decline_stolen_id']; + if (isset($this->request->post['payment_realex_declined_stolen_status_id'])) { + $data['payment_realex_declined_stolen_status_id'] = (int)$this->request->post['payment_realex_declined_stolen_status_id']; } else { - $data['payment_realex_decline_stolen_id'] = (int)$this->config->get('payment_realex_decline_stolen_id'); + $data['payment_realex_declined_stolen_status_id'] = (int)$this->config->get('payment_realex_declined_stolen_status_id'); } - if (isset($this->request->post['payment_realex_decline_bank_id'])) { - $data['payment_realex_decline_bank_id'] = (int)$this->request->post['payment_realex_decline_bank_id']; + if (isset($this->request->post['payment_realex_declined_bank_status_id'])) { + $data['payment_realex_declined_bank_status_id'] = (int)$this->request->post['payment_realex_declined_bank_status_id']; } else { - $data['payment_realex_decline_bank_id'] = (int)$this->config->get('payment_realex_decline_bank_id'); + $data['payment_realex_declined_bank_status_id'] = (int)$this->config->get('payment_realex_declined_bank_status_id'); } // Order Statuses diff --git a/upload/admin/controller/extension/payment/realex_remote.php b/upload/admin/controller/extension/payment/realex_remote.php index b34c491a0..b040a073a 100644 --- a/upload/admin/controller/extension/payment/realex_remote.php +++ b/upload/admin/controller/extension/payment/realex_remote.php @@ -171,27 +171,27 @@ public function index(): void { } if (isset($this->request->post['payment_realex_remote_declined_status_id'])) { - $data['payment_realex_remote_decline_id'] = (int)$this->request->post['payment_realex_remote_declined_status_id']; + $data['payment_realex_remote_declined_id'] = (int)$this->request->post['payment_realex_remote_declined_status_id']; } else { - $data['payment_realex_remote_decline_id'] = (int)$this->config->get('payment_realex_remote_declined_status_id'); + $data['payment_realex_remote_declined_id'] = (int)$this->config->get('payment_realex_remote_declined_status_id'); } - if (isset($this->request->post['payment_realex_remote_decline_pending_id'])) { - $data['payment_realex_remote_decline_pending_id'] = (int)$this->request->post['payment_realex_remote_decline_pending_id']; + if (isset($this->request->post['payment_realex_remote_declined_pending_status_id'])) { + $data['payment_realex_remote_declined_pending_status_id'] = (int)$this->request->post['payment_realex_remote_declined_pending_status_id']; } else { - $data['payment_realex_remote_decline_pending_id'] = (int)$this->config->get('payment_realex_remote_decline_pending_id'); + $data['payment_realex_remote_declined_pending_status_id'] = (int)$this->config->get('payment_realex_remote_declined_pending_status_id'); } - if (isset($this->request->post['payment_realex_remote_decline_stolen_id'])) { - $data['payment_realex_remote_decline_stolen_id'] = (int)$this->request->post['payment_realex_remote_decline_stolen_id']; + if (isset($this->request->post['payment_realex_remote_declined_stolen_status_id'])) { + $data['payment_realex_remote_declined_stolen_status_id'] = (int)$this->request->post['payment_realex_remote_declined_stolen_status_id']; } else { - $data['payment_realex_remote_decline_stolen_id'] = (int)$this->config->get('payment_realex_remote_decline_stolen_id'); + $data['payment_realex_remote_declined_stolen_status_id'] = (int)$this->config->get('payment_realex_remote_declined_stolen_status_id'); } - if (isset($this->request->post['payment_realex_remote_decline_bank_id'])) { - $data['payment_realex_remote_decline_bank_id'] = (int)$this->request->post['payment_realex_remote_decline_bank_id']; + if (isset($this->request->post['payment_realex_remote_declined_bank_status_id'])) { + $data['payment_realex_remote_declined_bank_status_id'] = (int)$this->request->post['payment_realex_remote_declined_bank_status_id']; } else { - $data['payment_realex_remote_decline_bank_id'] = (int)$this->config->get('payment_realex_remote_decline_bank_id'); + $data['payment_realex_remote_declined_bank_status_id'] = (int)$this->config->get('payment_realex_remote_declined_bank_status_id'); } // Order Statuses diff --git a/upload/admin/controller/extension/payment/securetrading_pp.php b/upload/admin/controller/extension/payment/securetrading_pp.php index 9c275a892..b55683e2d 100644 --- a/upload/admin/controller/extension/payment/securetrading_pp.php +++ b/upload/admin/controller/extension/payment/securetrading_pp.php @@ -429,7 +429,7 @@ public function release(): void { $json['msg'] = $this->language->get('text_release_ok_order'); $json['order_id'] = (int)$this->request->post['order_id']; - $json['order_status_id'] = (int)$this->config->get('payment_securetrading_pp_order_status_success_settled_status_id'); + $json['order_status_id'] = (int)$this->config->get('payment_securetrading_pp_success_settled_status_id'); } else { $release_status = 0; diff --git a/upload/admin/language/en-gb/extension/payment/globalpay.php b/upload/admin/language/en-gb/extension/payment/globalpay.php index 792a2c93a..cfba211fb 100644 --- a/upload/admin/language/en-gb/extension/payment/globalpay.php +++ b/upload/admin/language/en-gb/extension/payment/globalpay.php @@ -66,9 +66,9 @@ $_['entry_status_success_settled'] = 'Success - settled'; $_['entry_status_success_unsettled'] = 'Success - not settled'; $_['entry_status_decline'] = 'Decline'; -$_['entry_status_decline_pending'] = 'Decline - offline auth'; -$_['entry_status_decline_stolen'] = 'Decline - lost or stolen card'; -$_['entry_status_decline_bank'] = 'Decline - bank error'; +$_['entry_status_declined_pending'] = 'Decline - offline auth'; +$_['entry_status_declined_stolen'] = 'Decline - lost or stolen card'; +$_['entry_status_declined_bank'] = 'Decline - bank error'; $_['entry_status_void'] = 'Voided'; $_['entry_status_rebate'] = 'Rebated'; $_['entry_notification_url'] = 'Notification URL'; diff --git a/upload/admin/language/en-gb/extension/payment/globalpay_remote.php b/upload/admin/language/en-gb/extension/payment/globalpay_remote.php index 4ab9e67f3..c343f7e07 100644 --- a/upload/admin/language/en-gb/extension/payment/globalpay_remote.php +++ b/upload/admin/language/en-gb/extension/payment/globalpay_remote.php @@ -63,9 +63,9 @@ $_['entry_status_success_settled'] = 'Success - settled'; $_['entry_status_success_unsettled'] = 'Success - not settled'; $_['entry_status_decline'] = 'Decline'; -$_['entry_status_decline_pending'] = 'Decline - offline auth'; -$_['entry_status_decline_stolen'] = 'Decline - lost or stolen card'; -$_['entry_status_decline_bank'] = 'Decline - bank error'; +$_['entry_status_declined_pending'] = 'Decline - offline auth'; +$_['entry_status_declined_stolen'] = 'Decline - lost or stolen card'; +$_['entry_status_declined_bank'] = 'Decline - bank error'; $_['entry_status_void'] = 'Voided'; $_['entry_status_rebate'] = 'Rebated'; diff --git a/upload/admin/language/en-gb/extension/payment/realex.php b/upload/admin/language/en-gb/extension/payment/realex.php index 452de281e..f1c329306 100644 --- a/upload/admin/language/en-gb/extension/payment/realex.php +++ b/upload/admin/language/en-gb/extension/payment/realex.php @@ -66,9 +66,9 @@ $_['entry_status_success_settled'] = 'Success - settled'; $_['entry_status_success_unsettled'] = 'Success - not settled'; $_['entry_status_decline'] = 'Decline'; -$_['entry_status_decline_pending'] = 'Decline - offline auth'; -$_['entry_status_decline_stolen'] = 'Decline - lost or stolen card'; -$_['entry_status_decline_bank'] = 'Decline - bank error'; +$_['entry_status_declined_pending'] = 'Decline - offline auth'; +$_['entry_status_declined_stolen'] = 'Decline - lost or stolen card'; +$_['entry_status_declined_bank'] = 'Decline - bank error'; $_['entry_status_void'] = 'Voided'; $_['entry_status_rebate'] = 'Rebated'; $_['entry_notification_url'] = 'Notification URL'; diff --git a/upload/admin/language/en-gb/extension/payment/realex_remote.php b/upload/admin/language/en-gb/extension/payment/realex_remote.php index e4df3583a..a64227ef5 100644 --- a/upload/admin/language/en-gb/extension/payment/realex_remote.php +++ b/upload/admin/language/en-gb/extension/payment/realex_remote.php @@ -63,9 +63,9 @@ $_['entry_status_success_settled'] = 'Success - settled'; $_['entry_status_success_unsettled'] = 'Success - not settled'; $_['entry_status_decline'] = 'Decline'; -$_['entry_status_decline_pending'] = 'Decline - offline auth'; -$_['entry_status_decline_stolen'] = 'Decline - lost or stolen card'; -$_['entry_status_decline_bank'] = 'Decline - bank error'; +$_['entry_status_declined_pending'] = 'Decline - offline auth'; +$_['entry_status_declined_stolen'] = 'Decline - lost or stolen card'; +$_['entry_status_declined_bank'] = 'Decline - bank error'; $_['entry_status_void'] = 'Voided'; $_['entry_status_rebate'] = 'Rebated'; diff --git a/upload/admin/view/template/extension/payment/firstdata.twig b/upload/admin/view/template/extension/payment/firstdata.twig index 59240d3b7..fdb337350 100644 --- a/upload/admin/view/template/extension/payment/firstdata.twig +++ b/upload/admin/view/template/extension/payment/firstdata.twig @@ -127,7 +127,7 @@
{% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_firstdata_order_status_success_unsettled_status_id %} + {% if order_status.order_status_id == payment_firstdata_success_unsettled_status_id %} {% else %} @@ -151,9 +151,9 @@
- +
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_firstdata_declined_status_id %} @@ -167,9 +167,9 @@
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_firstdata_order_status_void_id %} + {% if order_status.order_status_id == payment_firstdata_void_status_id %} {% else %} diff --git a/upload/admin/view/template/extension/payment/firstdata_remote.twig b/upload/admin/view/template/extension/payment/firstdata_remote.twig index 0dd49abae..c501f150f 100644 --- a/upload/admin/view/template/extension/payment/firstdata_remote.twig +++ b/upload/admin/view/template/extension/payment/firstdata_remote.twig @@ -157,7 +157,7 @@
{% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_firstdata_remote_order_status_success_unsettled_status_id %} + {% if order_status.order_status_id == payment_firstdata_remote_success_unsettled_status_id %} {% else %} @@ -181,9 +181,9 @@
- +
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_firstdata_remote_declined_status_id %} diff --git a/upload/admin/view/template/extension/payment/globalpay.twig b/upload/admin/view/template/extension/payment/globalpay.twig index 4ee86e36a..3f06be772 100644 --- a/upload/admin/view/template/extension/payment/globalpay.twig +++ b/upload/admin/view/template/extension/payment/globalpay.twig @@ -191,7 +191,7 @@
{% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_globalpay_order_status_success_unsettled_status_id %} + {% if order_status.order_status_id == payment_globalpay_success_unsettled_status_id %} {% else %} @@ -215,9 +215,9 @@
- +
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_declined_status_id %} @@ -229,11 +229,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_globalpay_order_status_decline_pending_id %} + {% if order_status.order_status_id == payment_globalpay_declined_pending_status_id %} {% else %} @@ -243,11 +243,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_globalpay_order_status_decline_stolen_id %} + {% if order_status.order_status_id == payment_globalpay_declined_stolen_status_id %} {% else %} @@ -257,11 +257,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_globalpay_order_status_decline_bank_id %} + {% if order_status.order_status_id == payment_globalpay_declined_bank_status_id %} {% else %} diff --git a/upload/admin/view/template/extension/payment/globalpay_remote.twig b/upload/admin/view/template/extension/payment/globalpay_remote.twig index e701171ba..7ef92bcfb 100644 --- a/upload/admin/view/template/extension/payment/globalpay_remote.twig +++ b/upload/admin/view/template/extension/payment/globalpay_remote.twig @@ -186,7 +186,7 @@
{% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_globalpay_remote_order_status_success_unsettled_status_id %} + {% if order_status.order_status_id == payment_globalpay_remote_success_unsettled_status_id %} {% else %} @@ -210,9 +210,9 @@
- +
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_remote_declined_status_id %} @@ -224,11 +224,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_globalpay_remote_order_status_decline_pending_id %} + {% if order_status.order_status_id == payment_globalpay_remote_declined_pending_status_id %} {% else %} @@ -238,11 +238,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_globalpay_remote_order_status_decline_stolen_id %} + {% if order_status.order_status_id == payment_globalpay_remote_declined_stolen_status_id %} {% else %} @@ -252,11 +252,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_globalpay_remote_order_status_decline_bank_id %} + {% if order_status.order_status_id == payment_globalpay_remote_declined_bank_status_id %} {% else %} diff --git a/upload/admin/view/template/extension/payment/realex.twig b/upload/admin/view/template/extension/payment/realex.twig index 6e23fa66d..5c1cd7fd6 100644 --- a/upload/admin/view/template/extension/payment/realex.twig +++ b/upload/admin/view/template/extension/payment/realex.twig @@ -190,7 +190,7 @@
{% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_realex_order_status_success_unsettled_status_id %} + {% if order_status.order_status_id == payment_realex_success_unsettled_status_id %} {% else %} @@ -214,9 +214,9 @@
- +
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_declined_status_id %} @@ -228,11 +228,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_realex_order_status_decline_pending_id %} + {% if order_status.order_status_id == payment_realex_declined_pending_status_id %} {% else %} @@ -242,11 +242,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_realex_order_status_decline_stolen_id %} + {% if order_status.order_status_id == payment_realex_declined_stolen_status_id %} {% else %} @@ -256,11 +256,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_realex_order_status_decline_bank_id %} + {% if order_status.order_status_id == payment_realex_declined_bank_status_id %} {% else %} diff --git a/upload/admin/view/template/extension/payment/realex_remote.twig b/upload/admin/view/template/extension/payment/realex_remote.twig index ab43bd790..8d52e5075 100644 --- a/upload/admin/view/template/extension/payment/realex_remote.twig +++ b/upload/admin/view/template/extension/payment/realex_remote.twig @@ -186,7 +186,7 @@
{% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_realex_remote_order_status_success_unsettled_status_id %} + {% if order_status.order_status_id == payment_realex_remote_success_unsettled_status_id %} {% else %} @@ -210,9 +210,9 @@
- +
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_remote_declined_status_id %} @@ -224,11 +224,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_realex_remote_order_status_decline_pending_id %} + {% if order_status.order_status_id == payment_realex_remote_declined_pending_status_id %} {% else %} @@ -238,11 +238,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_realex_remote_order_status_decline_stolen_id %} + {% if order_status.order_status_id == payment_realex_remote_declined_stolen_status_id %} {% else %} @@ -252,11 +252,11 @@
- +
- {% for order_status in order_statuses %} - {% if order_status.order_status_id == payment_realex_remote_order_status_decline_bank_id %} + {% if order_status.order_status_id == payment_realex_remote_declined_bank_status_id %} {% else %} diff --git a/upload/catalog/controller/extension/payment/amazon_login_pay.php b/upload/catalog/controller/extension/payment/amazon_login_pay.php index 1f1b1e230..9af253ea5 100644 --- a/upload/catalog/controller/extension/payment/amazon_login_pay.php +++ b/upload/catalog/controller/extension/payment/amazon_login_pay.php @@ -668,7 +668,7 @@ private function authorize(): void { switch ($reason_code) { case 'InvalidPaymentMethod': - $this->session->data['apalwa']['error'] = $this->language->get('error_decline_invalid_payment_method'); + $this->session->data['apalwa']['error'] = $this->language->get('error_declined_invalid_payment_method'); $this->response->redirect($this->url->link('extension/payment/amazon_login_pay/payment', '', true)); break; @@ -678,9 +678,9 @@ private function authorize(): void { } $cart_error_messages = [ - 'TransactionTimedOut' => $this->language->get('error_decline_transaction_timed_out'), - 'AmazonRejected' => $this->language->get('error_decline_amazon_rejected'), - 'ProcessingFailure' => $this->language->get('error_decline_processing_failure') + 'TransactionTimedOut' => $this->language->get('error_declined_transaction_timed_out'), + 'AmazonRejected' => $this->language->get('error_declined_amazon_rejected'), + 'ProcessingFailure' => $this->language->get('error_declined_processing_failure') ]; if (in_array($reason_code, array_keys($cart_error_messages))) { @@ -802,7 +802,7 @@ public function process_us(): void { switch ($reason_code) { case 'InvalidPaymentMethod': - $this->session->data['apalwa']['error'] = $this->language->get('error_decline_invalid_payment_method'); + $this->session->data['apalwa']['error'] = $this->language->get('error_declined_invalid_payment_method'); $this->response->redirect($this->url->link('extension/payment/amazon_login_pay/payment', '', true)); break; @@ -812,9 +812,9 @@ public function process_us(): void { } $cart_error_messages = [ - 'TransactionTimedOut' => $this->language->get('error_decline_transaction_timed_out'), - 'AmazonRejected' => $this->language->get('error_decline_amazon_rejected'), - 'ProcessingFailure' => $this->language->get('error_decline_processing_failure') + 'TransactionTimedOut' => $this->language->get('error_declined_transaction_timed_out'), + 'AmazonRejected' => $this->language->get('error_declined_amazon_rejected'), + 'ProcessingFailure' => $this->language->get('error_declined_processing_failure') ]; if (in_array($reason_code, array_keys($cart_error_messages))) { diff --git a/upload/catalog/controller/extension/payment/firstdata.php b/upload/catalog/controller/extension/payment/firstdata.php index df0b39b76..0d0ceb819 100644 --- a/upload/catalog/controller/extension/payment/firstdata.php +++ b/upload/catalog/controller/extension/payment/firstdata.php @@ -225,7 +225,7 @@ public function notify(): void { $this->model_extension_payment_firstdata->addTransaction($fd_order['firstdata_order_id'], 'void'); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_order_status_void_id'), $message, false); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_void_status_id'), $message, false); } } diff --git a/upload/catalog/controller/extension/payment/globalpay.php b/upload/catalog/controller/extension/payment/globalpay.php index 2f249f427..2f29dd5ba 100644 --- a/upload/catalog/controller/extension/payment/globalpay.php +++ b/upload/catalog/controller/extension/payment/globalpay.php @@ -245,31 +245,31 @@ public function notify(): void { $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); } elseif ($this->request->post['RESULT'] == '102') { // Referal B - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_decline_pending_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_declined_pending_status_id'), $message); $data['text_response'] = $this->language->get('text_decline'); $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); } elseif ($this->request->post['RESULT'] == '103') { // Referal A - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_decline_stolen_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_declined_stolen_status_id'), $message); $data['text_response'] = $this->language->get('text_decline'); $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); } elseif ($this->request->post['RESULT'] == '200') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_declined_bank_status_id'), $message); $data['text_response'] = $this->language->get('text_bank_error'); $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); } elseif ($this->request->post['RESULT'] == '204') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_declined_bank_status_id'), $message); $data['text_response'] = $this->language->get('text_bank_error'); $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); } elseif ($this->request->post['RESULT'] == '205') { // Comms Error - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_declined_bank_status_id'), $message); $data['text_response'] = $this->language->get('text_bank_error'); $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); diff --git a/upload/catalog/controller/extension/payment/realex.php b/upload/catalog/controller/extension/payment/realex.php index 8a439cd40..0c0046d04 100644 --- a/upload/catalog/controller/extension/payment/realex.php +++ b/upload/catalog/controller/extension/payment/realex.php @@ -240,31 +240,31 @@ public function notify(): void { $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); } elseif ($this->request->post['RESULT'] == '102') { // Referal B - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_decline_pending_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_declined_pending_status_id'), $message); $data['text_response'] = $this->language->get('text_decline'); $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); } elseif ($this->request->post['RESULT'] == '103') { // Referal A - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_decline_stolen_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_declined_stolen_status_id'), $message); $data['text_response'] = $this->language->get('text_decline'); $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); } elseif ($this->request->post['RESULT'] == '200') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_declined_bank_status_id'), $message); $data['text_response'] = $this->language->get('text_bank_error'); $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); } elseif ($this->request->post['RESULT'] == '204') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_declined_bank_status_id'), $message); $data['text_response'] = $this->language->get('text_bank_error'); $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); } elseif ($this->request->post['RESULT'] == '205') { // Comms Error - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_declined_bank_status_id'), $message); $data['text_response'] = $this->language->get('text_bank_error'); $data['text_link'] = sprintf($this->language->get('text_link'), $this->url->link('checkout/checkout', '', true)); diff --git a/upload/catalog/controller/extension/payment/sagepay_server.php b/upload/catalog/controller/extension/payment/sagepay_server.php index b19217a4c..bc6d2b3a3 100644 --- a/upload/catalog/controller/extension/payment/sagepay_server.php +++ b/upload/catalog/controller/extension/payment/sagepay_server.php @@ -388,9 +388,9 @@ public function callback(): void { } if (isset($this->request->post['DeclineCode'])) { - $str_decline_code = $this->request->post['DeclineCode']; + $str_declined_code = $this->request->post['DeclineCode']; } else { - $str_decline_code = ''; + $str_declined_code = ''; } if (isset($this->request->post['BankAuthCode'])) { @@ -428,7 +428,7 @@ public function callback(): void { * * component that is included to create our own signature to compare with ** * * the contents of the VPSSignature field in the POST. Check the Sage Pay Server protocol ** * * if you need clarification on this process * */ - $str_message = $str_vps_tx_id . $vendor_tx_code . $str_status . $str_tx_auth_no . $this->config->get('payment_sagepay_server_vendor') . urldecode($str_avs_cv2) . $str_security_key . $str_address_result . $str_postcode_result . $str_cv2_result . $str_gift_aid . $str_3d_secure_status . $str_cavv . $str_address_status . $str_payer_status . $str_card_type . $str_last_4_digits . $str_decline_code . $str_expiry_date . $str_bank_auth_code; + $str_message = $str_vps_tx_id . $vendor_tx_code . $str_status . $str_tx_auth_no . $this->config->get('payment_sagepay_server_vendor') . urldecode($str_avs_cv2) . $str_security_key . $str_address_result . $str_postcode_result . $str_cv2_result . $str_gift_aid . $str_3d_secure_status . $str_cavv . $str_address_status . $str_payer_status . $str_card_type . $str_last_4_digits . $str_declined_code . $str_expiry_date . $str_bank_auth_code; $str_my_signature = strtoupper(md5($str_message)); // We can now compare our MD5 Hash signature with that from Sage Pay Server diff --git a/upload/catalog/language/en-gb/extension/payment/amazon_login_pay.php b/upload/catalog/language/en-gb/extension/payment/amazon_login_pay.php index 2f244f3f8..6a72392ce 100644 --- a/upload/catalog/language/en-gb/extension/payment/amazon_login_pay.php +++ b/upload/catalog/language/en-gb/extension/payment/amazon_login_pay.php @@ -35,10 +35,10 @@ $_['error_constraint_amount_not_set'] = 'The order failed due to a technical error, please select another payment method or contact our support.'; $_['error_constraint_payment_method_not_allowed'] = 'The selected payment method is not available for this transaction. Please select another one or add a new payment method to the wallet widget.'; $_['error_constraint_payment_plan_not_set'] = 'No payment instrument has been selected for this order, please try to refresh the page or add a new payment instrument in the wallet widget.'; -$_['error_decline_amazon_rejected'] = 'Your payment could not be processed. Please try to place the order again using another payment method.'; -$_['error_decline_invalid_payment_method'] = 'Your payment could not be processed, please follow the instructions in the payment method box.'; -$_['error_decline_processing_failure'] = 'Your order could not be processed due to a system error. Please try to place the order again.'; -$_['error_decline_transaction_timed_out'] = 'Your payment could not be processed. Please try to place the order again using another payment method.'; +$_['error_declined_amazon_rejected'] = 'Your payment could not be processed. Please try to place the order again using another payment method.'; +$_['error_declined_invalid_payment_method'] = 'Your payment could not be processed, please follow the instructions in the payment method box.'; +$_['error_declined_processing_failure'] = 'Your order could not be processed due to a system error. Please try to place the order again.'; +$_['error_declined_transaction_timed_out'] = 'Your payment could not be processed. Please try to place the order again using another payment method.'; $_['error_login'] = 'Login failed'; $_['error_login_email'] = 'Login failed: %s account email address did not match Amazon account email address'; $_['error_minimum'] = 'Minimum order amount for Amazon Pay and Login with Amazon is %s!'; diff --git a/upload/catalog/model/extension/payment/globalpay_remote.php b/upload/catalog/model/extension/payment/globalpay_remote.php index 7ac0db513..18d656c72 100644 --- a/upload/catalog/model/extension/payment/globalpay_remote.php +++ b/upload/catalog/model/extension/payment/globalpay_remote.php @@ -383,19 +383,19 @@ public function capturePayment(string $account, float $amount, string $currency, $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_declined_status_id'), $message); } elseif ($response->result == '102') { // Referal B - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_decline_pending_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_declined_pending_status_id'), $message); } elseif ($response->result == '103') { // Referal A - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_decline_stolen_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_declined_stolen_status_id'), $message); } elseif ($response->result == '200') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_declined_bank_status_id'), $message); } elseif ($response->result == '204') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_declined_bank_status_id'), $message); } elseif ($response->result == '205') { // Comms Error - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_declined_bank_status_id'), $message); } else { // Other $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_declined_status_id'), $message); diff --git a/upload/catalog/model/extension/payment/realex_remote.php b/upload/catalog/model/extension/payment/realex_remote.php index 917680b44..72cac0193 100644 --- a/upload/catalog/model/extension/payment/realex_remote.php +++ b/upload/catalog/model/extension/payment/realex_remote.php @@ -387,19 +387,19 @@ public function capturePayment(string $account, float $amount, string $currency, $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_declined_status_id'), $message); } elseif ($response->result == '102') { // Referal B - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_decline_pending_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_declined_pending_status_id'), $message); } elseif ($response->result == '103') { // Referal A - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_decline_stolen_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_declined_stolen_status_id'), $message); } elseif ($response->result == '200') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_declined_bank_status_id'), $message); } elseif ($response->result == '204') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_declined_bank_status_id'), $message); } elseif ($response->result == '205') { // Comms Error - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_declined_bank_status_id'), $message); } else { // Other $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_declined_status_id'), $message);