Skip to content

Commit

Permalink
More status prefixes work
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheCartpenter
TheCartpenter committed May 19, 2024
1 parent 7375e23 commit 37fc035
Show file tree
Hide file tree
Showing 25 changed files with 164 additions and 164 deletions.
6 changes: 3 additions & 3 deletions upload/admin/controller/extension/payment/firstdata.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'])) {
Expand Down
12 changes: 6 additions & 6 deletions upload/admin/controller/extension/payment/firstdata_remote.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'])) {
Expand Down
22 changes: 11 additions & 11 deletions upload/admin/controller/extension/payment/globalpay.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions upload/admin/controller/extension/payment/globalpay_remote.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions upload/admin/controller/extension/payment/realex.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions upload/admin/controller/extension/payment/realex_remote.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/securetrading_pp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions upload/admin/language/en-gb/extension/payment/globalpay.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/language/en-gb/extension/payment/globalpay_remote.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 3 additions & 3 deletions upload/admin/language/en-gb/extension/payment/realex.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/language/en-gb/extension/payment/realex_remote.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Loading

0 comments on commit 37fc035

Please sign in to comment.