diff --git a/upload/admin/language/en-gb/extension/payment/sagepay_direct.php b/upload/admin/language/en-gb/extension/payment/sagepay_direct.php index ba0a2091973..aa1a93b1d3d 100644 --- a/upload/admin/language/en-gb/extension/payment/sagepay_direct.php +++ b/upload/admin/language/en-gb/extension/payment/sagepay_direct.php @@ -6,13 +6,11 @@ $_['text_extension'] = 'Extensions'; $_['text_success'] = 'Success: You have modified SagePay account details!'; $_['text_edit'] = 'Edit SagePay Direct'; -$_['text_sagepay_direct'] = 'SagePay'; -$_['text_sim'] = 'Simulator'; $_['text_test'] = 'Test'; $_['text_live'] = 'Live'; $_['text_defered'] = 'Defered'; $_['text_authenticate'] = 'Authenticate'; -$_['text_payment'] = 'Payment'; +$_['text_payment'] = 'Payment'; $_['text_release_ok'] = 'Release was successful'; $_['text_release_ok_order'] = 'Release was successful, order status updated to success - settled'; $_['text_rebate_ok'] = 'Rebate was successful'; diff --git a/upload/admin/language/en-gb/extension/payment/sagepay_server.php b/upload/admin/language/en-gb/extension/payment/sagepay_server.php index 8af13b55f3e..54aa9ee8e26 100644 --- a/upload/admin/language/en-gb/extension/payment/sagepay_server.php +++ b/upload/admin/language/en-gb/extension/payment/sagepay_server.php @@ -6,13 +6,11 @@ $_['text_extension'] = 'Extensions'; $_['text_success'] = 'Success: You have modified SagePay account details!'; $_['text_edit'] = 'Edit SagePay Server'; -$_['text_sagepay_server'] = 'SagePay'; -$_['text_sim'] = 'Simulator'; $_['text_test'] = 'Test'; $_['text_live'] = 'Live'; $_['text_defered'] = 'Defered'; $_['text_authenticate'] = 'Authenticate'; -$_['text_payment'] = 'Payment'; +$_['text_payment'] = 'Payment'; $_['text_release_ok'] = 'Release was successful'; $_['text_release_ok_order'] = 'Release was successful, order status updated to success - settled'; $_['text_rebate_ok'] = 'Rebate was successful'; diff --git a/upload/admin/model/extension/payment/sagepay_direct.php b/upload/admin/model/extension/payment/sagepay_direct.php index 7a5258b1e1e..5de49740442 100644 --- a/upload/admin/model/extension/payment/sagepay_direct.php +++ b/upload/admin/model/extension/payment/sagepay_direct.php @@ -77,14 +77,15 @@ public function void($order_id) { $void_data = array(); if ($this->config->get('payment_sagepay_direct_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/void.vsp'; - $void_data['VPSProtocol'] = '3.00'; +// $url = 'https://live.sagepay.com/gateway/service/void.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/void.vsp'; +// $void_data['VPSProtocol'] = '3.00'; + $void_data['VPSProtocol'] = '4.00'; } elseif ($this->config->get('payment_sagepay_direct_test') == 'test') { - $url = 'https://test.sagepay.com/gateway/service/void.vsp'; - $void_data['VPSProtocol'] = '3.00'; - } elseif ($this->config->get('payment_sagepay_direct_test') == 'sim') { - $url = 'https://test.sagepay.com/Simulator/VSPServerGateway.asp?Service=VendorVoidTx'; - $void_data['VPSProtocol'] = '2.23'; +// $url = 'https://test.sagepay.com/gateway/service/void.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/void.vsp'; +// $void_data['VPSProtocol'] = '3.00'; + $void_data['VPSProtocol'] = '4.00'; } $void_data['TxType'] = 'VOID'; @@ -114,14 +115,15 @@ public function release($order_id, $amount) { $release_data = array(); if ($this->config->get('payment_sagepay_direct_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/release.vsp'; - $release_data['VPSProtocol'] = '3.00'; +// $url = 'https://live.sagepay.com/gateway/service/release.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/release.vsp'; +// $release_data['VPSProtocol'] = '3.00'; + $release_data['VPSProtocol'] = '4.00'; } elseif ($this->config->get('payment_sagepay_direct_test') == 'test') { - $url = 'https://test.sagepay.com/gateway/service/release.vsp'; - $release_data['VPSProtocol'] = '3.00'; - } elseif ($this->config->get('payment_sagepay_direct_test') == 'sim') { - $url = 'https://test.sagepay.com/Simulator/VSPServerGateway.asp?Service=VendorReleaseTx'; - $release_data['VPSProtocol'] = '2.23'; +// $url = 'https://test.sagepay.com/gateway/service/release.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/release.vsp'; +// $release_data['VPSProtocol'] = '3.00'; + $release_data['VPSProtocol'] = '4.00'; } $release_data['TxType'] = 'RELEASE'; @@ -152,14 +154,15 @@ public function rebate($order_id, $amount) { $refund_data = array(); if ($this->config->get('payment_sagepay_direct_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/refund.vsp'; - $refund_data['VPSProtocol'] = '3.00'; +// $url = 'https://live.sagepay.com/gateway/service/refund.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/refund.vsp'; +// $refund_data['VPSProtocol'] = '3.00'; + $refund_data['VPSProtocol'] = '4.00'; } elseif ($this->config->get('payment_sagepay_direct_test') == 'test') { - $url = 'https://test.sagepay.com/gateway/service/refund.vsp'; - $refund_data['VPSProtocol'] = '3.00'; - } elseif ($this->config->get('payment_sagepay_direct_test') == 'sim') { - $url = 'https://test.sagepay.com/Simulator/VSPServerGateway.asp?Service=VendorRefundTx'; - $refund_data['VPSProtocol'] = '2.23'; +// $url = 'https://test.sagepay.com/gateway/service/refund.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/refund.vsp'; +// $refund_data['VPSProtocol'] = '3.00'; + $refund_data['VPSProtocol'] = '4.00'; } $refund_data['TxType'] = 'REFUND'; diff --git a/upload/admin/model/extension/payment/sagepay_server.php b/upload/admin/model/extension/payment/sagepay_server.php index f77c879eab4..3f29c3a3ead 100644 --- a/upload/admin/model/extension/payment/sagepay_server.php +++ b/upload/admin/model/extension/payment/sagepay_server.php @@ -78,14 +78,15 @@ public function void($order_id) { $void_data = array(); if ($this->config->get('payment_sagepay_server_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/void.vsp'; - $void_data['VPSProtocol'] = '3.00'; +// $url = 'https://live.sagepay.com/gateway/service/void.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/void.vsp'; +// $void_data['VPSProtocol'] = '3.00'; + $void_data['VPSProtocol'] = '4.00'; } elseif ($this->config->get('payment_sagepay_server_test') == 'test') { - $url = 'https://test.sagepay.com/gateway/service/void.vsp'; - $void_data['VPSProtocol'] = '3.00'; - } elseif ($this->config->get('payment_sagepay_server_test') == 'sim') { - $url = 'https://test.sagepay.com/Simulator/VSPServerGateway.asp?Service=VendorVoidTx'; - $void_data['VPSProtocol'] = '2.23'; +// $url = 'https://test.sagepay.com/gateway/service/void.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/void.vsp'; +// $void_data['VPSProtocol'] = '3.00'; + $void_data['VPSProtocol'] = '4.00'; } $void_data['TxType'] = 'VOID'; @@ -115,14 +116,15 @@ public function release($order_id, $amount) { $release_data = array(); if ($this->config->get('payment_sagepay_server_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/release.vsp'; - $release_data['VPSProtocol'] = '3.00'; +// $url = 'https://live.sagepay.com/gateway/service/release.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/release.vsp'; +// $release_data['VPSProtocol'] = '3.00'; + $release_data['VPSProtocol'] = '4.00'; } elseif ($this->config->get('payment_sagepay_server_test') == 'test') { - $url = 'https://test.sagepay.com/gateway/service/release.vsp'; - $release_data['VPSProtocol'] = '3.00'; - } elseif ($this->config->get('payment_sagepay_server_test') == 'sim') { - $url = 'https://test.sagepay.com/Simulator/VSPServerGateway.asp?Service=VendorReleaseTx'; - $release_data['VPSProtocol'] = '2.23'; +// $url = 'https://test.sagepay.com/gateway/service/release.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/release.vsp'; +// $release_data['VPSProtocol'] = '3.00'; + $release_data['VPSProtocol'] = '4.00'; } $release_data['TxType'] = 'RELEASE'; @@ -157,14 +159,15 @@ public function rebate($order_id, $amount) { $refund_data = array(); if ($this->config->get('payment_sagepay_server_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/refund.vsp'; - $refund_data['VPSProtocol'] = '3.00'; +// $url = 'https://live.sagepay.com/gateway/service/refund.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/refund.vsp'; +// $refund_data['VPSProtocol'] = '3.00'; + $refund_data['VPSProtocol'] = '4.00'; } elseif ($this->config->get('payment_sagepay_server_test') == 'test') { - $url = 'https://test.sagepay.com/gateway/service/refund.vsp'; - $refund_data['VPSProtocol'] = '3.00'; - } elseif ($this->config->get('payment_sagepay_server_test') == 'sim') { - $url = 'https://test.sagepay.com/Simulator/VSPServerGateway.asp?Service=VendorRefundTx'; - $refund_data['VPSProtocol'] = '2.23'; +// $url = 'https://test.sagepay.com/gateway/service/refund.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/refund.vsp'; +/// $refund_data['VPSProtocol'] = '3.00'; + $refund_data['VPSProtocol'] = '4.00'; } $refund_data['TxType'] = 'REFUND'; diff --git a/upload/admin/view/template/extension/payment/sagepay_direct.twig b/upload/admin/view/template/extension/payment/sagepay_direct.twig index 7fe4b963a6f..a86af413b7a 100644 --- a/upload/admin/view/template/extension/payment/sagepay_direct.twig +++ b/upload/admin/view/template/extension/payment/sagepay_direct.twig @@ -38,11 +38,6 @@
- {% if payment_sagepay_server_test == 'sim' %} - - {% else %} - - {% endif %} {% if payment_sagepay_server_test == 'test' %} {% else %} diff --git a/upload/catalog/controller/extension/payment/sagepay_direct.php b/upload/catalog/controller/extension/payment/sagepay_direct.php index 958f4a5e30d..18e9e9fc79d 100644 --- a/upload/catalog/controller/extension/payment/sagepay_direct.php +++ b/upload/catalog/controller/extension/payment/sagepay_direct.php @@ -110,14 +110,15 @@ public function send() { $payment_data = array(); if ($this->config->get('payment_sagepay_direct_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/vspdirect-register.vsp'; - $payment_data['VPSProtocol'] = '3.00'; +// $url = 'https://live.sagepay.com/gateway/service/vspdirect-register.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/vspdirect-register.vsp'; +// $payment_data['VPSProtocol'] = '3.00'; + $payment_data['VPSProtocol'] = '4.00'; } elseif ($this->config->get('payment_sagepay_direct_test') == 'test') { - $url = 'https://test.sagepay.com/gateway/service/vspdirect-register.vsp'; - $payment_data['VPSProtocol'] = '3.00'; - } elseif ($this->config->get('payment_sagepay_direct_test') == 'sim') { - $url = 'https://test.sagepay.com/Simulator/VSPDirectGateway.asp'; - $payment_data['VPSProtocol'] = '2.23'; +// $url = 'https://test.sagepay.com/gateway/service/vspdirect-register.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/vspdirect-register.vsp'; +// $payment_data['VPSProtocol'] = '3.00'; + $payment_data['VPSProtocol'] = '4.00'; } if(!isset($this->session->data['order_id'])) { @@ -348,11 +349,11 @@ public function callback() { if (isset($this->session->data['order_id'])) { if ($this->config->get('payment_sagepay_direct_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/direct3dcallback.vsp'; +// $url = 'https://live.sagepay.com/gateway/service/direct3dcallback.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/direct3dcallback.vsp'; } elseif ($this->config->get('payment_sagepay_direct_test') == 'test') { - $url = 'https://test.sagepay.com/gateway/service/direct3dcallback.vsp'; - } elseif ($this->config->get('payment_sagepay_direct_test') == 'sim') { - $url = 'https://test.sagepay.com/Simulator/VSPDirectCallback.asp'; +// $url = 'https://test.sagepay.com/gateway/service/direct3dcallback.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/direct3dcallback.vsp'; } $response_data = $this->model_extension_payment_sagepay_direct->sendCurl($url, $this->request->post); @@ -436,11 +437,14 @@ public function delete() { if (!empty($card['token'])) { if ($this->config->get('payment_sagepay_direct_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/removetoken.vsp'; +// $url = 'https://live.sagepay.com/gateway/service/removetoken.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/removetoken.vsp'; } else { - $url = 'https://test.sagepay.com/gateway/service/removetoken.vsp'; +// $url = 'https://test.sagepay.com/gateway/service/removetoken.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/removetoken.vsp'; } - $payment_data['VPSProtocol'] = '3.00'; +// $payment_data['VPSProtocol'] = '3.00'; + $payment_data['VPSProtocol'] = '4.00'; $payment_data['Vendor'] = $this->config->get('payment_sagepay_direct_vendor'); $payment_data['TxType'] = 'REMOVETOKEN'; $payment_data['Token'] = $card['token']; diff --git a/upload/catalog/controller/extension/payment/sagepay_server.php b/upload/catalog/controller/extension/payment/sagepay_server.php index 8103a64664a..85192f29a74 100644 --- a/upload/catalog/controller/extension/payment/sagepay_server.php +++ b/upload/catalog/controller/extension/payment/sagepay_server.php @@ -43,17 +43,17 @@ public function send() { $payment_data = array(); if ($this->config->get('payment_sagepay_server_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/vspserver-register.vsp'; +// $url = 'https://live.sagepay.com/gateway/service/vspserver-register.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/vspdirect-register.vsp'; - $payment_data['VPSProtocol'] = '3.00'; +// $payment_data['VPSProtocol'] = '3.00'; + $payment_data['VPSProtocol'] = '4.00'; } elseif ($this->config->get('payment_sagepay_server_test') == 'test') { - $url = 'https://test.sagepay.com/gateway/service/vspserver-register.vsp'; +// $url = 'https://test.sagepay.com/gateway/service/vspserver-register.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/vspdirect-register.vsp'; - $payment_data['VPSProtocol'] = '3.00'; - } elseif ($this->config->get('payment_sagepay_server_test') == 'sim') { - $url = 'https://test.sagepay.com/Simulator/VSPServerGateway.asp?Service=VendorRegisterTx'; - - $payment_data['VPSProtocol'] = '2.23'; +// $payment_data['VPSProtocol'] = '3.00'; + $payment_data['VPSProtocol'] = '4.00'; } $this->load->model('checkout/order'); @@ -469,11 +469,14 @@ public function delete() { if (!empty($card['token'])) { if ($this->config->get('payment_sagepay_server_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/removetoken.vsp'; +// $url = 'https://live.sagepay.com/gateway/service/removetoken.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/removetoken.vsp'; } else { - $url = 'https://test.sagepay.com/gateway/service/removetoken.vsp'; +// $url = 'https://test.sagepay.com/gateway/service/removetoken.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/removetoken.vsp'; } - $payment_data['VPSProtocol'] = '3.00'; +// $payment_data['VPSProtocol'] = '3.00'; + $payment_data['VPSProtocol'] = '4.00'; $payment_data['Vendor'] = $this->config->get('payment_sagepay_server_vendor'); $payment_data['TxType'] = 'REMOVETOKEN'; $payment_data['Token'] = $card['token']; diff --git a/upload/catalog/model/extension/payment/sagepay_direct.php b/upload/catalog/model/extension/payment/sagepay_direct.php index f385bd20218..dc452685645 100644 --- a/upload/catalog/model/extension/payment/sagepay_direct.php +++ b/upload/catalog/model/extension/payment/sagepay_direct.php @@ -188,14 +188,15 @@ public function recurringPayment($item, $vendor_tx_code) { private function setPaymentData($order_info, $sagepay_order_info, $price, $order_recurring_id, $recurring_name, $i = null) { if ($this->config->get('payment_sagepay_direct_test') == 'live') { - $url = 'https://live.sagepay.com/gateway/service/repeat.vsp'; - $payment_data['VPSProtocol'] = '3.00'; +// $url = 'https://live.sagepay.com/gateway/service/repeat.vsp'; + $url = 'https://live.opayo.eu.elavon.com/gateway/service/repeat.vsp'; +// $payment_data['VPSProtocol'] = '3.00'; + $payment_data['VPSProtocol'] = '4.00'; } elseif ($this->config->get('payment_sagepay_direct_test') == 'test') { - $url = 'https://test.sagepay.com/gateway/service/repeat.vsp'; - $payment_data['VPSProtocol'] = '3.00'; - } elseif ($this->config->get('payment_sagepay_direct_test') == 'sim') { - $url = 'https://test.sagepay.com/Simulator/VSPServerGateway.asp?Service=VendorRepeatTx'; - $payment_data['VPSProtocol'] = '2.23'; +// $url = 'https://test.sagepay.com/gateway/service/repeat.vsp'; + $url = 'https://sandbox.opayo.eu.elavon.com/gateway/service/repeat.vsp'; +// $payment_data['VPSProtocol'] = '3.00'; + $payment_data['VPSProtocol'] = '4.00'; } $payment_data['TxType'] = 'REPEAT';