-
Notifications
You must be signed in to change notification settings - Fork 8
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 #61 from Adyen/develop
Release 1.2.0
- Loading branch information
Showing
8 changed files
with
224 additions
and
3 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 |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| name: Main CI workflow | ||
|
|
||
| on: | ||
| pull_request: | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| build: | ||
| if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) || (github.event_name == 'workflow_dispatch') | ||
| environment: ${{ (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) && 'external' || 'internal' }} | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| matrix: | ||
| php-version: [8.2,8.3] | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Use PHP ${{ matrix.php-version }} | ||
| uses: shivammathur/setup-php@v2 | ||
| with: | ||
| php-version: ${{ matrix.php-version }} | ||
| tools: composer:v1 | ||
|
|
||
| - name: SonarCloud Scan | ||
| if: ${{ env.SONAR_TOKEN }} | ||
| uses: SonarSource/sonarcloud-github-action@master | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} |
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
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,6 @@ | ||
| sonar.organization=adyen | ||
| sonar.projectKey=Adyen_adyen-magento2-hyva | ||
| sonar.sources=. | ||
| sonar.exclusions=vendor/**/*, Test/**/*, view/**/* | ||
| sonar.php.coverage.reportPaths=build/clover.xml | ||
| sonar.php.tests.reportPath=build/tests-log.xml |
142 changes: 142 additions & 0 deletions
142
view/frontend/templates/payment/method-renderer/adyen-facilypay-3x-method.phtml
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,142 @@ | ||
| <?php | ||
| use Adyen\Hyva\Magewire\Payment\Method\AbstractPaymentMethodWire; | ||
| use Magento\Framework\Escaper; | ||
| use Magento\Framework\View\Element\Template; | ||
|
|
||
| /** @var AbstractPaymentMethodWire $magewire */ | ||
| /** @var Template $block */ | ||
| /** @var Escaper $escaper */ | ||
|
|
||
| ?> | ||
|
|
||
| <div> | ||
|
|
||
| <div id="<?= $magewire->getContainerName() ?>ActionContainer" wire:ignore></div> | ||
|
|
||
| <script> | ||
| class facilypay3xComponentHandler extends componentHandler { | ||
| constructor(paymentMethodCode, wire, elementLabel) { | ||
| super(paymentMethodCode, wire, elementLabel); | ||
| } | ||
|
|
||
| buildConfiguration(paymentMethod, paymentMethodsExtraInfo) { | ||
| let baseComponentConfiguration = super.buildConfiguration(paymentMethod, paymentMethodsExtraInfo); | ||
|
|
||
| let formattedShippingAddress = {}; | ||
| let formattedBillingAddress = {}; | ||
| let shopperDateOfBirth = ''; | ||
| let email = ''; | ||
|
|
||
| const shippingAddress = this.wire.get('shippingAddress'); | ||
| const billingAddress = this.wire.get('billingAddress'); | ||
| const quoteData = this.wire.get('quoteData'); | ||
| const customerData = this.wire.get('customerData'); | ||
|
|
||
|
|
||
| if (customerData) { | ||
| const parsedCustomerData = JSON.parse(customerData); | ||
| shopperDateOfBirth = parsedCustomerData.shopper_date_of_birth || ''; | ||
| email = parsedCustomerData.email || ''; | ||
| } | ||
|
|
||
| if (!email && quoteData) { | ||
| const parsedQuoteData = JSON.parse(quoteData); | ||
| email = parsedQuoteData.shopper_email || ''; | ||
| } | ||
|
|
||
| if (shippingAddress) { | ||
| formattedShippingAddress = this.getFormattedAddress(JSON.parse(shippingAddress)); | ||
| } | ||
|
|
||
| if (billingAddress) { | ||
| formattedBillingAddress = this.getFormattedAddress(JSON.parse(billingAddress)); | ||
| } | ||
|
|
||
| baseComponentConfiguration.data = {}; | ||
|
|
||
| if (formattedShippingAddress) { | ||
| baseComponentConfiguration.data.deliveryAddress = { | ||
| city: formattedShippingAddress.city, | ||
| country: formattedShippingAddress.country, | ||
| houseNumberOrName: formattedShippingAddress.houseNumber, | ||
| postalCode: formattedShippingAddress.postalCode, | ||
| street: formattedShippingAddress.street | ||
| }; | ||
| } | ||
|
|
||
| if (formattedBillingAddress) { | ||
| baseComponentConfiguration.data.personalDetails = { | ||
| firstName: formattedBillingAddress.firstName, | ||
| lastName: formattedBillingAddress.lastName, | ||
| telephoneNumber: formattedBillingAddress.telephone, | ||
| shopperEmail: email, | ||
| dateOfBirth: shopperDateOfBirth, | ||
| }; | ||
| baseComponentConfiguration.data.billingAddress = { | ||
| city: formattedBillingAddress.city, | ||
| country: formattedBillingAddress.country, | ||
| houseNumberOrName: formattedBillingAddress.houseNumber, | ||
| postalCode: formattedBillingAddress.postalCode, | ||
| street: formattedBillingAddress.street, | ||
| }; | ||
| } | ||
|
|
||
| return baseComponentConfiguration; | ||
| } | ||
| } | ||
|
|
||
| window.addEventListener('checkout:payment:method-list-boot', async (event) => { | ||
| unmountAdyenComponent(); | ||
| await init(event.detail.method); | ||
| }); | ||
|
|
||
| window.addEventListener('checkout:payment:method-activate', async (event) => { | ||
| await init(event.detail.method); | ||
| }); | ||
|
|
||
| window.addEventListener('checkout:init:evaluation', event => { | ||
| hyvaCheckout.evaluation.registerValidator('validate-adyen-component-state', (element, component) => { | ||
| let isValid; | ||
| if (!window.AdyenPaymentHandler.actionComponent.isValid) { | ||
| window.AdyenPaymentHandler.actionComponent.showValidation(); | ||
| isValid = false; | ||
| } else { | ||
| isValid = true; | ||
| } | ||
| return isValid; | ||
| }); | ||
| }); | ||
|
|
||
| async function init(methodCode) { | ||
| try { | ||
| let wire = Magewire.find('checkout.payment.methods.' + methodCode); | ||
|
|
||
| wire.refreshProperties() | ||
| .then(() => { | ||
| let methodHandler = new facilypay3xComponentHandler( | ||
| methodCode, | ||
| wire, | ||
| '<?= $magewire->getContainerName() ?>ActionContainer' | ||
| ); | ||
| window.AdyenPaymentHandler = methodHandler; | ||
| if (methodCode !== '<?= $magewire->getMethodCode() ?>') { | ||
| methodHandler.renderMethodUnavailableMessage(); | ||
| return; | ||
| } | ||
| if (wire.get('requiresShipping')) { | ||
| methodHandler.renderMessage('Please select shipping method.'); | ||
| } else { | ||
| let rawResponse = wire.get('paymentResponse'); | ||
| let paymentMethods = JSON.parse(rawResponse); | ||
| methodHandler.activatePaymentMethod(methodCode, paymentMethods, '<?= $magewire->getContainerName() ?>ActionContainer'); | ||
| showPrimaryButton(); | ||
| } | ||
| }).catch(() => { | ||
| console.error(`Error occurred during ${methodCode} component load`); | ||
| }); | ||
| } catch (e) { | ||
| console.error('Error in init function:', e); | ||
| } | ||
| } | ||
| </script> | ||
| </div> |