diff --git a/upload/admin/view/template/extension/payment/paypal/general.twig b/upload/admin/view/template/extension/payment/paypal/general.twig
index bb7d38d16db..e2808bf301c 100644
--- a/upload/admin/view/template/extension/payment/paypal/general.twig
+++ b/upload/admin/view/template/extension/payment/paypal/general.twig
@@ -34,7 +34,8 @@
{{ text_tab_googlepay_button }}
{{ text_tab_applepay_button }}
{{ text_tab_card }}
-
{{ text_tab_message }}
+
{{ text_tab_message_configurator }}
+
{{ text_tab_message_setting }}
{{ text_tab_order_status }}
{{ text_tab_contact }}
diff --git a/upload/admin/view/template/extension/payment/paypal/googlepay_button.twig b/upload/admin/view/template/extension/payment/paypal/googlepay_button.twig
index 098d2a6a543..60b8f1c3dec 100644
--- a/upload/admin/view/template/extension/payment/paypal/googlepay_button.twig
+++ b/upload/admin/view/template/extension/payment/paypal/googlepay_button.twig
@@ -34,7 +34,8 @@
{{ text_tab_googlepay_button }}
{{ text_tab_applepay_button }}
{{ text_tab_card }}
-
{{ text_tab_message }}
+
{{ text_tab_message_configurator }}
+
{{ text_tab_message_setting }}
{{ text_tab_order_status }}
{{ text_tab_contact }}
diff --git a/upload/admin/view/template/extension/payment/paypal/order_status.twig b/upload/admin/view/template/extension/payment/paypal/order_status.twig
index 6f1ed8ab4af..2fda3d8c3ab 100644
--- a/upload/admin/view/template/extension/payment/paypal/order_status.twig
+++ b/upload/admin/view/template/extension/payment/paypal/order_status.twig
@@ -34,7 +34,8 @@
{{ text_tab_googlepay_button }}
{{ text_tab_applepay_button }}
{{ text_tab_card }}
-
{{ text_tab_message }}
+
{{ text_tab_message_configurator }}
+
{{ text_tab_message_setting }}
{{ text_tab_order_status }}
{{ text_tab_contact }}
diff --git a/upload/catalog/controller/extension/payment/paypal.php b/upload/catalog/controller/extension/payment/paypal.php
index ddae8b02f28..9db0a2c75f8 100644
--- a/upload/catalog/controller/extension/payment/paypal.php
+++ b/upload/catalog/controller/extension/payment/paypal.php
@@ -10,7 +10,7 @@ public function __construct($registry) {
ini_set('serialize_precision', 14);
}
- if (empty($this->config->get('paypal_version')) || (!empty($this->config->get('paypal_version')) && ($this->config->get('paypal_version') < '2.2.0'))) {
+ if (empty($this->config->get('paypal_version')) || (!empty($this->config->get('paypal_version')) && ($this->config->get('paypal_version') < '3.0.0'))) {
$this->update();
}
}
@@ -20,7 +20,7 @@ public function index() {
$agree_status = $this->model_extension_payment_paypal->getAgreeStatus();
- if ($this->config->get('payment_paypal_status') && $this->config->get('payment_paypal_client_id') && $this->config->get('payment_paypal_secret') && !$this->webhook() && !$this->cron() && $agree_status) {
+ if ($this->config->get('payment_paypal_status') && $this->config->get('payment_paypal_client_id') && $this->config->get('payment_paypal_secret') && !$this->callback() && !$this->webhook() && !$this->cron() && $agree_status) {
$this->load->language('extension/payment/paypal');
$_config = new Config();
@@ -43,6 +43,8 @@ public function index() {
$data['googlepay_button_status'] = $setting['googlepay_button']['status'];
$data['applepay_button_status'] = $setting['applepay_button']['status'];
$data['card_status'] = $setting['card']['status'];
+
+ $data['logged'] = $this->customer->isLogged();
require_once DIR_SYSTEM .'library/paypal/paypal.php';
@@ -219,9 +221,6 @@ public function getData() {
$data['message_status'] = $setting['message']['home']['status'];
$data['message_insert_tag'] = html_entity_decode($setting['message']['home']['insert_tag']);
$data['message_insert_type'] = $setting['message']['home']['insert_type'];
- $data['message_align'] = $setting['message']['home']['align'];
- $data['message_size'] = $setting['message']['home']['size'];
- $data['message_width'] = $setting['message_width'][$data['message_size']];
$data['message_layout'] = $setting['message']['home']['layout'];
$data['message_logo_type'] = $setting['message']['home']['logo_type'];
$data['message_logo_position'] = $setting['message']['home']['logo_position'];
@@ -268,9 +267,6 @@ public function getData() {
$data['message_status'] = $setting['message']['product']['status'];
$data['message_insert_tag'] = html_entity_decode($setting['message']['product']['insert_tag']);
$data['message_insert_type'] = $setting['message']['product']['insert_type'];
- $data['message_align'] = $setting['message']['product']['align'];
- $data['message_size'] = $setting['message']['product']['size'];
- $data['message_width'] = $setting['message_width'][$data['message_size']];
$data['message_layout'] = $setting['message']['product']['layout'];
$data['message_logo_type'] = $setting['message']['product']['logo_type'];
$data['message_logo_position'] = $setting['message']['product']['logo_position'];
@@ -319,9 +315,6 @@ public function getData() {
$data['message_status'] = $setting['message']['cart']['status'];
$data['message_insert_tag'] = html_entity_decode($setting['message']['cart']['insert_tag']);
$data['message_insert_type'] = $setting['message']['cart']['insert_type'];
- $data['message_align'] = $setting['message']['cart']['align'];
- $data['message_size'] = $setting['message']['cart']['size'];
- $data['message_width'] = $setting['message_width'][$data['message_size']];
$data['message_layout'] = $setting['message']['cart']['layout'];
$data['message_logo_type'] = $setting['message']['cart']['logo_type'];
$data['message_logo_position'] = $setting['message']['cart']['logo_position'];
@@ -445,20 +438,30 @@ public function getData() {
}
if ($setting['card']['status']) {
- $data['components'][] = 'hosted-fields';
+ $data['components'][] = 'card-fields';
$data['card_status'] = $setting['card']['status'];
$data['card_align'] = $setting['card']['align'];
$data['card_size'] = $setting['card']['size'];
$data['card_width'] = $setting['card_width'][$data['card_size']];
- $data['card_secure_status'] = $setting['card']['secure_status'];
+
+ $data['card_customer_tokens'] = array();
+
+ if ($this->customer->isLogged()) {
+ $card_customer_tokens = $this->model_extension_payment_paypal->getPayPalCustomerTokens($this->customer->getId(), 'card');
+
+ foreach ($card_customer_tokens as $card_customer_token) {
+ $data['card_customer_tokens'][] = array(
+ 'vault_id' => $card_customer_token['vault_id'],
+ 'card_type' => $card_customer_token['card_type'],
+ 'card_number' => sprintf($this->language->get('text_card_number'), $card_customer_token['card_nice_type'], $card_customer_token['card_last_digits'])
+ );
+ }
+ }
}
if ($setting['message']['checkout']['status'] && ($data['currency_code'] == $setting['general']['currency_code'])) {
$data['components'][] = 'messages';
$data['message_status'] = $setting['message']['checkout']['status'];
- $data['message_align'] = $setting['message']['checkout']['align'];
- $data['message_size'] = $setting['message']['checkout']['size'];
- $data['message_width'] = $setting['message_width'][$data['message_size']];
$data['message_layout'] = $setting['message']['checkout']['layout'];
$data['message_logo_type'] = $setting['message']['checkout']['logo_type'];
$data['message_logo_position'] = $setting['message']['checkout']['logo_position'];
@@ -502,10 +505,23 @@ public function getData() {
$paypal = new PayPal($paypal_info);
$token_info = array(
- 'grant_type' => 'client_credentials'
- );
+ 'grant_type' => 'client_credentials',
+ );
+
+ if ($this->customer->isLogged()) {
+ $paypal_customer_token = $this->model_extension_payment_paypal->getPayPalCustomerMainToken($this->customer->getId(), 'paypal');
- $paypal->setAccessToken($token_info);
+ if (!empty($paypal_customer_token['vault_customer_id'])) {
+ $token_info['response_type'] = 'id_token';
+ $token_info['target_customer_id'] = $paypal_customer_token['vault_customer_id'];
+ }
+ }
+
+ $result = $paypal->setAccessToken($token_info);
+
+ if (!empty($result['id_token'])) {
+ $data['id_token'] = $result['id_token'];
+ }
$data['client_token'] = $paypal->getClientToken();
@@ -551,9 +567,20 @@ public function createOrder() {
$page_code = $this->request->post['page_code'];
$payment_type = $this->request->post['payment_type'];
+ $payment_method = '';
+
+ if ($payment_type == 'button') {
+ $payment_method = 'paypal';
+ }
+
+ if ($payment_type == 'card') {
+ $payment_method = 'card';
+ }
+
$errors = array();
- $data['order_id'] = '';
+ $data['paypal_order_id'] = '';
+ $data['url'] = '';
if (!empty($this->request->post['product'])) {
$this->request->post['product'] = $this->unserialize($this->request->post['product']);
@@ -825,31 +852,59 @@ public function createOrder() {
$paypal_order_info['application_context']['shipping_preference'] = $shipping_preference;
- if ($this->cart->hasRecurringProducts()) {
- $payment_method = '';
-
- if ($payment_type == 'button') {
- $payment_method = 'paypal';
- }
-
- if ($payment_type == 'card') {
- $payment_method = 'card';
+ if ($this->customer->isLogged() || $this->cart->hasRecurringProducts()) {
+ if ($payment_method == 'paypal') {
+ $paypal_customer_token = array();
+
+ if ($this->customer->isLogged()) {
+ $paypal_customer_token = $this->model_extension_payment_paypal->getPayPalCustomerMainToken($this->customer->getId(), $payment_method);
+ }
+
+ if (empty($paypal_customer_token['vault_id'])) {
+ $paypal_order_info['payment_source'][$payment_method]['attributes']['vault'] = array(
+ 'permit_multiple_payment_tokens' => 'false',
+ 'store_in_vault' => 'ON_SUCCESS',
+ 'usage_type' => 'MERCHANT',
+ 'customer_type' => 'CONSUMER'
+ );
+ }
+
+ $paypal_order_info['payment_source'][$payment_method]['experience_context']['return_url'] = $this->url->link('extension/payment/paypal', 'callback_token=' . $setting['general']['callback_token'], true);
+ $paypal_order_info['payment_source'][$payment_method]['experience_context']['cancel_url'] = $this->url->link('checkout/checkout', '', true);
}
- if ($payment_method) {
- $paypal_order_info['payment_source'][$payment_method]['attributes']['vault'] = array(
- 'store_in_vault' => 'ON_SUCCESS',
- 'usage_type' => 'MERCHANT',
- 'customer_type' => 'CONSUMER'
- );
-
- $paypal_order_info['payment_source']['paypal']['experience_context'] = array(
- 'return_url' => $this->url->link('checkout/success', '', true),
- 'cancel_url' => $this->url->link('checkout/success', '', true)
- );
+ if ($payment_method == 'card') {
+ if (isset($this->request->post['index'])) {
+ $card_token_index = $this->request->post['index'];
+
+ $card_customer_tokens = $this->model_extension_payment_paypal->getPayPalCustomerTokens($this->customer->getId(), $payment_method);
+
+ if (!empty($card_customer_tokens[$card_token_index]['vault_id'])) {
+ $paypal_order_info['payment_source'][$payment_method]['vault_id'] = $card_customer_tokens[$card_token_index]['vault_id'];
+ $paypal_order_info['payment_source'][$payment_method]['stored_credential']['payment_initiator'] = 'CUSTOMER';
+ $paypal_order_info['payment_source'][$payment_method]['stored_credential']['payment_type'] = 'ONE_TIME';
+ $paypal_order_info['payment_source'][$payment_method]['stored_credential']['usage'] = 'SUBSEQUENT';
+ }
+ } else {
+ if (!empty($this->request->post['card_save']) || $this->cart->hasRecurringProducts()) {
+ $paypal_order_info['payment_source'][$payment_method]['attributes']['vault']['store_in_vault'] = 'ON_SUCCESS';
+ $paypal_order_info['payment_source'][$payment_method]['stored_credential']['payment_initiator'] = 'CUSTOMER';
+ $paypal_order_info['payment_source'][$payment_method]['stored_credential']['usage'] = 'FIRST';
+
+ if ($this->cart->hasRecurringProducts()) {
+ $paypal_order_info['payment_source'][$payment_method]['stored_credential']['payment_type'] = 'UNSCHEDULED';
+ } else {
+ $paypal_order_info['payment_source'][$payment_method]['stored_credential']['payment_type'] = 'ONE_TIME';
+ }
+ }
+ }
}
}
+ $paypal_order_info['payment_source'][$payment_method]['attributes']['verification']['method'] = strtoupper($setting['card']['secure_method']);
+ $paypal_order_info['payment_source'][$payment_method]['experience_context']['return_url'] = $this->url->link('extension/payment/paypal', 'callback_token=' . $setting['general']['callback_token'], true);
+ $paypal_order_info['payment_source'][$payment_method]['experience_context']['cancel_url'] = $this->url->link('checkout/checkout', '', true);
+
$result = $paypal->createOrder($paypal_order_info);
if ($paypal->hasErrors()) {
@@ -877,19 +932,32 @@ public function createOrder() {
if (!empty($this->error['warning'])) {
$this->error['warning'] .= ' ' . sprintf($this->language->get('error_payment'), $this->url->link('information/contact', '', true));
}
-
- $data['paypal_order_id'] = '';
-
+
if (isset($result['id']) && isset($result['status']) && !$this->error) {
$this->model_extension_payment_paypal->log($result, 'Create Order');
-
+
if ($result['status'] == 'VOIDED') {
$this->error['warning'] = sprintf($this->language->get('error_order_voided'), $this->url->link('information/contact', '', true));
}
-
- if ($result['status'] == 'COMPLETED') {
+
+ if (($result['status'] == 'COMPLETED') && empty($paypal_order_info['payment_source']['card']['vault_id'])) {
$this->error['warning'] = sprintf($this->language->get('error_order_completed'), $this->url->link('information/contact', '', true));
}
+
+ if (($result['status'] == 'COMPLETED') && !empty($paypal_order_info['payment_source']['card']['vault_id'])) {
+ $data['url'] = $this->url->link('checkout/success', '', true);
+ }
+
+ if (($result['status'] == 'PAYER_ACTION_REQUIRED') && !empty($paypal_order_info['payment_source']['card']['vault_id'])) {
+ foreach ($result['links'] as $link) {
+ if ($link['rel'] == 'payer-action') {
+ $data['url'] = $link['href'];
+
+ $this->session->data['paypal_order_id'] = $result['id'];
+ $this->session->data['paypal_card_token_index'] = $this->request->post['index'];
+ }
+ }
+ }
if (!$this->error) {
$data['paypal_order_id'] = $result['id'];
@@ -905,7 +973,7 @@ public function createOrder() {
$this->response->addHeader('Content-Type: application/json');
$this->response->setOutput(json_encode($data));
}
-
+
public function approveOrder() {
$this->load->language('extension/payment/paypal');
@@ -1110,97 +1178,89 @@ public function approveOrder() {
$data['url'] = $this->url->link('extension/payment/paypal/confirmOrder', '', true);
}
} else {
- if ((($payment_type == 'button') || ($payment_type == 'googlepay_button') || ($payment_type == 'applepay_button')) && !empty($this->request->post['paypal_order_id'])) {
+ if (!empty($this->request->post['paypal_order_id'])) {
$paypal_order_id = $this->request->post['paypal_order_id'];
}
- if (($payment_type == 'card') && !empty($this->request->post['payload'])) {
- $payload = json_decode(htmlspecialchars_decode($this->request->post['payload']), true);
-
- if (isset($payload['orderId'])) {
- $paypal_order_id = $payload['orderId'];
-
- if ($setting['card']['secure_status']) {
- $paypal_order_info = $paypal->getOrder($paypal_order_id);
+ if (($payment_type == 'card') && !empty($paypal_order_id)) {
+ $paypal_order_info = $paypal->getOrder($paypal_order_id);
- if ($paypal->hasErrors()) {
- $error_messages = array();
+ if ($paypal->hasErrors()) {
+ $error_messages = array();
- $errors = $paypal->getErrors();
+ $errors = $paypal->getErrors();
- foreach ($errors as $error) {
- if (isset($error['name']) && ($error['name'] == 'CURLE_OPERATION_TIMEOUTED')) {
- $error['message'] = $this->language->get('error_timeout');
- }
-
- if (isset($error['details'][0]['description'])) {
- $error_messages[] = $error['details'][0]['description'];
- } elseif (isset($error['message'])) {
- $error_messages[] = $error['message'];
- }
+ foreach ($errors as $error) {
+ if (isset($error['name']) && ($error['name'] == 'CURLE_OPERATION_TIMEOUTED')) {
+ $error['message'] = $this->language->get('error_timeout');
+ }
- $this->model_extension_payment_paypal->log($error, $error['message']);
- }
-
- $this->error['warning'] = implode(' ', $error_messages);
+ if (isset($error['details'][0]['description'])) {
+ $error_messages[] = $error['details'][0]['description'];
+ } elseif (isset($error['message'])) {
+ $error_messages[] = $error['message'];
}
+
+ $this->model_extension_payment_paypal->log($error, $error['message']);
+ }
+
+ $this->error['warning'] = implode(' ', $error_messages);
+ }
- if (isset($paypal_order_info['payment_source']['card']) && !$this->error) {
- $this->model_extension_payment_paypal->log($paypal_order_info['payment_source']['card'], 'Card');
+ if (isset($paypal_order_info['payment_source']['card']) && !$this->error) {
+ $this->model_extension_payment_paypal->log($paypal_order_info['payment_source']['card'], 'Card');
- $liability_shift = (isset($paypal_order_info['payment_source']['card']['authentication_result']['liability_shift']) ? $paypal_order_info['payment_source']['card']['authentication_result']['liability_shift'] : '');
- $enrollment_status = (isset($paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['enrollment_status']) ? $paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['enrollment_status'] : '');
- $authentication_status = (isset($paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['authentication_status']) ? $paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['authentication_status'] : '');
+ $liability_shift = (isset($paypal_order_info['payment_source']['card']['authentication_result']['liability_shift']) ? $paypal_order_info['payment_source']['card']['authentication_result']['liability_shift'] : '');
+ $enrollment_status = (isset($paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['enrollment_status']) ? $paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['enrollment_status'] : '');
+ $authentication_status = (isset($paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['authentication_status']) ? $paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['authentication_status'] : '');
- if ($enrollment_status == 'Y') {
- if (($authentication_status == 'N') && !$setting['card']['secure_scenario']['failed_authentication']) {
- $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['failed_authentication']['error']);
- }
+ if ($enrollment_status == 'Y') {
+ if (($authentication_status == 'N') && !$setting['card']['secure_scenario']['failed_authentication']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['failed_authentication']['error']);
+ }
- if (($authentication_status == 'R') && !$setting['card']['secure_scenario']['rejected_authentication']) {
- $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['rejected_authentication']['error']);
- }
+ if (($authentication_status == 'R') && !$setting['card']['secure_scenario']['rejected_authentication']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['rejected_authentication']['error']);
+ }
- if (($authentication_status == 'A') && !$setting['card']['secure_scenario']['attempted_authentication']) {
- $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['attempted_authentication']['error']);
- }
+ if (($authentication_status == 'A') && !$setting['card']['secure_scenario']['attempted_authentication']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['attempted_authentication']['error']);
+ }
- if (($authentication_status == 'U') && !$setting['card']['secure_scenario']['unable_authentication']) {
- $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['unable_authentication']['error']);
- }
+ if (($authentication_status == 'U') && !$setting['card']['secure_scenario']['unable_authentication']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['unable_authentication']['error']);
+ }
- if (($authentication_status == 'C') && !$setting['card']['secure_scenario']['challenge_authentication']) {
- $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['challenge_authentication']['error']);
- }
- }
+ if (($authentication_status == 'C') && !$setting['card']['secure_scenario']['challenge_authentication']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['challenge_authentication']['error']);
+ }
+ }
- if (($enrollment_status == 'N') && !$setting['card']['secure_scenario']['card_ineligible']) {
- $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['card_ineligible']['error']);
- }
+ if (($enrollment_status == 'N') && !$setting['card']['secure_scenario']['card_ineligible']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['card_ineligible']['error']);
+ }
- if (($enrollment_status == 'U') && !$setting['card']['secure_scenario']['system_unavailable']) {
- $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['system_unavailable']['error']);
- }
+ if (($enrollment_status == 'U') && !$setting['card']['secure_scenario']['system_unavailable']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['system_unavailable']['error']);
+ }
- if (($enrollment_status == 'B') && !$setting['card']['secure_scenario']['system_bypassed']) {
- $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['system_bypassed']['error']);
- }
- }
-
- if (!empty($this->error['warning'])) {
- $this->error['warning'] .= ' ' . sprintf($this->language->get('error_payment'), $this->url->link('information/contact', '', true));
- }
+ if (($enrollment_status == 'B') && !$setting['card']['secure_scenario']['system_bypassed']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['system_bypassed']['error']);
}
}
+
+ if (!empty($this->error['warning'])) {
+ $this->error['warning'] .= ' ' . sprintf($this->language->get('error_payment'), $this->url->link('information/contact', '', true));
+ }
}
-
- if (isset($paypal_order_id) && !$this->error) {
+
+ if (!empty($paypal_order_id) && !$this->error) {
if ($transaction_method == 'authorize') {
$result = $paypal->setOrderAuthorize($paypal_order_id);
} else {
$result = $paypal->setOrderCapture($paypal_order_id);
}
-
+
if ($paypal->hasErrors()) {
$error_messages = array();
@@ -1248,15 +1308,21 @@ public function approveOrder() {
$payment_method = '';
$vault_id = '';
$vault_customer_id = '';
+ $card_type = (!empty($this->request->post['card_type']) ? $this->request->post['card_type'] : '');
+ $card_nice_type = (!empty($this->request->post['card_nice_type']) ? $this->request->post['card_nice_type'] : '');
+ $card_last_digits = '';
+ $card_expiry = '';
if (!$this->cart->hasShipping()) {
$seller_protection_status = 'NOT_ELIGIBLE';
}
foreach ($result['payment_source'] as $payment_source_key => $payment_source) {
+ $payment_method = $payment_source_key;
$vault_id = (isset($payment_source['attributes']['vault']['id']) ? $payment_source['attributes']['vault']['id'] : '');
$vault_customer_id = (isset($payment_source['attributes']['vault']['customer']['id']) ? $payment_source['attributes']['vault']['customer']['id'] : '');
- $payment_method = $payment_source_key;
+ $card_last_digits = (isset($payment_source['last_digits']) ? $payment_source['last_digits'] : '');
+ $card_expiry = (isset($payment_source['expiry']) ? $payment_source['expiry'] : '');
break;
}
@@ -1293,19 +1359,60 @@ public function approveOrder() {
}
if (($authorization_status == 'CREATED') || ($authorization_status == 'DENIED') || ($authorization_status == 'PENDING')) {
+ if ($payment_method == 'paypal') {
+ $paypal_customer_token = array();
+
+ if ($this->customer->isLogged()) {
+ $paypal_customer_token = $this->model_extension_payment_paypal->getPayPalCustomerMainToken($this->customer->getId(), $payment_method);
+ }
+
+ if (!empty($paypal_customer_token['vault_id'])) {
+ $vault_id = $paypal_customer_token['vault_id'];
+ $vault_customer_id = $paypal_customer_token['vault_customer_id'];
+ }
+ }
+
$this->model_extension_payment_paypal->deletePayPalOrder($this->session->data['order_id']);
$paypal_order_data = array(
'order_id' => $this->session->data['order_id'],
+ 'paypal_order_id' => $paypal_order_id,
'transaction_id' => $authorization_id,
'transaction_status' => $transaction_status,
'payment_method' => $payment_method,
'vault_id' => $vault_id,
'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry,
'environment' => $environment
);
$this->model_extension_payment_paypal->addPayPalOrder($paypal_order_data);
+
+ if ($this->customer->isLogged() && $vault_id) {
+ $customer_id = $this->customer->getId();
+
+ $paypal_customer_token_info = $this->model_extension_payment_paypal->getPayPalCustomerToken($customer_id, $payment_method, $vault_id);
+
+ if (!$paypal_customer_token_info) {
+ $paypal_customer_token_data = array(
+ 'customer_id' => $customer_id,
+ 'payment_method' => $payment_method,
+ 'vault_id' => $vault_id,
+ 'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry
+ );
+
+ $this->model_extension_payment_paypal->addPayPalCustomerToken($paypal_customer_token_data);
+ }
+
+ $this->model_extension_payment_paypal->setPayPalCustomerMainToken($customer_id, $payment_method, $vault_id);
+ }
}
if (($authorization_status == 'CREATED') || ($authorization_status == 'PENDING')) {
@@ -1332,15 +1439,21 @@ public function approveOrder() {
$payment_method = '';
$vault_id = '';
$vault_customer_id = '';
-
+ $card_type = (!empty($this->request->post['card_type']) ? $this->request->post['card_type'] : '');
+ $card_nice_type = (!empty($this->request->post['card_nice_type']) ? $this->request->post['card_nice_type'] : '');
+ $card_last_digits = '';
+ $card_expiry = '';
+
if (!$this->cart->hasShipping()) {
$seller_protection_status = 'NOT_ELIGIBLE';
}
foreach ($result['payment_source'] as $payment_source_key => $payment_source) {
+ $payment_method = $payment_source_key;
$vault_id = (isset($payment_source['attributes']['vault']['id']) ? $payment_source['attributes']['vault']['id'] : '');
$vault_customer_id = (isset($payment_source['attributes']['vault']['customer']['id']) ? $payment_source['attributes']['vault']['customer']['id'] : '');
- $payment_method = $payment_source_key;
+ $card_last_digits = (isset($payment_source['last_digits']) ? $payment_source['last_digits'] : '');
+ $card_expiry = (isset($payment_source['expiry']) ? $payment_source['expiry'] : '');
break;
}
@@ -1373,19 +1486,60 @@ public function approveOrder() {
}
if (($capture_status == 'COMPLETED') || ($capture_status == 'DECLINED') || ($capture_status == 'PENDING')) {
+ if ($payment_method == 'paypal') {
+ $paypal_customer_token = array();
+
+ if ($this->customer->isLogged()) {
+ $paypal_customer_token = $this->model_extension_payment_paypal->getPayPalCustomerMainToken($this->customer->getId(), $payment_method);
+ }
+
+ if (!empty($paypal_customer_token['vault_id'])) {
+ $vault_id = $paypal_customer_token['vault_id'];
+ $vault_customer_id = $paypal_customer_token['vault_customer_id'];
+ }
+ }
+
$this->model_extension_payment_paypal->deletePayPalOrder($this->session->data['order_id']);
$paypal_order_data = array(
'order_id' => $this->session->data['order_id'],
+ 'paypal_order_id' => $paypal_order_id,
'transaction_id' => $capture_id,
'transaction_status' => $transaction_status,
'payment_method' => $payment_method,
'vault_id' => $vault_id,
'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry,
'environment' => $environment
);
$this->model_extension_payment_paypal->addPayPalOrder($paypal_order_data);
+
+ if ($this->customer->isLogged() && $vault_id) {
+ $customer_id = $this->customer->getId();
+
+ $paypal_customer_token_info = $this->model_extension_payment_paypal->getPayPalCustomerToken($customer_id, $payment_method, $vault_id);
+
+ if (!$paypal_customer_token_info) {
+ $paypal_customer_token_data = array(
+ 'customer_id' => $customer_id,
+ 'payment_method' => $payment_method,
+ 'vault_id' => $vault_id,
+ 'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry
+ );
+
+ $this->model_extension_payment_paypal->addPayPalCustomerToken($paypal_customer_token_data);
+ }
+
+ $this->model_extension_payment_paypal->setPayPalCustomerMainToken($customer_id, $payment_method, $vault_id);
+ }
}
if (($capture_status == 'COMPLETED') || ($capture_status == 'PENDING')) {
@@ -1411,7 +1565,7 @@ public function approveOrder() {
$this->response->addHeader('Content-Type: application/json');
$this->response->setOutput(json_encode($data));
}
-
+
public function confirmOrder() {
$this->load->language('extension/payment/paypal');
$this->load->language('checkout/cart');
@@ -2390,15 +2544,21 @@ public function completeOrder() {
$payment_method = '';
$vault_id = '';
$vault_customer_id = '';
+ $card_type = '';
+ $card_nice_type = '';
+ $card_last_digits = '';
+ $card_expiry = '';
if (!$this->cart->hasShipping()) {
$seller_protection_status = 'NOT_ELIGIBLE';
}
foreach ($result['payment_source'] as $payment_source_key => $payment_source) {
+ $payment_method = $payment_source_key;
$vault_id = (isset($payment_source['attributes']['vault']['id']) ? $payment_source['attributes']['vault']['id'] : '');
$vault_customer_id = (isset($payment_source['attributes']['vault']['customer']['id']) ? $payment_source['attributes']['vault']['customer']['id'] : '');
- $payment_method = $payment_source_key;
+ $card_last_digits = (isset($payment_source['last_digits']) ? $payment_source['last_digits'] : '');
+ $card_expiry = (isset($payment_source['expiry']) ? $payment_source['expiry'] : '');
break;
}
@@ -2435,19 +2595,60 @@ public function completeOrder() {
}
if (($authorization_status == 'CREATED') || ($authorization_status == 'DENIED') || ($authorization_status == 'PENDING')) {
+ if ($payment_method == 'paypal') {
+ $paypal_customer_token = array();
+
+ if ($this->customer->isLogged()) {
+ $paypal_customer_token = $this->model_extension_payment_paypal->getPayPalCustomerMainToken($this->customer->getId(), $payment_method);
+ }
+
+ if (!empty($paypal_customer_token['vault_id'])) {
+ $vault_id = $paypal_customer_token['vault_id'];
+ $vault_customer_id = $paypal_customer_token['vault_customer_id'];
+ }
+ }
+
$this->model_extension_payment_paypal->deletePayPalOrder($this->session->data['order_id']);
-
+
$paypal_order_data = array(
'order_id' => $this->session->data['order_id'],
+ 'paypal_order_id' => $paypal_order_id,
'transaction_id' => $authorization_id,
'transaction_status' => $transaction_status,
'payment_method' => $payment_method,
'vault_id' => $vault_id,
'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry,
'environment' => $environment
);
$this->model_extension_payment_paypal->addPayPalOrder($paypal_order_data);
+
+ if ($this->customer->isLogged() && $vault_id) {
+ $customer_id = $this->customer->getId();
+
+ $paypal_customer_token_info = $this->model_extension_payment_paypal->getPayPalCustomerToken($customer_id, $payment_method, $vault_id);
+
+ if (!$paypal_customer_token_info) {
+ $paypal_customer_token_data = array(
+ 'customer_id' => $customer_id,
+ 'payment_method' => $payment_method,
+ 'vault_id' => $vault_id,
+ 'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry,
+ );
+
+ $this->model_extension_payment_paypal->addPayPalCustomerToken($paypal_customer_token_data);
+ }
+
+ $this->model_extension_payment_paypal->setPayPalCustomerMainToken($customer_id, $payment_method, $vault_id);
+ }
}
if (($authorization_status == 'CREATED') || ($authorization_status == 'PENDING')) {
@@ -2474,16 +2675,22 @@ public function completeOrder() {
$payment_method = '';
$vault_id = '';
$vault_customer_id = '';
-
+ $card_type = '';
+ $card_nice_type = '';
+ $card_last_digits = '';
+ $card_expiry = '';
+
if (!$this->cart->hasShipping()) {
$seller_protection_status = 'NOT_ELIGIBLE';
}
foreach ($result['payment_source'] as $payment_source_key => $payment_source) {
+ $payment_method = $payment_source_key;
$vault_id = (isset($payment_source['attributes']['vault']['id']) ? $payment_source['attributes']['vault']['id'] : '');
$vault_customer_id = (isset($payment_source['attributes']['vault']['customer']['id']) ? $payment_source['attributes']['vault']['customer']['id'] : '');
- $payment_method = $payment_source_key;
-
+ $card_last_digits = (isset($payment_source['last_digits']) ? $payment_source['last_digits'] : '');
+ $card_expiry = (isset($payment_source['expiry']) ? $payment_source['expiry'] : '');
+
break;
}
@@ -2515,19 +2722,60 @@ public function completeOrder() {
}
if (($capture_status == 'COMPLETED') || ($capture_status == 'DECLINED') || ($capture_status == 'PENDING')) {
+ if ($payment_method == 'paypal') {
+ $paypal_customer_token = array();
+
+ if ($this->customer->isLogged()) {
+ $paypal_customer_token = $this->model_extension_payment_paypal->getPayPalCustomerMainToken($this->customer->getId(), $payment_method);
+ }
+
+ if (!empty($paypal_customer_token['vault_id'])) {
+ $vault_id = $paypal_customer_token['vault_id'];
+ $vault_customer_id = $paypal_customer_token['vault_customer_id'];
+ }
+ }
+
$this->model_extension_payment_paypal->deletePayPalOrder($this->session->data['order_id']);
-
+
$paypal_order_data = array(
'order_id' => $this->session->data['order_id'],
+ 'paypal_order_id' => $paypal_order_id,
'transaction_id' => $capture_id,
'transaction_status' => $transaction_status,
'payment_method' => $payment_method,
'vault_id' => $vault_id,
'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry,
'environment' => $environment
);
$this->model_extension_payment_paypal->addPayPalOrder($paypal_order_data);
+
+ if ($this->customer->isLogged() && $vault_id) {
+ $customer_id = $this->customer->getId();
+
+ $paypal_customer_token_info = $this->model_extension_payment_paypal->getPayPalCustomerToken($customer_id, $payment_method, $vault_id);
+
+ if (!$paypal_customer_token_info) {
+ $paypal_customer_token_data = array(
+ 'customer_id' => $customer_id,
+ 'payment_method' => $payment_method,
+ 'vault_id' => $vault_id,
+ 'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry,
+ );
+
+ $this->model_extension_payment_paypal->addPayPalCustomerToken($paypal_customer_token_data);
+ }
+
+ $this->model_extension_payment_paypal->setPayPalCustomerMainToken($customer_id, $payment_method, $vault_id);
+ }
}
if (($capture_status == 'COMPLETED') || ($capture_status == 'PENDING')) {
@@ -2723,7 +2971,514 @@ public function confirmShippingAddress() {
$this->response->addHeader('Content-Type: application/json');
$this->response->setOutput(json_encode($data));
}
+
+ public function deleteCustomerToken() {
+ $this->load->language('extension/payment/paypal');
+
+ $this->load->model('extension/payment/paypal');
+
+ if ($this->customer->isLogged() && isset($this->request->post['index'])) {
+ $card_token_index = $this->request->post['index'];
+
+ $card_customer_tokens = $this->model_extension_payment_paypal->getPayPalCustomerTokens($this->customer->getId(), 'card');
+
+ if (!empty($card_customer_tokens[$card_token_index]['vault_id'])) {
+ $vault_id = $card_customer_tokens[$card_token_index]['vault_id'];
+
+ $_config = new Config();
+ $_config->load('paypal');
+
+ $config_setting = $_config->get('paypal_setting');
+
+ $setting = array_replace_recursive((array)$config_setting, (array)$this->config->get('payment_paypal_setting'));
+
+ $client_id = $this->config->get('payment_paypal_client_id');
+ $secret = $this->config->get('payment_paypal_secret');
+ $merchant_id = $this->config->get('payment_paypal_merchant_id');
+ $environment = $this->config->get('payment_paypal_environment');
+ $partner_id = $setting['partner'][$environment]['partner_id'];
+ $partner_attribution_id = $setting['partner'][$environment]['partner_attribution_id'];
+
+ require_once DIR_SYSTEM . 'library/paypal/paypal.php';
+
+ $paypal_info = array(
+ 'partner_id' => $partner_id,
+ 'client_id' => $client_id,
+ 'secret' => $secret,
+ 'environment' => $environment,
+ 'partner_attribution_id' => $partner_attribution_id
+ );
+
+ $paypal = new PayPal($paypal_info);
+
+ $token_info = array(
+ 'grant_type' => 'client_credentials'
+ );
+
+ $result = $paypal->setAccessToken($token_info);
+
+ $result = $paypal->deletePaymentToken($vault_id);
+
+ if ($paypal->hasErrors()) {
+ $error_messages = array();
+
+ $errors = $paypal->getErrors();
+
+ foreach ($errors as $error) {
+ if (isset($error['name']) && ($error['name'] == 'CURLE_OPERATION_TIMEOUTED')) {
+ $error['message'] = $this->language->get('error_timeout');
+ }
+ if (isset($error['details'][0]['description'])) {
+ $error_messages[] = $error['details'][0]['description'];
+ } elseif (isset($error['message'])) {
+ $error_messages[] = $error['message'];
+ }
+
+ $this->model_extension_payment_paypal->log($error, $error['message']);
+ }
+
+ $this->error['warning'] = implode(' ', $error_messages);
+ }
+
+ if (!empty($this->error['warning'])) {
+ $this->error['warning'] .= ' ' . sprintf($this->language->get('error_payment'), $this->url->link('information/contact', '', true));
+ }
+
+
+ if (!empty($this->error['warning'])) {
+ $this->error['warning'] .= ' ' . sprintf($this->language->get('error_payment'), $this->url->link('information/contact', '', true));
+ }
+
+ if ($result && !$this->error) {
+ $this->model_extension_payment_paypal->deletePayPalCustomerToken($this->customer->getId(), 'card', $vault_id);
+
+ $data['success'] = true;
+ }
+ }
+ }
+
+ $data['error'] = $this->error;
+
+ $this->response->addHeader('Content-Type: application/json');
+ $this->response->setOutput(json_encode($data));
+ }
+
+ public function callback() {
+ $this->load->language('extension/payment/paypal');
+
+ $this->load->model('extension/payment/paypal');
+
+ if (!empty($this->request->get['callback_token'])) {
+ $_config = new Config();
+ $_config->load('paypal');
+
+ $config_setting = $_config->get('paypal_setting');
+
+ $setting = array_replace_recursive((array)$config_setting, (array)$this->config->get('payment_paypal_setting'));
+
+ if (hash_equals($setting['general']['callback_token'], $this->request->get['callback_token']) && !empty($this->session->data['order_id']) && !empty($this->session->data['paypal_order_id']) && isset($this->session->data['paypal_card_token_index'])) {
+ $order_id = $this->session->data['order_id'];
+ $paypal_order_id = $this->session->data['paypal_order_id'];
+ $card_token_index = $this->session->data['paypal_card_token_index'];
+
+ $card_customer_tokens = $this->model_extension_payment_paypal->getPayPalCustomerTokens($this->customer->getId(), 'card');
+
+ if (!empty($card_customer_tokens[$card_token_index]['vault_id'])) {
+ $vault_id = $card_customer_tokens[$card_token_index]['vault_id'];
+ $vault_customer_id = $card_customer_tokens[$card_token_index]['vault_customer_id'];
+ $card_type = $card_customer_tokens[$card_token_index]['card_type'];
+ $card_nice_type = $card_customer_tokens[$card_token_index]['card_nice_type'];
+ $card_last_digits = $card_customer_tokens[$card_token_index]['card_last_digits'];
+ $card_expiry = $card_customer_tokens[$card_token_index]['card_expiry'];
+
+ $client_id = $this->config->get('payment_paypal_client_id');
+ $secret = $this->config->get('payment_paypal_secret');
+ $environment = $this->config->get('payment_paypal_environment');
+ $partner_id = $setting['partner'][$environment]['partner_id'];
+ $partner_attribution_id = $setting['partner'][$environment]['partner_attribution_id'];
+ $transaction_method = $setting['general']['transaction_method'];
+
+ require_once DIR_SYSTEM . 'library/paypal/paypal.php';
+
+ $paypal_info = array(
+ 'partner_id' => $partner_id,
+ 'client_id' => $client_id,
+ 'secret' => $secret,
+ 'environment' => $environment,
+ 'partner_attribution_id' => $partner_attribution_id
+ );
+
+ $paypal = new PayPal($paypal_info);
+
+ $token_info = array(
+ 'grant_type' => 'client_credentials'
+ );
+
+ $paypal->setAccessToken($token_info);
+
+ $paypal_order_info = $paypal->getOrder($paypal_order_id);
+
+ if ($paypal->hasErrors()) {
+ $error_messages = array();
+
+ $errors = $paypal->getErrors();
+
+ foreach ($errors as $error) {
+ if (isset($error['name']) && ($error['name'] == 'CURLE_OPERATION_TIMEOUTED')) {
+ $error['message'] = $this->language->get('error_timeout');
+ }
+
+ if (isset($error['details'][0]['description'])) {
+ $error_messages[] = $error['details'][0]['description'];
+ } elseif (isset($error['message'])) {
+ $error_messages[] = $error['message'];
+ }
+
+ $this->model_extension_payment_paypal->log($error, $error['message']);
+ }
+
+ $this->error['warning'] = implode(' ', $error_messages);
+ }
+
+ if (isset($paypal_order_info['payment_source']['card']) && !$this->error) {
+ $this->model_extension_payment_paypal->log($paypal_order_info['payment_source']['card'], 'Card');
+
+ $liability_shift = (isset($paypal_order_info['payment_source']['card']['authentication_result']['liability_shift']) ? $paypal_order_info['payment_source']['card']['authentication_result']['liability_shift'] : '');
+ $enrollment_status = (isset($paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['enrollment_status']) ? $paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['enrollment_status'] : '');
+ $authentication_status = (isset($paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['authentication_status']) ? $paypal_order_info['payment_source']['card']['authentication_result']['three_d_secure']['authentication_status'] : '');
+
+ if ($enrollment_status == 'Y') {
+ if (($authentication_status == 'N') && !$setting['card']['secure_scenario']['failed_authentication']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['failed_authentication']['error']);
+ }
+
+ if (($authentication_status == 'R') && !$setting['card']['secure_scenario']['rejected_authentication']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['rejected_authentication']['error']);
+ }
+
+ if (($authentication_status == 'A') && !$setting['card']['secure_scenario']['attempted_authentication']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['attempted_authentication']['error']);
+ }
+
+ if (($authentication_status == 'U') && !$setting['card']['secure_scenario']['unable_authentication']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['unable_authentication']['error']);
+ }
+
+ if (($authentication_status == 'C') && !$setting['card']['secure_scenario']['challenge_authentication']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['challenge_authentication']['error']);
+ }
+ }
+
+ if (($enrollment_status == 'N') && !$setting['card']['secure_scenario']['card_ineligible']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['card_ineligible']['error']);
+ }
+
+ if (($enrollment_status == 'U') && !$setting['card']['secure_scenario']['system_unavailable']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['system_unavailable']['error']);
+ }
+
+ if (($enrollment_status == 'B') && !$setting['card']['secure_scenario']['system_bypassed']) {
+ $this->error['warning'] = $this->language->get($setting['card_secure_scenario']['system_bypassed']['error']);
+ }
+ }
+
+ if (!empty($this->error['warning'])) {
+ $this->error['warning'] .= ' ' . sprintf($this->language->get('error_payment'), $this->url->link('information/contact', '', true));
+ }
+
+ if (!$this->error) {
+ if ($transaction_method == 'authorize') {
+ $result = $paypal->setOrderAuthorize($paypal_order_id);
+ } else {
+ $result = $paypal->setOrderCapture($paypal_order_id);
+ }
+
+ if ($paypal->hasErrors()) {
+ $error_messages = array();
+
+ $errors = $paypal->getErrors();
+
+ foreach ($errors as $error) {
+ if (isset($error['details'][0]['issue']) && ($error['details'][0]['issue'] == 'INSTRUMENT_DECLINED')) {
+ $data['restart'] = true;
+ }
+
+ if (isset($error['name']) && ($error['name'] == 'CURLE_OPERATION_TIMEOUTED')) {
+ $error['message'] = $this->language->get('error_timeout');
+ }
+
+ if (isset($error['details'][0]['description'])) {
+ $error_messages[] = $error['details'][0]['description'];
+ } elseif (isset($error['message'])) {
+ $error_messages[] = $error['message'];
+ }
+
+ $this->model_extension_payment_paypal->log($error, $error['message']);
+ }
+
+ $this->error['warning'] = implode(' ', $error_messages);
+ }
+
+ if (!empty($this->error['warning'])) {
+ $this->error['warning'] .= ' ' . sprintf($this->language->get('error_payment'), $this->url->link('information/contact', '', true));
+ }
+
+ if (!$this->error) {
+ $this->load->model('checkout/order');
+
+ $order_info = $this->model_checkout_order->getOrder($this->session->data['order_id']);
+
+ if ($transaction_method == 'authorize') {
+ $this->model_extension_payment_paypal->log($result, 'Authorize Order');
+
+ if (isset($result['purchase_units'][0]['payments']['authorizations'][0]['status']) && isset($result['purchase_units'][0]['payments']['authorizations'][0]['seller_protection']['status'])) {
+ $authorization_id = $result['purchase_units'][0]['payments']['authorizations'][0]['id'];
+ $authorization_status = $result['purchase_units'][0]['payments']['authorizations'][0]['status'];
+ $seller_protection_status = $result['purchase_units'][0]['payments']['authorizations'][0]['seller_protection']['status'];
+ $order_status_id = 0;
+ $transaction_status = '';
+ $payment_method = 'card';
+
+ if (!$this->cart->hasShipping()) {
+ $seller_protection_status = 'NOT_ELIGIBLE';
+ }
+
+ if ($authorization_status == 'CREATED') {
+ $order_status_id = $setting['order_status']['pending']['id'];
+ $transaction_status = 'created';
+ }
+
+ if ($authorization_status == 'CAPTURED') {
+ $this->error['warning'] = sprintf($this->language->get('error_authorization_captured'), $this->url->link('information/contact', '', true));
+ }
+
+ if ($authorization_status == 'DENIED') {
+ $order_status_id = $setting['order_status']['denied']['id'];
+ $transaction_status = 'denied';
+
+ $this->error['warning'] = $this->language->get('error_authorization_denied');
+ }
+
+ if ($authorization_status == 'EXPIRED') {
+ $this->error['warning'] = sprintf($this->language->get('error_authorization_expired'), $this->url->link('information/contact', '', true));
+ }
+
+ if ($authorization_status == 'PENDING') {
+ $order_status_id = $setting['order_status']['pending']['id'];
+ $transaction_status = 'pending';
+ }
+
+ if (($authorization_status == 'CREATED') || ($authorization_status == 'DENIED') || ($authorization_status == 'PENDING')) {
+ $message = sprintf($this->language->get('text_order_message'), $seller_protection_status);
+
+ $this->model_checkout_order->addOrderHistory($this->session->data['order_id'], $order_status_id, $message);
+ }
+
+ if (($authorization_status == 'CREATED') || ($authorization_status == 'DENIED') || ($authorization_status == 'PENDING')) {
+ $this->model_extension_payment_paypal->deletePayPalOrder($this->session->data['order_id']);
+
+ $paypal_order_data = array(
+ 'order_id' => $this->session->data['order_id'],
+ 'paypal_order_id' => $paypal_order_id,
+ 'transaction_id' => $authorization_id,
+ 'transaction_status' => $transaction_status,
+ 'payment_method' => $payment_method,
+ 'vault_id' => $vault_id,
+ 'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry,
+ 'environment' => $environment
+ );
+
+ $this->model_extension_payment_paypal->addPayPalOrder($paypal_order_data);
+
+ if ($this->customer->isLogged() && $vault_id) {
+ $customer_id = $this->customer->getId();
+
+ $paypal_customer_token_info = $this->model_extension_payment_paypal->getPayPalCustomerToken($customer_id, $payment_method, $vault_id);
+
+ if (!$paypal_customer_token_info) {
+ $paypal_customer_token_data = array(
+ 'customer_id' => $customer_id,
+ 'payment_method' => $payment_method,
+ 'vault_id' => $vault_id,
+ 'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry
+ );
+
+ $this->model_extension_payment_paypal->addPayPalCustomerToken($paypal_customer_token_data);
+ }
+
+ $this->model_extension_payment_paypal->setPayPalCustomerMainToken($customer_id, $payment_method, $vault_id);
+ }
+ }
+
+ if (($authorization_status == 'CREATED') || ($authorization_status == 'PENDING')) {
+ $recurring_products = $this->cart->getRecurringProducts();
+
+ foreach ($recurring_products as $recurring_product) {
+ $this->model_extension_payment_paypal->recurringPayment($recurring_product, $order_info, $paypal_order_data);
+ }
+ }
+
+ if (($authorization_status == 'CREATED') || ($authorization_status == 'PARTIALLY_CAPTURED') || ($authorization_status == 'PARTIALLY_CREATED') || ($authorization_status == 'VOIDED') || ($authorization_status == 'PENDING')) {
+ $this->response->redirect($this->url->link('checkout/success', '', true));
+ }
+ }
+ } else {
+ $this->model_extension_payment_paypal->log($result, 'Capture Order');
+
+ if (isset($result['purchase_units'][0]['payments']['captures'][0]['status']) && isset($result['purchase_units'][0]['payments']['captures'][0]['seller_protection']['status'])) {
+ $capture_id = $result['purchase_units'][0]['payments']['captures'][0]['id'];
+ $capture_status = $result['purchase_units'][0]['payments']['captures'][0]['status'];
+ $seller_protection_status = $result['purchase_units'][0]['payments']['captures'][0]['seller_protection']['status'];
+
+ $order_status_id = 0;
+ $transaction_status = '';
+ $payment_method = 'card';
+
+ if (!$this->cart->hasShipping()) {
+ $seller_protection_status = 'NOT_ELIGIBLE';
+ }
+
+ if ($capture_status == 'COMPLETED') {
+ $order_status_id = $setting['order_status']['completed']['id'];
+ $transaction_status = 'completed';
+ }
+
+ if ($capture_status == 'DECLINED') {
+ $order_status_id = $setting['order_status']['denied']['id'];
+ $transaction_status = 'denied';
+
+ $this->error['warning'] = $this->language->get('error_capture_declined');
+ }
+
+ if ($capture_status == 'FAILED') {
+ $this->error['warning'] = sprintf($this->language->get('error_capture_failed'), $this->url->link('information/contact', '', true));
+ }
+
+ if ($capture_status == 'PENDING') {
+ $order_status_id = $setting['order_status']['pending']['id'];
+ $transaction_status = 'pending';
+ }
+
+ if (($capture_status == 'COMPLETED') || ($capture_status == 'DECLINED') || ($capture_status == 'PENDING')) {
+ $message = sprintf($this->language->get('text_order_message'), $seller_protection_status);
+
+ $this->model_checkout_order->addOrderHistory($this->session->data['order_id'], $order_status_id, $message);
+ }
+
+ if (($capture_status == 'COMPLETED') || ($capture_status == 'DECLINED') || ($capture_status == 'PENDING')) {
+ $this->model_extension_payment_paypal->deletePayPalOrder($this->session->data['order_id']);
+
+ $paypal_order_data = array(
+ 'order_id' => $this->session->data['order_id'],
+ 'paypal_order_id' => $paypal_order_id,
+ 'transaction_id' => $capture_id,
+ 'transaction_status' => $transaction_status,
+ 'payment_method' => $payment_method,
+ 'vault_id' => $vault_id,
+ 'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry,
+ 'environment' => $environment
+ );
+
+ $this->model_extension_payment_paypal->addPayPalOrder($paypal_order_data);
+
+ if ($this->customer->isLogged() && $vault_id) {
+ $customer_id = $this->customer->getId();
+
+ $paypal_customer_token_info = $this->model_extension_payment_paypal->getPayPalCustomerToken($customer_id, $payment_method, $vault_id);
+
+ if (!$paypal_customer_token_info) {
+ $paypal_customer_token_data = array(
+ 'customer_id' => $customer_id,
+ 'payment_method' => $payment_method,
+ 'vault_id' => $vault_id,
+ 'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry
+ );
+
+ $this->model_extension_payment_paypal->addPayPalCustomerToken($paypal_customer_token_data);
+ }
+
+ $this->model_extension_payment_paypal->setPayPalCustomerMainToken($customer_id, $payment_method, $vault_id);
+ }
+ }
+
+ if (($capture_status == 'COMPLETED') || ($capture_status == 'PENDING')) {
+ $recurring_products = $this->cart->getRecurringProducts();
+
+ foreach ($recurring_products as $recurring_product) {
+ $this->model_extension_payment_paypal->recurringPayment($recurring_product, $order_info, $paypal_order_data);
+ }
+ }
+
+ if (($capture_status == 'COMPLETED') || ($capture_status == 'PARTIALLY_REFUNDED') || ($capture_status == 'REFUNDED') || ($capture_status == 'PENDING')) {
+ $this->response->redirect($this->url->link('checkout/success', '', true));
+ }
+ }
+ }
+ }
+ }
+ }
+
+ $this->document->setTitle($this->language->get('text_failure_page_title'));
+
+ $data['breadcrumbs'] = array();
+
+ $data['breadcrumbs'][] = array(
+ 'text' => $this->language->get('text_home'),
+ 'href' => $this->url->link('common/home', '', true)
+ );
+
+ $data['breadcrumbs'][] = array(
+ 'text' => $this->language->get('text_cart'),
+ 'href' => $this->url->link('checkout/cart', '', true)
+ );
+
+ $data['breadcrumbs'][] = array(
+ 'text' => $this->language->get('text_paypal'),
+ 'href' => $this->url->link('extension/payment/paypal/callback', '', true)
+ );
+
+ $data['text_title'] = $this->language->get('text_failure_page_title');
+ $data['text_message'] = sprintf($this->language->get('text_failure_page_message'), $this->url->link('information/contact', '', true));
+
+ if (!empty($this->error['warning'])) {
+ $data['text_message'] = $this->error['warning'];
+ }
+
+ $data['continue'] = $this->url->link('common/home');
+
+ $data['column_left'] = $this->load->controller('common/column_left');
+ $data['column_right'] = $this->load->controller('common/column_right');
+ $data['content_top'] = $this->load->controller('common/content_top');
+ $data['content_bottom'] = $this->load->controller('common/content_bottom');
+ $data['footer'] = $this->load->controller('common/footer');
+ $data['header'] = $this->load->controller('common/header');
+
+ $this->response->setOutput($this->load->view('extension/payment/paypal/failure', $data));
+
+ return true;
+ }
+ }
+
+ return false;
+ }
+
public function webhook() {
if (!empty($this->request->get['webhook_token'])) {
$_config = new Config();
@@ -2737,6 +3492,7 @@ public function webhook() {
if (hash_equals($setting['general']['webhook_token'], $this->request->get['webhook_token']) && !empty($webhook_info['id']) && !empty($webhook_info['event_type'])) {
$this->load->model('extension/payment/paypal');
+ $this->load->model('checkout/order');
$this->model_extension_payment_paypal->log($webhook_info, 'Webhook');
@@ -2789,71 +3545,127 @@ public function webhook() {
}
}
- if (isset($webhook_event['resource']['invoice_id']) && (strpos($webhook_event['resource']['invoice_id'], '_') !== false) && !$errors) {
+ if (!empty($webhook_event['resource']['invoice_id']) && (strpos($webhook_event['resource']['invoice_id'], '_') !== false) && !$errors) {
$invoice_id = explode('_', $webhook_event['resource']['invoice_id']);
$order_id = reset($invoice_id);
+
+ $order_info = $this->model_checkout_order->getOrder($order_id);
- $order_status_id = 0;
- $transaction_status = '';
+ if ($order_info) {
+ $order_status_id = 0;
+ $transaction_status = '';
- if ($webhook_event['event_type'] == 'PAYMENT.AUTHORIZATION.CREATED') {
- $order_status_id = $setting['order_status']['pending']['id'];
- $transaction_status = 'created';
- }
+ if ($webhook_event['event_type'] == 'PAYMENT.AUTHORIZATION.CREATED') {
+ $order_status_id = $setting['order_status']['pending']['id'];
+ $transaction_status = 'created';
+ }
- if ($webhook_event['event_type'] == 'PAYMENT.AUTHORIZATION.VOIDED') {
- $order_status_id = $setting['order_status']['voided']['id'];
- $transaction_status = 'voided';
- }
+ if ($webhook_event['event_type'] == 'PAYMENT.AUTHORIZATION.VOIDED') {
+ $order_status_id = $setting['order_status']['voided']['id'];
+ $transaction_status = 'voided';
+ }
- if ($webhook_event['event_type'] == 'PAYMENT.CAPTURE.COMPLETED') {
- $order_status_id = $setting['order_status']['completed']['id'];
- $transaction_status = 'completed';
- }
+ if ($webhook_event['event_type'] == 'PAYMENT.CAPTURE.COMPLETED') {
+ $order_status_id = $setting['order_status']['completed']['id'];
+ $transaction_status = 'completed';
+ }
- if ($webhook_event['event_type'] == 'PAYMENT.CAPTURE.DENIED') {
- $order_status_id = $setting['order_status']['denied']['id'];
- $transaction_status = 'denied';
- }
+ if ($webhook_event['event_type'] == 'PAYMENT.CAPTURE.DENIED') {
+ $order_status_id = $setting['order_status']['denied']['id'];
+ $transaction_status = 'denied';
+ }
- if ($webhook_event['event_type'] == 'PAYMENT.CAPTURE.PENDING') {
- $order_status_id = $setting['order_status']['pending']['id'];
- $transaction_status = 'pending';
- }
+ if ($webhook_event['event_type'] == 'PAYMENT.CAPTURE.PENDING') {
+ $order_status_id = $setting['order_status']['pending']['id'];
+ $transaction_status = 'pending';
+ }
- if ($webhook_event['event_type'] == 'PAYMENT.CAPTURE.REFUNDED') {
- $order_status_id = $setting['order_status']['refunded']['id'];
- $transaction_status = 'refunded';
- }
+ if ($webhook_event['event_type'] == 'PAYMENT.CAPTURE.REFUNDED') {
+ $order_status_id = $setting['order_status']['refunded']['id'];
+ $transaction_status = 'refunded';
+ }
- if ($webhook_event['event_type'] == 'PAYMENT.CAPTURE.REVERSED') {
- $order_status_id = $setting['order_status']['reversed']['id'];
- $transaction_status = 'reversed';
- }
+ if ($webhook_event['event_type'] == 'PAYMENT.CAPTURE.REVERSED') {
+ $order_status_id = $setting['order_status']['reversed']['id'];
+ $transaction_status = 'reversed';
+ }
- if ($webhook_event['event_type'] == 'CHECKOUT.ORDER.COMPLETED') {
- $order_status_id = $setting['order_status']['completed']['id'];
- }
+ if ($webhook_event['event_type'] == 'CHECKOUT.ORDER.COMPLETED') {
+ $order_status_id = $setting['order_status']['completed']['id'];
+ }
- if ($order_status_id) {
- $this->load->model('checkout/order');
+ if ($order_status_id && ($order_info['order_status_id'] != $order_status_id)) {
+ $this->load->model('checkout/order');
- $this->model_checkout_order->addOrderHistory($order_id, $order_status_id, '', true);
- }
+ $this->model_checkout_order->addOrderHistory($order_id, $order_status_id, '', true);
+ }
+
+ if (isset($webhook_event['resource']['id']) && $transaction_status) {
+ $transaction_id = $webhook_event['resource']['id'];
- if (isset($webhook_event['resource']['id']) && $transaction_status) {
- $transaction_id = $webhook_event['resource']['id'];
+ $paypal_order_data = array(
+ 'order_id' => $order_id,
+ 'transaction_status' => $transaction_status
+ );
+
+ if (($transaction_status != 'refunded') && ($transaction_status != 'reversed')) {
+ $paypal_order_data['transaction_id'] = $transaction_id;
+ }
+
+ $this->model_extension_payment_paypal->editPayPalOrder($paypal_order_data);
+ }
+ }
+ }
+ if (($webhook_event['event_type'] == 'VAULT.PAYMENT-TOKEN.CREATED') && !empty($webhook_info['resource']['id']) && !empty($webhook_info['resource']['customer']['id']) && !empty($webhook_event['resource']['metadata']['order_id']) && !$errors) {
+ $paypal_order_id = $webhook_event['resource']['metadata']['order_id'];
+
+ $paypal_order_info = $this->model_extension_payment_paypal->getPayPalOrderByPayPalOrderId($paypal_order_id);
+
+ if ($paypal_order_info) {
+ $order_id = $paypal_order_info['order_id'];
+ $payment_method = $paypal_order_info['payment_method'];
+ $vault_id = $webhook_event['resource']['id'];
+ $vault_customer_id = $webhook_event['resource']['customer']['id'];
+ $card_type = $paypal_order_info['card_type'];
+ $card_nice_type = $paypal_order_info['card_nice_type'];
+ $card_last_digits = (isset($webhook_event['resource']['payment_source']['card']['last_digits']) ? $webhook_event['resource']['payment_source']['card']['last_digits'] : '');
+ $card_expiry = (isset($webhook_event['resource']['payment_source']['card']['expiry']) ? $webhook_event['resource']['payment_source']['card']['expiry'] : '');
+
$paypal_order_data = array(
'order_id' => $order_id,
- 'transaction_status' => $transaction_status
+ 'vault_id' => $vault_id,
+ 'vault_customer_id' => $vault_customer_id,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry
);
-
- if (($transaction_status != 'refunded') && ($transaction_status != 'reversed')) {
- $paypal_order_data['transaction_id'] = $transaction_id;
- }
-
+
$this->model_extension_payment_paypal->editPayPalOrder($paypal_order_data);
+
+ $order_info = $this->model_checkout_order->getOrder($order_id);
+
+ if (!empty($order_info['customer_id']) && $vault_id) {
+ $customer_id = $order_info['customer_id'];
+
+ $paypal_customer_token_info = $this->model_extension_payment_paypal->getPayPalCustomerToken($customer_id, $payment_method, $vault_id);
+
+ if (!$paypal_customer_token_info) {
+ $paypal_customer_token_data = array(
+ 'customer_id' => $customer_id,
+ 'payment_method' => $payment_method,
+ 'vault_id' => $vault_id,
+ 'vault_customer_id' => $vault_customer_id,
+ 'card_type' => $card_type,
+ 'card_nice_type' => $card_nice_type,
+ 'card_last_digits' => $card_last_digits,
+ 'card_expiry' => $card_expiry
+ );
+
+ $this->model_extension_payment_paypal->addPayPalCustomerToken($paypal_customer_token_data);
+ }
+
+ $this->model_extension_payment_paypal->setPayPalCustomerMainToken($customer_id, $payment_method, $vault_id);
+ }
}
}
diff --git a/upload/catalog/language/en-gb/extension/payment/paypal.php b/upload/catalog/language/en-gb/extension/payment/paypal.php
index 8913592ef33..08bdb9f9746 100644
--- a/upload/catalog/language/en-gb/extension/payment/paypal.php
+++ b/upload/catalog/language/en-gb/extension/payment/paypal.php
@@ -18,6 +18,7 @@
$_['text_semi_month'] = 'half-month';
$_['text_month'] = 'month';
$_['text_year'] = 'year';
+$_['text_card_number'] = '%s ending in %s';
$_['text_trial'] = '%s every %s %s for %s payments then ';
$_['text_recurring'] = '%s every %s %s';
$_['text_recurring_item'] = 'Recurring Item';
@@ -29,6 +30,8 @@
$_['text_order_message'] = 'PayPal Seller Protection - %s';
$_['text_wait'] = 'Please wait!';
$_['text_loading'] = 'Loading...';
+$_['text_failure_page_title'] = 'Your order is failed!';
+$_['text_failure_page_message'] = 'Sorry, but the transaction failed! Please choose another payment method or
contact us';
// Column
$_['column_image'] = 'Image';
@@ -53,6 +56,7 @@
$_['entry_card_number'] = 'Card Number';
$_['entry_expiration_date'] = 'Expiration Date';
$_['entry_cvv'] = 'CVV';
+$_['entry_card_save'] = 'Save your card';
// Button
$_['button_confirm'] = 'Confirm';
diff --git a/upload/catalog/model/extension/payment/paypal.php b/upload/catalog/model/extension/payment/paypal.php
index ebd08f2ae94..1af15172cc8 100644
--- a/upload/catalog/model/extension/payment/paypal.php
+++ b/upload/catalog/model/extension/payment/paypal.php
@@ -52,6 +52,93 @@ public function getZoneByCode($country_id, $code) {
return $query->row;
}
+ public function addPayPalCustomerToken($data) {
+ $sql = "INSERT INTO `" . DB_PREFIX . "paypal_checkout_integration_customer_token` SET";
+
+ $implode = array();
+
+ if (!empty($data['customer_id'])) {
+ $implode[] = "`customer_id` = '" . (int)$data['customer_id'] . "'";
+ }
+
+ if (!empty($data['payment_method'])) {
+ $implode[] = "`payment_method` = '" . $this->db->escape($data['payment_method']) . "'";
+ }
+
+ if (!empty($data['vault_id'])) {
+ $implode[] = "`vault_id` = '" . $this->db->escape($data['vault_id']) . "'";
+ }
+
+ if (!empty($data['vault_customer_id'])) {
+ $implode[] = "`vault_customer_id` = '" . $this->db->escape($data['vault_customer_id']) . "'";
+ }
+
+ if (!empty($data['card_type'])) {
+ $implode[] = "`card_type` = '" . $this->db->escape($data['card_type']) . "'";
+ }
+
+ if (!empty($data['card_nice_type'])) {
+ $implode[] = "`card_nice_type` = '" . $this->db->escape($data['card_nice_type']) . "'";
+ }
+
+ if (!empty($data['card_last_digits'])) {
+ $implode[] = "`card_last_digits` = '" . $this->db->escape($data['card_last_digits']) . "'";
+ }
+
+ if (!empty($data['card_expiry'])) {
+ $implode[] = "`card_expiry` = '" . $this->db->escape($data['card_expiry']) . "'";
+ }
+
+ if ($implode) {
+ $sql .= implode(", ", $implode);
+ }
+
+ $this->db->query($sql);
+ }
+
+ public function deletePayPalCustomerToken($customer_id, $payment_method, $vault_id) {
+ $query = $this->db->query("DELETE FROM `" . DB_PREFIX . "paypal_checkout_integration_customer_token` WHERE `customer_id` = '" . (int)$customer_id . "' AND `payment_method` = '" . $this->db->escape($payment_method) . "' AND `vault_id` = '" . $this->db->escape($vault_id) . "'");
+ }
+
+ public function setPayPalCustomerMainToken($customer_id, $payment_method, $vault_id) {
+ $this->db->query("UPDATE `" . DB_PREFIX . "paypal_checkout_integration_customer_token` SET `main_token_status` = '0' WHERE `customer_id` = '" . (int)$customer_id . "' AND `payment_method` = '" . $this->db->escape($payment_method) . "'");
+ $this->db->query("UPDATE `" . DB_PREFIX . "paypal_checkout_integration_customer_token` SET `main_token_status` = '1' WHERE `customer_id` = '" . (int)$customer_id . "' AND `payment_method` = '" . $this->db->escape($payment_method) . "' AND `vault_id` = '" . $this->db->escape($vault_id) . "'");
+ }
+
+ public function getPayPalCustomerMainToken($customer_id, $payment_method) {
+ $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "paypal_checkout_integration_customer_token` WHERE `customer_id` = '" . (int)$customer_id . "' AND `payment_method` = '" . $this->db->escape($payment_method) . "' AND `main_token_status` = '1'");
+
+ if ($query->num_rows) {
+ return $query->row;
+ } else {
+ return array();
+ }
+ }
+
+ public function getPayPalCustomerToken($customer_id, $payment_method, $vault_id) {
+ $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "paypal_checkout_integration_customer_token` WHERE `customer_id` = '" . (int)$customer_id . "' AND `payment_method` = '" . $this->db->escape($payment_method) . "' AND `vault_id` = '" . $this->db->escape($vault_id) . "'");
+
+ if ($query->num_rows) {
+ return $query->row;
+ } else {
+ return array();
+ }
+ }
+
+ public function getPayPalCustomerTokens($customer_id, $payment_method = '') {
+ if ($payment_method) {
+ $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "paypal_checkout_integration_customer_token` WHERE `customer_id` = '" . (int)$customer_id . "' AND `payment_method` = '" . $this->db->escape($payment_method) . "'");
+ } else {
+ $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "paypal_checkout_integration_customer_token` WHERE `customer_id` = '" . (int)$customer_id . "'");
+ }
+
+ if ($query->num_rows) {
+ return $query->rows;
+ } else {
+ return array();
+ }
+ }
+
public function addPayPalOrder($data) {
$sql = "INSERT INTO `" . DB_PREFIX . "paypal_checkout_integration_order` SET";
@@ -61,6 +148,10 @@ public function addPayPalOrder($data) {
$implode[] = "`order_id` = '" . (int)$data['order_id'] . "'";
}
+ if (!empty($data['paypal_order_id'])) {
+ $implode[] = "`paypal_order_id` = '" . $this->db->escape($data['paypal_order_id']) . "'";
+ }
+
if (!empty($data['transaction_id'])) {
$implode[] = "`transaction_id` = '" . $this->db->escape($data['transaction_id']) . "'";
}
@@ -80,6 +171,22 @@ public function addPayPalOrder($data) {
if (!empty($data['vault_customer_id'])) {
$implode[] = "`vault_customer_id` = '" . $this->db->escape($data['vault_customer_id']) . "'";
}
+
+ if (!empty($data['card_type'])) {
+ $implode[] = "`card_type` = '" . $this->db->escape($data['card_type']) . "'";
+ }
+
+ if (!empty($data['card_nice_type'])) {
+ $implode[] = "`card_nice_type` = '" . $this->db->escape($data['card_nice_type']) . "'";
+ }
+
+ if (!empty($data['card_last_digits'])) {
+ $implode[] = "`card_last_digits` = '" . $this->db->escape($data['card_last_digits']) . "'";
+ }
+
+ if (!empty($data['card_expiry'])) {
+ $implode[] = "`card_expiry` = '" . $this->db->escape($data['card_expiry']) . "'";
+ }
if (!empty($data['environment'])) {
$implode[] = "`environment` = '" . $this->db->escape($data['environment']) . "'";
@@ -97,6 +204,10 @@ public function editPayPalOrder($data) {
$implode = array();
+ if (!empty($data['paypal_order_id'])) {
+ $implode[] = "`paypal_order_id` = '" . $this->db->escape($data['paypal_order_id']) . "'";
+ }
+
if (!empty($data['transaction_id'])) {
$implode[] = "`transaction_id` = '" . $this->db->escape($data['transaction_id']) . "'";
}
@@ -117,6 +228,22 @@ public function editPayPalOrder($data) {
$implode[] = "`vault_customer_id` = '" . $this->db->escape($data['vault_customer_id']) . "'";
}
+ if (!empty($data['card_type'])) {
+ $implode[] = "`card_type` = '" . $this->db->escape($data['card_type']) . "'";
+ }
+
+ if (!empty($data['card_nice_type'])) {
+ $implode[] = "`card_nice_type` = '" . $this->db->escape($data['card_nice_type']) . "'";
+ }
+
+ if (!empty($data['card_last_digits'])) {
+ $implode[] = "`card_last_digits` = '" . $this->db->escape($data['card_last_digits']) . "'";
+ }
+
+ if (!empty($data['card_expiry'])) {
+ $implode[] = "`card_expiry` = '" . $this->db->escape($data['card_expiry']) . "'";
+ }
+
if (!empty($data['environment'])) {
$implode[] = "`environment` = '" . $this->db->escape($data['environment']) . "'";
}
@@ -144,6 +271,16 @@ public function getPayPalOrder($order_id) {
}
}
+ public function getPayPalOrderByPayPalOrderId($paypal_order_id) {
+ $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "paypal_checkout_integration_order` WHERE `paypal_order_id` = '" . $this->db->escape($paypal_order_id) . "'");
+
+ if ($query->num_rows) {
+ return $query->row;
+ } else {
+ return array();
+ }
+ }
+
public function addPayPalOrderRecurring($data) {
$this->db->query("INSERT INTO `" . DB_PREFIX . "paypal_checkout_integration_order_recurring` SET `order_recurring_id` = '" . (int)$data['order_recurring_id'] . "', `order_id` = '" . (int)$data['order_id'] . "', `date_added` = NOW(), `date_modified` = NOW(), `next_payment` = NOW(), `trial_end` = '" . $data['trial_end'] . "', `subscription_end` = '" . $data['subscription_end'] . "', `currency_code` = '" . $this->db->escape($data['currency_code']) . "', `total` = '" . $this->currency->format($data['amount'], $data['currency_code'], false, false) . "'");
}
@@ -163,7 +300,7 @@ public function getPayPalOrderRecurring($order_recurring_id) {
}
public function addOrderRecurring($order_id, $description, $data, $reference) {
- $this->db->query("INSERT INTO `" . DB_PREFIX . "order_recurring` SET `order_id` = '" . (int)$order_id . "', `date_added` = NOW(), `status` = 6, `product_id` = '" . (int)$data['product_id'] . "', `product_name` = '" . $this->db->escape($data['name']) . "', `product_quantity` = '" . $this->db->escape($data['quantity']) . "', `recurring_id` = '" . (int)$data['recurring']['recurring_id'] . "', `recurring_name` = '" . $this->db->escape($data['name']) . "', `recurring_description` = '" . $this->db->escape($description) . "', `recurring_frequency` = '" . $this->db->escape($data['recurring']['frequency']) . "', `recurring_cycle` = '" . (int)$data['recurring']['cycle'] . "', `recurring_duration` = '" . (int)$data['recurring']['duration'] . "', `recurring_price` = '" . (float)$data['recurring']['price'] . "', `trial` = '" . (int)$data['recurring']['trial'] . "', `trial_frequency` = '" . $this->db->escape($data['recurring']['trial_frequency']) . "', `trial_cycle` = '" . (int)$data['recurring']['trial_cycle'] . "', `trial_duration` = '" . (int)$data['recurring']['trial_duration'] . "', `trial_price` = '" . (float)$data['recurring']['trial_price'] . "', `reference` = '" . $this->db->escape($reference) . "'");
+ $this->db->query("INSERT INTO `" . DB_PREFIX . "order_recurring` SET `order_id` = '" . (int)$order_id . "', `date_added` = NOW(), `status` = '1', `product_id` = '" . (int)$data['product_id'] . "', `product_name` = '" . $this->db->escape($data['name']) . "', `product_quantity` = '" . $this->db->escape($data['quantity']) . "', `recurring_id` = '" . (int)$data['recurring']['recurring_id'] . "', `recurring_name` = '" . $this->db->escape($data['name']) . "', `recurring_description` = '" . $this->db->escape($description) . "', `recurring_frequency` = '" . $this->db->escape($data['recurring']['frequency']) . "', `recurring_cycle` = '" . (int)$data['recurring']['cycle'] . "', `recurring_duration` = '" . (int)$data['recurring']['duration'] . "', `recurring_price` = '" . (float)$data['recurring']['price'] . "', `trial` = '" . (int)$data['recurring']['trial'] . "', `trial_frequency` = '" . $this->db->escape($data['recurring']['trial_frequency']) . "', `trial_cycle` = '" . (int)$data['recurring']['trial_cycle'] . "', `trial_duration` = '" . (int)$data['recurring']['trial_duration'] . "', `trial_price` = '" . (float)$data['recurring']['trial_price'] . "', `reference` = '" . $this->db->escape($reference) . "'");
return $this->db->getLastId();
}
@@ -238,88 +375,90 @@ public function recurringPayment($product_data, $order_data, $paypal_order_data)
$order_recurring_id = $this->addOrderRecurring($order_data['order_id'], $recurring_description, $product_data, $paypal_order_data['transaction_id']);
- $next_payment = new DateTime('now');
- $trial_end = new DateTime('now');
- $subscription_end = new DateTime('now');
+ $this->editOrderRecurringStatus($order_recurring_id, 1);
+
+ if (!empty($paypal_order_data['vault_id'])) {
+ $next_payment = new DateTime('now');
+ $trial_end = new DateTime('now');
+ $subscription_end = new DateTime('now');
- if (($product_data['recurring']['trial'] == 1) && ($product_data['recurring']['trial_duration'] != 0)) {
- $next_payment = $this->calculateSchedule($product_data['recurring']['trial_frequency'], $next_payment, $product_data['recurring']['trial_cycle']);
- $trial_end = $this->calculateSchedule($product_data['recurring']['trial_frequency'], $trial_end, $product_data['recurring']['trial_cycle'] * $product_data['recurring']['trial_duration']);
- } elseif ($product_data['recurring']['trial'] == 1) {
- $next_payment = $this->calculateSchedule($product_data['recurring']['trial_frequency'], $next_payment, $product_data['recurring']['trial_cycle']);
- $trial_end = new DateTime('0000-00-00');
- }
+ if (($product_data['recurring']['trial'] == 1) && ($product_data['recurring']['trial_duration'] != 0)) {
+ $next_payment = $this->calculateSchedule($product_data['recurring']['trial_frequency'], $next_payment, $product_data['recurring']['trial_cycle']);
+ $trial_end = $this->calculateSchedule($product_data['recurring']['trial_frequency'], $trial_end, $product_data['recurring']['trial_cycle'] * $product_data['recurring']['trial_duration']);
+ } elseif ($product_data['recurring']['trial'] == 1) {
+ $next_payment = $this->calculateSchedule($product_data['recurring']['trial_frequency'], $next_payment, $product_data['recurring']['trial_cycle']);
+ $trial_end = new DateTime('0000-00-00');
+ }
- if (date_format($trial_end, 'Y-m-d H:i:s') > date_format($subscription_end, 'Y-m-d H:i:s') && $product_data['recurring']['duration'] != 0) {
- $subscription_end = new DateTime(date_format($trial_end, 'Y-m-d H:i:s'));
- $subscription_end = $this->calculateSchedule($product_data['recurring']['frequency'], $subscription_end, $product_data['recurring']['cycle'] * $product_data['recurring']['duration']);
- } elseif (date_format($trial_end, 'Y-m-d H:i:s') == date_format($subscription_end, 'Y-m-d H:i:s') && $product_data['recurring']['duration'] != 0) {
- $next_payment = $this->calculateSchedule($product_data['recurring']['frequency'], $next_payment, $product_data['recurring']['cycle']);
- $subscription_end = $this->calculateSchedule($product_data['recurring']['frequency'], $subscription_end, $product_data['recurring']['cycle'] * $product_data['recurring']['duration']);
- } elseif (date_format($trial_end, 'Y-m-d H:i:s') > date_format($subscription_end, 'Y-m-d H:i:s') && $product_data['recurring']['duration'] == 0) {
- $subscription_end = new DateTime('0000-00-00');
- } elseif (date_format($trial_end, 'Y-m-d H:i:s') == date_format($subscription_end, 'Y-m-d H:i:s') && $product_data['recurring']['duration'] == 0) {
- $next_payment = $this->calculateSchedule($product_data['recurring']['frequency'], $next_payment, $product_data['recurring']['cycle']);
- $subscription_end = new DateTime('0000-00-00');
- }
+ if (date_format($trial_end, 'Y-m-d H:i:s') > date_format($subscription_end, 'Y-m-d H:i:s') && $product_data['recurring']['duration'] != 0) {
+ $subscription_end = new DateTime(date_format($trial_end, 'Y-m-d H:i:s'));
+ $subscription_end = $this->calculateSchedule($product_data['recurring']['frequency'], $subscription_end, $product_data['recurring']['cycle'] * $product_data['recurring']['duration']);
+ } elseif (date_format($trial_end, 'Y-m-d H:i:s') == date_format($subscription_end, 'Y-m-d H:i:s') && $product_data['recurring']['duration'] != 0) {
+ $next_payment = $this->calculateSchedule($product_data['recurring']['frequency'], $next_payment, $product_data['recurring']['cycle']);
+ $subscription_end = $this->calculateSchedule($product_data['recurring']['frequency'], $subscription_end, $product_data['recurring']['cycle'] * $product_data['recurring']['duration']);
+ } elseif (date_format($trial_end, 'Y-m-d H:i:s') > date_format($subscription_end, 'Y-m-d H:i:s') && $product_data['recurring']['duration'] == 0) {
+ $subscription_end = new DateTime('0000-00-00');
+ } elseif (date_format($trial_end, 'Y-m-d H:i:s') == date_format($subscription_end, 'Y-m-d H:i:s') && $product_data['recurring']['duration'] == 0) {
+ $next_payment = $this->calculateSchedule($product_data['recurring']['frequency'], $next_payment, $product_data['recurring']['cycle']);
+ $subscription_end = new DateTime('0000-00-00');
+ }
- $result = $this->createPayment($order_data, $paypal_order_data, $price, $order_recurring_id, $recurring_name);
+ $result = $this->createPayment($order_data, $paypal_order_data, $price, $order_recurring_id, $recurring_name);
- $transaction_status = '';
- $transaction_id = '';
- $currency_code = '';
- $amount = '';
+ $transaction_status = '';
+ $transaction_id = '';
+ $currency_code = '';
+ $amount = '';
- if ($transaction_method == 'authorize') {
- if (isset($result['purchase_units'][0]['payments']['authorizations'][0]['status']) && isset($result['purchase_units'][0]['payments']['authorizations'][0]['seller_protection']['status'])) {
- $transaction_id = $result['purchase_units'][0]['payments']['authorizations'][0]['id'];
- $transaction_status = $result['purchase_units'][0]['payments']['authorizations'][0]['status'];
- $currency_code = $result['purchase_units'][0]['payments']['authorizations'][0]['amount']['currency_code'];
- $amount = $result['purchase_units'][0]['payments']['authorizations'][0]['amount']['value'];
- }
- } else {
- if (isset($result['purchase_units'][0]['payments']['captures'][0]['status']) && isset($result['purchase_units'][0]['payments']['captures'][0]['seller_protection']['status'])) {
- $transaction_id = $result['purchase_units'][0]['payments']['captures'][0]['id'];
- $transaction_status = $result['purchase_units'][0]['payments']['captures'][0]['status'];
- $currency_code = $result['purchase_units'][0]['payments']['captures'][0]['amount']['currency_code'];
- $amount = $result['purchase_units'][0]['payments']['captures'][0]['amount']['value'];
+ if ($transaction_method == 'authorize') {
+ if (isset($result['purchase_units'][0]['payments']['authorizations'][0]['status']) && isset($result['purchase_units'][0]['payments']['authorizations'][0]['seller_protection']['status'])) {
+ $transaction_id = $result['purchase_units'][0]['payments']['authorizations'][0]['id'];
+ $transaction_status = $result['purchase_units'][0]['payments']['authorizations'][0]['status'];
+ $currency_code = $result['purchase_units'][0]['payments']['authorizations'][0]['amount']['currency_code'];
+ $amount = $result['purchase_units'][0]['payments']['authorizations'][0]['amount']['value'];
+ }
+ } else {
+ if (isset($result['purchase_units'][0]['payments']['captures'][0]['status']) && isset($result['purchase_units'][0]['payments']['captures'][0]['seller_protection']['status'])) {
+ $transaction_id = $result['purchase_units'][0]['payments']['captures'][0]['id'];
+ $transaction_status = $result['purchase_units'][0]['payments']['captures'][0]['status'];
+ $currency_code = $result['purchase_units'][0]['payments']['captures'][0]['amount']['currency_code'];
+ $amount = $result['purchase_units'][0]['payments']['captures'][0]['amount']['value'];
+ }
}
- }
- if ($transaction_id && $transaction_status && $currency_code && $amount) {
- $this->editOrderRecurringStatus($order_recurring_id, 1);
-
- $paypal_order_recurring_data = array(
- 'order_recurring_id' => $order_recurring_id,
- 'order_id' => $order_data['order_id'],
- 'trial_end' => date_format($trial_end, 'Y-m-d H:i:s'),
- 'subscription_end' => date_format($subscription_end, 'Y-m-d H:i:s'),
- 'currency_code' => $currency_code,
- 'amount' => $amount
- );
-
- $this->addPayPalOrderRecurring($paypal_order_recurring_data);
-
- if (($transaction_status == 'CREATED') || ($transaction_status == 'COMPLETED') || ($transaction_status == 'PENDING')) {
- $order_recurring_transaction_data = array(
+ if ($transaction_id && $transaction_status && $currency_code && $amount) {
+ $paypal_order_recurring_data = array(
'order_recurring_id' => $order_recurring_id,
- 'reference' => $transaction_id,
- 'type' => '1',
+ 'order_id' => $order_data['order_id'],
+ 'trial_end' => date_format($trial_end, 'Y-m-d H:i:s'),
+ 'subscription_end' => date_format($subscription_end, 'Y-m-d H:i:s'),
+ 'currency_code' => $currency_code,
'amount' => $amount
);
+
+ $this->addPayPalOrderRecurring($paypal_order_recurring_data);
+
+ if (($transaction_status == 'CREATED') || ($transaction_status == 'COMPLETED') || ($transaction_status == 'PENDING')) {
+ $order_recurring_transaction_data = array(
+ 'order_recurring_id' => $order_recurring_id,
+ 'reference' => $transaction_id,
+ 'type' => '1',
+ 'amount' => $amount
+ );
- $this->addOrderRecurringTransaction($order_recurring_transaction_data);
+ $this->addOrderRecurringTransaction($order_recurring_transaction_data);
- $this->editPayPalOrderRecurringNextPayment($order_recurring_id, date_format($next_payment, 'Y-m-d H:i:s'));
- } else {
- $order_recurring_transaction_data = array(
- 'order_recurring_id' => $order_recurring_id,
- 'reference' => $transaction_id,
- 'type' => '4',
- 'amount' => $amount
- );
+ $this->editPayPalOrderRecurringNextPayment($order_recurring_id, date_format($next_payment, 'Y-m-d H:i:s'));
+ } else {
+ $order_recurring_transaction_data = array(
+ 'order_recurring_id' => $order_recurring_id,
+ 'reference' => $transaction_id,
+ 'type' => '4',
+ 'amount' => $amount
+ );
- $this->addOrderRecurringTransaction($order_recurring_transaction_data);
+ $this->addOrderRecurringTransaction($order_recurring_transaction_data);
+ }
}
}
}
@@ -352,65 +491,67 @@ public function cronPayment() {
$order_info = $this->model_checkout_order->getOrder($order_recurring['order_id']);
$paypal_order_info = $this->getPayPalOrder($order_recurring['order_id']);
-
- if ((date_format($today, 'Y-m-d H:i:s') > date_format($next_payment, 'Y-m-d H:i:s')) && (date_format($trial_end, 'Y-m-d H:i:s') > date_format($today, 'Y-m-d H:i:s') || date_format($trial_end, 'Y-m-d H:i:s') == date_format($unlimited, 'Y-m-d H:i:s'))) {
- $price = $this->currency->format($order_recurring['trial_price'], $order_info['currency_code'], false, false);
- $frequency = $order_recurring['trial_frequency'];
- $cycle = $order_recurring['trial_cycle'];
- $next_payment = $this->calculateSchedule($frequency, $next_payment, $cycle);
- } elseif ((date_format($today, 'Y-m-d H:i:s') > date_format($next_payment, 'Y-m-d H:i:s')) && (date_format($subscription_end, 'Y-m-d H:i:s') > date_format($today, 'Y-m-d H:i:s') || date_format($subscription_end, 'Y-m-d H:i:s') == date_format($unlimited, 'Y-m-d H:i:s'))) {
- $price = $this->currency->format($order_recurring['recurring_price'], $order_info['currency_code'], false, false);
- $frequency = $order_recurring['recurring_frequency'];
- $cycle = $order_recurring['recurring_cycle'];
- $next_payment = $this->calculateSchedule($frequency, $next_payment, $cycle);
- } else {
- continue;
- }
+
+ if (!empty($paypal_order_info['vault_id'])) {
+ if ((date_format($today, 'Y-m-d H:i:s') > date_format($next_payment, 'Y-m-d H:i:s')) && (date_format($trial_end, 'Y-m-d H:i:s') > date_format($today, 'Y-m-d H:i:s') || date_format($trial_end, 'Y-m-d H:i:s') == date_format($unlimited, 'Y-m-d H:i:s'))) {
+ $price = $this->currency->format($order_recurring['trial_price'], $order_info['currency_code'], false, false);
+ $frequency = $order_recurring['trial_frequency'];
+ $cycle = $order_recurring['trial_cycle'];
+ $next_payment = $this->calculateSchedule($frequency, $next_payment, $cycle);
+ } elseif ((date_format($today, 'Y-m-d H:i:s') > date_format($next_payment, 'Y-m-d H:i:s')) && (date_format($subscription_end, 'Y-m-d H:i:s') > date_format($today, 'Y-m-d H:i:s') || date_format($subscription_end, 'Y-m-d H:i:s') == date_format($unlimited, 'Y-m-d H:i:s'))) {
+ $price = $this->currency->format($order_recurring['recurring_price'], $order_info['currency_code'], false, false);
+ $frequency = $order_recurring['recurring_frequency'];
+ $cycle = $order_recurring['recurring_cycle'];
+ $next_payment = $this->calculateSchedule($frequency, $next_payment, $cycle);
+ } else {
+ continue;
+ }
- $result = $this->createPayment($order_info, $paypal_order_info, $price, $order_recurring['order_recurring_id'], $order_recurring['recurring_name']);
+ $result = $this->createPayment($order_info, $paypal_order_info, $price, $order_recurring['order_recurring_id'], $order_recurring['recurring_name']);
- $transaction_status = '';
- $transaction_id = '';
- $currency_code = '';
- $amount = '';
+ $transaction_status = '';
+ $transaction_id = '';
+ $currency_code = '';
+ $amount = '';
- if ($transaction_method == 'authorize') {
- if (isset($result['purchase_units'][0]['payments']['authorizations'][0]['status']) && isset($result['purchase_units'][0]['payments']['authorizations'][0]['seller_protection']['status'])) {
- $transaction_id = $result['purchase_units'][0]['payments']['authorizations'][0]['id'];
- $transaction_status = $result['purchase_units'][0]['payments']['authorizations'][0]['status'];
- $currency_code = $result['purchase_units'][0]['payments']['authorizations'][0]['amount']['currency_code'];
- $amount = $result['purchase_units'][0]['payments']['authorizations'][0]['amount']['value'];
- }
- } else {
- if (isset($result['purchase_units'][0]['payments']['captures'][0]['status']) && isset($result['purchase_units'][0]['payments']['captures'][0]['seller_protection']['status'])) {
- $transaction_id = $result['purchase_units'][0]['payments']['captures'][0]['id'];
- $transaction_status = $result['purchase_units'][0]['payments']['captures'][0]['status'];
- $currency_code = $result['purchase_units'][0]['payments']['captures'][0]['amount']['currency_code'];
- $amount = $result['purchase_units'][0]['payments']['captures'][0]['amount']['value'];
+ if ($transaction_method == 'authorize') {
+ if (isset($result['purchase_units'][0]['payments']['authorizations'][0]['status']) && isset($result['purchase_units'][0]['payments']['authorizations'][0]['seller_protection']['status'])) {
+ $transaction_id = $result['purchase_units'][0]['payments']['authorizations'][0]['id'];
+ $transaction_status = $result['purchase_units'][0]['payments']['authorizations'][0]['status'];
+ $currency_code = $result['purchase_units'][0]['payments']['authorizations'][0]['amount']['currency_code'];
+ $amount = $result['purchase_units'][0]['payments']['authorizations'][0]['amount']['value'];
+ }
+ } else {
+ if (isset($result['purchase_units'][0]['payments']['captures'][0]['status']) && isset($result['purchase_units'][0]['payments']['captures'][0]['seller_protection']['status'])) {
+ $transaction_id = $result['purchase_units'][0]['payments']['captures'][0]['id'];
+ $transaction_status = $result['purchase_units'][0]['payments']['captures'][0]['status'];
+ $currency_code = $result['purchase_units'][0]['payments']['captures'][0]['amount']['currency_code'];
+ $amount = $result['purchase_units'][0]['payments']['captures'][0]['amount']['value'];
+ }
}
- }
- if ($transaction_id && $transaction_status && $currency_code && $amount) {
- if (($transaction_status == 'CREATED') || ($transaction_status == 'COMPLETED') || ($transaction_status == 'PENDING')) {
- $order_recurring_transaction_data = array(
- 'order_recurring_id' => $order_recurring['order_recurring_id'],
- 'reference' => $transaction_id,
- 'type' => '1',
- 'amount' => $amount
- );
+ if ($transaction_id && $transaction_status && $currency_code && $amount) {
+ if (($transaction_status == 'CREATED') || ($transaction_status == 'COMPLETED') || ($transaction_status == 'PENDING')) {
+ $order_recurring_transaction_data = array(
+ 'order_recurring_id' => $order_recurring['order_recurring_id'],
+ 'reference' => $transaction_id,
+ 'type' => '1',
+ 'amount' => $amount
+ );
- $this->addOrderRecurringTransaction($order_recurring_transaction_data);
+ $this->addOrderRecurringTransaction($order_recurring_transaction_data);
- $this->editPayPalOrderRecurringNextPayment($order_recurring['order_recurring_id'], date_format($next_payment, 'Y-m-d H:i:s'));
- } else {
- $order_recurring_transaction_data = array(
- 'order_recurring_id' => $order_recurring['order_recurring_id'],
- 'reference' => $transaction_id,
- 'type' => '4',
- 'amount' => $amount
- );
+ $this->editPayPalOrderRecurringNextPayment($order_recurring['order_recurring_id'], date_format($next_payment, 'Y-m-d H:i:s'));
+ } else {
+ $order_recurring_transaction_data = array(
+ 'order_recurring_id' => $order_recurring['order_recurring_id'],
+ 'reference' => $transaction_id,
+ 'type' => '4',
+ 'amount' => $amount
+ );
- $this->addOrderRecurringTransaction($order_recurring_transaction_data);
+ $this->addOrderRecurringTransaction($order_recurring_transaction_data);
+ }
}
}
}
@@ -503,6 +644,13 @@ public function createPayment($order_data, $paypal_order_data, $price, $order_re
$paypal_order_info['payment_source'][$paypal_order_data['payment_method']]['vault_id'] = $paypal_order_data['vault_id'];
+ if ($paypal_order_data['payment_method'] == 'card') {
+ $paypal_order_info['payment_source'][$paypal_order_data['payment_method']]['stored_credential']['payment_initiator'] = 'MERCHANT';
+ $paypal_order_info['payment_source'][$paypal_order_data['payment_method']]['stored_credential']['payment_type'] = 'UNSCHEDULED';
+ $paypal_order_info['payment_source'][$paypal_order_data['payment_method']]['stored_credential']['usage'] = 'SUBSEQUENT';
+ $paypal_order_info['payment_source'][$paypal_order_data['payment_method']]['stored_credential']['previous_transaction_reference'] = $paypal_order_data['transaction_id'];
+ }
+
$result = $paypal->createOrder($paypal_order_info);
$errors = array();
@@ -602,21 +750,25 @@ public function log($data, $title = '') {
}
public function update() {
+ $this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "paypal_checkout_integration_customer_token`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "paypal_checkout_integration_order`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "paypal_checkout_integration_order_recurring`");
- $this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "paypal_checkout_integration_order` (`order_id` INT(11) NOT NULL, `transaction_id` VARCHAR(20) NOT NULL, `transaction_status` VARCHAR(20) NULL, `payment_method` VARCHAR(20) NULL, `vault_id` VARCHAR(50) NULL, `vault_customer_id` VARCHAR(50) NULL, `environment` VARCHAR(20) NULL, PRIMARY KEY (`order_id`, `transaction_id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci");
+ $this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "paypal_checkout_integration_customer_token` (`customer_id` INT(11) NOT NULL, `payment_method` VARCHAR(20) NOT NULL, `vault_id` VARCHAR(50) NOT NULL, `vault_customer_id` VARCHAR(50) NOT NULL, `card_type` VARCHAR(40) NOT NULL, `card_nice_type` VARCHAR(40) NOT NULL, `card_last_digits` VARCHAR(4) NOT NULL, `card_expiry` VARCHAR(20) NOT NULL, `main_token_status` TINYINT(1) NOT NULL, PRIMARY KEY (`customer_id`, `payment_method`, `vault_id`), KEY `vault_customer_id` (`vault_customer_id`), KEY `main_token_status` (`main_token_status`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci");
+ $this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "paypal_checkout_integration_order` (`order_id` INT(11) NOT NULL, `paypal_order_id` VARCHAR(20) NOT NULL, `transaction_id` VARCHAR(20) NOT NULL, `transaction_status` VARCHAR(20) NOT NULL, `payment_method` VARCHAR(20) NOT NULL, `vault_id` VARCHAR(50) NOT NULL, `vault_customer_id` VARCHAR(50) NOT NULL, `card_type` VARCHAR(40) NOT NULL, `card_nice_type` VARCHAR(40) NOT NULL, `card_last_digits` VARCHAR(4) NOT NULL, `card_expiry` VARCHAR(20) NOT NULL, `environment` VARCHAR(20) NOT NULL, PRIMARY KEY (`order_id`), KEY `paypal_order_id` (`paypal_order_id`), KEY `transaction_id` (`transaction_id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci");
$this->db->query("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "paypal_checkout_integration_order_recurring` (`paypal_order_recurring_id` INT(11) NOT NULL AUTO_INCREMENT, `order_id` INT(11) NOT NULL, `order_recurring_id` INT(11) NOT NULL, `date_added` DATETIME NOT NULL, `date_modified` DATETIME NOT NULL, `next_payment` DATETIME NOT NULL, `trial_end` DATETIME DEFAULT NULL, `subscription_end` DATETIME DEFAULT NULL, `currency_code` CHAR(3) NOT NULL, `total` DECIMAL(10, 2) NOT NULL, PRIMARY KEY (`paypal_order_recurring_id`), KEY (`order_id`), KEY (`order_recurring_id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci");
$this->db->query("DELETE FROM `" . DB_PREFIX . "event` WHERE `code` = 'paypal_order_info'");
$this->db->query("DELETE FROM `" . DB_PREFIX . "event` WHERE `code` = 'paypal_header'");
$this->db->query("DELETE FROM `" . DB_PREFIX . "event` WHERE `code` = 'paypal_extension_get_extensions'");
$this->db->query("DELETE FROM `" . DB_PREFIX . "event` WHERE `code` = 'paypal_order_delete_order'");
+ $this->db->query("DELETE FROM `" . DB_PREFIX . "event` WHERE `code` = 'paypal_customer_delete_customer'");
$this->db->query("INSERT INTO `" . DB_PREFIX . "event` SET `code` = 'paypal_order_info', `trigger` = 'admin/view/sale/order_info/before', `action` = 'extension/payment/paypal/order_info_before', `sort_order` = '0', `status` = '1'");
$this->db->query("INSERT INTO `" . DB_PREFIX . "event` SET `code` = 'paypal_header', `trigger` = 'catalog/controller/common/header/before', `action` = 'extension/payment/paypal/header_before', `sort_order` = '0', `status` = '1'");
$this->db->query("INSERT INTO `" . DB_PREFIX . "event` SET `code` = 'paypal_extension_get_extensions', `trigger` = 'catalog/model/setting/extension/getExtensions/after', `action` = 'extension/payment/paypal/extension_get_extensions_after', `sort_order` = '0', `status` = '1'");
$this->db->query("INSERT INTO `" . DB_PREFIX . "event` SET `code` = 'paypal_order_delete_order', `trigger` = 'catalog/model/checkout/order/deleteOrder/before', `action` = 'extension/payment/paypal/order_delete_order_before', `sort_order` = '0', `status` = '1'");
+ $this->db->query("INSERT INTO `" . DB_PREFIX . "event` SET `code` = 'paypal_customer_delete_customer', `trigger` = 'admin/model/customer/customer/deleteCustomer/before', `action` = 'extension/payment/paypal/customer_delete_customer_before', `sort_order` = '0', `status` = '1'");
// Setting
$_config = new Config();
diff --git a/upload/catalog/view/javascript/paypal/paypal.js b/upload/catalog/view/javascript/paypal/paypal.js
index 01f9d712837..af03284fcb5 100644
--- a/upload/catalog/view/javascript/paypal/paypal.js
+++ b/upload/catalog/view/javascript/paypal/paypal.js
@@ -132,8 +132,12 @@ var PayPalAPI = (function () {
paypal_script[script_count].src = src;
paypal_script[script_count].setAttribute('data-partner-attribution-id', paypal_data['partner_attribution_id']);
paypal_script[script_count].setAttribute('data-client-token', paypal_data['client_token']);
- paypal_script[script_count].setAttribute('data-namespace', 'PayPalSDK');
+ paypal_script[script_count].setAttribute('data-namespace', 'PayPalSDK');
+ if (paypal_data['id_token']) {
+ paypal_script[script_count].setAttribute('data-user-id-token', paypal_data['id_token']);
+ }
+
paypal_script[script_count].async = false;
paypal_script[script_count].onload = readyPayPalSDK();
@@ -169,8 +173,7 @@ var PayPalAPI = (function () {
label: paypal_data['button_label'],
tagline: ((paypal_data['page_code'] != 'checkout') ? paypal_data['button_tagline'] : 'false')
},
- // Set up the transaction
- createOrder: function(data, actions) {
+ createOrder: function() {
paypal_order_id = false;
product_data = $('#product input[type=\'text\'], #product input[type=\'hidden\'], #product input[type=\'radio\']:checked, #product input[type=\'checkbox\']:checked, #product select, #product textarea').serialize();
@@ -178,7 +181,7 @@ var PayPalAPI = (function () {
$.ajax({
method: 'post',
url: 'index.php?route=extension/payment/paypal/createOrder',
- data: {'page_code' : paypal_data['page_code'], 'payment_type' : 'button', 'product' : product_data},
+ data: {'page_code': paypal_data['page_code'], 'payment_type': 'button', 'product': product_data},
dataType: 'json',
async: false,
success: function(json) {
@@ -193,23 +196,15 @@ var PayPalAPI = (function () {
return paypal_order_id;
},
- // Finalize the transaction
- onApprove: function(data, actions) {
- // Call your server to save the transaction
- restart = false;
-
+ onApprove: function(data) {
$.ajax({
method: 'post',
url: 'index.php?route=extension/payment/paypal/approveOrder',
- data: {'page_code' : paypal_data['page_code'], 'payment_type' : 'button', 'paypal_order_id': data.orderID},
+ data: {'page_code': paypal_data['page_code'], 'payment_type': 'button', 'paypal_order_id': data.orderID},
dataType: 'json',
async: false,
success: function(json) {
showPayPalAlert(json);
-
- if (json['restart']) {
- restart = json['restart'];
- }
if (json['url']) {
location = json['url'];
@@ -219,10 +214,6 @@ var PayPalAPI = (function () {
console.log(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
}
});
-
- if (restart) {
- return actions.restart();
- }
}
};
@@ -264,7 +255,87 @@ var PayPalAPI = (function () {
}
}
- if (paypal_data['components'].includes('hosted-fields') && $('#paypal_card').length && !$('#paypal_card_form').find('iframe').length) {
+ if (paypal_data['card_customer_tokens'] && $('#paypal_card_tokens').length && !$('#paypal_card_tokens_container').html()) {
+ $('#paypal_card_tokens').css('text-align', paypal_data['card_align']);
+
+ if (paypal_data['card_width']) {
+ $('#paypal_card_tokens_container').css('display', 'inline-block');
+ $('#paypal_card_tokens_container').css('width', paypal_data['card_width']);
+ } else {
+ $('#paypal_card_tokens_container').css('display', 'block');
+ $('#paypal_card_tokens_container').css('width', 'auto');
+ }
+
+ $.each(paypal_data['card_customer_tokens'], function(index, card_customer_token) {
+ html = '
' + card_customer_token['card_number'] + '