Merge pull request #372 from OXID-eSales/b-7.0.x-PSPAYPAL-815-merge-6…

….3-plus-google-pay

B 7.0.x pspaypal 815 merge 6.3 plus google pay

.github/workflows/docker-publish.yml

@@ -67,14 +67,14 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934
+        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.gitignore

@@ -10,4 +10,5 @@ php-cs-fixer.phar
 /tests/Codeception/_support/_generated/
 /tests/.env
 /tests/report
-/resources/node_modules/
+/resources/node_modules/
+/resources/build/js/typescript-transpiled

CHANGELOG.md

@@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - use central logger like in v2 Branch
 - mark GiroPay as deprecated
 - [0007161](https://bugs.oxid-esales.com/view.php?id=7161): Removing payment method deactivation during module deactivation. Merchants must now do this themselves
+- add GooglePay payment method for oxid 7 version
 
 
 ## [3.3.4] - 2024-01-26
@@ -61,6 +62,78 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - first Version for OXID7 with APEX-Theme as Twig-Frontend-Standard-Theme, without Smarty-Support
 
+## [2.5.2] - 2024-??-??
+
+### FIX
+
+- Catch possible thrown Error by getting DataClientToken
+- [0007719](https://bugs.oxid-esales.com/view.php?id=7719): Tracking code also be stored in standard DB field for backwards compatibility
+
+## [2.5.1] - 2024-09-20
+
+### FIX
+
+- [0007161](https://bugs.oxid-esales.com/view.php?id=7161): Removing payment method deactivation during module deactivation. Merchants must now do this themselves
+- [0007584](https://bugs.oxid-esales.com/view.php?id=7584): Provide additional oxrights-elements for PayPal-Express, ApplePay and GooglePay-Buttons
+- [0007706](https://bugs.oxid-esales.com/view.php?id=7706): If Customer change the invoice-address on last page in checkout and use this address as deliveryaddress (checkbox invoiceaddress as deliveryaddress), then this changed address would be transferred to PayPal
+- [0007711](https://bugs.oxid-esales.com/view.php?id=7711): Temporary orders that are no longer needed and already have an order number will be cancelled. Temporary orders without an order number will still be deleted
+- [0007713](https://bugs.oxid-esales.com/view.php?id=7713): Correct SQL for select temporary Orders
+- provide correct encoded Shopname to PayPal
+- Fix order of closing brackets in applepay-template
+- Temporary orders that are no longer needed and already have an order number will be cancelled. Temporary orders without an order number will still be deleted
+- Provide BN codes even to previously overlooked API calls
+- Fix PHP7.3 Compatibility-Issues (remove functionalities that comes with later PHP-Versions)
+
+## [2.5.0] - 2024-08-16
+
+### FIX
+
+- Fix admin block parent call, thanks to Alpha-Sys
+- Fix Errorlog-Message "Duplicate entry ..." + fix Update send PUI-Bankdata via Webhook
+- Fix PayPalExpress Reauth is necessary if the cart amount (total is greater than before) has changed during the checkout process
+- Fix, don't show vaulting-Boxes if it is deactivated in Backend
+- [0007656](https://bugs.oxid-esales.com/view.php?id=7656): Fix incompatibility with Klarna-Module
+- better Vaulting-Check in PaymentController
+- disable Vaulting-Setting if Vaulting not possible
+- [0007666](https://bugs.oxid-esales.com/view.php?id=7666): Fix: Price surcharges on the detail page for selection lists are not taken into account
+- disable Vaulting-Option of Creditcard if Creditcard are not eligible
+- Automatically save Apple Pay certificates during the Apple Pay eligibility check
+- [0007681](https://bugs.oxid-esales.com/view.php?id=7681): fix OXID Logger.ERROR: Call to a member function getFieldData() on bool
+- [0007675](https://bugs.oxid-esales.com/view.php?id=7675): fix the possibility to finish order without redirect and login to Paypal
+- [0007676](https://bugs.oxid-esales.com/view.php?id=7676): If we have a corrupted generated_services.yaml and try to deactivate the module via the admin, we will display a more understandable error message about what happened.
+- introduce ActionHash to make the PayPal-Request-ID more unique
+- [0007695](https://bugs.oxid-esales.com/view.php?id=7695): Fix: if DeliverySet is set in Frontend, then do not add any PseudoDeliveryCosts for PPExpress
+
+### NEW
+- PayPal-Request-Id based on serialized body, no extra PayPal-Request-Id necessary anymore
+- Introduce GooglePay-Payment
+- Introduce ApplePay-Payment
+- use PayPal-Client v2.0.15
+- add Default-Shippingcosts for PP-Express to prevent overcharge.
+- mark GiroPay as deprecated
+
+## [2.4.0] - 2024-04-04
+
+### FIX
+- [0007588](https://bugs.oxid-esales.com/view.php?id=7588): Improve Error handling for Capture Order Requests (thanks to mount7)
+- remove Sofort and MyBank, Paymentmethods will soon no longer be accepted via PayPal
+- fix: Refund only with note to Buyer (required)
+- [0007595](https://bugs.oxid-esales.com/view.php?id=7595): : Fix PayPal Checkout substract discount from coupon series again, if 'Show net prices in frontend (B2B)' is active
+- use PayPal-Request-Id for every api-call
+- use PayPal-Client v2.0.12
+
+### NEW
+- PayPal Vaulting https://developer.paypal.com/braintree/docs/guides/paypal/checkout-with-vault/
+
+## [2.3.4] - 2024-01-26
+
+- Transfer OXID-Ordernumber to PayPal
+- PayPal-Log consider Shop-ErrorLogLevel
+- Composer-Installation now via packagist.
+  - https://packagist.org/packages/oxid-solution-catalysts/paypal-module
+  - https://packagist.org/packages/oxid-solution-catalysts/paypal-client
+-  "Repositories"-requirement for Source https://paypal-module.packages.oxid-esales.com/ not need anymore
+
 ## [2.3.3] - 2023-11-16
 
 - [0007549](https://bugs.oxid-esales.com/view.php?id=7549): Optional field in shop admin -> refund "Note to buyer" is transmitted to PayPal

LATEST_CLIENT_TAG

@@ -1 +1 @@
-v1.0.9
+v2.0.16

README.md

@@ -5,10 +5,10 @@ PayPal checkout integration for OXID eShop 6.1 and above.
 ## Documentation
 
 * Official [German PayPal Checkout for OXID 6.1 to 6.2 documentation](https://docs.oxid-esales.com/modules/paypal-checkout/de/1.2/)
-* Official [German PayPal Checkout for OXID 6.3 to 6.5 documentation](https://docs.oxid-esales.com/modules/paypal-checkout/de/2.4/)
+* Official [German PayPal Checkout for OXID 6.3 to 6.5 documentation](https://docs.oxid-esales.com/modules/paypal-checkout/de/2.5/)
 * Official [German PayPal Checkout for OXID from 7.0 documentation](https://docs.oxid-esales.com/modules/paypal-checkout/de/3.3/)
 * Official [English PayPal Checkout for OXID 6.1 to 6.2 documentation](https://docs.oxid-esales.com/modules/paypal-checkout/en/1.2/)
-* Official [English PayPal Checkout for OXID 6.3 to 6.5 documentation](https://docs.oxid-esales.com/modules/paypal-checkout/en/2.4/)
+* Official [English PayPal Checkout for OXID 6.3 to 6.5 documentation](https://docs.oxid-esales.com/modules/paypal-checkout/en/2.5/)
 * Official [English PayPal Checkout for OXID from 7.0 documentation](https://docs.oxid-esales.com/modules/paypal-checkout/en/3.3/)
 
 
@@ -71,4 +71,4 @@ Running codeception tests example with specific host/browser/testgroup:
 in OXID 6.3 and above:
 ```
 SELENIUM_SERVER_HOST=seleniumchrome BROWSER_NAME=chrome vendor/bin/runtests-codeception --group=examplegroup
-```
+```

assets/css/paypal.css

@@ -1,15 +1 @@
-.paypal-button-or {
-  padding: 10px; }
-
-.paypal-button-wrapper {
-  width: 100%; }
-  .paypal-button-wrapper.large {
-    max-width: 250px; }
-  .paypal-button-wrapper.small {
-    max-height: 200px; }
-#paypal-installment-banner-container>SPAN {
-  margin: 0 auto;
-}
-.paypal-sepa-option-info {
-  margin-top: 10px;
-}
+.google-pay-loading-container{float:right;margin-right:calc(50%)}#oscpaypal_googlepay{float:right}

composer.json

@@ -32,11 +32,11 @@
         "codeception/module-phpbrowser": "^3.0.0",
         "codeception/module-db": "^3.0.0",
         "squizlabs/php_codesniffer": "3.*",
-        "phpmd/phpmd": "^2.11",
         "symfony/dotenv": "^5.1",
         "oxid-esales/oxideshop-ce": "dev-b-7.0.x",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9.1.1"
+        "phpunit/phpunit": "^9.1.1",
+        "phpmd/phpmd": "^2.15"
     },
     "conflicts": {
         "oxid-esales/oxideshop-ce": "<7.0"
@@ -57,7 +57,7 @@
         "phpstan-generate-baseline": "phpstan -ctests/PhpStan/phpstan.neon analyse src/ --generate-baseline tests/PhpStan/phpstan-baseline.neon",
         "phpstan-report": "phpstan -ctests/PhpStan/phpstan.neon analyse src/ --error-format=json > tests/reports/phpstan.report.json",
 
-        "phpmd": "phpmd src ansi tests/PhpMd/standard.xml --baseline tests/PhpMd/phpmd.baseline.xml",
+        "phpmd": "phpmd src ansi tests/PhpMd/standard.xml --baseline-file tests/PhpMd/phpmd.baseline.xml",
         "phpmd-generate-baseline": "phpmd src ansi tests/PhpMd/standard.xml --generate-baseline",
         "phpmd-report": "phpmd src json tests/PhpMd/standard.xml --reportfile tests/reports/phpmd.report.json --baseline tests/PhpMd/phpmd.baseline.xml",