-
Notifications
You must be signed in to change notification settings - Fork 53
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
MOL-245: PPE #705
Merged
Merged
MOL-245: PPE #705
Conversation
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
commit 95aa056 Author: Vitalij Mik <[email protected]> Date: Wed Jan 24 10:02:14 2024 +0100 NTR: test newer shopware version (mollie#696) Co-authored-by: Vitalij Mik <[email protected]> commit aab2afc Author: Vitalij Mik <[email protected]> Date: Wed Jan 24 10:01:22 2024 +0100 NTR: change sw version release (mollie#697) Co-authored-by: Vitalij Mik <[email protected]> commit 2cee88b Author: Vitalij Mik <[email protected]> Date: Fri Jan 19 13:15:08 2024 +0100 NTR: prepare hotfix 4.4.1 (mollie#694) Co-authored-by: Vitalij Mik <[email protected]> commit 549addb Author: Vitalij Mik <[email protected]> Date: Thu Jan 18 13:47:44 2024 +0100 NTR: change min sw release version (mollie#693) Co-authored-by: Vitalij Mik <[email protected]> commit 01f09cf Author: Vitalij Mik <[email protected]> Date: Thu Jan 18 13:37:00 2024 +0100 NTR: Fix release version for production composer.json (mollie#692) Co-authored-by: Vitalij Mik <[email protected]> commit 4c75daf Author: Vitalij Mik <[email protected]> Date: Thu Jan 18 12:40:44 2024 +0100 NTR: new plugin version (mollie#691) * NTR: new plugin version * NTR: Composer update * NTR: update composer --------- Co-authored-by: Vitalij Mik <[email protected]> commit 08f42c5 Author: Vitalij Mik <[email protected]> Date: Thu Jan 18 10:46:31 2024 +0100 NTR: revert shopware version (mollie#690) Co-authored-by: Vitalij Mik <[email protected]> commit a341cf1 Author: Vitalij Mik <[email protected]> Date: Thu Jan 18 09:12:28 2024 +0100 NTR: update shopware version (mollie#689) Co-authored-by: Vitalij Mik <[email protected]> commit fd8746e Author: Vitalij Mik <[email protected]> Date: Wed Jan 17 16:13:37 2024 +0100 NTR: Fix saved credit card payment (mollie#688) Co-authored-by: Vitalij Mik <[email protected]> commit de772ee Author: Vitalij Mik <[email protected]> Date: Wed Jan 17 08:52:26 2024 +0100 NTR: Update shopware version to 6.5.7.4 (mollie#687) Co-authored-by: Vitalij Mik <[email protected]> commit 5d763dd Author: Vitalij Mik <[email protected]> Date: Tue Jan 16 15:24:22 2024 +0100 MOL-1196: add shipping method for tracking url (mollie#686) Co-authored-by: Vitalij Mik <[email protected]> commit 1900474 Author: Vitalij Mik <[email protected]> Date: Tue Jan 16 11:21:25 2024 +0100 MOL-1196: fix automatic shipping and add error logs (mollie#685) * MOL-1196: fix automatic shipping and add error logs * MOL-1196: remove comment --------- Co-authored-by: Vitalij Mik <[email protected]> commit 32b0be3 Author: Vitalij Mik <[email protected]> Date: Mon Jan 15 13:46:33 2024 +0100 MOL-1280: Fix retry route and add cypress tests (mollie#683) * MOL-1280: Fix retry route and add cypress tests * MOL-1280: Update cypress ID * MOL-1280: cleanup cypress test --------- Co-authored-by: Vitalij Mik <[email protected]> commit 9de44f9 Author: Vitalij Mik <[email protected]> Date: Mon Jan 15 08:59:14 2024 +0100 NTR: PISHPS-204: store bank data in order custom fields (mollie#664) Co-authored-by: Vitalij Mik <[email protected]> commit cbcc33c Author: Vitalij Mik <[email protected]> Date: Fri Jan 12 13:54:42 2024 +0100 MOL-1280: Fix subscription metadata after retry (mollie#682) Co-authored-by: Vitalij Mik <[email protected]> commit 48281db Author: Vitalij Mik <[email protected]> Date: Thu Jan 11 15:21:13 2024 +0100 MOL-1255: Fix cypress tests (mollie#681) Co-authored-by: Vitalij Mik <[email protected]> commit 04c71da Author: Vitalij Mik <[email protected]> Date: Thu Jan 11 09:50:58 2024 +0100 MOL-1287: Fix custom fields for payment methods (mollie#680) Co-authored-by: Vitalij Mik <[email protected]> commit 1491af3 Author: Vitalij Mik <[email protected]> Date: Wed Jan 10 10:35:50 2024 +0100 MOL-1287: do not overwrite exisisting technical name (mollie#678) * MOL-1287: do not overwrite exisisting technical name * MOL-1287: technical name in 6.5.7 * MOL-1287: cs and stan fix --------- Co-authored-by: Vitalij Mik <[email protected]> commit 37d176b Author: Vitalij Mik <[email protected]> Date: Tue Jan 9 11:49:11 2024 +0100 MOL-1294: force label to be empty string on null (mollie#677) * MOL-1294: force label to be empty string on null * MOL-1294: update test --------- Co-authored-by: Vitalij Mik <[email protected]> commit f411812 Author: Christian <[email protected]> Date: Fri Jan 5 10:13:43 2024 +0100 MOL-1287: add technical name to payment methods (mollie#675) commit 250a3d3 Author: Christian <[email protected]> Date: Fri Dec 22 12:34:53 2023 +0100 MOL-1206: create plugin config for log file retention days (mollie#674) commit 5511d15 Author: Christian <[email protected]> Date: Thu Dec 21 17:46:06 2023 +0100 MOL-1225: add batch shipments to administration (mollie#665) commit 2bc7a18 Author: Vitalij Mik <[email protected]> Date: Wed Dec 20 12:13:35 2023 +0100 MOL-1285: use stock manager config (mollie#669) Co-authored-by: Vitalij Mik <[email protected]> commit 8b464a8 Author: Christian <[email protected]> Date: Wed Dec 20 11:34:20 2023 +0100 NTR: add one click payments to headless config (mollie#672) commit c7622fa Author: Christian <[email protected]> Date: Wed Dec 20 11:30:08 2023 +0100 NTR: add missing oneClick payments to swagger docs (mollie#671) commit bb26750 Author: Christian Dangl <[email protected]> Date: Thu Dec 14 17:17:15 2023 +0100 NTR: allow shopware-cli downgrades commit 0a614b2 Author: Christian Dangl <[email protected]> Date: Thu Dec 14 17:08:20 2023 +0100 NTR: fix problem in automated shopware-cli installer commit 3906e26 Author: Vitalij Mik <[email protected]> Date: Thu Dec 14 16:35:44 2023 +0100 NTR: Set fixed version of shopware cli (mollie#668) Co-authored-by: Vitalij Mik <[email protected]> commit 22a6e8a Author: Vitalij Mik <[email protected]> Date: Thu Dec 14 09:35:57 2023 +0100 NTR: Fix make run (mollie#666) * NTR: Fix make run * NTR: Fix build * NTR: update --------- Co-authored-by: Vitalij Mik <[email protected]> commit ab42644 Author: Christian <[email protected]> Date: Mon Dec 4 15:48:29 2023 +0100 MOL-1260: use technical state machine name for log entry on reopen (mollie#663) commit f52ae30 Author: Vitalij Mik <[email protected]> Date: Mon Dec 4 15:48:06 2023 +0100 MOL-1196: Tracking (mollie#607) * MOL-1196: Tracking * MOL-1196: fix pipeline * MOL-1196: extract to factory * MOL-1196: check tracking code lenght * MOL-1196: update comment --------- Co-authored-by: Vitalij Mik <[email protected]> commit c08c340 Author: Christian Dangl <[email protected]> Date: Fri Dec 1 10:50:31 2023 +0100 NTR: fix typo in plugin config commit cc97b68 Author: Christian Dangl <[email protected]> Date: Fri Dec 1 09:45:49 2023 +0100 NTR: add Shopware 6.5.7.3 to pipeline commit 54836bb Author: Christian <[email protected]> Date: Wed Nov 29 09:38:20 2023 +0100 MOL-1276: add store api config route for frontend components (mollie#660) commit faa72b6 Author: Christian <[email protected]> Date: Wed Nov 29 09:38:00 2023 +0100 MOL-1277: fix wrong syntax in OrderLifeTimeLimitDetectorService.js (mollie#661) commit a420fa7 Author: Christian <[email protected]> Date: Wed Nov 29 09:37:47 2023 +0100 MOL-1278: fix ideal issuer reset leads to wrong url (mollie#662)
# Conflicts: # .github/actions/build-plugin/action.yml # .github/workflows/ci_pipe.yml # .github/workflows/nightly_pipe.yml # .github/workflows/pr_pipe.yml # makefile # src/Resources/config/config.xml
commit 4b0471e Author: Vitalij Mik <[email protected]> Date: Tue Apr 23 13:36:38 2024 +0200 NTR: fix tests commit 23341f7 Author: Vitalij Mik <[email protected]> Date: Tue Apr 23 11:49:29 2024 +0200 NTR: drop shopware 6.4.0.0 commit 05d4ce6 Author: Vitalij Mik <[email protected]> Date: Tue Apr 23 09:18:33 2024 +0200 NTR: fix exception commit a8427fe Author: Vitalij Mik <[email protected]> Date: Tue Apr 23 09:04:14 2024 +0200 NTR: update waiting timer commit 1c32404 Author: Vitalij Mik <[email protected]> Date: Mon Apr 22 15:28:39 2024 +0200 NTR: fix mollie#733 commit e4c8022 Author: Vitalij Mik <[email protected]> Date: Mon Apr 22 15:12:33 2024 +0200 NTR: fix subscription symbol commit 24dda2b Author: Vitalij Mik <[email protected]> Date: Mon Apr 22 14:44:30 2024 +0200 NTR: fix shipment cypress commit 4295f71 Author: Vitalij Mik <[email protected]> Date: Mon Apr 22 14:25:40 2024 +0200 NTR: fix shipment in 6.4 commit 24c33d0 Author: Vitalij Mik <[email protected]> Date: Mon Apr 22 14:10:11 2024 +0200 NTR: fix stan commit e1359f6 Author: Vitalij Mik <[email protected]> Date: Mon Apr 22 13:54:29 2024 +0200 NTR: fix checkout for 6.4 commit e0d6e80 Author: Vitalij Mik <[email protected]> Date: Mon Apr 22 11:37:18 2024 +0200 NTR: fix refund cypress tests commit a641bdd Author: Vitalij Mik <[email protected]> Date: Tue Apr 16 16:06:27 2024 +0200 NTR: revert dependencies commit c891cd9 Author: Vitalij Mik <[email protected]> Date: Tue Apr 16 15:34:59 2024 +0200 NTR: change dependencies commit 23c3cb8 Author: Vitalij Mik <[email protected]> Date: Tue Apr 16 14:50:43 2024 +0200 NTR: update composer depdencies commit 675d137 Author: Vitalij Mik <[email protected]> Date: Tue Apr 16 13:54:15 2024 +0200 NTR: updates for 6.6 (mollie#721) * NTR: set routing to xml * NTR: update routes * NTR: delete 6.5 specific controller * NTR: cleanup * NTR: fallback einbauen * NTR: fix routing for 6.5 * NTR: revert fixtures * NTR: fix routes scopes * NTR: fix routescope * NTR: phpstan fix * NTR: fix some tests for 6.6 * NTR: fix twig and exceptions * NTR: fix stan * NTR: fix smart contact form * NTR: fix phpstan errors * NTR: fix smart contact form * NTR: revert cart service * NTR: Csfix * NTR: add 6.6 to pipline * NTR: fix cart service * NTR: csfixer * NTR: fix add product * NTR: fix controller * NTR: admin updates * NTR: Update linter * NTR: fix refund manager * NTR: delete route annotations * NTR: add 6.6 to pipeline * NTR: fix subscription * NTR: csfix * NTR: fix mgration for sw 6.4 * NTR: update new sw version in pipeline checks * NTR: test apple pay buttons * NTR: bumb sw version * NTR: update php version * NTR: fix preview * NTR: eslint fix * NTR: eslint * NTR: eslint --------- Co-authored-by: Vitalij Mik <[email protected]> commit 4b1986b Author: Thilo <[email protected]> Date: Tue Apr 16 13:02:41 2024 +0200 Mol 1299/refund tax at net orders (mollie#734) * MOL-1299: Refund Tax at Net Orders * MOL-1299: Correct VAT Promotion Calculation --------- Co-authored-by: Thilo Lindner <[email protected]> commit c29bf21 Author: Vitalij Mik <[email protected]> Date: Tue Apr 16 10:14:32 2024 +0200 NTR: revert commit 2e8c35a Author: Vitalij Mik <[email protected]> Date: Tue Apr 16 10:06:53 2024 +0200 NTR: update php version commit 8fc3a2b Author: Vitalij Mik <[email protected]> Date: Tue Apr 16 08:58:55 2024 +0200 NTR: test new sw version commit ff38ec9 Author: Vitalij Mik <[email protected]> Date: Tue Mar 26 09:22:27 2024 +0100 NTR: set shopware version constraint commit 5966422 Author: Vitalij Mik <[email protected]> Date: Mon Mar 25 16:08:44 2024 +0100 NTR: Revert storeapi key commit 10d2ded Author: Vitalij Mik <[email protected]> Date: Mon Mar 25 11:34:27 2024 +0100 NTR: prepare 4..6.0 release (mollie#732) Co-authored-by: Vitalij Mik <[email protected]> commit 584f234 Author: Vitalij Mik <[email protected]> Date: Fri Mar 22 13:56:28 2024 +0100 PISHPS-243: create guest account over route (mollie#730) * NTR: PISHPS-243: create guest account over route * NTR: CSfixer * NTR: fix 6.4.20.2 --------- Co-authored-by: Vitalij Mik <[email protected]> commit c2fdc22 Author: Vitalij Mik <[email protected]> Date: Fri Mar 22 09:05:19 2024 +0100 PISHPS-263: allow set apple pay as default payment method (mollie#728) * NTR: PISHPS-263: allow set apple pay as default payment method * NTR: delete cypress tests for account --------- Co-authored-by: Vitalij Mik <[email protected]> commit edbe0dd Author: Vitalij Mik <[email protected]> Date: Thu Mar 21 13:17:48 2024 +0100 NTR: PISHPS-264: use SW logic for shipping methods in Apple Pay (mollie#731) Co-authored-by: Vitalij Mik <[email protected]> commit c13df34 Author: Vitalij Mik <[email protected]> Date: Thu Mar 21 13:17:13 2024 +0100 NTR: PISHPS-247: Klarna One payment (mollie#727) Co-authored-by: Vitalij Mik <[email protected]> commit 1734730 Author: Vitalij Mik <[email protected]> Date: Wed Mar 20 08:24:42 2024 +0100 NTR: fix payment in order edit (mollie#729) Co-authored-by: Vitalij Mik <[email protected]> commit 1903129 Author: Vitalij Mik <[email protected]> Date: Tue Mar 19 08:33:14 2024 +0100 NTR: add the default system language (mollie#726) Co-authored-by: Vitalij Mik <[email protected]> commit 77be51e Author: Vitalij Mik <[email protected]> Date: Tue Mar 19 08:32:52 2024 +0100 NTR: PISHPS-256: rebranding ideal (mollie#725) Co-authored-by: Vitalij Mik <[email protected]> commit 70fe37e Author: Vitalij Mik <[email protected]> Date: Mon Mar 18 15:17:08 2024 +0100 NTR: update mollie lbirary (mollie#723) Co-authored-by: Vitalij Mik <[email protected]> commit 7a18c81 Author: Vitalij Mik <[email protected]> Date: Thu Mar 7 15:25:11 2024 +0100 NTR: test SW 6.5.8.7 (mollie#720) Co-authored-by: Vitalij Mik <[email protected]> commit cfb4830 Author: Vitalij Mik <[email protected]> Date: Thu Feb 29 14:44:18 2024 +0100 NTR: Fix mollie#704 (mollie#718) * NTR: Fix mollie#704 * NTR: check subscription with custom routes * NTR: fix translation problem --------- Co-authored-by: Vitalij Mik <[email protected]> commit 89dd84e Author: Aleksej Wert <[email protected]> Date: Thu Feb 29 14:32:17 2024 +0100 NTR: show mollie payment js if needed (mollie#712) * NTR: show mollie payment js if needed * NTR: added comments * NTR: Fixes commit b2eff45 Author: Vitalij Mik <[email protected]> Date: Wed Feb 28 07:59:35 2024 +0100 NTR: search for active payment methods only (mollie#717) Co-authored-by: Vitalij Mik <[email protected]> commit a13da65 Author: Florian Bender <[email protected]> Date: Tue Feb 27 13:43:33 2024 +0100 NTR: Check for `OrderAware` interface (mollie#716) commit f06f96d Author: Vitalij Mik <[email protected]> Date: Wed Feb 21 11:04:21 2024 +0100 NTR: new sw version (mollie#713) Co-authored-by: Vitalij Mik <[email protected]> commit e584842 Author: Vitalij Mik <[email protected]> Date: Mon Feb 19 10:56:56 2024 +0100 NTR: new release 4.5.0 (mollie#710) Co-authored-by: Vitalij Mik <[email protected]> commit bf0055d Author: Vitalij Mik <[email protected]> Date: Fri Feb 16 13:39:31 2024 +0100 NTR: add testreail id to blik (mollie#709) Co-authored-by: Vitalij Mik <[email protected]> commit 20538c4 Author: Vitalij Mik <[email protected]> Date: Fri Feb 16 12:34:41 2024 +0100 MOL-1297: Fix payment method cache in production (mollie#706) * MOL-1297: Fix payment method cache in production * MOL-1297: refactor * MOL-1297: codestyle fix --------- Co-authored-by: Vitalij Mik <[email protected]> commit 4ecd79d Author: Vitalij Mik <[email protected]> Date: Fri Feb 16 12:34:28 2024 +0100 NTR: PISHPS-242: do not call save twice (mollie#708) * NTR: PISHPS-242: do not call save twice * NTR: PISHPS-242: fix refund manager in 6.5 --------- Co-authored-by: Vitalij Mik <[email protected]> commit 6189790 Author: Uwe Thiess <[email protected]> Date: Fri Feb 16 11:28:55 2024 +0100 Update register.html.twig (mollie#700) Insert hidden field to let shopware know we want to create an account. commit 1c582fa Author: Vitalij Mik <[email protected]> Date: Thu Feb 15 13:13:50 2024 +0100 NTR: test new shopware version (mollie#707) Co-authored-by: Vitalij Mik <[email protected]>
# Conflicts: # composer.lock # src/Components/ApplePayDirect/ApplePayDirect.php # src/Resources/config/services/subscriber.xml # src/Resources/views/storefront/base.html.twig # src/Service/CustomerService.php # src/Service/CustomerServiceInterface.php # tests/PHPUnit/Fakes/FakeCustomerService.php # vendor_manual/mollie/mollie-api-php/src/MollieApiClient.php
# Conflicts: # src/Resources/views/storefront/base.html.twig
# Conflicts: # composer.lock # src/Resources/app/storefront/src/register.js # src/Resources/app/storefront/src/scss/base.scss # src/Service/PaymentMethodService.php # src/Struct/Order/OrderAttributes.php # tests/PHPUnit/Service/PaymentMethodServiceTest.php
# Conflicts: # makefile # src/Components/ApplePayDirect/ApplePayDirect.php # src/Handler/Method/iDealPayment.php # src/Resources/config/config.xml # src/Resources/config/services/subscriber.xml # src/Service/CustomFieldService.php # src/Service/CustomerService.php # src/Service/CustomerServiceInterface.php # src/Service/Order/UpdateOrderLineItems.php # src/Service/PaymentMethodService.php # src/Setting/MollieSettingStruct.php # src/Subscriber/CheckoutConfirmPageSubscriber.php # tests/PHPUnit/Fakes/FakeCustomerService.php # tests/PHPUnit/Service/PaymentMethodServiceTest.php
# Conflicts: # src/Repository/CustomerAddress/CustomerAddressRepository.php # src/Repository/CustomerAddress/CustomerAddressRepositoryInterface.php # src/Service/CartService.php # src/Setting/MollieSettingStruct.php
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.