From ca744229afc06b93e77cb7c8241443063479442b Mon Sep 17 00:00:00 2001 From: TheCartpenter Date: Sun, 19 May 2024 09:16:26 -0400 Subject: [PATCH] Fixed some extension payment order statuses --- .../extension/payment/firstdata.php | 20 +++++------ .../extension/payment/globalpay.php | 34 +++++++++---------- .../extension/payment/globalpay_remote.php | 34 +++++++++---------- .../controller/extension/payment/realex.php | 34 +++++++++---------- .../extension/payment/realex_remote.php | 34 +++++++++---------- .../extension/payment/securetrading_ws.php | 22 ++++++------ .../template/extension/payment/firstdata.twig | 4 +-- .../extension/payment/firstdata_remote.twig | 6 ++-- .../template/extension/payment/globalpay.twig | 10 +++--- .../extension/payment/globalpay_remote.twig | 10 +++--- .../template/extension/payment/realex.twig | 10 +++--- .../extension/payment/realex_remote.twig | 10 +++--- .../extension/payment/firstdata.php | 6 ++-- .../extension/payment/firstdata_remote.php | 4 +-- .../extension/payment/globalpay.php | 14 ++++---- .../controller/extension/payment/realex.php | 14 ++++---- .../controller/extension/payment/worldpay.php | 2 +- .../extension/payment/globalpay_remote.php | 14 ++++---- .../model/extension/payment/realex_remote.php | 14 ++++---- 19 files changed, 148 insertions(+), 148 deletions(-) diff --git a/upload/admin/controller/extension/payment/firstdata.php b/upload/admin/controller/extension/payment/firstdata.php index 73ec5475f..0017fb0d3 100644 --- a/upload/admin/controller/extension/payment/firstdata.php +++ b/upload/admin/controller/extension/payment/firstdata.php @@ -149,28 +149,28 @@ public function index(): void { $data['payment_firstdata_auto_settle'] = 1; } - if (isset($this->request->post['payment_firstdata_order_status_success_settled_id'])) { - $data['payment_firstdata_order_status_success_settled_id'] = (int)$this->request->post['payment_firstdata_order_status_success_settled_id']; + if (isset($this->request->post['payment_firstdata_success_settled_id'])) { + $data['payment_firstdata_success_settled_id'] = (int)$this->request->post['payment_firstdata_success_settled_id']; } else { - $data['payment_firstdata_order_status_success_settled_id'] = (int)$this->config->get('payment_firstdata_order_status_success_settled_id'); + $data['payment_firstdata_success_settled_id'] = (int)$this->config->get('payment_firstdata_success_settled_id'); } - if (isset($this->request->post['payment_firstdata_order_status_success_unsettled_id'])) { - $data['payment_firstdata_order_status_success_unsettled_id'] = (int)$this->request->post['payment_firstdata_order_status_success_unsettled_id']; + if (isset($this->request->post['payment_firstdata_success_unsettled_id'])) { + $data['payment_firstdata_success_unsettled_id'] = (int)$this->request->post['payment_firstdata_success_unsettled_id']; } else { - $data['payment_firstdata_order_status_success_unsettled_id'] = (int)$this->config->get('payment_firstdata_order_status_success_unsettled_id'); + $data['payment_firstdata_success_unsettled_id'] = (int)$this->config->get('payment_firstdata_success_unsettled_id'); } if (isset($this->request->post['payment_firstdata_order_status_decline_id'])) { - $data['payment_firstdata_order_status_decline_id'] = (int)$this->request->post['payment_firstdata_order_status_decline_id']; + $data['payment_firstdata_decline_id'] = (int)$this->request->post['payment_firstdata_order_status_decline_id']; } else { - $data['payment_firstdata_order_status_decline_id'] = (int)$this->config->get('payment_firstdata_order_status_decline_id'); + $data['payment_firstdata_decline_id'] = (int)$this->config->get('payment_firstdata_order_status_decline_id'); } if (isset($this->request->post['payment_firstdata_order_status_void_id'])) { - $data['payment_firstdata_order_status_void_id'] = (int)$this->request->post['payment_firstdata_order_status_void_id']; + $data['payment_firstdata_void_id'] = (int)$this->request->post['payment_firstdata_order_status_void_id']; } else { - $data['payment_firstdata_order_status_void_id'] = (int)$this->config->get('payment_firstdata_order_status_void_id'); + $data['payment_firstdata_void_id'] = (int)$this->config->get('payment_firstdata_order_status_void_id'); } if (isset($this->request->post['payment_firstdata_live_url'])) { diff --git a/upload/admin/controller/extension/payment/globalpay.php b/upload/admin/controller/extension/payment/globalpay.php index 35e1f2f32..95f132e37 100644 --- a/upload/admin/controller/extension/payment/globalpay.php +++ b/upload/admin/controller/extension/payment/globalpay.php @@ -166,40 +166,40 @@ public function index(): void { $data['payment_globalpay_tss_check'] = $this->config->get('payment_globalpay_tss_check'); } - if (isset($this->request->post['payment_globalpay_order_status_success_settled_id'])) { - $data['payment_globalpay_order_status_success_settled_id'] = (int)$this->request->post['payment_globalpay_order_status_success_settled_id']; + if (isset($this->request->post['payment_globalpay_success_settled_id'])) { + $data['payment_globalpay_success_settled_id'] = (int)$this->request->post['payment_globalpay_success_settled_id']; } else { - $data['payment_globalpay_order_status_success_settled_id'] = (int)$this->config->get('payment_globalpay_order_status_success_settled_id'); + $data['payment_globalpay_success_settled_id'] = (int)$this->config->get('payment_globalpay_success_settled_id'); } - if (isset($this->request->post['payment_globalpay_order_status_success_unsettled_id'])) { - $data['payment_globalpay_order_status_success_unsettled_id'] = (int)$this->request->post['payment_globalpay_order_status_success_unsettled_id']; + if (isset($this->request->post['payment_globalpay_success_unsettled_id'])) { + $data['payment_globalpay_success_unsettled_id'] = (int)$this->request->post['payment_globalpay_success_unsettled_id']; } else { - $data['payment_globalpay_order_status_success_unsettled_id'] = (int)$this->config->get('payment_globalpay_order_status_success_unsettled_id'); + $data['payment_globalpay_success_unsettled_id'] = (int)$this->config->get('payment_globalpay_success_unsettled_id'); } if (isset($this->request->post['payment_globalpay_order_status_decline_id'])) { - $data['payment_globalpay_order_status_decline_id'] = (int)$this->request->post['payment_globalpay_order_status_decline_id']; + $data['payment_globalpay_decline_id'] = (int)$this->request->post['payment_globalpay_order_status_decline_id']; } else { - $data['payment_globalpay_order_status_decline_id'] = (int)$this->config->get('payment_globalpay_order_status_decline_id'); + $data['payment_globalpay_decline_id'] = (int)$this->config->get('payment_globalpay_order_status_decline_id'); } - if (isset($this->request->post['payment_globalpay_order_status_decline_pending_id'])) { - $data['payment_globalpay_order_status_decline_pending_id'] = (int)$this->request->post['payment_globalpay_order_status_decline_pending_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']; } else { - $data['payment_globalpay_order_status_decline_pending_id'] = (int)$this->config->get('payment_globalpay_order_status_decline_pending_id'); + $data['payment_globalpay_decline_pending_id'] = (int)$this->config->get('payment_globalpay_decline_pending_id'); } - if (isset($this->request->post['payment_globalpay_order_status_decline_stolen_id'])) { - $data['payment_globalpay_order_status_decline_stolen_id'] = (int)$this->request->post['payment_globalpay_order_status_decline_stolen_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']; } else { - $data['payment_globalpay_order_status_decline_stolen_id'] = (int)$this->config->get('payment_globalpay_order_status_decline_stolen_id'); + $data['payment_globalpay_decline_stolen_id'] = (int)$this->config->get('payment_globalpay_decline_stolen_id'); } - if (isset($this->request->post['payment_globalpay_order_status_decline_bank_id'])) { - $data['payment_globalpay_order_status_decline_bank_id'] = (int)$this->request->post['payment_globalpay_order_status_decline_bank_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']; } else { - $data['payment_globalpay_order_status_decline_bank_id'] = (int)$this->config->get('payment_globalpay_order_status_decline_bank_id'); + $data['payment_globalpay_decline_bank_id'] = (int)$this->config->get('payment_globalpay_decline_bank_id'); } // Order Statuses diff --git a/upload/admin/controller/extension/payment/globalpay_remote.php b/upload/admin/controller/extension/payment/globalpay_remote.php index 96b3b69fb..5cbc7115b 100644 --- a/upload/admin/controller/extension/payment/globalpay_remote.php +++ b/upload/admin/controller/extension/payment/globalpay_remote.php @@ -158,40 +158,40 @@ public function index(): void { $data['payment_globalpay_remote_liability'] = $this->config->get('payment_globalpay_remote_liability'); } - if (isset($this->request->post['payment_globalpay_remote_order_status_success_settled_id'])) { - $data['payment_globalpay_remote_order_status_success_settled_id'] = (int)$this->request->post['payment_globalpay_remote_order_status_success_settled_id']; + if (isset($this->request->post['payment_globalpay_remote_success_settled_id'])) { + $data['payment_globalpay_remote_success_settled_id'] = (int)$this->request->post['payment_globalpay_remote_success_settled_id']; } else { - $data['payment_globalpay_remote_order_status_success_settled_id'] = (int)$this->config->get('payment_globalpay_remote_order_status_success_settled_id'); + $data['payment_globalpay_remote_success_settled_id'] = (int)$this->config->get('payment_globalpay_remote_success_settled_id'); } - if (isset($this->request->post['payment_globalpay_remote_order_status_success_unsettled_id'])) { - $data['payment_globalpay_remote_order_status_success_unsettled_id'] = (int)$this->request->post['payment_globalpay_remote_order_status_success_unsettled_id']; + if (isset($this->request->post['payment_globalpay_remote_success_unsettled_id'])) { + $data['payment_globalpay_remote_success_unsettled_id'] = (int)$this->request->post['payment_globalpay_remote_success_unsettled_id']; } else { - $data['payment_globalpay_remote_order_status_success_unsettled_id'] = (int)$this->config->get('payment_globalpay_remote_order_status_success_unsettled_id'); + $data['payment_globalpay_remote_success_unsettled_id'] = (int)$this->config->get('payment_globalpay_remote_success_unsettled_id'); } if (isset($this->request->post['payment_globalpay_remote_order_status_decline_id'])) { - $data['payment_globalpay_remote_order_status_decline_id'] = (int)$this->request->post['payment_globalpay_remote_order_status_decline_id']; + $data['payment_globalpay_remote_decline_id'] = (int)$this->request->post['payment_globalpay_remote_order_status_decline_id']; } else { - $data['payment_globalpay_remote_order_status_decline_id'] = (int)$this->config->get('payment_globalpay_remote_order_status_decline_id'); + $data['payment_globalpay_remote_decline_id'] = (int)$this->config->get('payment_globalpay_remote_order_status_decline_id'); } - if (isset($this->request->post['payment_globalpay_remote_order_status_decline_pending_id'])) { - $data['payment_globalpay_remote_order_status_decline_pending_id'] = (int)$this->request->post['payment_globalpay_remote_order_status_decline_pending_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']; } else { - $data['payment_globalpay_remote_order_status_decline_pending_id'] = (int)$this->config->get('payment_globalpay_remote_order_status_decline_pending_id'); + $data['payment_globalpay_remote_decline_pending_id'] = (int)$this->config->get('payment_globalpay_remote_decline_pending_id'); } - if (isset($this->request->post['payment_globalpay_remote_order_status_decline_stolen_id'])) { - $data['payment_globalpay_remote_order_status_decline_stolen_id'] = (int)$this->request->post['payment_globalpay_remote_order_status_decline_stolen_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']; } else { - $data['payment_globalpay_remote_order_status_decline_stolen_id'] = (int)$this->config->get('payment_globalpay_remote_order_status_decline_stolen_id'); + $data['payment_globalpay_remote_decline_stolen_id'] = (int)$this->config->get('payment_globalpay_remote_decline_stolen_id'); } - if (isset($this->request->post['payment_globalpay_remote_order_status_decline_bank_id'])) { - $data['payment_globalpay_remote_order_status_decline_bank_id'] = (int)$this->request->post['payment_globalpay_remote_order_status_decline_bank_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']; } else { - $data['payment_globalpay_remote_order_status_decline_bank_id'] = (int)$this->config->get('payment_globalpay_remote_order_status_decline_bank_id'); + $data['payment_globalpay_remote_decline_bank_id'] = (int)$this->config->get('payment_globalpay_remote_decline_bank_id'); } // Order Statuses diff --git a/upload/admin/controller/extension/payment/realex.php b/upload/admin/controller/extension/payment/realex.php index 349723497..d0fc70324 100644 --- a/upload/admin/controller/extension/payment/realex.php +++ b/upload/admin/controller/extension/payment/realex.php @@ -166,40 +166,40 @@ public function index(): void { $data['payment_realex_tss_check'] = $this->config->get('payment_realex_tss_check'); } - if (isset($this->request->post['payment_realex_order_status_success_settled_id'])) { - $data['payment_realex_order_status_success_settled_id'] = (int)$this->request->post['payment_realex_order_status_success_settled_id']; + if (isset($this->request->post['payment_realex_success_settled_id'])) { + $data['payment_realex_success_settled_id'] = (int)$this->request->post['payment_realex_success_settled_id']; } else { - $data['payment_realex_order_status_success_settled_id'] = (int)$this->config->get('payment_realex_order_status_success_settled_id'); + $data['payment_realex_success_settled_id'] = (int)$this->config->get('payment_realex_success_settled_id'); } - if (isset($this->request->post['payment_realex_order_status_success_unsettled_id'])) { - $data['payment_realex_order_status_success_unsettled_id'] = (int)$this->request->post['payment_realex_order_status_success_unsettled_id']; + if (isset($this->request->post['payment_realex_success_unsettled_id'])) { + $data['payment_realex_success_unsettled_id'] = (int)$this->request->post['payment_realex_success_unsettled_id']; } else { - $data['payment_realex_order_status_success_unsettled_id'] = (int)$this->config->get('payment_realex_order_status_success_unsettled_id'); + $data['payment_realex_success_unsettled_id'] = (int)$this->config->get('payment_realex_success_unsettled_id'); } if (isset($this->request->post['payment_realex_order_status_decline_id'])) { - $data['payment_realex_order_status_decline_id'] = (int)$this->request->post['payment_realex_order_status_decline_id']; + $data['payment_realex_decline_id'] = (int)$this->request->post['payment_realex_order_status_decline_id']; } else { - $data['payment_realex_order_status_decline_id'] = (int)$this->config->get('payment_realex_order_status_decline_id'); + $data['payment_realex_decline_id'] = (int)$this->config->get('payment_realex_order_status_decline_id'); } - if (isset($this->request->post['payment_realex_order_status_decline_pending_id'])) { - $data['payment_realex_order_status_decline_pending_id'] = (int)$this->request->post['payment_realex_order_status_decline_pending_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']; } else { - $data['payment_realex_order_status_decline_pending_id'] = (int)$this->config->get('payment_realex_order_status_decline_pending_id'); + $data['payment_realex_decline_pending_id'] = (int)$this->config->get('payment_realex_decline_pending_id'); } - if (isset($this->request->post['payment_realex_order_status_decline_stolen_id'])) { - $data['payment_realex_order_status_decline_stolen_id'] = (int)$this->request->post['payment_realex_order_status_decline_stolen_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']; } else { - $data['payment_realex_order_status_decline_stolen_id'] = (int)$this->config->get('payment_realex_order_status_decline_stolen_id'); + $data['payment_realex_decline_stolen_id'] = (int)$this->config->get('payment_realex_decline_stolen_id'); } - if (isset($this->request->post['payment_realex_order_status_decline_bank_id'])) { - $data['payment_realex_order_status_decline_bank_id'] = (int)$this->request->post['payment_realex_order_status_decline_bank_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']; } else { - $data['payment_realex_order_status_decline_bank_id'] = (int)$this->config->get('payment_realex_order_status_decline_bank_id'); + $data['payment_realex_decline_bank_id'] = (int)$this->config->get('payment_realex_decline_bank_id'); } // Order Statuses diff --git a/upload/admin/controller/extension/payment/realex_remote.php b/upload/admin/controller/extension/payment/realex_remote.php index bdf1a1aba..04dd80412 100644 --- a/upload/admin/controller/extension/payment/realex_remote.php +++ b/upload/admin/controller/extension/payment/realex_remote.php @@ -158,40 +158,40 @@ public function index(): void { $data['payment_realex_remote_liability'] = $this->config->get('payment_realex_remote_liability'); } - if (isset($this->request->post['payment_realex_remote_order_status_success_settled_id'])) { - $data['payment_realex_remote_order_status_success_settled_id'] = (int)$this->request->post['payment_realex_remote_order_status_success_settled_id']; + if (isset($this->request->post['payment_realex_remote_success_settled_id'])) { + $data['payment_realex_remote_success_settled_id'] = (int)$this->request->post['payment_realex_remote_success_settled_id']; } else { - $data['payment_realex_remote_order_status_success_settled_id'] = (int)$this->config->get('payment_realex_remote_order_status_success_settled_id'); + $data['payment_realex_remote_success_settled_id'] = (int)$this->config->get('payment_realex_remote_success_settled_id'); } - if (isset($this->request->post['payment_realex_remote_order_status_success_unsettled_id'])) { - $data['payment_realex_remote_order_status_success_unsettled_id'] = (int)$this->request->post['payment_realex_remote_order_status_success_unsettled_id']; + if (isset($this->request->post['payment_realex_remote_success_unsettled_id'])) { + $data['payment_realex_remote_success_unsettled_id'] = (int)$this->request->post['payment_realex_remote_success_unsettled_id']; } else { - $data['payment_realex_remote_order_status_success_unsettled_id'] = (int)$this->config->get('payment_realex_remote_order_status_success_unsettled_id'); + $data['payment_realex_remote_success_unsettled_id'] = (int)$this->config->get('payment_realex_remote_success_unsettled_id'); } if (isset($this->request->post['payment_realex_remote_order_status_decline_id'])) { - $data['payment_realex_remote_order_status_decline_id'] = (int)$this->request->post['payment_realex_remote_order_status_decline_id']; + $data['payment_realex_remote_decline_id'] = (int)$this->request->post['payment_realex_remote_order_status_decline_id']; } else { - $data['payment_realex_remote_order_status_decline_id'] = (int)$this->config->get('payment_realex_remote_order_status_decline_id'); + $data['payment_realex_remote_decline_id'] = (int)$this->config->get('payment_realex_remote_order_status_decline_id'); } - if (isset($this->request->post['payment_realex_remote_order_status_decline_pending_id'])) { - $data['payment_realex_remote_order_status_decline_pending_id'] = (int)$this->request->post['payment_realex_remote_order_status_decline_pending_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']; } else { - $data['payment_realex_remote_order_status_decline_pending_id'] = (int)$this->config->get('payment_realex_remote_order_status_decline_pending_id'); + $data['payment_realex_remote_decline_pending_id'] = (int)$this->config->get('payment_realex_remote_decline_pending_id'); } - if (isset($this->request->post['payment_realex_remote_order_status_decline_stolen_id'])) { - $data['payment_realex_remote_order_status_decline_stolen_id'] = (int)$this->request->post['payment_realex_remote_order_status_decline_stolen_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']; } else { - $data['payment_realex_remote_order_status_decline_stolen_id'] = (int)$this->config->get('payment_realex_remote_order_status_decline_stolen_id'); + $data['payment_realex_remote_decline_stolen_id'] = (int)$this->config->get('payment_realex_remote_decline_stolen_id'); } - if (isset($this->request->post['payment_realex_remote_order_status_decline_bank_id'])) { - $data['payment_realex_remote_order_status_decline_bank_id'] = (int)$this->request->post['payment_realex_remote_order_status_decline_bank_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']; } else { - $data['payment_realex_remote_order_status_decline_bank_id'] = (int)$this->config->get('payment_realex_remote_order_status_decline_bank_id'); + $data['payment_realex_remote_decline_bank_id'] = (int)$this->config->get('payment_realex_remote_decline_bank_id'); } // Order Statuses diff --git a/upload/admin/controller/extension/payment/securetrading_ws.php b/upload/admin/controller/extension/payment/securetrading_ws.php index 5cdb19fb4..ae38d7581 100644 --- a/upload/admin/controller/extension/payment/securetrading_ws.php +++ b/upload/admin/controller/extension/payment/securetrading_ws.php @@ -90,41 +90,41 @@ public function index(): void { } if (isset($this->request->post['payment_securetrading_ws_order_status_id'])) { - $data['payment_securetrading_ws_order_status_id'] = (int)$this->request->post['payment_securetrading_ws_order_status_id']; + $data['payment_securetrading_ws_id'] = (int)$this->request->post['payment_securetrading_ws_order_status_id']; } elseif ($this->config->get('payment_securetrading_ws_order_status_id') != '') { - $data['payment_securetrading_ws_order_status_id'] = (int)$this->config->get('payment_securetrading_ws_order_status_id'); + $data['payment_securetrading_ws_id'] = (int)$this->config->get('payment_securetrading_ws_order_status_id'); } else { $data['payment_securetrading_ws_order_status_id'] = 1; } if (isset($this->request->post['payment_securetrading_ws_failed_order_status_id'])) { - $data['payment_securetrading_ws_failed_order_status_id'] = (int)$this->request->post['payment_securetrading_ws_failed_order_status_id']; + $data['payment_securetrading_ws_failed_id'] = (int)$this->request->post['payment_securetrading_ws_failed_order_status_id']; } elseif ($this->config->get('payment_securetrading_ws_failed_order_status_id') != '') { - $data['payment_securetrading_ws_failed_order_status_id'] = (int)$this->config->get('payment_securetrading_ws_failed_order_status_id'); + $data['payment_securetrading_ws_failed_id'] = (int)$this->config->get('payment_securetrading_ws_failed_order_status_id'); } else { $data['payment_securetrading_ws_failed_order_status_id'] = 10; } if (isset($this->request->post['payment_securetrading_ws_declined_order_status_id'])) { - $data['payment_securetrading_ws_declined_order_status_id'] = (int)$this->request->post['payment_securetrading_ws_declined_order_status_id']; + $data['payment_securetrading_ws_declined_id'] = (int)$this->request->post['payment_securetrading_ws_declined_order_status_id']; } elseif ($this->config->get('payment_securetrading_ws_declined_order_status_id') != '') { - $data['payment_securetrading_ws_declined_order_status_id'] = (int)$this->config->get('payment_securetrading_ws_declined_order_status_id'); + $data['payment_securetrading_ws_declined_id'] = (int)$this->config->get('payment_securetrading_ws_declined_order_status_id'); } else { $data['payment_securetrading_ws_declined_order_status_id'] = 8; } if (isset($this->request->post['payment_securetrading_ws_refunded_order_status_id'])) { - $data['payment_securetrading_ws_refunded_order_status_id'] = (int)$this->request->post['payment_securetrading_ws_refunded_order_status_id']; + $data['payment_securetrading_ws_refunded_id'] = (int)$this->request->post['payment_securetrading_ws_refunded_order_status_id']; } elseif ($this->config->get('payment_securetrading_ws_refunded_order_status_id') != '') { - $data['payment_securetrading_ws_refunded_order_status_id'] = (int)$this->config->get('payment_securetrading_ws_refunded_order_status_id'); + $data['payment_securetrading_ws_refunded_id'] = (int)$this->config->get('payment_securetrading_ws_refunded_order_status_id'); } else { $data['payment_securetrading_ws_refunded_order_status_id'] = 11; } if (isset($this->request->post['payment_securetrading_ws_authorisation_reversed_order_status_id'])) { - $data['payment_securetrading_ws_authorisation_reversed_order_status_id'] = (int)$this->request->post['payment_securetrading_ws_authorisation_reversed_order_status_id']; + $data['payment_securetrading_ws_authorisation_reversed_id'] = (int)$this->request->post['payment_securetrading_ws_authorisation_reversed_order_status_id']; } elseif ($this->config->get('payment_securetrading_ws_authorisation_reversed_order_status_id') != '') { - $data['payment_securetrading_ws_authorisation_reversed_order_status_id'] = (int)$this->config->get('payment_securetrading_ws_authorisation_reversed_order_status_id'); + $data['payment_securetrading_ws_authorisation_reversed_id'] = (int)$this->config->get('payment_securetrading_ws_authorisation_reversed_order_status_id'); } else { $data['payment_securetrading_ws_authorisation_reversed_order_status_id'] = 12; } @@ -521,7 +521,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_ws_order_status_success_settled_id'); + $json['order_status_id'] = (int)$this->config->get('payment_securetrading_ws_success_settled_id'); } else { $release_status = 0; diff --git a/upload/admin/view/template/extension/payment/firstdata.twig b/upload/admin/view/template/extension/payment/firstdata.twig index bffab9619..f84e02d03 100644 --- a/upload/admin/view/template/extension/payment/firstdata.twig +++ b/upload/admin/view/template/extension/payment/firstdata.twig @@ -125,7 +125,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_firstdata_order_status_success_settled_id %} @@ -139,7 +139,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_firstdata_order_status_success_unsettled_id %} diff --git a/upload/admin/view/template/extension/payment/firstdata_remote.twig b/upload/admin/view/template/extension/payment/firstdata_remote.twig index 37f4ddfd8..9ae7a0ed1 100644 --- a/upload/admin/view/template/extension/payment/firstdata_remote.twig +++ b/upload/admin/view/template/extension/payment/firstdata_remote.twig @@ -153,9 +153,9 @@
- +
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_firstdata_remote_order_status_success_settled_id %} @@ -169,7 +169,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_firstdata_remote_order_status_success_unsettled_id %} diff --git a/upload/admin/view/template/extension/payment/globalpay.twig b/upload/admin/view/template/extension/payment/globalpay.twig index 51268f247..9b42af063 100644 --- a/upload/admin/view/template/extension/payment/globalpay.twig +++ b/upload/admin/view/template/extension/payment/globalpay.twig @@ -189,7 +189,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_order_status_success_settled_id %} @@ -203,7 +203,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_order_status_success_unsettled_id %} @@ -231,7 +231,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_order_status_decline_pending_id %} @@ -245,7 +245,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_order_status_decline_stolen_id %} @@ -259,7 +259,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_order_status_decline_bank_id %} diff --git a/upload/admin/view/template/extension/payment/globalpay_remote.twig b/upload/admin/view/template/extension/payment/globalpay_remote.twig index 10601bb1f..b91fe3125 100644 --- a/upload/admin/view/template/extension/payment/globalpay_remote.twig +++ b/upload/admin/view/template/extension/payment/globalpay_remote.twig @@ -184,7 +184,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_remote_order_status_success_settled_id %} @@ -198,7 +198,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_remote_order_status_success_unsettled_id %} @@ -226,7 +226,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_remote_order_status_decline_pending_id %} @@ -240,7 +240,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_remote_order_status_decline_stolen_id %} @@ -254,7 +254,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_globalpay_remote_order_status_decline_bank_id %} diff --git a/upload/admin/view/template/extension/payment/realex.twig b/upload/admin/view/template/extension/payment/realex.twig index d85724fa6..6abf093fd 100644 --- a/upload/admin/view/template/extension/payment/realex.twig +++ b/upload/admin/view/template/extension/payment/realex.twig @@ -188,7 +188,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_order_status_success_settled_id %} @@ -202,7 +202,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_order_status_success_unsettled_id %} @@ -230,7 +230,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_order_status_decline_pending_id %} @@ -244,7 +244,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_order_status_decline_stolen_id %} @@ -258,7 +258,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_order_status_decline_bank_id %} diff --git a/upload/admin/view/template/extension/payment/realex_remote.twig b/upload/admin/view/template/extension/payment/realex_remote.twig index 0957bbb00..28d76942a 100644 --- a/upload/admin/view/template/extension/payment/realex_remote.twig +++ b/upload/admin/view/template/extension/payment/realex_remote.twig @@ -184,7 +184,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_remote_order_status_success_settled_id %} @@ -198,7 +198,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_remote_order_status_success_unsettled_id %} @@ -226,7 +226,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_remote_order_status_decline_pending_id %} @@ -240,7 +240,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_remote_order_status_decline_stolen_id %} @@ -254,7 +254,7 @@
- {% for order_status in order_statuses %} {% if order_status.order_status_id == payment_realex_remote_order_status_decline_bank_id %} diff --git a/upload/catalog/controller/extension/payment/firstdata.php b/upload/catalog/controller/extension/payment/firstdata.php index 6b3a0418d..1ad1a68af 100644 --- a/upload/catalog/controller/extension/payment/firstdata.php +++ b/upload/catalog/controller/extension/payment/firstdata.php @@ -202,11 +202,11 @@ public function notify(): void { if ($this->config->get('payment_firstdata_auto_settle') == 1) { $this->model_extension_payment_firstdata->addTransaction($fd_order_id, 'payment', $order_info); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_order_status_success_settled_id'), $message, false); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_success_settled_id'), $message, false); } else { $this->model_extension_payment_firstdata->addTransaction($fd_order_id, 'auth', []); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_order_status_success_unsettled_id'), $message, false); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_success_unsettled_id'), $message, false); } } else { $message = $this->request->post['fail_reason'] . '
'; @@ -237,7 +237,7 @@ public function notify(): void { $this->model_extension_payment_firstdata->addTransaction($fd_order['firstdata_order_id'], 'payment', $order_info['total'], $order_info['currency_code'], $order_info['currency_value']); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_order_status_success_settled_id'), $message, false); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_success_settled_id'), $message, false); } } } else { diff --git a/upload/catalog/controller/extension/payment/firstdata_remote.php b/upload/catalog/controller/extension/payment/firstdata_remote.php index d140d8e30..ff311c8dc 100644 --- a/upload/catalog/controller/extension/payment/firstdata_remote.php +++ b/upload/catalog/controller/extension/payment/firstdata_remote.php @@ -130,11 +130,11 @@ public function send(): void { if ($this->config->get('payment_firstdata_remote_auto_settle') == 1) { $this->model_extension_payment_firstdata_remote->addTransaction($fd_order_id, 'payment', $order_info); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_remote_order_status_success_settled_id'), $message, false); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_remote_success_settled_id'), $message, false); } else { $this->model_extension_payment_firstdata_remote->addTransaction($fd_order_id, 'auth', []); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_remote_order_status_success_unsettled_id'), $message, false); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_firstdata_remote_success_unsettled_id'), $message, false); } } else { if (isset($capture_result['error']) && $capture_result['error'] != '') { diff --git a/upload/catalog/controller/extension/payment/globalpay.php b/upload/catalog/controller/extension/payment/globalpay.php index 5b6e00cc6..3e711e1ce 100644 --- a/upload/catalog/controller/extension/payment/globalpay.php +++ b/upload/catalog/controller/extension/payment/globalpay.php @@ -228,11 +228,11 @@ public function notify(): void { if ($auto_settle == 1) { $this->model_extension_payment_globalpay->addTransaction($globalpay_order_id, 'payment', $order_info); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_order_status_success_settled_id'), $message, false); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_success_settled_id'), $message, false); } else { $this->model_extension_payment_globalpay->addTransaction($globalpay_order_id, 'auth', 0.00); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_order_status_success_unsettled_id'), $message, false); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_success_unsettled_id'), $message, false); } $data['text_response'] = $this->language->get('text_success'); @@ -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_order_status_decline_pending_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_decline_pending_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_order_status_decline_stolen_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_decline_stolen_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_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_decline_bank_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_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_decline_bank_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_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_decline_bank_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 74b60dfbf..9d7f5e22b 100644 --- a/upload/catalog/controller/extension/payment/realex.php +++ b/upload/catalog/controller/extension/payment/realex.php @@ -223,11 +223,11 @@ public function notify(): void { if ($auto_settle == 1) { $this->model_extension_payment_realex->addTransaction($realex_order_id, 'payment', $order_info); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_order_status_success_settled_id'), $message, false); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_success_settled_id'), $message, false); } else { $this->model_extension_payment_realex->addTransaction($realex_order_id, 'auth', 0.00); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_order_status_success_unsettled_id'), $message, false); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_success_unsettled_id'), $message, false); } $data['text_response'] = $this->language->get('text_success'); @@ -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_order_status_decline_pending_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_decline_pending_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_order_status_decline_stolen_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_decline_stolen_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_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_decline_bank_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_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_decline_bank_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_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_decline_bank_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/worldpay.php b/upload/catalog/controller/extension/payment/worldpay.php index cd4fdcdcd..563a9ba59 100644 --- a/upload/catalog/controller/extension/payment/worldpay.php +++ b/upload/catalog/controller/extension/payment/worldpay.php @@ -89,7 +89,7 @@ public function send(): void { $order = [ 'token' => $this->request->post['token'], 'orderType' => $order_type, - 'amount' => (float)$amount * 100, + 'amount' => (float)$price * 100, 'currencyCode' => $order_info['currency_code'], 'name' => $order_info['firstname'] . ' ' . $order_info['lastname'], 'orderDescription' => $order_info['store_name'] . ' - ' . date('Y-m-d H:i:s'), diff --git a/upload/catalog/model/extension/payment/globalpay_remote.php b/upload/catalog/model/extension/payment/globalpay_remote.php index 05601728c..3ec3809e1 100644 --- a/upload/catalog/model/extension/payment/globalpay_remote.php +++ b/upload/catalog/model/extension/payment/globalpay_remote.php @@ -372,30 +372,30 @@ public function capturePayment(string $account, float $amount, string $currency, if ($this->config->get('payment_globalpay_remote_auto_settle') == 1) { $this->addTransaction($globalpay_order_id, 'payment', $order_info); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_order_status_success_settled_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_success_settled_id'), $message); } else { $this->addTransaction($globalpay_order_id, 'auth', 0); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_order_status_success_unsettled_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_success_unsettled_id'), $message); } } elseif ($response->result == '101') { // Decline $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_order_status_decline_id'), $message); } elseif ($response->result == '102') { // Referal B - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_order_status_decline_pending_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_decline_pending_id'), $message); } elseif ($response->result == '103') { // Referal A - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_order_status_decline_stolen_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_decline_stolen_id'), $message); } elseif ($response->result == '200') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_decline_bank_id'), $message); } elseif ($response->result == '204') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_decline_bank_id'), $message); } elseif ($response->result == '205') { // Comms Error - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_decline_bank_id'), $message); } else { // Other $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_globalpay_remote_order_status_decline_id'), $message); diff --git a/upload/catalog/model/extension/payment/realex_remote.php b/upload/catalog/model/extension/payment/realex_remote.php index 6809386ea..66967d547 100644 --- a/upload/catalog/model/extension/payment/realex_remote.php +++ b/upload/catalog/model/extension/payment/realex_remote.php @@ -376,30 +376,30 @@ public function capturePayment(string $account, float $amount, string $currency, if ($this->config->get('payment_realex_remote_auto_settle') == 1) { $this->addTransaction($realex_order_id, 'payment', $order_info); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_order_status_success_settled_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_success_settled_id'), $message); } else { $this->addTransaction($realex_order_id, 'auth', 0); - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_order_status_success_unsettled_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_success_unsettled_id'), $message); } } elseif ($response->result == '101') { // Decline $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_order_status_decline_id'), $message); } elseif ($response->result == '102') { // Referal B - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_order_status_decline_pending_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_decline_pending_id'), $message); } elseif ($response->result == '103') { // Referal A - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_order_status_decline_stolen_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_decline_stolen_id'), $message); } elseif ($response->result == '200') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_decline_bank_id'), $message); } elseif ($response->result == '204') { // Error Connecting to Bank - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_decline_bank_id'), $message); } elseif ($response->result == '205') { // Comms Error - $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_order_status_decline_bank_id'), $message); + $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_decline_bank_id'), $message); } else { // Other $this->model_checkout_order->addHistory($order_id, $this->config->get('payment_realex_remote_order_status_decline_id'), $message);