@@ -39,8 +39,7 @@ |
||
| 39 | 39 | |
| 40 | 40 | $i18n = app('\Aimeos\Shop\Base\I18n')->get( array( $locale ) ); |
| 41 | 41 | $translation = $i18n[$locale]; |
| 42 | - } |
|
| 43 | - else |
|
| 42 | + } else |
|
| 44 | 43 | { |
| 45 | 44 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
| 46 | 45 | } |
@@ -207,8 +207,7 @@ |
||
| 207 | 207 | $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); |
| 208 | 208 | $localeItem->setLanguageId( null ); |
| 209 | 209 | $localeItem->setCurrencyId( null ); |
| 210 | - } |
|
| 211 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 210 | + } catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 212 | 211 | { |
| 213 | 212 | $localeItem = $localeManager->createItem(); |
| 214 | 213 | } |
@@ -177,8 +177,7 @@ |
||
| 177 | 177 | try |
| 178 | 178 | { |
| 179 | 179 | $item = $manager->getItem( $code ); |
| 180 | - } |
|
| 181 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 180 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 182 | 181 | { |
| 183 | 182 | $item = $manager->createItem(); |
| 184 | 183 | $item->setLabel( $code ); |
@@ -163,8 +163,7 @@ |
||
| 163 | 163 | $site = \Route::input( 'site', 'default' ); |
| 164 | 164 | $lang = \Route::input( 'locale', '' ); |
| 165 | 165 | $currency = \Route::input( 'currency', '' ); |
| 166 | - } |
|
| 167 | - else |
|
| 166 | + } else |
|
| 168 | 167 | { |
| 169 | 168 | $site = 'default'; |
| 170 | 169 | $lang = $currency = ''; |
@@ -207,8 +207,7 @@ |
||
| 207 | 207 | $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); |
| 208 | 208 | $localeItem->setLanguageId( null ); |
| 209 | 209 | $localeItem->setCurrencyId( null ); |
| 210 | - } |
|
| 211 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 210 | + } catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 212 | 211 | { |
| 213 | 212 | $localeItem = $localeManager->createItem(); |
| 214 | 213 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | /** |
| 31 | 31 | * Returns the HTML code for a copy of a resource object |
| 32 | 32 | * |
| 33 | - * @return string Generated output |
|
| 33 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 34 | 34 | */ |
| 35 | 35 | public function copyAction() |
| 36 | 36 | { |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | /** |
| 47 | 47 | * Returns the HTML code for a new resource object |
| 48 | 48 | * |
| 49 | - * @return string Generated output |
|
| 49 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 50 | 50 | */ |
| 51 | 51 | public function createAction( $resource ) |
| 52 | 52 | { |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | /** |
| 63 | 63 | * Deletes the resource object or a list of resource objects |
| 64 | 64 | * |
| 65 | - * @return string Generated output |
|
| 65 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 66 | 66 | */ |
| 67 | 67 | public function deleteAction( $resource, $id ) |
| 68 | 68 | { |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | /** |
| 79 | 79 | * Returns the HTML code for the requested resource object |
| 80 | 80 | * |
| 81 | - * @return string Generated output |
|
| 81 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 82 | 82 | */ |
| 83 | 83 | public function getAction() |
| 84 | 84 | { |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | /** |
| 95 | 95 | * Saves a new resource object |
| 96 | 96 | * |
| 97 | - * @return string Generated output |
|
| 97 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 98 | 98 | */ |
| 99 | 99 | public function saveAction( $resource ) |
| 100 | 100 | { |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | /** |
| 111 | 111 | * Returns the HTML code for a list of resource objects |
| 112 | 112 | * |
| 113 | - * @return string Generated output |
|
| 113 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 114 | 114 | */ |
| 115 | 115 | public function searchAction( $resource ) |
| 116 | 116 | { |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | /** |
| 127 | 127 | * Returns the resource controller |
| 128 | 128 | * |
| 129 | - * @return \Aimeos\MShop\Context\Item\Iface Context item |
|
| 129 | + * @return \Aimeos\Admin\JQAdm\Iface Context item |
|
| 130 | 130 | */ |
| 131 | 131 | protected function createClient() |
| 132 | 132 | { |
@@ -135,7 +135,7 @@ |
||
| 135 | 135 | * Creates a list of all available translations. |
| 136 | 136 | * |
| 137 | 137 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 138 | - * @return array List of language IDs with labels |
|
| 138 | + * @return string List of language IDs with labels |
|
| 139 | 139 | */ |
| 140 | 140 | protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context ) |
| 141 | 141 | { |