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

FRW-9176 nonsplit to split merge #1622

Merged
merged 5 commits into from
Oct 11, 2024
Merged

FRW-9176 nonsplit to split merge #1622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f20dd6
FRW-1633 Updated docker
dimitriyTsemma Oct 11, 2024
a1564e3
Merge pull request #9091 from spryker/feature/frw-1633/master-postgre…
asmarovydlo Oct 11, 2024
4088b21
FRW-9176 Introduced View page for merchants in the BackOffice. (#9087)
olhalivitchuk Oct 11, 2024
afcc8de
Merge remote-tracking branch 'nonsplit/master' into feature/frw-9176/…
spryker-bot Oct 11, 2024
98cf71c
FRW-9176 Merge nonsplit/master.
spryker-bot Oct 11, 2024
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
2 changes: 1 addition & 1 deletion .git.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6f1a7372744d60d1736a2020c2074cba22cca547
8fde35456e60a7740380fdfdc0cc9170186c27cd
26 changes: 13 additions & 13 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Pyz/Zed/MerchantGui/MerchantGuiDependencyProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ protected function getMerchantUpdateFormViewExpanderPlugins(): array
];
}

/**
* @return array<\Spryker\Zed\MerchantGuiExtension\Dependency\Plugin\MerchantUpdateFormViewExpanderPluginInterface>
*/
protected function getMerchantViewFormViewExpanderPlugins(): array
{
return [
new MerchantUserViewMerchantUpdateFormViewExpanderPlugin(),
];
}

/**
* @return \Spryker\Zed\Kernel\Communication\Form\FormTypeInterface
*/
Expand Down
Loading