-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #511 from Invertus/single-click-improvments
Single click improvments
- Loading branch information
Showing
14 changed files
with
400 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,3 +14,4 @@ cypress/screenshots | |
| .php_cs.cache | ||
| .env | ||
| vendor | ||
| node_modules | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
198 changes: 198 additions & 0 deletions
198
src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| <?php | ||
| /** | ||
| * Copyright (c) 2012-2020, Mollie B.V. | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * - Redistributions of source code must retain the above copyright notice, | ||
| * this list of conditions and the following disclaimer. | ||
| * - Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY | ||
| * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY | ||
| * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | ||
| * DAMAGE. | ||
| * | ||
| * @author Mollie B.V. <[email protected]> | ||
| * @copyright Mollie B.V. | ||
| * @license Berkeley Software Distribution License (BSD-License 2) http://www.opensource.org/licenses/bsd-license.php | ||
| * | ||
| * @category Mollie | ||
| * | ||
| * @see https://www.mollie.nl | ||
| * @codingStandardsIgnoreStart | ||
| */ | ||
|
|
||
| namespace Mollie\Provider\PaymentOption; | ||
|
|
||
| use Configuration; | ||
| use Customer; | ||
| use MolCustomer; | ||
| use Mollie; | ||
| use Mollie\Adapter\LegacyContext; | ||
| use Mollie\Config\Config; | ||
| use Mollie\Provider\CreditCardLogoProvider; | ||
| use Mollie\Provider\OrderTotalProviderInterface; | ||
| use Mollie\Provider\PaymentFeeProviderInterface; | ||
| use Mollie\Repository\MolCustomerRepository; | ||
| use Mollie\Service\LanguageService; | ||
| use Mollie\Utility\CustomerUtility; | ||
| use MolPaymentMethod; | ||
| use PrestaShop\PrestaShop\Core\Payment\PaymentOption; | ||
| use Tools; | ||
|
|
||
| class CreditCardSingleClickPaymentOptionProvider implements PaymentOptionProviderInterface | ||
| { | ||
| /** | ||
| * @var Mollie | ||
| */ | ||
| private $module; | ||
|
|
||
| /** | ||
| * @var LegacyContext | ||
| */ | ||
| private $context; | ||
|
|
||
| /** | ||
| * @var CreditCardLogoProvider | ||
| */ | ||
| private $creditCardLogoProvider; | ||
|
|
||
| /** | ||
| * @var OrderTotalProviderInterface | ||
| */ | ||
| private $orderTotalProvider; | ||
|
|
||
| /** | ||
| * @var PaymentFeeProviderInterface | ||
| */ | ||
| private $paymentFeeProvider; | ||
|
|
||
| /** | ||
| * @var LanguageService | ||
| */ | ||
| private $languageService; | ||
| /** | ||
| * @var Customer | ||
| */ | ||
| private $customer; | ||
| /** | ||
| * @var MolCustomerRepository | ||
| */ | ||
| private $customerRepository; | ||
|
|
||
| public function __construct( | ||
| Mollie $module, | ||
| LegacyContext $context, | ||
| CreditCardLogoProvider $creditCardLogoProvider, | ||
| OrderTotalProviderInterface $orderTotalProvider, | ||
| PaymentFeeProviderInterface $paymentFeeProvider, | ||
| LanguageService $languageService, | ||
| Customer $customer, | ||
| MolCustomerRepository $customerRepository | ||
| ) { | ||
| $this->module = $module; | ||
| $this->context = $context; | ||
| $this->creditCardLogoProvider = $creditCardLogoProvider; | ||
| $this->orderTotalProvider = $orderTotalProvider; | ||
| $this->paymentFeeProvider = $paymentFeeProvider; | ||
| $this->languageService = $languageService; | ||
| $this->customer = $customer; | ||
| $this->customerRepository = $customerRepository; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| public function getPaymentOption(MolPaymentMethod $paymentMethod) | ||
| { | ||
| $paymentOption = new PaymentOption(); | ||
| $paymentOption->setCallToActionText( | ||
| $paymentMethod->title ?: | ||
| $this->languageService->lang($paymentMethod->method_name) | ||
| ); | ||
| $paymentOption->setModuleName($this->module->name); | ||
| $paymentOption->setAction($this->context->getLink()->getModuleLink( | ||
| 'mollie', | ||
| 'payScreen', | ||
| ['method' => $paymentMethod->getPaymentMethodName(), 'rand' => Mollie\Utility\TimeUtility::getCurrentTimeStamp()], | ||
| true | ||
| )); | ||
| $fullName = CustomerUtility::getCustomerFullName($this->customer->id); | ||
|
|
||
| /** @var MolCustomer|null $molCustomer */ | ||
| $molCustomer = $this->customerRepository->findOneBy( | ||
| [ | ||
| 'name' => $fullName, | ||
| 'email' => $this->customer->email, | ||
| ] | ||
| ); | ||
|
|
||
| $paymentOption->setInputs([ | ||
| [ | ||
| 'type' => 'hidden', | ||
| 'name' => 'mollieCardToken', | ||
| 'value' => '', | ||
| ], | ||
| [ | ||
| 'type' => 'hidden', | ||
| 'name' => 'mollieSaveCard', | ||
| 'value' => '', | ||
| ], | ||
| [ | ||
| 'type' => 'hidden', | ||
| 'name' => 'mollieCustomerExists', | ||
| 'value' => (bool) $molCustomer, | ||
| ], | ||
| [ | ||
| 'type' => 'hidden', | ||
| 'name' => 'mollieUseSavedCard', | ||
| 'value' => '', | ||
| ], | ||
| ]); | ||
|
|
||
| $this->context->getSmarty()->assign([ | ||
| 'price' => $this->orderTotalProvider->getOrderTotal(), | ||
| 'priceSign' => $this->context->getCurrencySign(), | ||
| 'methodId' => $paymentMethod->getPaymentMethodName(), | ||
| 'isSingleClickPayment' => (bool) Configuration::get(Mollie\Config\Config::MOLLIE_SINGLE_CLICK_PAYMENT), | ||
| 'mollieUseSavedCard' => (bool) (Configuration::get(Config::MOLLIE_SINGLE_CLICK_PAYMENT) && $molCustomer), | ||
| 'isGuest' => $this->customer->isGuest(), | ||
| ]); | ||
| $paymentOption->setLogo($this->creditCardLogoProvider->getMethodOptionLogo($paymentMethod)); | ||
|
|
||
| $paymentOption->setAdditionalInformation($this->module->display( | ||
| $this->module->getPathUri(), 'views/templates/hook/mollie_single_click.tpl' | ||
| )); | ||
|
|
||
| $paymentFee = $this->paymentFeeProvider->getPaymentFee($paymentMethod); | ||
|
|
||
| if ($paymentFee) { | ||
| $paymentOption->setInputs([ | ||
| [ | ||
| 'type' => 'hidden', | ||
| 'name' => 'payment-fee-price', | ||
| 'value' => $paymentFee, | ||
| ], | ||
| [ | ||
| 'type' => 'hidden', | ||
| 'name' => 'payment-fee-price-display', | ||
| 'value' => sprintf($this->module->l('Payment Fee: %1s'), Tools::displayPrice($paymentFee)), | ||
| ], | ||
| ]); | ||
| } | ||
|
|
||
| return $paymentOption; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.