| @@ -17,20 +17,20 @@ | ||
| 17 | 17 | 'uploaddir' => '/', | 
| 18 | 18 | |
| 19 | 19 | 'page' => [ | 
| 20 | - 'account-index' => [ 'locale/select', 'basket/mini','catalog/tree','catalog/search','account/profile','account/review','account/subscription','account/history','account/favorite','account/watch','catalog/session' ], | |
| 21 | - 'basket-index' => [ 'locale/select', 'catalog/tree','catalog/search','basket/standard','basket/bulk','basket/related' ], | |
| 22 | - 'catalog-count' => [ 'catalog/count' ], | |
| 23 | - 'catalog-detail' => [ 'locale/select', 'basket/mini','catalog/tree','catalog/search','catalog/stage','catalog/detail','catalog/session' ], | |
| 24 | - 'catalog-home' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/home' ], | |
| 25 | - 'catalog-list' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/price','catalog/supplier','catalog/attribute','catalog/session','catalog/stage','catalog/lists' ], | |
| 26 | - 'catalog-session' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/session' ], | |
| 27 | - 'catalog-stock' => [ 'catalog/stock' ], | |
| 28 | - 'catalog-suggest' => [ 'catalog/suggest' ], | |
| 29 | - 'catalog-tree' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/price','catalog/supplier','catalog/attribute','catalog/session','catalog/stage','catalog/lists' ], | |
| 30 | - 'checkout-confirm' => [ 'catalog/tree','catalog/search','checkout/confirm' ], | |
| 31 | - 'checkout-index' => [ 'locale/select', 'catalog/tree','catalog/search','checkout/standard' ], | |
| 32 | - 'checkout-update' => [ 'checkout/update' ], | |
| 33 | - 'supplier-detail' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','supplier/detail','catalog/lists'], | |
| 20 | + 'account-index' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'account/profile', 'account/review', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'catalog/session'], | |
| 21 | + 'basket-index' => ['locale/select', 'catalog/tree', 'catalog/search', 'basket/standard', 'basket/bulk', 'basket/related'], | |
| 22 | + 'catalog-count' => ['catalog/count'], | |
| 23 | + 'catalog-detail' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'catalog/stage', 'catalog/detail', 'catalog/session'], | |
| 24 | + 'catalog-home' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'catalog/home'], | |
| 25 | + 'catalog-list' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'catalog/price', 'catalog/supplier', 'catalog/attribute', 'catalog/session', 'catalog/stage', 'catalog/lists'], | |
| 26 | + 'catalog-session' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'catalog/session'], | |
| 27 | + 'catalog-stock' => ['catalog/stock'], | |
| 28 | + 'catalog-suggest' => ['catalog/suggest'], | |
| 29 | + 'catalog-tree' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'catalog/price', 'catalog/supplier', 'catalog/attribute', 'catalog/session', 'catalog/stage', 'catalog/lists'], | |
| 30 | + 'checkout-confirm' => ['catalog/tree', 'catalog/search', 'checkout/confirm'], | |
| 31 | + 'checkout-index' => ['locale/select', 'catalog/tree', 'catalog/search', 'checkout/standard'], | |
| 32 | + 'checkout-update' => ['checkout/update'], | |
| 33 | + 'supplier-detail' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'supplier/detail', 'catalog/lists'], | |
| 34 | 34 | ], | 
| 35 | 35 | |
| 36 | 36 | 'resource' => [ | 
| @@ -8,16 +8,16 @@ discard block | ||
| 8 | 8 | |
| 9 | 9 | |
| 10 | 10 |  if (! function_exists('airoute')) { | 
| 11 | - /** | |
| 12 | - * Generate the URL to a named route. | |
| 13 | - * | |
| 14 | - * @param array|string $name | |
| 15 | - * @param mixed $parameters | |
| 16 | - * @param bool $absolute | |
| 17 | - * @return string | |
| 18 | - */ | |
| 19 | - function airoute( $name, $parameters = [], $absolute = true ) | |
| 20 | -    { | |
| 11 | + /** | |
| 12 | + * Generate the URL to a named route. | |
| 13 | + * | |
| 14 | + * @param array|string $name | |
| 15 | + * @param mixed $parameters | |
| 16 | + * @param bool $absolute | |
| 17 | + * @return string | |
| 18 | + */ | |
| 19 | + function airoute( $name, $parameters = [], $absolute = true ) | |
| 20 | +	{ | |
| 21 | 21 | if( $current = Route::current() ) | 
| 22 | 22 |  		{ | 
| 23 | 23 | $parameters['site'] = $current->parameter( 'site', Request::get( 'site' ) ); | 
| @@ -25,8 +25,8 @@ discard block | ||
| 25 | 25 | $parameters['currency'] = $current->parameter( 'currency', Request::get( 'currency' ) ); | 
| 26 | 26 | } | 
| 27 | 27 | |
| 28 | -        return app('url')->route( $name, array_filter( $parameters ), $absolute ); | |
| 29 | - } | |
| 28 | +		return app('url')->route( $name, array_filter( $parameters ), $absolute ); | |
| 29 | + } | |
| 30 | 30 | } | 
| 31 | 31 | |
| 32 | 32 | |
| @@ -7,7 +7,7 @@ discard block | ||
| 7 | 7 | */ | 
| 8 | 8 | |
| 9 | 9 | |
| 10 | -if (! function_exists('airoute')) { | |
| 10 | +if( !function_exists( 'airoute' ) ) { | |
| 11 | 11 | /** | 
| 12 | 12 | * Generate the URL to a named route. | 
| 13 | 13 | * | 
| @@ -25,7 +25,7 @@ discard block | ||
| 25 | 25 | $parameters['currency'] = $current->parameter( 'currency', Request::get( 'currency' ) ); | 
| 26 | 26 | } | 
| 27 | 27 | |
| 28 | -        return app('url')->route( $name, array_filter( $parameters ), $absolute ); | |
| 28 | + return app( 'url' )->route( $name, array_filter( $parameters ), $absolute ); | |
| 29 | 29 | } | 
| 30 | 30 | } | 
| 31 | 31 | |