Skip to content

Commit

Permalink
Merge pull request #19 from shopware/use-sales-channel-language-id-fo…
Browse files Browse the repository at this point in the history
…r-default-customer

fix: use sales channel language id for default customer
  • Loading branch information
Phil23 authored Jun 3, 2024
2 parents bd8ae23 + 1b1bdf1 commit 31c3f4c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
[
"sh",
"-c",
"docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password --sql-require-primary-key=ON"
"docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --sql-require-primary-key=ON"
]

ports:
Expand Down
2 changes: 1 addition & 1 deletion playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default defineConfig({
},
// We abuse this to wait for the external webserver
webServer: {
command: 'docker compose up',
command: 'docker compose up --pull=always --quiet-pull shopware',
url: process.env['APP_URL'],
reuseExistingServer: true,
timeout: 120000,
Expand Down
1 change: 1 addition & 0 deletions src/fixtures/DefaultSalesChannel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ export const test = base.extend<NonNullable<unknown>, FixtureTypes>({
email: `customer_${id}@example.com`,
password: 'shopware',
salutationId: salutations.data[0].id,
languageId: SalesChannelBaseConfig.enGBLanguageId,

defaultShippingAddress: {
firstName: `${id} admin`,
Expand Down

0 comments on commit 31c3f4c

Please sign in to comment.