Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PW-1762 Redirect shopper to external authorization #35

Merged
merged 18 commits into from
Nov 6, 2019
Merged

Conversation

msilvagarcia
Copy link
Contributor

No description provided.

marcoss and others added 14 commits October 17, 2019 12:26
* Add an exception that is usually logged somewhere

* Create a refund model

* Simplify unnecessary abstraction

* Replace qualifier with an import

* Listen to actionOrderSlipAdd hook

* Fix notification message

* Add a method to get an order by order slips

This will be used as the merchant reference in the refund request. When a refund notification arrives, we need to be sure to fetch an order based on this order slip id.

* Change reference to ID

* Adjust fetching of order object based on order slips

* Fix order object fetching

* Fix module

* Update service/modification/Refund.php

Co-Authored-By: Alessio Zampatti <[email protected]>

* Remove logging

* Extract method for SQL query

* Make intentions more explicit

* Fix Refund tests

* Fix Refund tests

* Refactor the Adyen main class

* Help @Aleffio

Co-Authored-By: Alessio Zampatti <[email protected]>
* Add PHP Code Sniffer

* Move configuration around

* Clarify PHPCS instruction
# Conflicts:
#	adyen.php
#	controllers/admin/AdminAdyenPrestashopCronController.php
#	controllers/front/Payment.php
#	controllers/front/ThreeDSProcess.php
#	controllers/front/Validate3d.php
#	service/adapter/classes/order/OrderAdapter.php
$this->context->smarty->assign(
array(
'locale' => $this->helper_data->getLocale($this->context->language),
// no locale in PrestaShop1.6 only languageCode that is en-en but we need en_EN
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we define a default ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what do you mean with this?

Copy link
Contributor

@rikterbeek rikterbeek Nov 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are specifying that for 1.6 the format is incorrect en-en instead of en_EN should we then not prefine it for 1.6 to en_EN or should we make a converter that makes en-en to en_EN ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to do this in the getLocale function in the helper_data, I will create a youtrack ticket for this, so we can discuss

controllers/front/Payment.php Outdated Show resolved Hide resolved
controllers/front/Payment.php Show resolved Hide resolved
@msilvagarcia msilvagarcia merged commit 143648e into PW-1661 Nov 6, 2019
@msilvagarcia msilvagarcia deleted the PW-1762 branch November 6, 2019 12:54
msilvagarcia added a commit that referenced this pull request Nov 11, 2019
This commit contains changes from Pull Requests #27 and #35. It also wraps up the development of Local Payment Methods that work with a simple setup, like iDeal, Sofort and Dotpay.

Co-Authored-By: Alessio Zampatti <[email protected]>
Co-Authored-By: cyattilakiss <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants