Skip to content

PISHPS-450: 6.7 update #989

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

Merged
merged 53 commits into from
May 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
1345ae8
PISHPS-450: Fix files for SW 6.7
Mar 26, 2025
9a55dbc
NTR: update file permissions to 0644
Mar 26, 2025
69e7f3d
PISHPS-450: add rc1 to pipelien
Mar 26, 2025
db696e6
PISHPS-450: fix tests
Mar 26, 2025
daf5f58
NTR: pipeline fix
Mar 26, 2025
e92b173
NTR: fix dal:validate
Mar 26, 2025
df1ceab
NTR: fix pipelines
Mar 26, 2025
a23ee71
NTR: fix migration
Mar 26, 2025
ee4d307
NTR: add compatiblity to 6.4
Mar 26, 2025
ad5e789
NTR: added custom transaction
Mar 26, 2025
43b704d
NTR: fix cypress tests
Mar 27, 2025
02513de
NTR: fix admin actions for 6.7
Mar 27, 2025
6359da7
NTR: fix some subscription configs
Mar 27, 2025
b0c98a8
NTR: fix methods test
Mar 27, 2025
1951b46
NTR: fix cypress ppe
Mar 27, 2025
d2c5a5d
NTR: fix migration for 6.4
Mar 27, 2025
aaa8db6
NTR: fix migration
Mar 27, 2025
30109a6
NTR: try to fix segementation faul in 6.4
Mar 27, 2025
14d62fa
NTR: pipeline fix
Mar 27, 2025
ded0a56
NTR: fix
Mar 27, 2025
9c8d05b
NTR: csfix
Mar 27, 2025
f74abe0
NTR: fix build
Mar 28, 2025
613295f
NTR: fix dependencies
Mar 28, 2025
a6aa94b
NTR: fix objects
Mar 28, 2025
6bf1de4
NTR: fix error
Mar 28, 2025
2a764c7
NTR: fix cypress tests
Mar 28, 2025
674bc85
NTR: use import instead of require
Mar 28, 2025
66b6ee2
NTR: fix version compare
Mar 28, 2025
55067ec
NTR: fix version compare tests
Mar 28, 2025
006e04b
NTR: test admin
Mar 28, 2025
2a8ae01
NTR: remove sw version
Mar 28, 2025
2822314
NTR: pipeline
Mar 28, 2025
1fc9321
NTR: fix vouchers
Mar 28, 2025
97176e4
NTR: exclude credit card components for now
Mar 28, 2025
145a692
NTR: Merge branch 'master' into users/vm/PISHPS-450-6.7-update
Apr 15, 2025
1c88e86
NTR: fixing shipment
Apr 15, 2025
167208e
NTR: fix build process
Apr 15, 2025
b4bc9a1
NTR: Merge branch 'master' into users/vm/PISHPS-450-6.7-update
Apr 15, 2025
a40aa58
NTR: fix refund manager
Apr 16, 2025
940c660
NTR: fix subscirptions
Apr 16, 2025
31c15bb
NTR: fix sippet file (#1004)
BlackScorp Apr 16, 2025
34f1191
NTR: fix voucher tests
Apr 16, 2025
75474b3
NTR: fix paypal
Apr 16, 2025
7137ad3
NTR: fix shipment
Apr 16, 2025
3c10a65
NTR: fix submit
Apr 16, 2025
f7d3066
NTR: prettier fix
Apr 16, 2025
63b1f80
NTR: fix stockmanager
Apr 17, 2025
8cbaa01
NTR: fix segmentation fault in 6.4
Apr 17, 2025
af948e3
NTR: fix services
Apr 17, 2025
4c79984
NTR: fix bancomat pay
May 6, 2025
a068b9b
NTR: pipline fix
May 6, 2025
ab62e74
NTR: fix older sw version
May 8, 2025
81c29ae
NTR: pipeline fix
May 8, 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
6 changes: 5 additions & 1 deletion .github/actions/build-plugin/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ runs:
docker exec shop bash -c 'sudo chown www-data:www-data /var/www/html/custom/plugins -R'

# --------------------------------------------------------------------------------------------------------------------------------------

- name: Fix apt-get repo
shell: bash
run: |
docker exec -u root shop bash -c 'apt-get update --allow-releaseinfo-change'

- name: Install Plugin
shell: bash
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci_pipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ jobs:
fail-fast: false
matrix:
include:
- shopware: '6.7.0.0-rc3'
php: '8.3'
- shopware: '6.6.10.3'
php: '8.3'
- shopware: '6.6.9.0'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/nightly_pipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ jobs:
fail-fast: false
matrix:
include:
- shopware: '6.7.0.0-rc3'
php: '8.3'
- shopware: '6.6.10.3'
php: '8.3'
- shopware: '6.6.9.0'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr_pipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ jobs:
fail-fast: false
matrix:
include:
- shopware: '6.7.0.0-rc3'
php: '8.3'
- shopware: '6.6.10.3'
php: '8.2'
- shopware: '6.5.8.12'
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
### Added
- Added Compatibility with Shopware 6.7
- Added Norwegian language support
- Added Swedish language support
- Added Polish language support
Expand Down
1 change: 1 addition & 0 deletions config/.phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
- ./../src
excludePaths:
- ./../src/Resources/*
- ./../src/Migration/*
- ./../src/Compatibility/Bundles/FlowBuilder/Events/*
# legacy code that is not working with abstract/interface changes
- ./../src/Service/Mail/MailService63.php
Expand Down
13 changes: 7 additions & 6 deletions makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
#
# Makefile
#

.PHONY: help
.DEFAULT_GOAL := help

PLUGIN_VERSION=`php -r 'echo json_decode(file_get_contents("MolliePayments/composer.json"))->version;'`
PLUGIN_VERSION = $(shell php -r 'echo json_decode(file_get_contents("composer.json"))->version;')

NODE_VERSION:=$(shell node -v)
SW_VERSION := 6.4.5.0
# split by dot and use 2nd word and append it to "6."
SW_MAJVER:=6.$(word 2, $(subst ., ,$(SW_VERSION)))



help:
Expand Down Expand Up @@ -68,7 +64,12 @@ clean: ##1 Cleans all dependencies and files
build: ##2 Installs the plugin, and builds the artifacts using the Shopware build commands.
# CUSTOM WEBPACK
cd ./src/Resources/app/storefront && make build -B
ifndef nossl
cd ../../.. && export NODE_OPTIONS=--openssl-legacy-provider && shopware-cli extension build custom/plugins/MolliePayments
endif
ifeq ($(nossl),true)
cd ../../.. && shopware-cli extension build custom/plugins/MolliePayments
endif
# -----------------------------------------------------
# -----------------------------------------------------
cd ../../.. && php bin/console --no-debug theme:refresh
Expand Down
Loading