From cdccca211d606e0ec880d8fb2eadfffe0c46a147 Mon Sep 17 00:00:00 2001 From: Bastien Ho Date: Mon, 23 Oct 2023 12:10:18 +0200 Subject: [PATCH 1/2] Use transaction ID in order ID --- src/Message/CompletePurchaseResponse.php | 2 +- src/Message/PurchaseRequest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Message/CompletePurchaseResponse.php b/src/Message/CompletePurchaseResponse.php index 3110fd5..f3a901e 100644 --- a/src/Message/CompletePurchaseResponse.php +++ b/src/Message/CompletePurchaseResponse.php @@ -49,7 +49,7 @@ public function getCode() public function getTransactionId() { - return isset($this->data['vads_trans_id']) ? $this->data['vads_trans_id'] : null; + return isset($this->data['vads_order_id']) ? (int) $this->data['vads_order_id'] : null; } public function getUuid() diff --git a/src/Message/PurchaseRequest.php b/src/Message/PurchaseRequest.php index 3c75301..8c48d0f 100644 --- a/src/Message/PurchaseRequest.php +++ b/src/Message/PurchaseRequest.php @@ -27,6 +27,7 @@ public function getData() $data['vads_site_id'] = $this->getMerchantId(); $data['vads_ctx_mode'] = $this->getTestMode() ? 'TEST' : 'PRODUCTION'; $data['vads_trans_id'] = str_pad($this->getTransactionId(), 6, '0', STR_PAD_LEFT); + $data['vads_order_id'] = str_pad($this->getTransactionId(), 6, '0', STR_PAD_LEFT); $data['vads_trans_date'] = $this->getTransactionDate() ? $this->getTransactionDate() : date('YmdHis'); $data['vads_amount'] = $this->getAmountInteger(); $data['vads_currency'] = $this->getCurrencyNumeric(); @@ -40,7 +41,6 @@ public function getData() $data['vads_url_cancel'] = $this->getCancelUrl(); $data['vads_url_error'] = $this->getErrorUrl(); $data['vads_url_refused'] = $this->getRefusedUrl(); - $data['vads_order_id'] = $this->getOrderId(); $data['vads_payment_cards'] = $this->getPaymentCards(); if (null !== $this->getNotifyUrl()) { From 6713fa68fa17440792c68f3862b39d56217d0f2d Mon Sep 17 00:00:00 2001 From: Bastien Ho Date: Mon, 23 Oct 2023 12:12:55 +0200 Subject: [PATCH 2/2] Adds getTransactionReference() method --- src/Message/PurchaseResponse.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Message/PurchaseResponse.php b/src/Message/PurchaseResponse.php index da43d7f..69bc71f 100644 --- a/src/Message/PurchaseResponse.php +++ b/src/Message/PurchaseResponse.php @@ -41,4 +41,9 @@ public function getRedirectData() { return $this->data; } + + public function getTransactionReference() + { + return isset($this->data['vads_subscription']) ? (int) $this->data['vads_subscription'] : null; + } }