Merge remote-tracking branch 'upstream/master' into issue-4299

Merged With Master
2020-11-25 12:50:50 +05:30 · 2020-11-25 12:50:50 +05:30 · 985aae53a8
parent 68e17fc711 5b493cd456
commit 985aae53a8
1 changed files with 2 additions and 1 deletions
--- a/packages/Webkul/Product/src/Helpers/Toolbar.php
+++ b/packages/Webkul/Product/src/Helpers/Toolbar.php
@ -182,6 +182,7 @@ class Toolbar extends AbstractProduct
            $viewOption = 'list';
        }

-        return $viewOption;
+        /* if still default config is not set from the admin then in last needed hardcoded value */
+        return $viewOption ?? 'grid';
    }
 }