@@ -49,24 +49,32 @@ public function __construct(
4949 */
5050 public function getWitchModuleIsInstalled (): array
5151 {
52- $ modules = [
53- 'Magefan_Blog ' => 'https://github.com/magefan/hyva-theme-blog ' ,
54- 'Magefan_BlogPlus ' => 'https://github.com/magefan/hyva-theme-blog-plus ' ,
55- 'Magefan_BlogExtra ' => 'https://github.com/magefan/hyva-theme-blog-extra ' ,
56- 'Magefan_BlogAuthor ' => 'https://github.com/magefan/hyva-theme-blog-author ' ,
57- 'Magefan_AutoRelatedProduc ' => 'https://github.com/magefan/hyva-theme-auto-related-product ' ,
58- 'Magefan_AutoRelatedProductPlus ' => 'https://github.com/magefan/hyva-theme-auto-related-product-plus ' ,
59- 'Magefan_AutoLanguageSwitcher ' => 'https://github.com/magefan/hyva-theme-auto-language-switcher '
52+ $ moduleGroups = [
53+ 'Blog ' => [
54+ 'Magefan_BlogExtra ' => 'magefan/hyva-theme-blog-extra ' ,
55+ 'Magefan_BlogPlus ' => 'magefan/hyva-theme-blog-plus ' ,
56+ 'Magefan_Blog ' => 'magefan/hyva-theme-blog '
57+ ],
58+ 'AutoRelatedProduc ' => [
59+ 'Magefan_AutoRelatedProductPlus ' => 'magefan/hyva-theme-auto-related-product-plus ' ,
60+ 'Magefan_AutoRelatedProduc ' => 'magefan/hyva-theme-auto-related-product '
61+ ],
62+ 'AutoLanguageSwitcher ' => [
63+ 'Magefan_AutoLanguageSwitcher ' => 'magefan/hyva-theme-auto-language-switcher '
64+ ]
6065 ];
6166
6267 $ hyvaModules = [];
63- foreach ($ modules as $ module => $ url ){
64- if ($ this ->moduleManager ->isEnabled ($ module )) {
65- $ hyvaModule = 'Hyva_ ' . str_replace ('_ ' , '' , $ module );
66- if (!$ this ->moduleManager ->isEnabled ($ hyvaModule )) {
67- $ hyvaModules [$ hyvaModule ] = $ url ;
68- }
69- }
68+ foreach ($ moduleGroups as $ groupKey => $ modules ) {
69+ foreach ($ modules as $ module => $ packageName ) {
70+ if ($ this ->moduleManager ->isEnabled ($ module )) {
71+ $ hyvaModule = 'Hyva_ ' . str_replace ('_ ' , '' , $ module );
72+ if (!$ this ->moduleManager ->isEnabled ($ hyvaModule )) {
73+ $ hyvaModules [$ hyvaModule ] = $ packageName ;
74+ break ;
75+ }
76+ }
77+ }
7078 }
7179 return $ hyvaModules ;
7280 }
0 commit comments