aimeos /
aimeos-laravel
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/css/tether.min.css" integrity="sha256-y4TDcAD4/j5o4keZvggf698Cr9Oc7JZ+gGMax23qmVA=" crossorigin="anonymous" /> |
| 12 | 12 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" /> |
| 13 | 13 | <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous"> |
| 14 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'css' ) ); ?>"> |
|
| 14 | + <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'css')); ?>"> |
|
| 15 | 15 | </head> |
| 16 | 16 | <body> |
| 17 | 17 | |
@@ -24,6 +24,6 @@ discard block |
||
| 24 | 24 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/ckeditor.js" integrity="sha256-TD9khtuB9OoHJICSCe1SngH2RckROdDPDb5JJaUTi7I=" crossorigin="anonymous"></script> |
| 25 | 25 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/adapters/jquery.js" integrity="sha256-kWca68zAjkLv7iMEyHDuFKa9KxIij+DiCScmbTMlJHM=" crossorigin="anonymous"></script> |
| 26 | 26 | <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script> |
| 27 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'js' ) ); ?>"></script> |
|
| 27 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'js')); ?>"></script> |
|
| 28 | 28 | </body> |
| 29 | 29 | </html> |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | * @param \Aimeos\Shop\Base\Context $context Context provider |
| 40 | 40 | * @param \Aimeos\Shop\Base\Locale $locale Locale provider |
| 41 | 41 | */ |
| 42 | - public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale ) |
|
| 42 | + public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale) |
|
| 43 | 43 | { |
| 44 | 44 | $this->context = $context; |
| 45 | 45 | $this->locale = $locale; |
@@ -53,22 +53,22 @@ discard block |
||
| 53 | 53 | * @param string|array $groupcodes Unique user/customer group codes that are allowed |
| 54 | 54 | * @return boolean True if user is part of the group, false if not |
| 55 | 55 | */ |
| 56 | - public function checkUserGroup( \Illuminate\Foundation\Auth\User $user, $groupcodes ) |
|
| 56 | + public function checkUserGroup(\Illuminate\Foundation\Auth\User $user, $groupcodes) |
|
| 57 | 57 | { |
| 58 | - $context = $this->context->get( false ); |
|
| 58 | + $context = $this->context->get(false); |
|
| 59 | 59 | |
| 60 | 60 | try { |
| 61 | - $site = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' )->getItem( $user->siteid )->getCode(); |
|
| 62 | - } catch( \Exception $e ) { |
|
| 63 | - $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' ); |
|
| 61 | + $site = \Aimeos\MShop\Factory::createManager($context, 'locale/site')->getItem($user->siteid)->getCode(); |
|
| 62 | + } catch (\Exception $e) { |
|
| 63 | + $site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default'); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - $context->setLocale( $this->locale->getBackend( $context, $site ) ); |
|
| 66 | + $context->setLocale($this->locale->getBackend($context, $site)); |
|
| 67 | 67 | |
| 68 | - foreach( array_reverse( $context->getLocale()->getSitePath() ) as $siteid ) |
|
| 68 | + foreach (array_reverse($context->getLocale()->getSitePath()) as $siteid) |
|
| 69 | 69 | { |
| 70 | - if( $user->siteid === $siteid ) { |
|
| 71 | - return $this->checkGroups( $context, $user->id, $groupcodes ); |
|
| 70 | + if ($user->siteid === $siteid) { |
|
| 71 | + return $this->checkGroups($context, $user->id, $groupcodes); |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
@@ -84,14 +84,14 @@ discard block |
||
| 84 | 84 | * @return boolean True if user is part of the group, false if not |
| 85 | 85 | * @deprecated Use checkUserGroup() instead |
| 86 | 86 | */ |
| 87 | - public function checkGroup( $userid, $groupcodes ) |
|
| 87 | + public function checkGroup($userid, $groupcodes) |
|
| 88 | 88 | { |
| 89 | - $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' ); |
|
| 89 | + $site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default'); |
|
| 90 | 90 | |
| 91 | - $context = $this->context->get( false ); |
|
| 92 | - $context->setLocale( $this->locale->getBackend( $context, $site ) ); |
|
| 91 | + $context = $this->context->get(false); |
|
| 92 | + $context->setLocale($this->locale->getBackend($context, $site)); |
|
| 93 | 93 | |
| 94 | - return $this->checkGroups( $context, $userid, $groupcodes ); |
|
| 94 | + return $this->checkGroups($context, $userid, $groupcodes); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | |
@@ -101,15 +101,15 @@ discard block |
||
| 101 | 101 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item |
| 102 | 102 | * @return string[] List of group codes |
| 103 | 103 | */ |
| 104 | - public function getGroups( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 104 | + public function getGroups(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 105 | 105 | { |
| 106 | 106 | $list = array(); |
| 107 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' ); |
|
| 107 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group'); |
|
| 108 | 108 | |
| 109 | 109 | $search = $manager->createSearch(); |
| 110 | - $search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) ); |
|
| 110 | + $search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds())); |
|
| 111 | 111 | |
| 112 | - foreach( $manager->searchItems( $search ) as $item ) { |
|
| 112 | + foreach ($manager->searchItems($search) as $item) { |
|
| 113 | 113 | $list[] = $item->getCode(); |
| 114 | 114 | } |
| 115 | 115 | |
@@ -125,26 +125,26 @@ discard block |
||
| 125 | 125 | * @param string[] $groupcodes List of group codes to check against |
| 126 | 126 | * @return boolean True if the user is in one of the groups, false if not |
| 127 | 127 | */ |
| 128 | - protected function checkGroups( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes ) |
|
| 128 | + protected function checkGroups(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes) |
|
| 129 | 129 | { |
| 130 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' ); |
|
| 130 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group'); |
|
| 131 | 131 | |
| 132 | 132 | $search = $manager->createSearch(); |
| 133 | - $search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) ); |
|
| 134 | - $groupItems = $manager->searchItems( $search ); |
|
| 133 | + $search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes)); |
|
| 134 | + $groupItems = $manager->searchItems($search); |
|
| 135 | 135 | |
| 136 | 136 | |
| 137 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
| 137 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
| 138 | 138 | |
| 139 | 139 | $search = $manager->createSearch(); |
| 140 | 140 | $expr = array( |
| 141 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
| 142 | - $search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ), |
|
| 143 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
| 141 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
| 142 | + $search->compare('==', 'customer.lists.refid', array_keys($groupItems)), |
|
| 143 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
| 144 | 144 | ); |
| 145 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 146 | - $search->setSlice( 0, 1 ); |
|
| 145 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 146 | + $search->setSlice(0, 1); |
|
| 147 | 147 | |
| 148 | - return (bool) count( $manager->searchItems( $search ) ); |
|
| 148 | + return (bool) count($manager->searchItems($search)); |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | \ No newline at end of file |
@@ -36,24 +36,24 @@ |
||
| 36 | 36 | * @param \Illuminate\Http\Request $request Laravel request object |
| 37 | 37 | * @return \Illuminate\Contracts\View\View View for rendering the output |
| 38 | 38 | */ |
| 39 | - public function indexAction( Request $request ) |
|
| 39 | + public function indexAction(Request $request) |
|
| 40 | 40 | { |
| 41 | - if( Auth::check() === false |
|
| 42 | - || $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) === false |
|
| 41 | + if (Auth::check() === false |
|
| 42 | + || $request->user()->can('admin', [AdminController::class, ['admin', 'editor']]) === false |
|
| 43 | 43 | ) { |
| 44 | - return redirect()->guest( 'login' ); |
|
| 44 | + return redirect()->guest('login'); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
| 48 | - $siteManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
| 49 | - $siteItem = $siteManager->getItem( $request->user()->siteid ); |
|
| 47 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
| 48 | + $siteManager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
| 49 | + $siteItem = $siteManager->getItem($request->user()->siteid); |
|
| 50 | 50 | |
| 51 | 51 | $param = array( |
| 52 | 52 | 'resource' => 'dashboard', |
| 53 | - 'site' => Route::input( 'site', Input::get( 'site', $siteItem->getCode() ) ), |
|
| 54 | - 'lang' => Route::input( 'lang', Input::get( 'lang', $request->user()->langid ?: config( 'app.locale', 'en' ) ) ) |
|
| 53 | + 'site' => Route::input('site', Input::get('site', $siteItem->getCode())), |
|
| 54 | + 'lang' => Route::input('lang', Input::get('lang', $request->user()->langid ?: config('app.locale', 'en'))) |
|
| 55 | 55 | ); |
| 56 | 56 | |
| 57 | - return redirect()->route( 'aimeos_shop_jqadm_search', $param ); |
|
| 57 | + return redirect()->route('aimeos_shop_jqadm_search', $param); |
|
| 58 | 58 | } |
| 59 | 59 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function countAction() |
| 31 | 31 | { |
| 32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' ); |
|
| 32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count'); |
|
| 33 | 33 | |
| 34 | 34 | return Response::view('shop::catalog.count', $params) |
| 35 | 35 | ->header('Content-Type', 'application/javascript'); |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public function detailAction() |
| 45 | 45 | { |
| 46 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' ); |
|
| 46 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail'); |
|
| 47 | 47 | return Response::view('shop::catalog.detail', $params); |
| 48 | 48 | } |
| 49 | 49 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | */ |
| 56 | 56 | public function listAction() |
| 57 | 57 | { |
| 58 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' ); |
|
| 58 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list'); |
|
| 59 | 59 | return Response::view('shop::catalog.list', $params); |
| 60 | 60 | } |
| 61 | 61 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | public function stockAction() |
| 69 | 69 | { |
| 70 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' ); |
|
| 70 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock'); |
|
| 71 | 71 | |
| 72 | 72 | return Response::view('shop::catalog.stock', $params) |
| 73 | 73 | ->header('Content-Type', 'application/javascript'); |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | */ |
| 82 | 82 | public function suggestAction() |
| 83 | 83 | { |
| 84 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' ); |
|
| 84 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest'); |
|
| 85 | 85 | |
| 86 | 86 | return Response::view('shop::catalog.suggest', $params) |
| 87 | 87 | ->header('Content-Type', 'application/json'); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function indexAction() |
| 31 | 31 | { |
| 32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' ); |
|
| 32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('account-index'); |
|
| 33 | 33 | return Response::view('shop::account.index', $params); |
| 34 | 34 | } |
| 35 | 35 | |
@@ -41,17 +41,17 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | public function downloadAction() |
| 43 | 43 | { |
| 44 | - $context = app( '\Aimeos\Shop\Base\Context' )->get(); |
|
| 44 | + $context = app('\Aimeos\Shop\Base\Context')->get(); |
|
| 45 | 45 | $langid = $context->getLocale()->getLanguageId(); |
| 46 | 46 | |
| 47 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid ); |
|
| 48 | - $context->setView( $view ); |
|
| 47 | + $view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid); |
|
| 48 | + $context->setView($view); |
|
| 49 | 49 | |
| 50 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' ); |
|
| 51 | - $client->setView( $view ); |
|
| 50 | + $client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download'); |
|
| 51 | + $client->setView($view); |
|
| 52 | 52 | $client->process(); |
| 53 | 53 | |
| 54 | 54 | $response = $view->response(); |
| 55 | - return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() ); |
|
| 55 | + return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders()); |
|
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | \ No newline at end of file |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * @param \Aimeos\Shop\Base\Locale $locale Locale object |
| 56 | 56 | * @param \Aimeos\Shop\Base\I18n $i18n Internationalisation object |
| 57 | 57 | */ |
| 58 | - public function __construct( \Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n ) |
|
| 58 | + public function __construct(\Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n) |
|
| 59 | 59 | { |
| 60 | 60 | $this->session = $session; |
| 61 | 61 | $this->config = $config; |
@@ -71,36 +71,36 @@ discard block |
||
| 71 | 71 | * @param string $type Configuration type, i.e. "frontend" or "backend" (deprecated, use \Aimeos\Shop\Base\Config) |
| 72 | 72 | * @return \Aimeos\MShop\Context\Item\Iface Context object |
| 73 | 73 | */ |
| 74 | - public function get( $locale = true, $type = 'frontend' ) |
|
| 74 | + public function get($locale = true, $type = 'frontend') |
|
| 75 | 75 | { |
| 76 | - $config = $this->config->get( $type ); |
|
| 76 | + $config = $this->config->get($type); |
|
| 77 | 77 | |
| 78 | - if( $this->context === null ) |
|
| 78 | + if ($this->context === null) |
|
| 79 | 79 | { |
| 80 | 80 | $context = new \Aimeos\MShop\Context\Item\Standard(); |
| 81 | - $context->setConfig( $config ); |
|
| 82 | - |
|
| 83 | - $this->addDataBaseManager( $context ); |
|
| 84 | - $this->addFilesystemManager( $context ); |
|
| 85 | - $this->addMessageQueueManager( $context ); |
|
| 86 | - $this->addLogger( $context ); |
|
| 87 | - $this->addCache( $context ); |
|
| 88 | - $this->addMailer( $context); |
|
| 89 | - $this->addProcess( $context ); |
|
| 90 | - $this->addSession( $context ); |
|
| 91 | - $this->addUser( $context); |
|
| 92 | - $this->addGroups( $context); |
|
| 81 | + $context->setConfig($config); |
|
| 82 | + |
|
| 83 | + $this->addDataBaseManager($context); |
|
| 84 | + $this->addFilesystemManager($context); |
|
| 85 | + $this->addMessageQueueManager($context); |
|
| 86 | + $this->addLogger($context); |
|
| 87 | + $this->addCache($context); |
|
| 88 | + $this->addMailer($context); |
|
| 89 | + $this->addProcess($context); |
|
| 90 | + $this->addSession($context); |
|
| 91 | + $this->addUser($context); |
|
| 92 | + $this->addGroups($context); |
|
| 93 | 93 | |
| 94 | 94 | $this->context = $context; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - $this->context->setConfig( $config ); |
|
| 97 | + $this->context->setConfig($config); |
|
| 98 | 98 | |
| 99 | - if( $locale === true ) |
|
| 99 | + if ($locale === true) |
|
| 100 | 100 | { |
| 101 | - $localeItem = $this->locale->get( $this->context ); |
|
| 102 | - $this->context->setLocale( $localeItem ); |
|
| 103 | - $this->context->setI18n( $this->i18n->get( array( $localeItem->getLanguageId() ) ) ); |
|
| 101 | + $localeItem = $this->locale->get($this->context); |
|
| 102 | + $this->context->setLocale($localeItem); |
|
| 103 | + $this->context->setI18n($this->i18n->get(array($localeItem->getLanguageId()))); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | return $this->context; |
@@ -113,11 +113,11 @@ discard block |
||
| 113 | 113 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config |
| 114 | 114 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 115 | 115 | */ |
| 116 | - protected function addCache( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 116 | + protected function addCache(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 117 | 117 | { |
| 118 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context ); |
|
| 118 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context); |
|
| 119 | 119 | |
| 120 | - return $context->setCache( $cache ); |
|
| 120 | + return $context->setCache($cache); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | |
@@ -127,11 +127,11 @@ discard block |
||
| 127 | 127 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 128 | 128 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 129 | 129 | */ |
| 130 | - protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 130 | + protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 131 | 131 | { |
| 132 | - $dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() ); |
|
| 132 | + $dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig()); |
|
| 133 | 133 | |
| 134 | - return $context->setDatabaseManager( $dbm ); |
|
| 134 | + return $context->setDatabaseManager($dbm); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | |
@@ -141,14 +141,14 @@ discard block |
||
| 141 | 141 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 142 | 142 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 143 | 143 | */ |
| 144 | - protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 144 | + protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 145 | 145 | { |
| 146 | 146 | $config = $context->getConfig(); |
| 147 | - $path = storage_path( 'aimeos' ); |
|
| 147 | + $path = storage_path('aimeos'); |
|
| 148 | 148 | |
| 149 | - $fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, $path ); |
|
| 149 | + $fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path); |
|
| 150 | 150 | |
| 151 | - return $context->setFilesystemManager( $fs ); |
|
| 151 | + return $context->setFilesystemManager($fs); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | |
@@ -158,11 +158,11 @@ discard block |
||
| 158 | 158 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 159 | 159 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 160 | 160 | */ |
| 161 | - protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 161 | + protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 162 | 162 | { |
| 163 | - $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context ); |
|
| 163 | + $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context); |
|
| 164 | 164 | |
| 165 | - return $context->setLogger( $logger ); |
|
| 165 | + return $context->setLogger($logger); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | |
@@ -173,11 +173,11 @@ discard block |
||
| 173 | 173 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 174 | 174 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 175 | 175 | */ |
| 176 | - protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 176 | + protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 177 | 177 | { |
| 178 | - $mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } ); |
|
| 178 | + $mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } ); |
|
| 179 | 179 | |
| 180 | - return $context->setMail( $mail ); |
|
| 180 | + return $context->setMail($mail); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | |
@@ -187,11 +187,11 @@ discard block |
||
| 187 | 187 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 188 | 188 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 189 | 189 | */ |
| 190 | - protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 190 | + protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 191 | 191 | { |
| 192 | - $mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() ); |
|
| 192 | + $mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig()); |
|
| 193 | 193 | |
| 194 | - return $context->setMessageQueueManager( $mq ); |
|
| 194 | + return $context->setMessageQueueManager($mq); |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | |
@@ -201,16 +201,16 @@ discard block |
||
| 201 | 201 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 202 | 202 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 203 | 203 | */ |
| 204 | - protected function addProcess( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 204 | + protected function addProcess(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 205 | 205 | { |
| 206 | 206 | $config = $context->getConfig(); |
| 207 | - $max = $config->get( 'pcntl_max', 4 ); |
|
| 208 | - $prio = $config->get( 'pcntl_priority', 19 ); |
|
| 207 | + $max = $config->get('pcntl_max', 4); |
|
| 208 | + $prio = $config->get('pcntl_priority', 19); |
|
| 209 | 209 | |
| 210 | - $process = new \Aimeos\MW\Process\Pcntl( $max, $prio ); |
|
| 211 | - $process = new \Aimeos\MW\Process\Decorator\Check( $process ); |
|
| 210 | + $process = new \Aimeos\MW\Process\Pcntl($max, $prio); |
|
| 211 | + $process = new \Aimeos\MW\Process\Decorator\Check($process); |
|
| 212 | 212 | |
| 213 | - return $context->setProcess( $process ); |
|
| 213 | + return $context->setProcess($process); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | |
@@ -220,11 +220,11 @@ discard block |
||
| 220 | 220 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 221 | 221 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 222 | 222 | */ |
| 223 | - protected function addSession( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 223 | + protected function addSession(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 224 | 224 | { |
| 225 | - $session = new \Aimeos\MW\Session\Laravel5( $this->session ); |
|
| 225 | + $session = new \Aimeos\MW\Session\Laravel5($this->session); |
|
| 226 | 226 | |
| 227 | - return $context->setSession( $session ); |
|
| 227 | + return $context->setSession($session); |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | |
@@ -234,16 +234,16 @@ discard block |
||
| 234 | 234 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 235 | 235 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 236 | 236 | */ |
| 237 | - protected function addUser( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 237 | + protected function addUser(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 238 | 238 | { |
| 239 | - if( ( $userid = Auth::id() ) !== null ) { |
|
| 240 | - $context->setUserId( $userid ); |
|
| 239 | + if (($userid = Auth::id()) !== null) { |
|
| 240 | + $context->setUserId($userid); |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - if( ( $user = Auth::user() ) !== null ) { |
|
| 244 | - $context->setEditor( $user->name ); |
|
| 243 | + if (($user = Auth::user()) !== null) { |
|
| 244 | + $context->setEditor($user->name); |
|
| 245 | 245 | } else { |
| 246 | - $context->setEditor( \Request::ip() ); |
|
| 246 | + $context->setEditor(\Request::ip()); |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | return $context; |
@@ -256,14 +256,14 @@ discard block |
||
| 256 | 256 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 257 | 257 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 258 | 258 | */ |
| 259 | - protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 259 | + protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 260 | 260 | { |
| 261 | - if( ( $userid = Auth::id() ) !== null ) |
|
| 261 | + if (($userid = Auth::id()) !== null) |
|
| 262 | 262 | { |
| 263 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
| 263 | + $context->setGroupIds(function() use ($context, $userid) |
|
| 264 | 264 | { |
| 265 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
| 266 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
|
| 265 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
| 266 | + return $manager->getItem($userid, array('customer/group'))->getGroups(); |
|
| 267 | 267 | } ); |
| 268 | 268 | } |
| 269 | 269 | |
@@ -43,30 +43,30 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public function fire() |
| 45 | 45 | { |
| 46 | - $aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 46 | + $aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 47 | 47 | $context = $this->getContext(); |
| 48 | 48 | |
| 49 | 49 | $process = $context->getProcess(); |
| 50 | - $jobs = explode( ' ', $this->argument( 'jobs' ) ); |
|
| 51 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 50 | + $jobs = explode(' ', $this->argument('jobs')); |
|
| 51 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 52 | 52 | |
| 53 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
| 53 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
| 54 | 54 | { |
| 55 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
| 56 | - $localeItem->setLanguageId( null ); |
|
| 57 | - $localeItem->setCurrencyId( null ); |
|
| 55 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
| 56 | + $localeItem->setLanguageId(null); |
|
| 57 | + $localeItem->setCurrencyId(null); |
|
| 58 | 58 | |
| 59 | - $context->setLocale( $localeItem ); |
|
| 59 | + $context->setLocale($localeItem); |
|
| 60 | 60 | |
| 61 | - $this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) ); |
|
| 61 | + $this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode())); |
|
| 62 | 62 | |
| 63 | - foreach( $jobs as $jobname ) |
|
| 63 | + foreach ($jobs as $jobname) |
|
| 64 | 64 | { |
| 65 | - $fcn = function( $context, $aimeos, $jobname ) { |
|
| 66 | - \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run(); |
|
| 65 | + $fcn = function($context, $aimeos, $jobname) { |
|
| 66 | + \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run(); |
|
| 67 | 67 | }; |
| 68 | 68 | |
| 69 | - $process->start( $fcn, [$context, $aimeos, $jobname], true ); |
|
| 69 | + $process->start($fcn, [$context, $aimeos, $jobname], true); |
|
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | |
@@ -82,8 +82,8 @@ discard block |
||
| 82 | 82 | protected function getArguments() |
| 83 | 83 | { |
| 84 | 84 | return array( |
| 85 | - array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ), |
|
| 86 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ), |
|
| 85 | + array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'), |
|
| 86 | + array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'), |
|
| 87 | 87 | ); |
| 88 | 88 | } |
| 89 | 89 | |
@@ -106,19 +106,19 @@ discard block |
||
| 106 | 106 | protected function getContext() |
| 107 | 107 | { |
| 108 | 108 | $lv = $this->getLaravel(); |
| 109 | - $aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 110 | - $context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
| 109 | + $aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 110 | + $context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
| 111 | 111 | |
| 112 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
|
| 113 | - $view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths ); |
|
| 112 | + $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); |
|
| 113 | + $view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths); |
|
| 114 | 114 | |
| 115 | - $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' ); |
|
| 116 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
|
| 117 | - $i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids ); |
|
| 115 | + $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language'); |
|
| 116 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); |
|
| 117 | + $i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids); |
|
| 118 | 118 | |
| 119 | - $context->setEditor( 'aimeos:jobs' ); |
|
| 120 | - $context->setView( $view ); |
|
| 121 | - $context->setI18n( $i18n ); |
|
| 119 | + $context->setEditor('aimeos:jobs'); |
|
| 120 | + $context->setView($view); |
|
| 121 | + $context->setI18n($i18n); |
|
| 122 | 122 | |
| 123 | 123 | return $context; |
| 124 | 124 | } |
@@ -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 | { |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | /** |
| 129 | 129 | * Returns the HTML code for the requested resource object |
| 130 | 130 | * |
| 131 | - * @return string Generated output |
|
| 131 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 132 | 132 | */ |
| 133 | 133 | public function getAction() |
| 134 | 134 | { |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | /** |
| 166 | 166 | * Returns the HTML code for a list of resource objects |
| 167 | 167 | * |
| 168 | - * @return string Generated output |
|
| 168 | + * @return \Illuminate\Contracts\View\View Generated output |
|
| 169 | 169 | */ |
| 170 | 170 | public function searchAction() |
| 171 | 171 | { |
@@ -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', [JqadmController::class, ['admin', 'editor', 'viewer']] ); |
|
| 37 | + if (config('shop.authorize', true)) { |
|
| 38 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]); |
|
| 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', [JqadmController::class, ['admin', 'editor']] ); |
|
| 82 | + if (config('shop.authorize', true)) { |
|
| 83 | + $this->authorize('admin', [JqadmController::class, ['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', [JqadmController::class, ['admin', 'editor']] ); |
|
| 98 | + if (config('shop.authorize', true)) { |
|
| 99 | + $this->authorize('admin', [JqadmController::class, ['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,17 +111,17 @@ discard block |
||
| 111 | 111 | */ |
| 112 | 112 | public function deleteAction() |
| 113 | 113 | { |
| 114 | - if( config( 'shop.authorize', true ) ) { |
|
| 115 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
| 114 | + if (config('shop.authorize', true)) { |
|
| 115 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | $cntl = $this->createClient(); |
| 119 | 119 | |
| 120 | - if( ( $html = $cntl->delete() ) == '' ) { |
|
| 120 | + if (($html = $cntl->delete()) == '') { |
|
| 121 | 121 | return $cntl->getView()->response(); |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - return $this->getHtml( $html ); |
|
| 124 | + return $this->getHtml($html); |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | |
@@ -132,12 +132,12 @@ discard block |
||
| 132 | 132 | */ |
| 133 | 133 | public function getAction() |
| 134 | 134 | { |
| 135 | - if( config( 'shop.authorize', true ) ) { |
|
| 136 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'viewer']] ); |
|
| 135 | + if (config('shop.authorize', true)) { |
|
| 136 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | $cntl = $this->createClient(); |
| 140 | - return $this->getHtml( $cntl->get() ); |
|
| 140 | + return $this->getHtml($cntl->get()); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | |
@@ -148,17 +148,17 @@ discard block |
||
| 148 | 148 | */ |
| 149 | 149 | public function saveAction() |
| 150 | 150 | { |
| 151 | - if( config( 'shop.authorize', true ) ) { |
|
| 152 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
| 151 | + if (config('shop.authorize', true)) { |
|
| 152 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | $cntl = $this->createClient(); |
| 156 | 156 | |
| 157 | - if( ( $html = $cntl->save() ) == '' ) { |
|
| 157 | + if (($html = $cntl->save()) == '') { |
|
| 158 | 158 | return $cntl->getView()->response(); |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - return $this->getHtml( $html ); |
|
| 161 | + return $this->getHtml($html); |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | |
@@ -169,12 +169,12 @@ discard block |
||
| 169 | 169 | */ |
| 170 | 170 | public function searchAction() |
| 171 | 171 | { |
| 172 | - if( config( 'shop.authorize', true ) ) { |
|
| 173 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'viewer']] ); |
|
| 172 | + if (config('shop.authorize', true)) { |
|
| 173 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | $cntl = $this->createClient(); |
| 177 | - return $this->getHtml( $cntl->search() ); |
|
| 177 | + return $this->getHtml($cntl->search()); |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | |
@@ -185,19 +185,19 @@ discard block |
||
| 185 | 185 | */ |
| 186 | 186 | protected function createClient() |
| 187 | 187 | { |
| 188 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 189 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
| 190 | - $resource = Route::input( 'resource' ); |
|
| 188 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 189 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
| 190 | + $resource = Route::input('resource'); |
|
| 191 | 191 | |
| 192 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 193 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
| 192 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 193 | + $templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
| 194 | 194 | |
| 195 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
| 196 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); |
|
| 197 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
| 198 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) ); |
|
| 195 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
| 196 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); |
|
| 197 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
| 198 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang)); |
|
| 199 | 199 | |
| 200 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
| 200 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource); |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | |
@@ -207,15 +207,15 @@ discard block |
||
| 207 | 207 | * @param string $content Content from admin client |
| 208 | 208 | * @return \Illuminate\Contracts\View\View View for rendering the output |
| 209 | 209 | */ |
| 210 | - protected function getHtml( $content ) |
|
| 210 | + protected function getHtml($content) |
|
| 211 | 211 | { |
| 212 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' ); |
|
| 213 | - $extnames = implode( ',', $aimeos->get()->getExtensions() ); |
|
| 212 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos'); |
|
| 213 | + $extnames = implode(',', $aimeos->get()->getExtensions()); |
|
| 214 | 214 | $version = $aimeos->getVersion(); |
| 215 | 215 | |
| 216 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 217 | - $content = str_replace( ['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content ); |
|
| 216 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 217 | + $content = str_replace(['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content); |
|
| 218 | 218 | |
| 219 | - return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) ); |
|
| 219 | + return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site)); |
|
| 220 | 220 | } |
| 221 | 221 | } |
