diff --git a/catalog/controller/payment/worldline.php b/catalog/controller/payment/worldline.php
index 9b8ec19..6128226 100644
--- a/catalog/controller/payment/worldline.php
+++ b/catalog/controller/payment/worldline.php
@@ -66,8 +66,6 @@ public function confirm(): void {
$api_secret = $setting['account']['api_secret'][$environment];
$api_endpoint = $setting['account']['api_endpoint'][$environment];
$authorization_mode = strtoupper($setting['advanced']['authorization_mode']);
- $challenge_indicator = $setting['advanced']['challenge_indicator'];
- $exemption_request = $setting['advanced']['exemption_request'];
$language_code = explode('-', $this->config->get('config_language'));
$language_code = strtoupper(reset($language_code));
@@ -275,6 +273,16 @@ public function confirm(): void {
$item_total += $shipping_total;
}
+ $tokens = [];
+
+ if ($this->customer->isLogged()) {
+ $worldline_customer_tokens = $this->model_extension_worldline_payment_worldline->getWorldlineCustomerTokens($this->customer->getId());
+
+ foreach ($worldline_customer_tokens as $worldline_customer_token) {
+ $tokens[] = $worldline_customer_token['token'];
+ }
+ }
+
$order_references = new \OnlinePayments\Sdk\Domain\OrderReferences();
$order_references->setMerchantReference($order_info['order_id'] . '_' . date('Ymd_His'));
@@ -297,9 +305,20 @@ public function confirm(): void {
$card_payment_method_specific_input = new \OnlinePayments\Sdk\Domain\CardPaymentMethodSpecificInput();
$card_payment_method_specific_input->setAuthorizationMode($authorization_mode);
- $card_payment_method_specific_input->setSkipAuthentication(false);
- $card_payment_method_specific_input->setThreeDSecure($three_d_secure);
$card_payment_method_specific_input->setTransactionChannel('ECOMMERCE');
+
+ if ($setting['advanced']['tds_status']) {
+ $card_payment_method_specific_input->setSkipAuthentication(false);
+ $card_payment_method_specific_input->setThreeDSecure($three_d_secure);
+ } else {
+ $card_payment_method_specific_input->setSkipAuthentication(true);
+ }
+
+ if ($setting['advanced']['forced_tokenization']) {
+ $card_payment_method_specific_input->setTokenize(true);
+ } else {
+ $card_payment_method_specific_input->setTokenize(false);
+ }
$redirect_payment_method_specific_input = new \OnlinePayments\Sdk\Domain\RedirectPaymentMethodSpecificInput();
@@ -308,6 +327,12 @@ public function confirm(): void {
} else {
$redirect_payment_method_specific_input->setRequiresApproval(true);
}
+
+ if ($this->customer->isLogged() && $setting['advanced']['forced_tokenization']) {
+ $redirect_payment_method_specific_input->setTokenize(true);
+ } else {
+ $redirect_payment_method_specific_input->setTokenize(false);
+ }
$mobile_payment_method_specific_input = new \OnlinePayments\Sdk\Domain\MobilePaymentMethodSpecificInput();
$mobile_payment_method_specific_input->setAuthorizationMode($authorization_mode);
@@ -319,6 +344,14 @@ public function confirm(): void {
$hosted_checkout_specific_input->setLocale($language_code . '-' . strtoupper($language_code));
$hosted_checkout_specific_input->setReturnUrl(str_replace('&', '&', $this->url->link('extension/worldline/payment/worldline' . $this->separator . 'callback', 'language=' . $this->config->get('config_language'))));
$hosted_checkout_specific_input->setCardPaymentMethodSpecificInput($card_payment_method_specific_input_for_hosted_checkout);
+
+ if ($setting['advanced']['template']) {
+ $hosted_checkout_specific_input->setVariant($setting['advanced']['template']);
+ }
+
+ if ($tokens) {
+ $hosted_checkout_specific_input->setTokens(implode(',', $tokens));
+ }
$create_hosted_checkout_request = new \OnlinePayments\Sdk\Domain\CreateHostedCheckoutRequest();
$create_hosted_checkout_request->setOrder($order);
@@ -355,9 +388,9 @@ public function confirm(): void {
$hosted_checkout_id = $create_hosted_checkout_response->getHostedCheckoutId();
$hosted_checkout_url = $create_hosted_checkout_response->getRedirectUrl();
- $this->model_extension_worldline_payment_worldline->deleteOrder($order_id);
+ $this->model_extension_worldline_payment_worldline->deleteWorldlineOrder($order_id);
- $worldline_data = [
+ $worldline_order_data = [
'order_id' => $order_id,
'transaction_id' => $hosted_checkout_id,
'total' => ($order_info['total'] * $currency_value),
@@ -366,7 +399,7 @@ public function confirm(): void {
'environment' => $environment
];
- $this->model_extension_worldline_payment_worldline->createOrder($worldline_data);
+ $this->model_extension_worldline_payment_worldline->addWorldlineOrder($worldline_order_data);
$data['redirect'] = $hosted_checkout_url;
}
@@ -429,9 +462,13 @@ public function callback(): bool {
$currency_code = $hosted_checkout_response->getCreatedPaymentOutput()->getPayment()->getPaymentOutput()->getAmountOfMoney()->getCurrencyCode();
$payment_product_id = '';
+ $payment_type = '';
+ $token = '';
if (!empty($hosted_checkout_response->getCreatedPaymentOutput()->getPayment()->getPaymentOutput()->getCardPaymentMethodSpecificOutput())) {
$payment_product_id = $hosted_checkout_response->getCreatedPaymentOutput()->getPayment()->getPaymentOutput()->getCardPaymentMethodSpecificOutput()->getPaymentProductId();
+ $token = $hosted_checkout_response->getCreatedPaymentOutput()->getPayment()->getPaymentOutput()->getCardPaymentMethodSpecificOutput()->getToken();
+ $payment_type = 'card';
}
if (!empty($hosted_checkout_response->getCreatedPaymentOutput()->getPayment()->getPaymentOutput()->getMobilePaymentMethodSpecificOutput())) {
@@ -440,6 +477,8 @@ public function callback(): bool {
if (!empty($hosted_checkout_response->getCreatedPaymentOutput()->getPayment()->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput())) {
$payment_product_id = $hosted_checkout_response->getCreatedPaymentOutput()->getPayment()->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput()->getPaymentProductId();
+ $token = $hosted_checkout_response->getCreatedPaymentOutput()->getPayment()->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput()->getToken();
+ $payment_type = 'redirect';
}
if (!empty($hosted_checkout_response->getCreatedPaymentOutput()->getPayment()->getPaymentOutput()->getSepaDirectDebitPaymentMethodSpecificOutput())) {
@@ -451,7 +490,7 @@ public function callback(): bool {
$this->load->model('extension/worldline/payment/worldline');
- $worldline_order_info = $this->model_extension_worldline_payment_worldline->getOrder($order_id);
+ $worldline_order_info = $this->model_extension_worldline_payment_worldline->getWorldlineOrder($order_id);
if ($worldline_order_info) {
$order_status_id = 0;
@@ -521,16 +560,36 @@ public function callback(): bool {
}
}
- $worldline_data = [
+ $worldline_order_data = [
'order_id' => $order_id,
'transaction_status' => $transaction_status,
'payment_product' => $payment_product,
+ 'payment_type' => $payment_type,
+ 'token' => $token,
'total' => $total,
'amount' => $amount,
'currency_code' => $currency_code
];
- $this->model_extension_worldline_payment_worldline->updateOrder($worldline_data);
+ $this->model_extension_worldline_payment_worldline->editWorldlineOrder($worldline_order_data);
+
+ if ($this->customer->isLogged() && $token) {
+ $customer_id = $this->customer->getId();
+
+ $worldline_customer_token_info = $this->model_extension_worldline_payment_worldline->getWorldlineCustomerToken($customer_id, $payment_type, $token);
+
+ if (!$worldline_customer_token_info) {
+ $worldline_customer_token_data = [
+ 'customer_id' => $customer_id,
+ 'payment_type' => $payment_type,
+ 'token' => $token
+ ];
+
+ $this->model_extension_worldline_payment_worldline->addWorldlineCustomerToken($worldline_customer_token_data);
+ }
+
+ $this->model_extension_worldline_payment_worldline->setWorldlineCustomerMainToken($customer_id, $payment_type, $token);
+ }
}
if (($transaction_status == 'pending_capture') || ($transaction_status == 'captured')) {
@@ -660,7 +719,7 @@ public function failurePage(): void {
$this->load->model('extension/worldline/payment/worldline');
- $worldline_order_info = $this->model_extension_worldline_payment_worldline->getOrder($order_id);
+ $worldline_order_info = $this->model_extension_worldline_payment_worldline->getWorldlineOrder($order_id);
if ($worldline_order_info) {
$transaction_id = $worldline_order_info['transaction_id'];
@@ -690,7 +749,7 @@ public function getPaymentInfo(): void {
$this->load->model('extension/worldline/payment/worldline');
- $worldline_order_info = $this->model_extension_worldline_payment_worldline->getOrder($order_id);
+ $worldline_order_info = $this->model_extension_worldline_payment_worldline->getWorldlineOrder($order_id);
if ($worldline_order_info) {
$transaction_id = $worldline_order_info['transaction_id'];
@@ -759,9 +818,13 @@ public function getPaymentInfo(): void {
$currency_code = $payment_response->getPaymentOutput()->getAmountOfMoney()->getCurrencyCode();
$payment_product_id = '';
+ $payment_type = '';
+ $token = '';
if (!empty($payment_response->getPaymentOutput()->getCardPaymentMethodSpecificOutput())) {
$payment_product_id = $payment_response->getPaymentOutput()->getCardPaymentMethodSpecificOutput()->getPaymentProductId();
+ $token = $payment_response->getPaymentOutput()->getCardPaymentMethodSpecificOutput()->getToken();
+ $payment_type = 'card';
}
if (!empty($payment_response->getPaymentOutput()->getMobilePaymentMethodSpecificOutput())) {
@@ -770,6 +833,8 @@ public function getPaymentInfo(): void {
if (!empty($payment_response->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput())) {
$payment_product_id = $payment_response->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput()->getPaymentProductId();
+ $token = $payment_response->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput()->getToken();
+ $payment_type = 'redirect';
}
if (!empty($payment_response->getPaymentOutput()->getSepaDirectDebitPaymentMethodSpecificOutput())) {
@@ -843,16 +908,36 @@ public function getPaymentInfo(): void {
}
}
- $worldline_data = [
+ $worldline_order_data = [
'order_id' => $order_id,
'transaction_status' => $transaction_status,
'payment_product' => $payment_product,
+ 'payment_type' => $payment_type,
+ 'token' => $token,
'total' => $total,
'amount' => $amount,
'currency_code' => $currency_code
];
-
- $this->model_extension_worldline_payment_worldline->updateOrder($worldline_data);
+
+ $this->model_extension_worldline_payment_worldline->editWorldlineOrder($worldline_order_data);
+
+ if ($this->customer->isLogged() && $token) {
+ $customer_id = $this->customer->getId();
+
+ $worldline_customer_token_info = $this->model_extension_worldline_payment_worldline->getWorldlineCustomerToken($customer_id, $payment_type, $token);
+
+ if (!$worldline_customer_token_info) {
+ $worldline_customer_token_data = [
+ 'customer_id' => $customer_id,
+ 'payment_type' => $payment_type,
+ 'token' => $token
+ ];
+
+ $this->model_extension_worldline_payment_worldline->addWorldlineCustomerToken($worldline_customer_token_data);
+ }
+
+ $this->model_extension_worldline_payment_worldline->setWorldlineCustomerMainToken($customer_id, $payment_type, $token);
+ }
}
if (($transaction_status == 'pending_capture') || ($transaction_status == 'captured')) {
@@ -893,6 +978,7 @@ public function webhook(): bool {
$this->load->language('extension/worldline/payment/worldline');
$this->load->model('extension/worldline/payment/worldline');
+ $this->load->model('checkout/order');
$this->model_extension_worldline_payment_worldline->log($webhook_info, 'Webhook');
@@ -954,9 +1040,13 @@ public function webhook(): bool {
$currency_code = $payment_response->getPaymentOutput()->getAmountOfMoney()->getCurrencyCode();
$payment_product_id = '';
+ $payment_type = '';
+ $token = '';
if (!empty($payment_response->getPaymentOutput()->getCardPaymentMethodSpecificOutput())) {
$payment_product_id = $payment_response->getPaymentOutput()->getCardPaymentMethodSpecificOutput()->getPaymentProductId();
+ $token = $payment_response->getPaymentOutput()->getCardPaymentMethodSpecificOutput()->getToken();
+ $payment_type = 'card';
}
if (!empty($payment_response->getPaymentOutput()->getMobilePaymentMethodSpecificOutput())) {
@@ -965,6 +1055,8 @@ public function webhook(): bool {
if (!empty($payment_response->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput())) {
$payment_product_id = $payment_response->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput()->getPaymentProductId();
+ $token = $payment_response->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput()->getToken();
+ $payment_type = 'redirect';
}
if (!empty($payment_response->getPaymentOutput()->getSepaDirectDebitPaymentMethodSpecificOutput())) {
@@ -977,9 +1069,10 @@ public function webhook(): bool {
$payment_id = explode('_', $webhook_info['payment']['id']);
$transaction_id = reset($payment_id);
- $worldline_order_info = $this->model_extension_worldline_payment_worldline->getOrder($order_id);
+ $worldline_order_info = $this->model_extension_worldline_payment_worldline->getWorldlineOrder($order_id);
+ $order_info = $this->model_checkout_order->getOrder($order_id);
- if ($worldline_order_info && ($worldline_order_info['transaction_id'] == $transaction_id)) {
+ if ($worldline_order_info && ($worldline_order_info['transaction_id'] == $transaction_id) && $order_info) {
$order_status_id = 0;
if ($transaction_status == 'created') {
@@ -1006,14 +1099,8 @@ public function webhook(): bool {
$order_status_id = $setting['order_status']['refunded']['id'];
}
- if ($order_status_id) {
- $this->load->model('checkout/order');
-
- $order_info = $this->model_checkout_order->getOrder($order_id);
-
- if ($order_info && ($order_info['order_status_id'] != $order_status_id)) {
- $this->model_checkout_order->addHistory($order_id, $order_status_id, '', true);
- }
+ if ($order_status_id && ($order_info['order_status_id'] != $order_status_id)) {
+ $this->model_checkout_order->addHistory($order_id, $order_status_id, '', true);
}
if (($transaction_status == 'created') || ($transaction_status == 'pending_capture') || ($transaction_status == 'captured') || ($transaction_status == 'cancelled') || ($transaction_status == 'rejected') || ($transaction_status == 'rejected_capture') || ($transaction_status == 'refunded') || ($transaction_status == 'authorization_requested') || ($transaction_status == 'capture_requested') || ($transaction_status == 'refund_requested')) {
@@ -1047,16 +1134,36 @@ public function webhook(): bool {
}
}
- $worldline_data = [
+ $worldline_order_data = [
'order_id' => $order_id,
'transaction_status' => $transaction_status,
'payment_product' => $payment_product,
+ 'payment_type' => $payment_type,
+ 'token' => $token,
'total' => $total,
'amount' => $amount,
'currency_code' => $currency_code
];
- $this->model_extension_worldline_payment_worldline->updateOrder($worldline_data);
+ $this->model_extension_worldline_payment_worldline->editWorldlineOrder($worldline_order_data);
+
+ if (!empty($order_info['customer_id']) && $token) {
+ $customer_id = $order_info['customer_id'];
+
+ $worldline_customer_token_info = $this->model_extension_worldline_payment_worldline->getWorldlineCustomerToken($customer_id, $payment_type, $token);
+
+ if (!$worldline_customer_token_info) {
+ $worldline_customer_token_data = [
+ 'customer_id' => $customer_id,
+ 'payment_type' => $payment_type,
+ 'token' => $token
+ ];
+
+ $this->model_extension_worldline_payment_worldline->addWorldlineCustomerToken($worldline_customer_token_data);
+ }
+
+ $this->model_extension_worldline_payment_worldline->setWorldlineCustomerMainToken($customer_id, $payment_type, $token);
+ }
}
}
}
@@ -1082,10 +1189,11 @@ public function cron(): bool {
if (hash_equals($setting['account']['cron_token'], $this->request->get['cron_token'])) {
$this->load->model('extension/worldline/payment/worldline');
+ $this->load->model('checkout/order');
- $waiting_orders = $this->model_extension_worldline_payment_worldline->getWaitingOrders();
+ $waiting_worldline_orders = $this->model_extension_worldline_payment_worldline->getWaitingWorldlineOrders();
- if ($waiting_orders) {
+ if ($waiting_worldline_orders) {
$environment = $setting['account']['environment'];
$merchant_id = $setting['account']['merchant_id'][$environment];
$api_key = $setting['account']['api_key'][$environment];
@@ -1103,9 +1211,11 @@ public function cron(): bool {
$client = new \OnlinePayments\Sdk\Client($communicator);
- foreach ($waiting_orders as $waiting_order) {
- $order_id = $waiting_order['order_id'];
- $transaction_id = $waiting_order['transaction_id'];
+ foreach ($waiting_worldline_orders as $waiting_worldline_order) {
+ $order_id = $waiting_worldline_order['order_id'];
+ $transaction_id = $waiting_worldline_order['transaction_id'];
+
+ $order_info = $this->model_checkout_order->getOrder($order_id);
$errors = [];
@@ -1121,16 +1231,20 @@ public function cron(): bool {
}
}
- if (!$errors) {
+ if ($order_info && !$errors) {
$transaction_status = strtolower($payment_response->getStatus());
$total = $payment_response->getPaymentOutput()->getAmountOfMoney()->getAmount() / 100;
$amount = $payment_response->getPaymentOutput()->getAcquiredAmount()->getAmount() / 100;
$currency_code = $payment_response->getPaymentOutput()->getAmountOfMoney()->getCurrencyCode();
$payment_product_id = '';
+ $payment_type = '';
+ $token = '';
if (!empty($payment_response->getPaymentOutput()->getCardPaymentMethodSpecificOutput())) {
$payment_product_id = $payment_response->getPaymentOutput()->getCardPaymentMethodSpecificOutput()->getPaymentProductId();
+ $token = $payment_response->getPaymentOutput()->getCardPaymentMethodSpecificOutput()->getToken();
+ $payment_type = 'card';
}
if (!empty($payment_response->getPaymentOutput()->getMobilePaymentMethodSpecificOutput())) {
@@ -1139,6 +1253,8 @@ public function cron(): bool {
if (!empty($payment_response->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput())) {
$payment_product_id = $payment_response->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput()->getPaymentProductId();
+ $token = $payment_response->getPaymentOutput()->getRedirectPaymentMethodSpecificOutput()->getToken();
+ $payment_type = 'redirect';
}
if (!empty($payment_response->getPaymentOutput()->getSepaDirectDebitPaymentMethodSpecificOutput())) {
@@ -1170,24 +1286,18 @@ public function cron(): bool {
if ($transaction_status == 'refunded') {
$order_status_id = $setting['order_status']['refunded']['id'];
}
-
- if ($order_status_id) {
- $this->load->model('checkout/order');
- $order_info = $this->model_checkout_order->getOrder($order_id);
-
- if ($order_info && ($order_info['order_status_id'] != $order_status_id)) {
- $this->model_checkout_order->addHistory($order_id, $order_status_id, '', true);
- }
+ if ($order_status_id && ($order_info['order_status_id'] != $order_status_id)) {
+ $this->model_checkout_order->addHistory($order_id, $order_status_id, '', true);
}
if (($transaction_status == 'created') || ($transaction_status == 'pending_capture') || ($transaction_status == 'captured') || ($transaction_status == 'cancelled') || ($transaction_status == 'rejected') || ($transaction_status == 'rejected_capture') || ($transaction_status == 'refunded') || ($transaction_status == 'authorization_requested') || ($transaction_status == 'capture_requested') || ($transaction_status == 'refund_requested')) {
- $payment_product = $waiting_order['payment_product'];
+ $payment_product = $waiting_worldline_order['payment_product'];
- if (!$waiting_order['transaction_status']) {
+ if (!$waiting_worldline_order['transaction_status']) {
$payment_product_params = new \OnlinePayments\Sdk\Merchant\Products\GetPaymentProductParams();
$payment_product_params->setCurrencyCode($currency_code);
- $payment_product_params->setCountryCode($waiting_order['country_code']);
+ $payment_product_params->setCountryCode($waiting_worldline_order['country_code']);
try {
$payment_product_response = $client->merchant($merchant_id)->products()->getPaymentProduct($payment_product_id, $payment_product_params);
@@ -1212,16 +1322,36 @@ public function cron(): bool {
}
}
- $worldline_data = [
+ $worldline_order_data = [
'order_id' => $order_id,
'transaction_status' => $transaction_status,
'payment_product' => $payment_product,
+ 'payment_type' => $payment_type,
+ 'token' => $token,
'total' => $total,
'amount' => $amount,
'currency_code' => $currency_code
];
- $this->model_extension_worldline_payment_worldline->updateOrder($worldline_data);
+ $this->model_extension_worldline_payment_worldline->editWorldlineOrder($worldline_order_data);
+
+ if (!empty($order_info['customer_id']) && $token) {
+ $customer_id = $order_info['customer_id'];
+
+ $worldline_customer_token_info = $this->model_extension_worldline_payment_worldline->getWorldlineCustomerToken($customer_id, $payment_type, $token);
+
+ if (!$worldline_customer_token_info) {
+ $worldline_customer_token_data = [
+ 'customer_id' => $customer_id,
+ 'payment_type' => $payment_type,
+ 'token' => $token
+ ];
+
+ $this->model_extension_worldline_payment_worldline->addWorldlineCustomerToken($worldline_customer_token_data);
+ }
+
+ $this->model_extension_worldline_payment_worldline->setWorldlineCustomerMainToken($customer_id, $payment_type, $token);
+ }
}
}
}
@@ -1239,7 +1369,7 @@ public function order_delete_order_before(string $route, array $data): void {
$order_id = $data[0];
- $this->model_extension_worldline_payment_worldline->deleteOrder($order_id);
+ $this->model_extension_worldline_payment_worldline->deleteWorldlineOrder($order_id);
}
private function getallheaders() {
diff --git a/catalog/model/payment/worldline.php b/catalog/model/payment/worldline.php
index 725b1ef..7838045 100644
--- a/catalog/model/payment/worldline.php
+++ b/catalog/model/payment/worldline.php
@@ -101,7 +101,56 @@ public function getMethods(array $address = []): array {
return $method_data;
}
- public function createOrder(array $data): void {
+ public function addWorldlineCustomerToken(array $data): void {
+ $sql = "INSERT INTO `" . DB_PREFIX . "worldline_customer_token` SET";
+
+ $implode = [];
+
+ if (!empty($data['customer_id'])) {
+ $implode[] .= "`customer_id` = '" . (int)$data['customer_id'] . "'";
+ }
+
+ if (!empty($data['payment_type'])) {
+ $implode[] .= "`payment_type` = '" . $this->db->escape($data['payment_type']) . "'";
+ }
+
+ if (!empty($data['token'])) {
+ $implode[] .= "`token` = '" . $this->db->escape($data['token']) . "'";
+ }
+
+ if ($implode) {
+ $sql .= implode(", ", $implode);
+ }
+
+ $this->db->query($sql);
+ }
+
+ public function setWorldlineCustomerMainToken(int $customer_id, string $payment_type, string $token): void {
+ $this->db->query("UPDATE `" . DB_PREFIX . "worldline_customer_token` SET `main_token_status` = '0' WHERE `customer_id` = '" . (int)$customer_id . "' AND `payment_type` = '" . $this->db->escape($payment_type) . "'");
+ $this->db->query("UPDATE `" . DB_PREFIX . "worldline_customer_token` SET `main_token_status` = '1' WHERE `customer_id` = '" . (int)$customer_id . "' AND `payment_type` = '" . $this->db->escape($payment_type) . "' AND `token` = '" . $this->db->escape($token) . "'");
+ }
+
+ public function getWorldlineCustomerToken(int $customer_id, string $payment_type, string $token): array {
+ $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "worldline_customer_token` WHERE `customer_id` = '" . (int)$customer_id . "' AND `payment_type` = '" . $this->db->escape($payment_type) . "' AND `token` = '" . $this->db->escape($token) . "'");
+
+ if ($query->num_rows) {
+ return $query->row;
+ } else {
+ return [];
+ }
+ }
+
+ public function getWorldlineCustomerTokens(int $customer_id): array {
+ $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "worldline_customer_token` WHERE `customer_id` = '" . (int)$customer_id . "'");
+
+ if ($query->num_rows) {
+ return $query->rows;
+ } else {
+ return [];
+ }
+ }
+
+ public function addWorldlineOrder(array $data): void {
$sql = "INSERT INTO `" . DB_PREFIX . "worldline_order` SET";
$implode = [];
@@ -122,6 +171,14 @@ public function createOrder(array $data): void {
$implode[] .= "`payment_product` = '" . $this->db->escape($data['payment_product']) . "'";
}
+ if (!empty($data['payment_type'])) {
+ $implode[] .= "`payment_type` = '" . $this->db->escape($data['payment_type']) . "'";
+ }
+
+ if (!empty($data['token'])) {
+ $implode[] .= "`token` = '" . $this->db->escape($data['token']) . "'";
+ }
+
if (!empty($data['total'])) {
$implode[] .= "`total` = '" . (float)$data['total'] . "'";
}
@@ -146,6 +203,10 @@ public function createOrder(array $data): void {
$implode[] .= "`environment` = '" . $this->db->escape($data['environment']) . "'";
}
+ if (!empty($data['token'])) {
+ $implode[] .= "`token` = '" . $this->db->escape($data['token']) . "'";
+ }
+
if ($implode) {
$sql .= implode(", ", $implode);
}
@@ -153,7 +214,7 @@ public function createOrder(array $data): void {
$this->db->query($sql);
}
- public function updateOrder(array $data): void {
+ public function editWorldlineOrder(array $data): void {
$sql = "UPDATE `" . DB_PREFIX . "worldline_order` SET";
$implode = [];
@@ -170,6 +231,14 @@ public function updateOrder(array $data): void {
$implode[] .= "`payment_product` = '" . $this->db->escape($data['payment_product']) . "'";
}
+ if (!empty($data['payment_type'])) {
+ $implode[] .= "`payment_type` = '" . $this->db->escape($data['payment_type']) . "'";
+ }
+
+ if (!empty($data['token'])) {
+ $implode[] .= "`token` = '" . $this->db->escape($data['token']) . "'";
+ }
+
if (!empty($data['total'])) {
$implode[] .= "`total` = '" . (float)$data['total'] . "'";
}
@@ -189,7 +258,7 @@ public function updateOrder(array $data): void {
if (!empty($data['environment'])) {
$implode[] .= "`environment` = '" . $this->db->escape($data['environment']) . "'";
}
-
+
$implode[] .= "`date` = COALESCE(`date`, NOW())";
if ($implode) {
@@ -201,11 +270,11 @@ public function updateOrder(array $data): void {
$this->db->query($sql);
}
- public function deleteOrder(int $order_id): void {
+ public function deleteWorldlineOrder(int $order_id): void {
$query = $this->db->query("DELETE FROM `" . DB_PREFIX . "worldline_order` WHERE `order_id` = '" . (int)$order_id . "'");
}
- public function getOrder(int $order_id): array {
+ public function getWorldlineOrder(int $order_id): array {
$query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "worldline_order` WHERE `order_id` = '" . (int)$order_id . "'");
if ($query->num_rows) {
@@ -215,7 +284,7 @@ public function getOrder(int $order_id): array {
}
}
- public function getWaitingOrders(): array {
+ public function getWaitingWorldlineOrders(): array {
$query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "worldline_order` WHERE `transaction_status` = '' OR `transaction_status` = 'created' OR `transaction_status` = 'authorization_requested' OR `transaction_status` = 'capture_requested' OR `transaction_status` = 'refund_requested'");
return $query->rows;
diff --git a/system/config/worldline.php b/system/config/worldline.php
index 2a14da9..1948e3f 100644
--- a/system/config/worldline.php
+++ b/system/config/worldline.php
@@ -21,8 +21,11 @@
'debug' => false,
'authorization_mode' => 'sale',
'group_cards' => true,
- 'challenge_indicator' => 'challenge-required',
- 'exemption_request' => 'low-value'
+ 'forced_tokenization' => true,
+ 'tds_secure_status' => true,
+ 'tds_challenge_indicator' => 'challenge-required',
+ 'tds_exemption_request' => 'low-value',
+ 'template' => ''
],
'order_status' => [
'created' => [
@@ -88,7 +91,7 @@
'name' => 'text_sale'
]
],
- 'challenge_indicator' => [
+ 'tds_challenge_indicator' => [
'no-preference' => [
'code' => 'no-preference',
'name' => 'text_no_preference'
@@ -106,7 +109,7 @@
'name' => 'text_challenge_required'
]
],
- 'exemption_request' => [
+ 'tds_exemption_request' => [
'none' => [
'code' => 'none',
'name' => 'text_exemption_none'