diff --git a/CHANGELOG.md b/CHANGELOG.md index 4663030..a00bc17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ ## Unreleased +## v1.4.0 (2020-02-12) +### Added +- Gateway callback validation +### Changed +- Remove order status changes from gateway response handling - handled in callback +- Remove superfluous payment gateway response error output +### Fixed +- Missing cc input overflow obfuscating border +- CCV -> CVV typo + ## v1.3.1 (2020-01-20) ### Fixed - Postback callback URL card type assignment diff --git a/build.php b/build.php index a3875ce..03bf3f9 100644 --- a/build.php +++ b/build.php @@ -2,7 +2,7 @@ /** * extension source version */ -$version = '1.3.1'; +$version = '1.4.0'; /** * dist filename diff --git a/src/upload/catalog/controller/extension/payment/payment_gateway_cloud_creditcard.php b/src/upload/catalog/controller/extension/payment/payment_gateway_cloud_creditcard.php index af2768e..4f346de 100644 --- a/src/upload/catalog/controller/extension/payment/payment_gateway_cloud_creditcard.php +++ b/src/upload/catalog/controller/extension/payment/payment_gateway_cloud_creditcard.php @@ -194,14 +194,14 @@ public function confirm() } if ($paymentResult->hasErrors()) { - $this->processFailure($this->order, $paymentResult->getFirstError()); + $this->processFailure($this->order); } if ($paymentResult->isSuccess()) { // $gatewayReferenceId = $paymentResult->getReferenceId(); switch ($paymentResult->getReturnType()) { case TransactionResult::RETURN_TYPE_ERROR: - $this->processFailure($this->order, $paymentResult->getFirstError()); + $this->processFailure($this->order); break; case TransactionResult::RETURN_TYPE_REDIRECT: /** @@ -229,14 +229,11 @@ public function confirm() $this->processFailure($this->order); } - private function processFailure($order, $errors = null) + private function processFailure($order) { if ($order['order_status_id'] == self::PENDING) { $this->model_checkout_order->addOrderHistory($order['order_id'], self::FAILED); $this->session->data['error'] = $this->language->get('order_error'); - if (!empty($errors)) { - $this->session->data['error'] = $errors; - } $this->response->redirect($this->url->link('checkout/checkout')); } } @@ -300,20 +297,17 @@ public function response() $cancelled = !empty($_REQUEST['cancelled']); if ($cancelled) { $this->session->data['error'] = $this->language->get('order_cancelled'); - $this->updateOrderStatus($orderId, self::CANCELED); $this->response->redirect($this->url->link('checkout/checkout')); return; } $success = !empty($_REQUEST['success']); if ($success) { - $this->updateOrderStatus($orderId, self::PROCESSING); $this->response->redirect($this->url->link('checkout/success')); return; } $this->session->data['error'] = $this->language->get('order_error'); - $this->updateOrderStatus($orderId, self::FAILED); $this->response->redirect($this->url->link('checkout/checkout')); } @@ -326,12 +320,12 @@ public function callback() $client = $this->client($cardType); - // if (!$client->validateCallbackWithGlobals()) { - // if (!headers_sent()) { - // http_response_code(400); - // } - // die("OK"); - // } + if (!$client->validateCallbackWithGlobals()) { + if (!headers_sent()) { + http_response_code(400); + } + die("OK"); + } $callbackResult = $client->readCallback(file_get_contents('php://input')); diff --git a/src/upload/catalog/language/en-gb/extension/payment/payment_gateway_cloud.php b/src/upload/catalog/language/en-gb/extension/payment/payment_gateway_cloud.php index b313958..d40729b 100644 --- a/src/upload/catalog/language/en-gb/extension/payment/payment_gateway_cloud.php +++ b/src/upload/catalog/language/en-gb/extension/payment/payment_gateway_cloud.php @@ -9,7 +9,7 @@ $_['card_holder'] = 'Card Holder'; $_['card_number'] = 'Card Number'; -$_['card_ccv'] = 'CCV'; +$_['card_cvv'] = 'CVV'; $_['card_expiry_month'] = 'Expiry Month'; $_['card_expiry_year'] = 'Expiry Year'; diff --git a/src/upload/catalog/view/theme/default/template/extension/payment/payment_gateway_cloud.twig b/src/upload/catalog/view/theme/default/template/extension/payment/payment_gateway_cloud.twig index 53be2ad..e467b42 100644 --- a/src/upload/catalog/view/theme/default/template/extension/payment/payment_gateway_cloud.twig +++ b/src/upload/catalog/view/theme/default/template/extension/payment/payment_gateway_cloud.twig @@ -21,13 +21,13 @@
-
+
- -
+ +