@@ -22,19 +22,19 @@ |
||
| 22 | 22 | * @param string|array $sites Unique site codes |
| 23 | 23 | * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items |
| 24 | 24 | */ |
| 25 | - protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites ) |
|
| 25 | + protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites) |
|
| 26 | 26 | { |
| 27 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
| 27 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
| 28 | 28 | $search = $manager->createSearch(); |
| 29 | 29 | |
| 30 | - if( is_scalar( $sites ) && $sites != '' ) { |
|
| 31 | - $sites = explode( ' ', $sites ); |
|
| 30 | + if (is_scalar($sites) && $sites != '') { |
|
| 31 | + $sites = explode(' ', $sites); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - if( !empty( $sites ) ) { |
|
| 35 | - $search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) ); |
|
| 34 | + if (!empty($sites)) { |
|
| 35 | + $search->setConditions($search->compare('==', 'locale.site.code', $sites)); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - return $manager->searchItems( $search ); |
|
| 38 | + return $manager->searchItems($search); |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | \ No newline at end of file |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function indexAction() |
| 30 | 30 | { |
| 31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' ); |
|
| 31 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index'); |
|
| 32 | 32 | return \View::make('shop::basket.index', $params); |
| 33 | 33 | } |
| 34 | 34 | } |
| 35 | 35 | \ No newline at end of file |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function countAction() |
| 30 | 30 | { |
| 31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' ); |
|
| 31 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count'); |
|
| 32 | 32 | $contents = \View::make('shop::catalog.count', $params); |
| 33 | 33 | |
| 34 | 34 | $response = \Response::make($contents, 200); |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function detailAction() |
| 47 | 47 | { |
| 48 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' ); |
|
| 48 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail'); |
|
| 49 | 49 | return \View::make('shop::catalog.detail', $params); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | public function listAction() |
| 59 | 59 | { |
| 60 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' ); |
|
| 60 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list'); |
|
| 61 | 61 | return \View::make('shop::catalog.list', $params); |
| 62 | 62 | } |
| 63 | 63 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | public function stockAction() |
| 71 | 71 | { |
| 72 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' ); |
|
| 72 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock'); |
|
| 73 | 73 | $contents = \View::make('shop::catalog.stock', $params); |
| 74 | 74 | |
| 75 | 75 | $response = \Response::make($contents, 200); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public function suggestAction() |
| 88 | 88 | { |
| 89 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' ); |
|
| 89 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest'); |
|
| 90 | 90 | $contents = \View::make('shop::catalog.suggest', $params); |
| 91 | 91 | |
| 92 | 92 | $response = \Response::make($contents, 200); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function confirmAction() |
| 30 | 30 | { |
| 31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' ); |
|
| 31 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm'); |
|
| 32 | 32 | return \View::make('shop::checkout.confirm', $params); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function indexAction() |
| 42 | 42 | { |
| 43 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' ); |
|
| 43 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index'); |
|
| 44 | 44 | return \View::make('shop::checkout.index', $params); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function updateAction() |
| 54 | 54 | { |
| 55 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' ); |
|
| 55 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update'); |
|
| 56 | 56 | return \View::make('shop::checkout.update', $params); |
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | \ No newline at end of file |
@@ -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 | { |
@@ -34,65 +34,65 @@ discard block |
||
| 34 | 34 | * @param \Illuminate\Http\Request $request Laravel request object |
| 35 | 35 | * @return \Illuminate\Contracts\View\View View for rendering the output |
| 36 | 36 | */ |
| 37 | - public function indexAction( Request $request ) |
|
| 37 | + public function indexAction(Request $request) |
|
| 38 | 38 | { |
| 39 | - if( config( 'shop.authorize', true ) ) { |
|
| 40 | - $this->authorize( 'admin', [['admin']] ); |
|
| 39 | + if (config('shop.authorize', true)) { |
|
| 40 | + $this->authorize('admin', [['admin']]); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 44 | - $lang = Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) ); |
|
| 45 | - $tab = Route::input( 'tab', Input::get( 'tab', 0 ) ); |
|
| 43 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 44 | + $lang = Route::input('lang', Input::get('lang', config('app.locale', 'en'))); |
|
| 45 | + $tab = Route::input('tab', Input::get('tab', 0)); |
|
| 46 | 46 | |
| 47 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' ); |
|
| 47 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos'); |
|
| 48 | 48 | |
| 49 | 49 | $bootstrap = $aimeos->get(); |
| 50 | - $cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' ); |
|
| 50 | + $cntlPaths = $bootstrap->getCustomPaths('controller/extjs'); |
|
| 51 | 51 | |
| 52 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
| 53 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
| 52 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
| 53 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
| 54 | 54 | |
| 55 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
| 55 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
| 56 | 56 | $cssFiles = array(); |
| 57 | 57 | |
| 58 | - foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
| 58 | + foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths) |
|
| 59 | 59 | { |
| 60 | - foreach( $paths as $path ) |
|
| 60 | + foreach ($paths as $path) |
|
| 61 | 61 | { |
| 62 | - $jsbAbsPath = $base . '/' . $path; |
|
| 62 | + $jsbAbsPath = $base.'/'.$path; |
|
| 63 | 63 | |
| 64 | - if( !is_file( $jsbAbsPath ) ) { |
|
| 65 | - throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) ); |
|
| 64 | + if (!is_file($jsbAbsPath)) { |
|
| 65 | + throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath)); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) ); |
|
| 69 | - $cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) ); |
|
| 68 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path)); |
|
| 69 | + $cssFiles = array_merge($cssFiles, $jsb2->getUrls('css')); |
|
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - $jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) ); |
|
| 74 | - $jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) ); |
|
| 75 | - $adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) ); |
|
| 73 | + $jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product')); |
|
| 74 | + $jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token())); |
|
| 75 | + $adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>')); |
|
| 76 | 76 | |
| 77 | 77 | $vars = array( |
| 78 | 78 | 'site' => $site, |
| 79 | 79 | 'lang' => $lang, |
| 80 | 80 | 'cssFiles' => $cssFiles, |
| 81 | - 'languages' => $this->getJsonLanguages( $context), |
|
| 82 | - 'config' => $this->getJsonClientConfig( $context ), |
|
| 83 | - 'siteitem' => $this->getJsonSiteItem( $context, $site ), |
|
| 84 | - 'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ), |
|
| 81 | + 'languages' => $this->getJsonLanguages($context), |
|
| 82 | + 'config' => $this->getJsonClientConfig($context), |
|
| 83 | + 'siteitem' => $this->getJsonSiteItem($context, $site), |
|
| 84 | + 'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang), |
|
| 85 | 85 | 'searchSchemas' => $controller->getJsonSearchSchemas(), |
| 86 | 86 | 'itemSchemas' => $controller->getJsonItemSchemas(), |
| 87 | - 'smd' => $controller->getJsonSmd( $jsonUrl ), |
|
| 88 | - 'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ), |
|
| 89 | - 'uploaddir' => config( 'shop::uploaddir' ), |
|
| 87 | + 'smd' => $controller->getJsonSmd($jsonUrl), |
|
| 88 | + 'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)), |
|
| 89 | + 'uploaddir' => config('shop::uploaddir'), |
|
| 90 | 90 | 'version' => $aimeos->getVersion(), |
| 91 | 91 | 'jqadmurl' => $jqadmUrl, |
| 92 | 92 | 'activeTab' => $tab, |
| 93 | 93 | ); |
| 94 | 94 | |
| 95 | - return View::make( 'shop::extadm.index', $vars ); |
|
| 95 | + return View::make('shop::extadm.index', $vars); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | |
@@ -102,25 +102,25 @@ discard block |
||
| 102 | 102 | * @param \Illuminate\Http\Request $request Laravel request object |
| 103 | 103 | * @return \Illuminate\Contracts\View\View View for rendering the output |
| 104 | 104 | */ |
| 105 | - public function doAction( Request $request ) |
|
| 105 | + public function doAction(Request $request) |
|
| 106 | 106 | { |
| 107 | - if( config( 'shop.authorize', true ) ) { |
|
| 108 | - $this->authorize( 'admin', [['admin']] ); |
|
| 107 | + if (config('shop.authorize', true)) { |
|
| 108 | + $this->authorize('admin', [['admin']]); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 111 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 112 | 112 | |
| 113 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 114 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' ); |
|
| 113 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 114 | + $cntlPaths = $aimeos->getCustomPaths('controller/extjs'); |
|
| 115 | 115 | |
| 116 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
| 117 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, array() ) ); |
|
| 118 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
| 116 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
| 117 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, array())); |
|
| 118 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
| 119 | 119 | |
| 120 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
| 120 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
| 121 | 121 | |
| 122 | - $response = $controller->process( Input::instance()->request->all(), $request->getContent() ); |
|
| 123 | - return View::make( 'shop::extadm.do', array( 'output' => $response ) ); |
|
| 122 | + $response = $controller->process(Input::instance()->request->all(), $request->getContent()); |
|
| 123 | + return View::make('shop::extadm.do', array('output' => $response)); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | |
@@ -131,32 +131,32 @@ discard block |
||
| 131 | 131 | */ |
| 132 | 132 | public function fileAction() |
| 133 | 133 | { |
| 134 | - if( config( 'shop.authorize', true ) ) { |
|
| 135 | - $this->authorize( 'admin', [['admin']] ); |
|
| 134 | + if (config('shop.authorize', true)) { |
|
| 135 | + $this->authorize('admin', [['admin']]); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | $contents = ''; |
| 139 | 139 | $jsFiles = array(); |
| 140 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 140 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 141 | 141 | |
| 142 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
| 142 | + foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) |
|
| 143 | 143 | { |
| 144 | - foreach( $paths as $path ) |
|
| 144 | + foreach ($paths as $path) |
|
| 145 | 145 | { |
| 146 | - $jsbAbsPath = $base . '/' . $path; |
|
| 147 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
| 148 | - $jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) ); |
|
| 146 | + $jsbAbsPath = $base.'/'.$path; |
|
| 147 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
| 148 | + $jsFiles = array_merge($jsFiles, $jsb2->getFiles('js')); |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - foreach( $jsFiles as $file ) |
|
| 152 | + foreach ($jsFiles as $file) |
|
| 153 | 153 | { |
| 154 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
| 154 | + if (($content = file_get_contents($file)) !== false) { |
|
| 155 | 155 | $contents .= $content; |
| 156 | 156 | } |
| 157 | 157 | } |
| 158 | 158 | |
| 159 | - return response( $contents )->header( 'Content-Type', 'application/javascript' ); |
|
| 159 | + return response($contents)->header('Content-Type', 'application/javascript'); |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | |
@@ -166,15 +166,15 @@ discard block |
||
| 166 | 166 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 167 | 167 | * @return array List of language IDs with labels |
| 168 | 168 | */ |
| 169 | - protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 169 | + protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 170 | 170 | { |
| 171 | 171 | $result = array(); |
| 172 | 172 | |
| 173 | - foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) { |
|
| 174 | - $result[] = array( 'id' => $id, 'label' => $id ); |
|
| 173 | + foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) { |
|
| 174 | + $result[] = array('id' => $id, 'label' => $id); |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | - return json_encode( $result ); |
|
| 177 | + return json_encode($result); |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | |
@@ -184,10 +184,10 @@ discard block |
||
| 184 | 184 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item object |
| 185 | 185 | * @return string JSON encoded configuration object |
| 186 | 186 | */ |
| 187 | - protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 187 | + protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 188 | 188 | { |
| 189 | - $config = $context->getConfig()->get( 'admin/extjs', array() ); |
|
| 190 | - return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT ); |
|
| 189 | + $config = $context->getConfig()->get('admin/extjs', array()); |
|
| 190 | + return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT); |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | |
@@ -198,16 +198,16 @@ discard block |
||
| 198 | 198 | * @param string $lang ISO language code like "en" or "en_GB" |
| 199 | 199 | * @return string JSON encoded translation object |
| 200 | 200 | */ |
| 201 | - protected function getJsonClientI18n( array $i18nPaths, $lang ) |
|
| 201 | + protected function getJsonClientI18n(array $i18nPaths, $lang) |
|
| 202 | 202 | { |
| 203 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang ); |
|
| 203 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang); |
|
| 204 | 204 | |
| 205 | 205 | $content = array( |
| 206 | - 'admin' => $i18n->getAll( 'admin' ), |
|
| 207 | - 'admin/ext' => $i18n->getAll( 'admin/ext' ), |
|
| 206 | + 'admin' => $i18n->getAll('admin'), |
|
| 207 | + 'admin/ext' => $i18n->getAll('admin/ext'), |
|
| 208 | 208 | ); |
| 209 | 209 | |
| 210 | - return json_encode( $content, JSON_FORCE_OBJECT ); |
|
| 210 | + return json_encode($content, JSON_FORCE_OBJECT); |
|
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | |
@@ -219,18 +219,18 @@ discard block |
||
| 219 | 219 | * @return string JSON encoded site item object |
| 220 | 220 | * @throws Exception If no site item was found for the code |
| 221 | 221 | */ |
| 222 | - protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
| 222 | + protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
| 223 | 223 | { |
| 224 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
| 224 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
| 225 | 225 | |
| 226 | 226 | $criteria = $manager->createSearch(); |
| 227 | - $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) ); |
|
| 228 | - $items = $manager->searchItems( $criteria ); |
|
| 227 | + $criteria->setConditions($criteria->compare('==', 'locale.site.code', $site)); |
|
| 228 | + $items = $manager->searchItems($criteria); |
|
| 229 | 229 | |
| 230 | - if( ( $item = reset( $items ) ) === false ) { |
|
| 231 | - throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) ); |
|
| 230 | + if (($item = reset($items)) === false) { |
|
| 231 | + throw new \Exception(sprintf('No site found for code "%1$s"', $site)); |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - return json_encode( $item->toArray() ); |
|
| 234 | + return json_encode($item->toArray()); |
|
| 235 | 235 | } |
| 236 | 236 | } |
| 237 | 237 | \ No newline at end of file |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 36 | 36 | */ |
| 37 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) |
|
| 37 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) |
|
| 38 | 38 | { |
| 39 | 39 | $this->config = $config; |
| 40 | 40 | } |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function get() |
| 49 | 49 | { |
| 50 | - if( $this->object === null ) |
|
| 50 | + if ($this->object === null) |
|
| 51 | 51 | { |
| 52 | - $extDirs = (array) $this->config->get( 'shop.extdir', array() ); |
|
| 53 | - $this->object = new \Aimeos\Bootstrap( $extDirs, false ); |
|
| 52 | + $extDirs = (array) $this->config->get('shop.extdir', array()); |
|
| 53 | + $this->object = new \Aimeos\Bootstrap($extDirs, false); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | return $this->object; |
@@ -64,12 +64,12 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | public function getVersion() |
| 66 | 66 | { |
| 67 | - if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false |
|
| 68 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) |
|
| 67 | + if (($content = @file_get_contents(base_path('composer.lock'))) !== false |
|
| 68 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) |
|
| 69 | 69 | ) { |
| 70 | - foreach( (array) $content['packages'] as $item ) |
|
| 70 | + foreach ((array) $content['packages'] as $item) |
|
| 71 | 71 | { |
| 72 | - if( $item['name'] === 'aimeos/aimeos-laravel' ) { |
|
| 72 | + if ($item['name'] === 'aimeos/aimeos-laravel') { |
|
| 73 | 73 | return $item['version']; |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | /** |
| 76 | 76 | * Returns the HTML code for a copy of a resource object |
| 77 | 77 | * |
| 78 | - * @return string Generated output |
|
| 78 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 79 | 79 | */ |
| 80 | 80 | public function copyAction() |
| 81 | 81 | { |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | /** |
| 92 | 92 | * Returns the HTML code for a new resource object |
| 93 | 93 | * |
| 94 | - * @return string Generated output |
|
| 94 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 95 | 95 | */ |
| 96 | 96 | public function createAction() |
| 97 | 97 | { |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | /** |
| 108 | 108 | * Deletes the resource object or a list of resource objects |
| 109 | 109 | * |
| 110 | - * @return string Generated output |
|
| 110 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 111 | 111 | */ |
| 112 | 112 | public function deleteAction() |
| 113 | 113 | { |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | /** |
| 124 | 124 | * Returns the HTML code for the requested resource object |
| 125 | 125 | * |
| 126 | - * @return string Generated output |
|
| 126 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 127 | 127 | */ |
| 128 | 128 | public function getAction() |
| 129 | 129 | { |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | /** |
| 140 | 140 | * Saves a new resource object |
| 141 | 141 | * |
| 142 | - * @return string Generated output |
|
| 142 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 143 | 143 | */ |
| 144 | 144 | public function saveAction() |
| 145 | 145 | { |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | /** |
| 156 | 156 | * Returns the HTML code for a list of resource objects |
| 157 | 157 | * |
| 158 | - * @return string Generated output |
|
| 158 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 159 | 159 | */ |
| 160 | 160 | public function searchAction() |
| 161 | 161 | { |
@@ -34,38 +34,38 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public function fileAction() |
| 36 | 36 | { |
| 37 | - if( config( 'shop.authorize', true ) ) { |
|
| 38 | - $this->authorize( 'admin', [['admin', 'editor']] ); |
|
| 37 | + if (config('shop.authorize', true)) { |
|
| 38 | + $this->authorize('admin', [['admin', 'editor']]); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | $contents = ''; |
| 42 | 42 | $files = array(); |
| 43 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 44 | - $type = Route::input( 'type', Input::get( 'type', 'js' ) ); |
|
| 43 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 44 | + $type = Route::input('type', Input::get('type', 'js')); |
|
| 45 | 45 | |
| 46 | - foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths ) |
|
| 46 | + foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths) |
|
| 47 | 47 | { |
| 48 | - foreach( $paths as $path ) |
|
| 48 | + foreach ($paths as $path) |
|
| 49 | 49 | { |
| 50 | - $jsbAbsPath = $base . '/' . $path; |
|
| 51 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
| 52 | - $files = array_merge( $files, $jsb2->getFiles( $type ) ); |
|
| 50 | + $jsbAbsPath = $base.'/'.$path; |
|
| 51 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
| 52 | + $files = array_merge($files, $jsb2->getFiles($type)); |
|
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - foreach( $files as $file ) |
|
| 56 | + foreach ($files as $file) |
|
| 57 | 57 | { |
| 58 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
| 58 | + if (($content = file_get_contents($file)) !== false) { |
|
| 59 | 59 | $contents .= $content; |
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - $response = response( $contents ); |
|
| 63 | + $response = response($contents); |
|
| 64 | 64 | |
| 65 | - if( $type === 'js' ) { |
|
| 66 | - $response->header( 'Content-Type', 'application/javascript' ); |
|
| 67 | - } elseif( $type === 'css' ) { |
|
| 68 | - $response->header( 'Content-Type', 'text/css' ); |
|
| 65 | + if ($type === 'js') { |
|
| 66 | + $response->header('Content-Type', 'application/javascript'); |
|
| 67 | + } elseif ($type === 'css') { |
|
| 68 | + $response->header('Content-Type', 'text/css'); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | return $response; |
@@ -79,12 +79,12 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | public function copyAction() |
| 81 | 81 | { |
| 82 | - if( config( 'shop.authorize', true ) ) { |
|
| 83 | - $this->authorize( 'admin', [['admin', 'editor']] ); |
|
| 82 | + if (config('shop.authorize', true)) { |
|
| 83 | + $this->authorize('admin', [['admin', 'editor']]); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | $cntl = $this->createClient(); |
| 87 | - return $this->getHtml( $cntl->copy() ); |
|
| 87 | + return $this->getHtml($cntl->copy()); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | |
@@ -95,12 +95,12 @@ discard block |
||
| 95 | 95 | */ |
| 96 | 96 | public function createAction() |
| 97 | 97 | { |
| 98 | - if( config( 'shop.authorize', true ) ) { |
|
| 99 | - $this->authorize( 'admin', [['admin', 'editor']] ); |
|
| 98 | + if (config('shop.authorize', true)) { |
|
| 99 | + $this->authorize('admin', [['admin', 'editor']]); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | $cntl = $this->createClient(); |
| 103 | - return $this->getHtml( $cntl->create() ); |
|
| 103 | + return $this->getHtml($cntl->create()); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | |
@@ -111,12 +111,12 @@ discard block |
||
| 111 | 111 | */ |
| 112 | 112 | public function deleteAction() |
| 113 | 113 | { |
| 114 | - if( config( 'shop.authorize', true ) ) { |
|
| 115 | - $this->authorize( 'admin', [['admin', 'editor']] ); |
|
| 114 | + if (config('shop.authorize', true)) { |
|
| 115 | + $this->authorize('admin', [['admin', 'editor']]); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | $cntl = $this->createClient(); |
| 119 | - return $this->getHtml( $cntl->delete() . $cntl->search() ); |
|
| 119 | + return $this->getHtml($cntl->delete().$cntl->search()); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | |
@@ -127,12 +127,12 @@ discard block |
||
| 127 | 127 | */ |
| 128 | 128 | public function getAction() |
| 129 | 129 | { |
| 130 | - if( config( 'shop.authorize', true ) ) { |
|
| 131 | - $this->authorize( 'admin', [['admin', 'editor']] ); |
|
| 130 | + if (config('shop.authorize', true)) { |
|
| 131 | + $this->authorize('admin', [['admin', 'editor']]); |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | $cntl = $this->createClient(); |
| 135 | - return $this->getHtml( $cntl->get() ); |
|
| 135 | + return $this->getHtml($cntl->get()); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | |
@@ -143,12 +143,12 @@ discard block |
||
| 143 | 143 | */ |
| 144 | 144 | public function saveAction() |
| 145 | 145 | { |
| 146 | - if( config( 'shop.authorize', true ) ) { |
|
| 147 | - $this->authorize( 'admin', [['admin', 'editor']] ); |
|
| 146 | + if (config('shop.authorize', true)) { |
|
| 147 | + $this->authorize('admin', [['admin', 'editor']]); |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | $cntl = $this->createClient(); |
| 151 | - return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) ); |
|
| 151 | + return $this->getHtml(($cntl->save() ?: $cntl->search())); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | |
@@ -159,12 +159,12 @@ discard block |
||
| 159 | 159 | */ |
| 160 | 160 | public function searchAction() |
| 161 | 161 | { |
| 162 | - if( config( 'shop.authorize', true ) ) { |
|
| 163 | - $this->authorize( 'admin', [['admin', 'editor']] ); |
|
| 162 | + if (config('shop.authorize', true)) { |
|
| 163 | + $this->authorize('admin', [['admin', 'editor']]); |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | $cntl = $this->createClient(); |
| 167 | - return $this->getHtml( $cntl->search() ); |
|
| 167 | + return $this->getHtml($cntl->search()); |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | |
@@ -175,19 +175,19 @@ discard block |
||
| 175 | 175 | */ |
| 176 | 176 | protected function createClient() |
| 177 | 177 | { |
| 178 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 179 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
| 180 | - $resource = Route::input( 'resource' ); |
|
| 178 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 179 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
| 180 | + $resource = Route::input('resource'); |
|
| 181 | 181 | |
| 182 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 183 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
| 182 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 183 | + $templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
| 184 | 184 | |
| 185 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
| 186 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); |
|
| 187 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
| 188 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) ); |
|
| 185 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
| 186 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); |
|
| 187 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
| 188 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang)); |
|
| 189 | 189 | |
| 190 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
| 190 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource); |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | |
@@ -197,12 +197,12 @@ discard block |
||
| 197 | 197 | * @param string $content Content from admin client |
| 198 | 198 | * @return \Illuminate\Contracts\View\View View for rendering the output |
| 199 | 199 | */ |
| 200 | - protected function getHtml( $content ) |
|
| 200 | + protected function getHtml($content) |
|
| 201 | 201 | { |
| 202 | - $version = app( '\Aimeos\Shop\Base\Aimeos' )->getVersion(); |
|
| 203 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 204 | - $content = str_replace( ['{type}', '{version}'], ['Laravel', $version], $content ); |
|
| 202 | + $version = app('\Aimeos\Shop\Base\Aimeos')->getVersion(); |
|
| 203 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 204 | + $content = str_replace(['{type}', '{version}'], ['Laravel', $version], $content); |
|
| 205 | 205 | |
| 206 | - return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) ); |
|
| 206 | + return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site)); |
|
| 207 | 207 | } |
| 208 | 208 | } |
@@ -125,7 +125,7 @@ |
||
| 125 | 125 | /** |
| 126 | 126 | * Get the services provided by the provider. |
| 127 | 127 | * |
| 128 | - * @return array |
|
| 128 | + * @return string[] |
|
| 129 | 129 | */ |
| 130 | 130 | public function provides() |
| 131 | 131 | { |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/css/tether.min.css"> |
| 11 | 11 | <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css"> |
| 12 | 12 | <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css"> |
| 13 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'css' ) ); ?>"> |
|
| 13 | + <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'css')); ?>"> |
|
| 14 | 14 | |
| 15 | 15 | <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> |
| 16 | 16 | <!--[if lt IE 9]> |
@@ -29,6 +29,6 @@ discard block |
||
| 29 | 29 | <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js"></script> |
| 30 | 30 | <script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/ckeditor.js"></script> |
| 31 | 31 | <script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/adapters/jquery.js"></script> |
| 32 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'js' ) ); ?>"></script> |
|
| 32 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'js')); ?>"></script> |
|
| 33 | 33 | </body> |
| 34 | 34 | </html> |