| @@ -27,7 +27,6 @@ discard block | ||
| 27 | 27 | * | 
| 28 | 28 | * @param \Illuminate\Http\Request $request Request object | 
| 29 | 29 | * @param string Resource location, e.g. "product/stock/wareshouse" | 
| 30 | - * @param string $sitecode Unique site code | |
| 31 | 30 | * @param integer|null $id Unique resource ID | 
| 32 | 31 | * @return \Illuminate\Http\Response Response object containing the generated output | 
| 33 | 32 | */ | 
| @@ -48,7 +47,6 @@ discard block | ||
| 48 | 47 | * | 
| 49 | 48 | * @param \Illuminate\Http\Request $request Request object | 
| 50 | 49 | * @param string Resource location, e.g. "product/stock/wareshouse" | 
| 51 | - * @param string $sitecode Unique site code | |
| 52 | 50 | * @param integer|null $id Unique resource ID | 
| 53 | 51 | * @return \Illuminate\Http\Response Response object containing the generated output | 
| 54 | 52 | */ | 
| @@ -69,7 +67,6 @@ discard block | ||
| 69 | 67 | * | 
| 70 | 68 | * @param \Illuminate\Http\Request $request Request object | 
| 71 | 69 | * @param string Resource location, e.g. "product/stock/wareshouse" | 
| 72 | - * @param string $sitecode Unique site code | |
| 73 | 70 | * @param integer|null $id Unique resource ID | 
| 74 | 71 | * @return \Illuminate\Http\Response Response object containing the generated output | 
| 75 | 72 | */ | 
| @@ -90,7 +87,6 @@ discard block | ||
| 90 | 87 | * | 
| 91 | 88 | * @param \Illuminate\Http\Request $request Request object | 
| 92 | 89 | * @param string Resource location, e.g. "product/stock/wareshouse" | 
| 93 | - * @param string $sitecode Unique site code | |
| 94 | 90 | * @param integer $id Unique ID of the resource | 
| 95 | 91 | * @return \Illuminate\Http\Response Response object containing the generated output | 
| 96 | 92 | */ | 
| @@ -111,7 +107,6 @@ discard block | ||
| 111 | 107 | * | 
| 112 | 108 | * @param \Illuminate\Http\Request $request Request object | 
| 113 | 109 | * @param string Resource location, e.g. "product/stock/wareshouse" | 
| 114 | - * @param string $sitecode Unique site code | |
| 115 | 110 | * @param integer|null $id Unique resource ID | 
| 116 | 111 | * @return \Illuminate\Http\Response Response object containing the generated output | 
| 117 | 112 | */ | 
| @@ -132,7 +127,6 @@ discard block | ||
| 132 | 127 | * | 
| 133 | 128 | * @param \Illuminate\Http\Request $request Request object | 
| 134 | 129 | * @param string Resource location, e.g. "product/stock/wareshouse" | 
| 135 | - * @param string $sitecode Unique site code | |
| 136 | 130 | * @return \Illuminate\Http\Response Response object containing the generated output | 
| 137 | 131 | */ | 
| 138 | 132 | public function optionsAction( Request $request, $site = 'default', $resource = '' ) | 
| @@ -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 | } | 
| @@ -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 | } | 
| @@ -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 = ''; | 
| @@ -29,7 +29,6 @@ discard block | ||
| 29 | 29 | * Returns the HTML code for a copy of a resource object | 
| 30 | 30 | * | 
| 31 | 31 | * @param string Resource location, e.g. "product" | 
| 32 | - * @param string $sitecode Unique site code | |
| 33 | 32 | * @param integer $id Unique resource ID | 
| 34 | 33 | * @return string Generated output | 
| 35 | 34 | */ | 
| @@ -51,7 +50,6 @@ discard block | ||
| 51 | 50 | * Returns the HTML code for a new resource object | 
| 52 | 51 | * | 
| 53 | 52 | * @param string Resource location, e.g. "product" | 
| 54 | - * @param string $sitecode Unique site code | |
| 55 | 53 | * @return string Generated output | 
| 56 | 54 | */ | 
| 57 | 55 | public function createAction( $site = 'default', $resource ) | 
| @@ -72,7 +70,6 @@ discard block | ||
| 72 | 70 | * Deletes the resource object or a list of resource objects | 
| 73 | 71 | * | 
| 74 | 72 | * @param string Resource location, e.g. "product" | 
| 75 | - * @param string $sitecode Unique site code | |
| 76 | 73 | * @param integer $id Unique resource ID | 
| 77 | 74 | * @return string Generated output | 
| 78 | 75 | */ | 
| @@ -94,7 +91,6 @@ discard block | ||
| 94 | 91 | * Returns the HTML code for the requested resource object | 
| 95 | 92 | * | 
| 96 | 93 | * @param string Resource location, e.g. "product" | 
| 97 | - * @param string $sitecode Unique site code | |
| 98 | 94 | * @param integer $id Unique resource ID | 
| 99 | 95 | * @return string Generated output | 
| 100 | 96 | */ | 
| @@ -116,7 +112,6 @@ discard block | ||
| 116 | 112 | * Saves a new resource object | 
| 117 | 113 | * | 
| 118 | 114 | * @param string Resource location, e.g. "product" | 
| 119 | - * @param string $sitecode Unique site code | |
| 120 | 115 | * @return string Generated output | 
| 121 | 116 | */ | 
| 122 | 117 | public function saveAction( $site = 'default', $resource ) | 
| @@ -137,7 +132,6 @@ discard block | ||
| 137 | 132 | * Returns the HTML code for a list of resource objects | 
| 138 | 133 | * | 
| 139 | 134 | * @param string Resource location, e.g. "product" | 
| 140 | - * @param string $sitecode Unique site code | |
| 141 | 135 | * @return string Generated output | 
| 142 | 136 | */ | 
| 143 | 137 | public function searchAction( $site = 'default', $resource ) | 
| @@ -158,7 +152,7 @@ discard block | ||
| 158 | 152 | * Returns the resource controller | 
| 159 | 153 | * | 
| 160 | 154 | * @param string $sitecode Unique site code | 
| 161 | - * @return \Aimeos\MShop\Context\Item\Iface Context item | |
| 155 | + * @return \Aimeos\Admin\JQAdm\Iface Context item | |
| 162 | 156 | */ | 
| 163 | 157 | protected function createClient( $sitecode, $resource ) | 
| 164 | 158 |  	{ | 
| @@ -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 |  	{ | 
| @@ -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 | } |