Skip to content

Commit

Permalink
Merge pull request opencart#13766 from mhcwebdesign/3.0.x.x
Browse files Browse the repository at this point in the history 
[3.0.x.x] Sagepay URL updates
  • Loading branch information
@mhcwebdesign
mhcwebdesign committed Mar 5, 2024
2 parents 5883529 + 122ba06 commit c53bd3b
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 90 deletions.
4 changes: 1 addition & 3 deletions upload/admin/language/en-gb/extension/payment/sagepay_direct.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
$_['text_extension'] = 'Extensions';
$_['text_success'] = 'Success: You have modified SagePay account details!';
$_['text_edit'] = 'Edit SagePay Direct';
$_['text_sagepay_direct'] = '<a href="https://support.sagepay.com/apply/default.aspx?PartnerID=E511AF91-E4A0-42DE-80B0-09C981A3FB61" target="_blank"><img src="view/image/payment/sagepay.png" alt="SagePay" title="SagePay" style="border: 1px solid #EEEEEE;" /></a>';
$_['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';
Expand Down
4 changes: 1 addition & 3 deletions upload/admin/language/en-gb/extension/payment/sagepay_server.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
$_['text_extension'] = 'Extensions';
$_['text_success'] = 'Success: You have modified SagePay account details!';
$_['text_edit'] = 'Edit SagePay Server';
$_['text_sagepay_server'] = '<a href="https://support.sagepay.com/apply/default.aspx?PartnerID=E511AF91-E4A0-42DE-80B0-09C981A3FB61" target="_blank"><img src="view/image/payment/sagepay.png" alt="SagePay" title="SagePay" style="border: 1px solid #EEEEEE;" /></a>';
$_['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';
Expand Down
45 changes: 24 additions & 21 deletions upload/admin/model/extension/payment/sagepay_direct.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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';
Expand Down Expand Up @@ -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';
Expand Down
45 changes: 24 additions & 21 deletions upload/admin/model/extension/payment/sagepay_server.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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';
Expand Down Expand Up @@ -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';
Expand Down
5 changes: 0 additions & 5 deletions upload/admin/view/template/extension/payment/sagepay_direct.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@
<label class="col-sm-2 control-label" for="input-test">{{ entry_test }}</label>
<div class="col-sm-10">
<select name="payment_sagepay_direct_test" id="input-test" class="form-control">
{% if payment_sagepay_direct_test == 'sim' %}
<option value="sim" selected="selected">{{ text_sim }}</option>
{% else %}
<option value="sim">{{ text_sim }}</option>
{% endif %}
{% if payment_sagepay_direct_test == 'test' %}
<option value="test" selected="selected">{{ text_test }}</option>
{% else %}
Expand Down
5 changes: 0 additions & 5 deletions upload/admin/view/template/extension/payment/sagepay_server.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@
<label class="col-sm-2 control-label" for="input-test">{{ entry_test }}</label>
<div class="col-sm-10">
<select name="payment_sagepay_server_test" id="input-test" class="form-control">
{% if payment_sagepay_server_test == 'sim' %}
<option value="sim" selected="selected">{{ text_sim }}</option>
{% else %}
<option value="sim">{{ text_sim }}</option>
{% endif %}
{% if payment_sagepay_server_test == 'test' %}
<option value="test" selected="selected">{{ text_test }}</option>
{% else %}
Expand Down
32 changes: 18 additions & 14 deletions upload/catalog/controller/extension/payment/sagepay_direct.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'])) {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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'];
Expand Down
25 changes: 14 additions & 11 deletions upload/catalog/controller/extension/payment/sagepay_server.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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'];
Expand Down
15 changes: 8 additions & 7 deletions upload/catalog/model/extension/payment/sagepay_direct.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down

0 comments on commit c53bd3b

Please sign in to comment.