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.

Sign up for GitHub

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

Jump to bottom

MOL-1196: Tracking #607

Merged
merged 6 commits into from
Dec 4, 2023
Merged

MOL-1196: Tracking #607

merged 6 commits into from
Dec 4, 2023

Conversation

BlackScorp
Copy link
Collaborator

No description provided.

@BlackScorp BlackScorp requested a review from boxblinkracer July 31, 2023 06:43
boxblinkracer
boxblinkracer reviewed Nov 28, 2023
View reviewed changes
src/Service/TrackingInfoStructFactory.php Outdated
throw new \InvalidArgumentException('Missing Argument for Tracking Code!');
}

$trackingUrl = trim($trackingUrl . $trackingCode);
Copy link
Collaborator

Choose a reason for hiding this comment

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

this does not work, thats just a string concat
in sw5 there was a placeholder being allowed for specific values
so we need to figure out if its the same, or come up with something like {trackingCode}, and then this would need to replaced, a basic concat leads to an invalid url very likely

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

in SW6 there is trackingCode variable just in email, the URL itself does not have a tracking Code

https://docs.shopware.com/en/shopware-6-en/tutorials-and-faq/track-and-trace it seems like sw6 expects that the tracking code is at the end of the URL

Copy link
Collaborator

Choose a reason for hiding this comment

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

nope, the info icon says clearly its the placeholder %s

boxblinkracer
boxblinkracer reviewed Nov 28, 2023
View reviewed changes
tests/PHPUnit/Service/TrackingInfoStructFactoryTest.php Outdated
* @param string $trackingCode
* @return void
*/
public function testInvalidTrackingCodeCharacter(string $trackingCode):void{
Copy link
Collaborator

Choose a reason for hiding this comment

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

quite sure a lot of cases are missing in here, also positive ones
here is a list of possible test cases
https://github.com/mollie/Shopware/blob/master/Tests/PHPUnit/Components/Mollie/Shipping/MollieShippingTest.php

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

the positives ones are tested here

https://github.com/mollie/Shopware6/blob/8f63450b225e13541fed965e4b538104a33c6706/tests/PHPUnit/Facade/MollieShipment/SetShipmentTest.php

Copy link
Collaborator

Choose a reason for hiding this comment

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

i only see entity written tests or missing-xyz-tests but no positive ones

boxblinkracer
boxblinkracer reviewed Nov 28, 2023
View reviewed changes
src/Facade/MollieShipment.php
@@ -250,7 +261,7 @@ public function shipOrder(
$shipment = $this->mollieApiShipmentService->shipOrder(
$mollieOrderId,
$order->getSalesChannelId(),
$this->createTrackingInfoStruct($trackingCarrier, $trackingCode, $trackingUrl)
$this->trackingInfoStructFactory->create($trackingCarrier, $trackingCode, $trackingUrl)
Copy link
Collaborator

Choose a reason for hiding this comment

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

really wondering, this PR is about automating tracking in whatever shipping is being done.
so if we extract tracking from delivery in the constructor....then i would assume its used somewhere, but i only see function arguments being used here, and the calling instance doesnt seem to have changed which means its the old logic? so where is the auto-extracted data then used?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

the shipment facade is too big and too much things, the tests are too complicated, i wanted to extract some private methods into seperate services in order to write smaller tests. the factory is not used anywhere else but it makes the tests easier

Copy link
Collaborator

Choose a reason for hiding this comment

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

this doesnt really give an answer to the question
i think we should talk about it :)

boxblinkracer
boxblinkracer requested changes Nov 28, 2023
View reviewed changes
Copy link
Collaborator

@boxblinkracer boxblinkracer left a comment

Choose a reason for hiding this comment

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

comments

@BlackScorp BlackScorp force-pushed the users/vm/MOL-1196-tracking branch 2 times, most recently from 41a0b86 to 6757864 Compare December 4, 2023 13:21
@BlackScorp BlackScorp force-pushed the users/vm/MOL-1196-tracking branch from 6757864 to 19016e8 Compare December 4, 2023 13:48
@BlackScorp BlackScorp force-pushed the users/vm/MOL-1196-tracking branch from 19016e8 to c947525 Compare December 4, 2023 14:27
@boxblinkracer boxblinkracer merged commit f52ae30 into mollie:master Dec 4, 2023
19 checks passed
@BlackScorp BlackScorp deleted the users/vm/MOL-1196-tracking branch December 5, 2023 07:35
BlackScorp pushed a commit to BlackScorp/Shopware6 that referenced this pull request Feb 6, 2024
NTR: Squashed commit of the following:
8a76def 
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)
BlackScorp added a commit that referenced this pull request Oct 22, 2024
@BlackScorp @boxblinkracer
MOL-245: PPE (#705)
616c80a 
* MOL-245: Add PayPal Express

* NTR: Squashed commit of the following:

commit 95aa056
Author: Vitalij Mik <[email protected]>
Date:   Wed Jan 24 10:02:14 2024 +0100

    NTR: test newer shopware version (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#674)

commit 5511d15
Author: Christian <[email protected]>
Date:   Thu Dec 21 17:46:06 2023 +0100

    MOL-1225: add batch shipments to administration (#665)

commit 2bc7a18
Author: Vitalij Mik <[email protected]>
Date:   Wed Dec 20 12:13:35 2023 +0100

    MOL-1285: use stock manager config (#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 (#672)

commit c7622fa
Author: Christian <[email protected]>
Date:   Wed Dec 20 11:30:08 2023 +0100

    NTR: add missing oneClick payments to swagger docs (#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 (#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 (#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 (#663)

commit f52ae30
Author: Vitalij Mik <[email protected]>
Date:   Mon Dec 4 15:48:06 2023 +0100

    MOL-1196: Tracking (#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 (#660)

commit faa72b6
Author: Christian <[email protected]>
Date:   Wed Nov 29 09:38:00 2023 +0100

    MOL-1277: fix wrong syntax in OrderLifeTimeLimitDetectorService.js (#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 (#662)

* MOL-245: refactor code

* MOL-245: reuse addresses

* MOL-245: refactor buttons

* MOL-245: PPE

* MOL-245: refactor custom fields keys

* MOL-245: refactor custom fields

* MOL-245: refactor

* MOL-245: use quantity + fix 2nd attempt payment

* MOL-245: fix csrf

* MOL-245: fix customfields for first customer

* MOL-245: fix config

* MOL-245: add cypress ui tests

* MOL-245: setup a timer

* MOL-245: added release tag

* NTR: Squashed commit of the following:

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 #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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 (#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 #704 (#718)

    * NTR: Fix #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 (#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 (#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 (#716)

commit f06f96d
Author: Vitalij Mik <[email protected]>
Date:   Wed Feb 21 11:04:21 2024 +0100

    NTR: new sw version (#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 (#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 (#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 (#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 (#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 (#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 (#707)

    Co-authored-by: Vitalij Mik <[email protected]>

* NTR: update PPE

* NTR: fix guest account

* NTR: update composer

* NTR: fix ppe tests

* NTR: update

* NTR: Merge master into PPE

* NTR: Cs fix

* NTR: fix subscriber

* NTR: do not check paypal redirect, api key is not set in pipeline

* NTR: fixed config

* NTR: update mollie api to 2.73

* NTR: CS Fix

* NTR: Fix cypress

* NTR: switch to method Details

* NTR: add onfig over env

* NTR: fix tests

* NTR: fix tests

* NTR: added more logs in PPE

* NTR: fix settings

* NTR: use express buttons as class selector

* NTR: remove old klarna from tests

* NTR: Cs fix

* NTR: display privacy note checkbox

* NTR: refactored JS

* NTR: accepted data protection serverside check

* NTR: update backup cart

* NTR: Fix ppe cypress tests

* NTR: refactor apple pay

---------

Co-authored-by: Christian Dangl <[email protected]>
Co-authored-by: Vitalij Mik <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@boxblinkracer boxblinkracer Awaiting requested review from boxblinkracer

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@BlackScorp @boxblinkracer