Allow paying with using on-site credit card #22

jakubtobiasz · 2024-09-10T12:47:39Z

closes #21

assets/shop/js/card_encoder.js

src/Form/Type/TpayCardType.php

src/Form/Type/TpayGatewayConfigurationType.php

src/Payum/Action/Api/AbstractCreateTransactionAction.php

src/Payum/Action/Api/CreateBlik0TransactionAction.php

jakubtobiasz · 2024-09-12T09:23:11Z

src/Payum/Action/Api/PayWithCardAction.php

+        if ('failed' === $response['result']) {
+            $details['tpay']['status'] = PaymentInterface::STATE_FAILED;
+        }
+
+        if ('success' === $response['result'] && 'pending' === $response['status']) {
+            $details['tpay']['transaction_payment_url'] = $response['transactionPaymentUrl'];
+
+            $model->setDetails($details);
+
+            throw new HttpRedirect($details['tpay']['transaction_payment_url']);
+        }


To be checked: make sure it handles all possible cases
Improvement: we might introduce ->isFailed() or isRequiring3DS() to make it cleaner;

templates/shop/scripts.html.twig

config/services/form.php

index.js

phpstan.neon

coldic3 · 2024-09-12T09:55:26Z

src/Form/Type/TpayPaymentDetailsType.php

+
+        $builder->addEventListener(
+            FormEvents::PRE_SUBMIT,
+            [$this->removeUnnecessaryPaymentDetailsFieldsListener, '__invoke'],


Suggested change

[$this->removeUnnecessaryPaymentDetailsFieldsListener, '__invoke'],

[$this->removeUnnecessaryPaymentDetailsFieldsListener],

Will it also work like this?

src/Payum/Action/Api/PayWithCardAction.php

src/Tpay/Factory/CreateBlik0PaymentPayloadFactory.php

coldic3 · 2024-09-12T10:15:57Z

tests/Unit/Form/EventListener/RemoveUnnecessaryPaymentDetailsFieldsListenerTest.php

+        $form = $this->prophesize(FormInterface::class);
+        $form->remove('card')->shouldBeCalled()->willReturn($form);
+        $form->remove('blik_token')->shouldNotBeCalled();
+
+        $event = new FormEvent($form->reveal(), ['blik_token' => '123456']);
+
+        $this->createTestSubject()->__invoke($event);


It's totally fine now, but I'd like to share an idea to follow AAA pattern. All "should" methods we could move at the end. WDYT?

Suggested change

$form = $this->prophesize(FormInterface::class);

$form->remove('card')->shouldBeCalled()->willReturn($form);

$form->remove('blik_token')->shouldNotBeCalled();

$event = new FormEvent($form->reveal(), ['blik_token' => '123456']);

$this->createTestSubject()->__invoke($event);

$form = $this->prophesize(FormInterface::class);

$form->remove('card')->willReturn($form);

$event = new FormEvent($form->reveal(), ['blik_token' => '123456']);

$this->createTestSubject()->__invoke($event);

$form->remove('card)->shouldBeCalled();

$form->remove('blik_token')->shouldNotBeCalled();

coldic3 · 2024-09-12T10:22:03Z

src/Form/Type/TpayCardType.php

+                    'mapped' => false,
+                    'label' => 'commerce_weavers_sylius_tpay.shop.order_summary.card.expiration_date.month.label',
+                    'choices' => [
+                        'commerce_weavers_sylius_tpay.shop.order_summary.card.expiration_date.month.january' => '01',


$choices = []; foreach (['january, 'february', '...', 'december'] as $key => $month) { $choices[sprintf('commerce_weavers_sylius_tpay.shop.order_summary.card.expiration_date.month.%s', $month)] = sprintf("%02d", $key + 1) }

WDYT?

assets/shop/js/card_encoder.js

config/config/sylius_fixtures.php

config/config/sylius_template_events.php

lchrusciel · 2024-09-12T19:32:30Z

src/Form/EventListener/RemoveUnnecessaryPaymentDetailsFieldsListener.php

+
+use Symfony\Component\Form\FormEvent;
+
+final class RemoveUnnecessaryPaymentDetailsFieldsListener


Can't we rather base our decision on the state of the payment itself? Only when given payment method will be selected, then we are adding given fields

I think this solutions is enough. We base the decision about passed data on a type defined in the gateway (see my screenshot two comments below). Here we only check whether a some data is passed (template is no loaded = field is not shown = we're getting a null); so we just remove it to avoid 500.

src/Model/OrderLastNewPaymentAwareInterface.php

lchrusciel · 2024-09-12T19:36:45Z

src/Payum/Action/Api/CreateRedirectBasedTransactionAction.php

+
+        $details = $model->getDetails();
+
+        return !isset($details['tpay']['card']) && !isset($details['tpay']['blik_token']);


how will we decide in UI which option will be used?

In the Admin Panel we can choose a Tpay payment type:

And in the UI we just check this value:

At the same time, I believe this type should be a value on payment details, so it can be easily accessed e.g. in the Payum action, so instead this if statement you marked, we'll do something like this:

return $details['tpay']['type'] === 'redirect';

Thanks to this change, once a new method is added, it's not required to modify the CreateRedirectBasedTransactionAction class.

templates/shop/scripts.html.twig

…nsactions

…ayPaymentDetailsType

jakubtobiasz force-pushed the 21-support-on-site-card-payment branch from e8ade80 to 9b21855 Compare September 10, 2024 17:45

jakubtobiasz added 2 commits September 11, 2024 17:13

Allow to choose type of Tpay payment method (on-site card, redirect)

2326bf2

Create a simple form for card payments

064532c

jakubtobiasz force-pushed the 21-support-on-site-card-payment branch from d35d5ff to 6272f93 Compare September 11, 2024 17:29

jakubtobiasz changed the title ~~🚧 Allow paying with using on-site credit card~~ Allow paying with using on-site credit card Sep 11, 2024

jakubtobiasz commented Sep 12, 2024

View reviewed changes

coldic3 reviewed Sep 12, 2024

View reviewed changes

lchrusciel reviewed Sep 12, 2024

View reviewed changes

jakubtobiasz added 9 commits September 13, 2024 08:30

Add encrypting a passed card data on a client side

94bc40c

Refactoring creating a transaction and add handling a credit card tra…

a9e1c6c

…nsactions

Fix CI

004b498

Update fixtures to make testing a card payment with Tpay easier

9da6fdc

Add handling a failed card payment status

ca7c7af

Unify both blik and card templates path and template events definitions

023e0e2

Refactor BLIK payment method to match the new implementation

be90545

Extract the CardTypeDataTransformer from the TpayCardType

fdc1446

Extract the RemoveUnnecessaryPaymentDetailsFieldsListener from the Tp…

8b26e3a

…ayPaymentDetailsType

jakubtobiasz force-pushed the 21-support-on-site-card-payment branch from c1f43c1 to 8b26e3a Compare September 13, 2024 06:30

jakubtobiasz merged commit c40d0c8 into CommerceWeavers:main Sep 13, 2024
4 checks passed

jakubtobiasz deleted the 21-support-on-site-card-payment branch September 13, 2024 06:42

jakubtobiasz mentioned this pull request Sep 13, 2024

Card payments improvements #27

Closed

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow paying with using on-site credit card #22

Allow paying with using on-site credit card #22

jakubtobiasz commented Sep 10, 2024 •

edited

Loading

jakubtobiasz Sep 12, 2024

coldic3 Sep 12, 2024

coldic3 Sep 12, 2024

coldic3 Sep 12, 2024

lchrusciel Sep 12, 2024

jakubtobiasz Sep 13, 2024

lchrusciel Sep 12, 2024

jakubtobiasz Sep 13, 2024

jakubtobiasz Sep 13, 2024

	[$this->removeUnnecessaryPaymentDetailsFieldsListener, '__invoke'],
	[$this->removeUnnecessaryPaymentDetailsFieldsListener],


		use Symfony\Component\Form\FormEvent;

		final class RemoveUnnecessaryPaymentDetailsFieldsListener


		$details = $model->getDetails();

		return !isset($details['tpay']['card']) && !isset($details['tpay']['blik_token']);

Allow paying with using on-site credit card #22

Allow paying with using on-site credit card #22

Conversation

jakubtobiasz commented Sep 10, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jakubtobiasz commented Sep 10, 2024 •

edited

Loading