Make default site customizable

aimeos · Mar 11, 2022 · fd24b09 · fd24b09
1 parent d4828c4
commit fd24b09
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Aimeos/Shop/Base/View.php b/src/Aimeos/Shop/Base/View.php
@@ -275,7 +275,7 @@ protected function addTranslate( \Aimeos\MW\View\Iface $view, string $locale = n
 	protected function addUrl( \Aimeos\MW\View\Iface $view ) : \Aimeos\MW\View\Iface
 	{
 		$fixed = [
-			'site' => Request::input( 'site', env( 'SHOP_MULTISHOP' ) ? 'default' : null ),
+			'site' => Request::input( 'site', env( 'SHOP_MULTISHOP' ) ? config( 'shop.mshop.locale.site', 'default' ) : null ),
 			'locale' => Request::input( 'locale' ),
 			'currency' => Request::input( 'currency' )
 		];

diff --git a/src/Aimeos/Shop/Controller/JqadmController.php b/src/Aimeos/Shop/Controller/JqadmController.php
@@ -226,7 +226,7 @@ public function searchAction()
 	 */
 	protected function createAdmin() : \Aimeos\Admin\JQAdm\Iface
 	{
-		$site = Route::input( 'site', Request::get( 'site', 'default' ) );
+		$site = Route::input( 'site', Request::get( 'site', config( 'shop.mshop.locale.site', 'default' ) ) );
 		$lang = Request::get( 'locale', config( 'app.locale', 'en' ) );
 		$resource = Route::input( 'resource' );
 
@@ -257,7 +257,7 @@ protected function createAdmin() : \Aimeos\Admin\JQAdm\Iface
 	 */
 	protected function getHtml( string $content )
 	{
-		$site = Route::input( 'site', Request::get( 'site', 'default' ) );
+		$site = Route::input( 'site', Request::get( 'site', config( 'shop.mshop.locale.site', 'default' ) ) );
 		$lang = Request::get( 'locale', config( 'app.locale', 'en' ) );
 
 		return View::make( 'shop::jqadm.index', [

diff --git a/src/Aimeos/Shop/Controller/JsonadmController.php b/src/Aimeos/Shop/Controller/JsonadmController.php
@@ -132,7 +132,7 @@ public function optionsAction( ServerRequestInterface $request )
 	 */
 	protected function createAdmin() : \Aimeos\Admin\JsonAdm\Iface
 	{
-		$site = Route::input( 'site', Request::get( 'site', 'default' ) );
+		$site = Route::input( 'site', Request::get( 'site', config( 'shop.mshop.locale.site', 'default' ) ) );
 		$lang = Request::get( 'locale', config( 'app.locale', 'en' ) );
 		$resource = Route::input( 'resource', '' );
 

diff --git a/src/helpers.php b/src/helpers.php
@@ -21,7 +21,7 @@ function airoute( $name, $parameters = [], $absolute = true )
 	{
 		if( $current = Route::current() )
 		{
-			$site = config( 'app.shop_multishop' ) ? 'default' : null;
+			$site = config( 'app.shop_multishop' ) ? config( 'shop.mshop.locale.site', 'default' ) : null;
 
 			$parameters['site'] = $current->parameter( 'site', Request::get( 'site', $site ) );
 			$parameters['locale'] = $current->parameter( 'locale', Request::get( 'locale' ) );