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

[ECP-9225] Use Magento_Tax module to build open invoice line items #2651

Merged
merged 64 commits into from
Feb 18, 2025
Merged
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
202b339
deprecate tax calculation methods and rely on Magento_Weee module to …
RokPopov Jun 7, 2024
3852ec3
Merge branch 'main' into ECP-9225
RokPopov Jul 3, 2024
77d8c6b
fix unit tests
RokPopov Jul 4, 2024
07d8bdb
Merge branch 'main' into ECP-9225
RokPopov Jul 4, 2024
2f0447e
set magento_weee version
RokPopov Jul 5, 2024
0931f1e
fix open invoice unit tests
RokPopov Jul 5, 2024
395709e
add area code to magento installation script for CI/CD pipeline
RokPopov Jul 5, 2024
10c3ebe
fix code sniffer issue
RokPopov Jul 5, 2024
2285397
add verbose output to debug pipeline workflows
RokPopov Jul 5, 2024
d837f56
capture errors directly
RokPopov Jul 5, 2024
39425f8
add verbose output to plugin installation
RokPopov Jul 5, 2024
f2e7d34
debugging makefile
RokPopov Jul 5, 2024
27a2cdd
output stack trace directly
RokPopov Jul 5, 2024
151e76c
verbose output in setup:upgrade command
RokPopov Jul 5, 2024
c8d622b
debug makefile
RokPopov Jul 5, 2024
576051f
debug 2 makefile
RokPopov Jul 5, 2024
40cfa44
more verbose outputs
RokPopov Jul 5, 2024
2f1d264
run n98-magerun command as www-data user
RokPopov Jul 5, 2024
0b2c12e
debug 3
RokPopov Jul 5, 2024
5498b2d
debug 4
RokPopov Jul 5, 2024
6a9231f
debug 5
RokPopov Jul 5, 2024
f629ad7
debug 6
RokPopov Jul 5, 2024
2013f6f
debug 6
RokPopov Jul 5, 2024
ff84c91
add area code to EnablePaymentMethodsCommand
RokPopov Jul 9, 2024
d0a6b57
Merge branch 'main' into ECP-9225
RokPopov Jul 9, 2024
d3f3b9e
fix enable payment methods command tests
RokPopov Jul 9, 2024
a3574ca
set area when calling cli upgrade script
RokPopov Jul 9, 2024
12b96f8
try to fix area issue in ci/cd pipeline
RokPopov Jul 9, 2024
aeaec39
Merge branch 'main' into ECP-9225
RokPopov Jul 10, 2024
80c6557
CI/CD debugging
RokPopov Jul 10, 2024
ba31221
remove area code setup command from magento installation
RokPopov Jul 10, 2024
d40d756
add state to custom webhook processor command, fix unit test
RokPopov Jul 10, 2024
02f3ba7
debug pipeline
RokPopov Jul 10, 2024
94707a7
fix unit test
RokPopov Jul 10, 2024
509d182
debug functional tests
RokPopov Jul 10, 2024
ba3ffae
add custom console command to set the area code and include it before…
RokPopov Jul 10, 2024
4ef944f
replicate restapi workflow magento installation into mftf workflow
RokPopov Jul 11, 2024
4407b74
remove redundant console command class and change steps in mftf workf…
RokPopov Jul 11, 2024
98a0bc5
remove unused console command from di.xml
RokPopov Jul 11, 2024
1064653
change order of processes in mftf.yml
RokPopov Jul 11, 2024
c18aa54
flush the cache before running install
RokPopov Jul 11, 2024
a84e7f5
copy rest api tests into mftf tests to check if install step will fail
RokPopov Jul 11, 2024
2c75b48
remove mftf specific container to check the result of the workflow
RokPopov Jul 11, 2024
7a903c8
mirror restapi tests completely
RokPopov Jul 12, 2024
80cf3c5
execute on pull request on main
RokPopov Jul 12, 2024
4ebd605
add mftf container
RokPopov Jul 12, 2024
7a3aa70
enable mftf tests to run
RokPopov Jul 12, 2024
0b4c63e
temporarily comment out mftf part of the workflow
RokPopov Jul 12, 2024
835634e
enable mftf part again
RokPopov Jul 12, 2024
8a53218
Merge branch 'main' into ECP-9225
RokPopov Jul 12, 2024
f0689f3
Merge branch 'main' into ECP-9225
candemiralp Jan 8, 2025
417a3cb
[ECP-9225] Revert workflow related changes
Jan 8, 2025
66da533
[ECP-9225] Use Magento_Tax module instead of Magento_Weee
Jan 8, 2025
82d7c4f
[ECP-9225] Replace Weee module import
Jan 8, 2025
1ef5b68
[ECP-9225] Use factory to load Renderer class
Jan 8, 2025
48d37c9
[ECP-9225] Fix unit test
Jan 8, 2025
ce71f32
[ECP-9225] Fix unit test
Jan 8, 2025
68dd837
[ECP-9225] Remove unused variable
Jan 8, 2025
a6dd6ea
[ECP-9225] Fix unit tests
Jan 8, 2025
1627983
Merge branch 'main' into ECP-9225
candemiralp Jan 8, 2025
4904f41
Merge branch 'main' into ECP-9225
candemiralp Feb 11, 2025
3089f1f
Merge branch 'main' into ECP-9225
candemiralp Feb 14, 2025
dee95cb
Merge branch 'main' into ECP-9225
candemiralp Feb 17, 2025
9151334
Merge branch 'main' into ECP-9225
candemiralp Feb 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add custom console command to set the area code and include it before…
… setup:upgrade in the install part of yml
RokPopov committed Jul 10, 2024
commit ba3ffaef7cb96b9ca1967fb1c5dca64f1d09ceff
12 changes: 11 additions & 1 deletion .github/Makefile
Original file line number Diff line number Diff line change
@@ -17,7 +17,17 @@ install:
composer require "adyen/module-payment:*"
vendor/bin/phpcs --standard=Magento2 --extensions=php,phtml --error-severity=10 --ignore-annotations -n -p vendor/adyen/module-payment
bin/magento module:enable Adyen_Payment
bin/magento setup:upgrade -vvv
bin/magento setup:upgrade --verbose
bin/magento setup:di:compile

# Plugin install for mftf tests
install-mftf:
composer config --json repositories.local '{"type": "path", "url": "/data/extensions/workdir", "options": { "symlink": false } }'
composer require "adyen/module-payment:*"
vendor/bin/phpcs --standard=Magento2 --extensions=php,phtml --error-severity=10 --ignore-annotations -n -p vendor/adyen/module-payment
bin/magento module:enable Adyen_Payment
bin/magento adyen:setareacode:run
bin/magento setup:upgrade
bin/magento setup:di:compile

# Install developer module
2 changes: 1 addition & 1 deletion .github/workflows/mftf-test.yml
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ jobs:
run: docker exec magento2-container /etc/init.d/cron stop

- name: Install plugin
run: docker exec -u www-data magento2-container make install
run: docker exec -u www-data magento2-container make install-mftf

- name: Build MFTF project
run: docker exec magento2-container make setup-mftf
45 changes: 45 additions & 0 deletions Console/Command/SetAreaCodeCommand.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php

namespace Adyen\Payment\Console\Command;

use Magento\Framework\Console\Cli;
use Magento\Framework\App\State;
use Magento\Framework\App\Area;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

class SetAreaCodeCommand extends Command
{
private PaymentMethodsFactory $paymentMethodsFactory;
private State $appState;

public function __construct(
State $appState
)
{
$this->appState = $appState;
parent::__construct();
}

protected function configure(): void
{
$this->setName('adyen:setareacode:run');
parent::configure();
}

/**
* @throws \Exception
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
try {
$this->appState->setAreaCode(Area::AREA_GLOBAL);
$output->writeln("Area code set to 'global'");
return Cli::RETURN_SUCCESS;
} catch (\Magento\Framework\Exception\LocalizedException $e) {
$output->writeln("Area code was already set: {$e->getMessage()}");
return Cli::RETURN_FAILURE;
}
}
}
1 change: 1 addition & 0 deletions etc/di.xml
Original file line number Diff line number Diff line change
@@ -1667,6 +1667,7 @@
<argument name="commands" xsi:type="array">
<item name="adyen_webhookprocessorcommand" xsi:type="object">Adyen\Payment\Console\Command\WebhookProcessorCommand</item>
<item name="adyen_enablepaymentmethodscommand" xsi:type="object">Adyen\Payment\Console\Command\EnablePaymentMethodsCommand</item>
<item name="adyen_setareacodecommand" xsi:type="object">Adyen\Payment\Console\Command\SetAreaCodeCommand</item>
</argument>
</arguments>
</type>