@@ -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 |
@@ -28,31 +28,31 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function boot() |
| 30 | 30 | { |
| 31 | - $basedir = dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR; |
|
| 31 | + $basedir = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR; |
|
| 32 | 32 | |
| 33 | - $this->mergeConfigFrom(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR.'config/shop.php', 'shop'); |
|
| 33 | + $this->mergeConfigFrom(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'config/shop.php', 'shop'); |
|
| 34 | 34 | |
| 35 | - $this->loadViewsFrom($basedir.'views', 'shop'); |
|
| 35 | + $this->loadViewsFrom($basedir . 'views', 'shop'); |
|
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | $this->publishes(array( |
| 39 | - $basedir.'config/shop.php' => config_path('shop.php'), |
|
| 39 | + $basedir . 'config/shop.php' => config_path('shop.php'), |
|
| 40 | 40 | ), 'config'); |
| 41 | 41 | |
| 42 | 42 | $this->publishes(array( |
| 43 | - $basedir.'database/migrations' => base_path('database/migrations'), |
|
| 43 | + $basedir . 'database/migrations' => base_path('database/migrations'), |
|
| 44 | 44 | ), 'migrations'); |
| 45 | 45 | |
| 46 | 46 | $this->publishes(array( |
| 47 | - $basedir.'views' => base_path('resources/views/vendor/shop'), |
|
| 47 | + $basedir . 'views' => base_path('resources/views/vendor/shop'), |
|
| 48 | 48 | ), 'views'); |
| 49 | 49 | |
| 50 | 50 | $this->publishes(array( |
| 51 | - dirname($basedir).DIRECTORY_SEPARATOR.'public' => public_path('packages/aimeos/shop'), |
|
| 51 | + dirname($basedir) . DIRECTORY_SEPARATOR . 'public' => public_path('packages/aimeos/shop'), |
|
| 52 | 52 | ), 'public'); |
| 53 | 53 | |
| 54 | 54 | |
| 55 | - require $basedir.'routes.php'; |
|
| 55 | + require $basedir . 'routes.php'; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | |
@@ -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 ); |
@@ -39,21 +39,21 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public function fire() |
| 41 | 41 | { |
| 42 | - $code = $this->argument( 'email' ); |
|
| 43 | - if( ( $password = $this->option( 'password' ) ) === null ) { |
|
| 44 | - $password = $this->secret( 'Password' ); |
|
| 42 | + $code = $this->argument('email'); |
|
| 43 | + if (($password = $this->option('password')) === null) { |
|
| 44 | + $password = $this->secret('Password'); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false ); |
|
| 48 | - $context->setEditor( 'aimeos:account' ); |
|
| 47 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false); |
|
| 48 | + $context->setEditor('aimeos:account'); |
|
| 49 | 49 | |
| 50 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 51 | - $context->setLocale( $localeManager->createItem() ); |
|
| 50 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 51 | + $context->setLocale($localeManager->createItem()); |
|
| 52 | 52 | |
| 53 | - $user = $this->createCustomerItem( $context, $code, $password ); |
|
| 53 | + $user = $this->createCustomerItem($context, $code, $password); |
|
| 54 | 54 | |
| 55 | - if( $this->option( 'admin' ) ) { |
|
| 56 | - $this->addPrivilege( $context, $user, 'admin' ); |
|
| 55 | + if ($this->option('admin')) { |
|
| 56 | + $this->addPrivilege($context, $user, 'admin'); |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | |
@@ -65,31 +65,31 @@ discard block |
||
| 65 | 65 | * @param string $userid Unique user ID |
| 66 | 66 | * @param string $groupid Unique group ID |
| 67 | 67 | */ |
| 68 | - protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid ) |
|
| 68 | + protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid) |
|
| 69 | 69 | { |
| 70 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'lists' ); |
|
| 71 | - $typeid = $manager->getSubmanager( 'type' )->findItem( 'default', array(), 'customer/group' )->getId(); |
|
| 70 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('lists'); |
|
| 71 | + $typeid = $manager->getSubmanager('type')->findItem('default', array(), 'customer/group')->getId(); |
|
| 72 | 72 | |
| 73 | 73 | $search = $manager->createSearch(); |
| 74 | 74 | $expr = array( |
| 75 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
| 76 | - $search->compare( '==', 'customer.lists.refid', $groupid ), |
|
| 77 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
| 78 | - $search->compare( '==', 'customer.lists.typeid', $typeid ), |
|
| 75 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
| 76 | + $search->compare('==', 'customer.lists.refid', $groupid), |
|
| 77 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
| 78 | + $search->compare('==', 'customer.lists.typeid', $typeid), |
|
| 79 | 79 | ); |
| 80 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 81 | - $search->setSlice( 0, 1 ); |
|
| 80 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 81 | + $search->setSlice(0, 1); |
|
| 82 | 82 | |
| 83 | - if( count( $manager->searchItems( $search ) ) === 0 ) |
|
| 83 | + if (count($manager->searchItems($search)) === 0) |
|
| 84 | 84 | { |
| 85 | 85 | $item = $manager->createItem(); |
| 86 | - $item->setDomain( 'customer/group' ); |
|
| 87 | - $item->setParentId( $userid ); |
|
| 88 | - $item->setTypeId( $typeid ); |
|
| 89 | - $item->setRefId( $groupid ); |
|
| 90 | - $item->setStatus( 1 ); |
|
| 86 | + $item->setDomain('customer/group'); |
|
| 87 | + $item->setParentId($userid); |
|
| 88 | + $item->setTypeId($typeid); |
|
| 89 | + $item->setRefId($groupid); |
|
| 90 | + $item->setStatus(1); |
|
| 91 | 91 | |
| 92 | - $manager->saveItem( $item, false ); |
|
| 92 | + $manager->saveItem($item, false); |
|
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | 95 | |
@@ -101,23 +101,23 @@ discard block |
||
| 101 | 101 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object |
| 102 | 102 | * @param string $privilege Unique customer group code |
| 103 | 103 | */ |
| 104 | - protected function addPrivilege( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $privilege ) |
|
| 104 | + protected function addPrivilege(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $privilege) |
|
| 105 | 105 | { |
| 106 | - $this->info( sprintf( 'Add "%1$s" privilege to user "%2$s" for sites', $privilege, $user->getCode() ) ); |
|
| 106 | + $this->info(sprintf('Add "%1$s" privilege to user "%2$s" for sites', $privilege, $user->getCode())); |
|
| 107 | 107 | |
| 108 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 108 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 109 | 109 | |
| 110 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
| 110 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
| 111 | 111 | { |
| 112 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
| 112 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
| 113 | 113 | |
| 114 | 114 | $lcontext = clone $context; |
| 115 | - $lcontext->setLocale( $localeItem ); |
|
| 115 | + $lcontext->setLocale($localeItem); |
|
| 116 | 116 | |
| 117 | - $this->info( '- ' . $siteItem->getCode() ); |
|
| 117 | + $this->info('- ' . $siteItem->getCode()); |
|
| 118 | 118 | |
| 119 | - $groupItem = $this->getGroupItem( $lcontext, $privilege ); |
|
| 120 | - $this->addListItem( $lcontext, $user->getId(), $groupItem->getId() ); |
|
| 119 | + $groupItem = $this->getGroupItem($lcontext, $privilege); |
|
| 120 | + $this->addListItem($lcontext, $user->getId(), $groupItem->getId()); |
|
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | |
@@ -132,21 +132,21 @@ discard block |
||
| 132 | 132 | * @param string $password New user password |
| 133 | 133 | * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object |
| 134 | 134 | */ |
| 135 | - protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password ) |
|
| 135 | + protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password) |
|
| 136 | 136 | { |
| 137 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
| 137 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
| 138 | 138 | |
| 139 | 139 | try { |
| 140 | - $item = $manager->findItem( $email ); |
|
| 141 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 140 | + $item = $manager->findItem($email); |
|
| 141 | + } catch (\Aimeos\MShop\Exception $e) { |
|
| 142 | 142 | $item = $manager->createItem(); |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - $item->setCode( $email ); |
|
| 146 | - $item->getPaymentAddress()->setEmail( $email ); |
|
| 147 | - $item->setPassword( $password ); |
|
| 145 | + $item->setCode($email); |
|
| 146 | + $item->getPaymentAddress()->setEmail($email); |
|
| 147 | + $item->setPassword($password); |
|
| 148 | 148 | |
| 149 | - $manager->saveItem( $item ); |
|
| 149 | + $manager->saveItem($item); |
|
| 150 | 150 | |
| 151 | 151 | return $item; |
| 152 | 152 | } |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | protected function getArguments() |
| 161 | 161 | { |
| 162 | 162 | return array( |
| 163 | - array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ), |
|
| 164 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)' ), |
|
| 163 | + array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'), |
|
| 164 | + array('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)'), |
|
| 165 | 165 | ); |
| 166 | 166 | } |
| 167 | 167 | |
@@ -173,21 +173,21 @@ discard block |
||
| 173 | 173 | * @param string $code Unique customer group code |
| 174 | 174 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object |
| 175 | 175 | */ |
| 176 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code ) |
|
| 176 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code) |
|
| 177 | 177 | { |
| 178 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' ); |
|
| 178 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group'); |
|
| 179 | 179 | |
| 180 | 180 | try |
| 181 | 181 | { |
| 182 | - $item = $manager->findItem( $code ); |
|
| 182 | + $item = $manager->findItem($code); |
|
| 183 | 183 | } |
| 184 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 184 | + catch (\Aimeos\MShop\Exception $e) |
|
| 185 | 185 | { |
| 186 | 186 | $item = $manager->createItem(); |
| 187 | - $item->setLabel( $code ); |
|
| 188 | - $item->setCode( $code ); |
|
| 187 | + $item->setLabel($code); |
|
| 188 | + $item->setCode($code); |
|
| 189 | 189 | |
| 190 | - $manager->saveItem( $item ); |
|
| 190 | + $manager->saveItem($item); |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | return $item; |
@@ -202,8 +202,8 @@ discard block |
||
| 202 | 202 | protected function getOptions() |
| 203 | 203 | { |
| 204 | 204 | return array( |
| 205 | - array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ), |
|
| 206 | - array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ), |
|
| 205 | + array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'), |
|
| 206 | + array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'), |
|
| 207 | 207 | ); |
| 208 | 208 | } |
| 209 | 209 | |
@@ -216,23 +216,23 @@ discard block |
||
| 216 | 216 | * @return \Aimeos\MShop\Common\Item\Type\Iface Aimeos customer list type item object |
| 217 | 217 | * @throws \Exception If no customer list type item for the given code is found |
| 218 | 218 | */ |
| 219 | - protected function getTypeItem( \Aimeos\MShop\Common\Manager\Iface $listManager, $code ) |
|
| 219 | + protected function getTypeItem(\Aimeos\MShop\Common\Manager\Iface $listManager, $code) |
|
| 220 | 220 | { |
| 221 | - $manager = $listManager->getSubmanager( 'type' ); |
|
| 221 | + $manager = $listManager->getSubmanager('type'); |
|
| 222 | 222 | |
| 223 | 223 | $search = $manager->createSearch(); |
| 224 | 224 | $expr = array( |
| 225 | - $search->compare( '==', 'customer.lists.type.domain', 'customer/group' ), |
|
| 226 | - $search->compare( '==', 'customer.lists.type.code', $code ), |
|
| 225 | + $search->compare('==', 'customer.lists.type.domain', 'customer/group'), |
|
| 226 | + $search->compare('==', 'customer.lists.type.code', $code), |
|
| 227 | 227 | ); |
| 228 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 228 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 229 | 229 | |
| 230 | - $result = $manager->searchItems( $search ); |
|
| 230 | + $result = $manager->searchItems($search); |
|
| 231 | 231 | |
| 232 | - if( ( $item = reset( $result ) ) === false ) |
|
| 232 | + if (($item = reset($result)) === false) |
|
| 233 | 233 | { |
| 234 | - $msg = sprintf( 'No user list type item for domain "%1$s" and code "%2$s" found', 'customer/group', $code ); |
|
| 235 | - throw new \Exception( $msg ); |
|
| 234 | + $msg = sprintf('No user list type item for domain "%1$s" and code "%2$s" found', 'customer/group', $code); |
|
| 235 | + throw new \Exception($msg); |
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | return $item; |
@@ -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 = ''; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 46 | 46 | * @param \Illuminate\Session\Store $session Laravel session object |
| 47 | 47 | */ |
| 48 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Illuminate\Session\Store $session ) |
|
| 48 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Illuminate\Session\Store $session) |
|
| 49 | 49 | { |
| 50 | 50 | $this->config = $config; |
| 51 | 51 | $this->session = $session; |
@@ -58,48 +58,48 @@ discard block |
||
| 58 | 58 | * @param boolean $locale True to add locale object to context, false if not |
| 59 | 59 | * @return \Aimeos\MShop\Context\Item\Iface Context object |
| 60 | 60 | */ |
| 61 | - public function get( $locale = true ) |
|
| 61 | + public function get($locale = true) |
|
| 62 | 62 | { |
| 63 | - if( self::$context === null ) |
|
| 63 | + if (self::$context === null) |
|
| 64 | 64 | { |
| 65 | 65 | $context = new \Aimeos\MShop\Context\Item\Standard(); |
| 66 | 66 | |
| 67 | 67 | $config = $this->getConfig(); |
| 68 | - $context->setConfig( $config ); |
|
| 68 | + $context->setConfig($config); |
|
| 69 | 69 | |
| 70 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $config ); |
|
| 71 | - $context->setDatabaseManager( $dbm ); |
|
| 70 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($config); |
|
| 71 | + $context->setDatabaseManager($dbm); |
|
| 72 | 72 | |
| 73 | - $fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, storage_path( 'aimeos' ) ); |
|
| 74 | - $context->setFilesystemManager( $fs ); |
|
| 73 | + $fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, storage_path('aimeos')); |
|
| 74 | + $context->setFilesystemManager($fs); |
|
| 75 | 75 | |
| 76 | - $mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } ); |
|
| 77 | - $context->setMail( $mail ); |
|
| 76 | + $mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } ); |
|
| 77 | + $context->setMail($mail); |
|
| 78 | 78 | |
| 79 | - $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context ); |
|
| 80 | - $context->setLogger( $logger ); |
|
| 79 | + $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context); |
|
| 80 | + $context->setLogger($logger); |
|
| 81 | 81 | |
| 82 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context ); |
|
| 83 | - $context->setCache( $cache ); |
|
| 82 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context); |
|
| 83 | + $context->setCache($cache); |
|
| 84 | 84 | |
| 85 | 85 | self::$context = $context; |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | $context = self::$context; |
| 89 | 89 | |
| 90 | - if( $locale === true ) |
|
| 90 | + if ($locale === true) |
|
| 91 | 91 | { |
| 92 | - $localeItem = $this->getLocale( $context ); |
|
| 92 | + $localeItem = $this->getLocale($context); |
|
| 93 | 93 | $langid = $localeItem->getLanguageId(); |
| 94 | 94 | |
| 95 | - $context->setLocale( $localeItem ); |
|
| 96 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $langid ) ) ); |
|
| 95 | + $context->setLocale($localeItem); |
|
| 96 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($langid))); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - $session = new \Aimeos\MW\Session\Laravel5( $this->session ); |
|
| 100 | - $context->setSession( $session ); |
|
| 99 | + $session = new \Aimeos\MW\Session\Laravel5($this->session); |
|
| 100 | + $context->setSession($session); |
|
| 101 | 101 | |
| 102 | - $this->addUser( $context ); |
|
| 102 | + $this->addUser($context); |
|
| 103 | 103 | |
| 104 | 104 | return $context; |
| 105 | 105 | } |
@@ -110,20 +110,20 @@ discard block |
||
| 110 | 110 | * |
| 111 | 111 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 112 | 112 | */ |
| 113 | - protected function addUser( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 113 | + protected function addUser(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 114 | 114 | { |
| 115 | - if( ( $userid = \Auth::id() ) !== null ) |
|
| 115 | + if (($userid = \Auth::id()) !== null) |
|
| 116 | 116 | { |
| 117 | - $context->setUserId( $userid ); |
|
| 118 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
| 117 | + $context->setUserId($userid); |
|
| 118 | + $context->setGroupIds(function() use ($context, $userid) |
|
| 119 | 119 | { |
| 120 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
| 121 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
|
| 120 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
| 121 | + return $manager->getItem($userid, array('customer/group'))->getGroups(); |
|
| 122 | 122 | } ); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - if( ( $user = \Auth::user() ) !== null ) { |
|
| 126 | - $context->setEditor( $user->name ); |
|
| 125 | + if (($user = \Auth::user()) !== null) { |
|
| 126 | + $context->setEditor($user->name); |
|
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | |
@@ -135,13 +135,13 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | protected function getConfig() |
| 137 | 137 | { |
| 138 | - $conf = $this->config->get( 'shop' ); |
|
| 138 | + $conf = $this->config->get('shop'); |
|
| 139 | 139 | |
| 140 | - $configPaths = app( '\Aimeos\Shop\Base\Aimeos' )->get()->getConfigPaths( 'mysql' ); |
|
| 141 | - $config = new \Aimeos\MW\Config\PHPArray( $conf, $configPaths ); |
|
| 140 | + $configPaths = app('\Aimeos\Shop\Base\Aimeos')->get()->getConfigPaths('mysql'); |
|
| 141 | + $config = new \Aimeos\MW\Config\PHPArray($conf, $configPaths); |
|
| 142 | 142 | |
| 143 | - if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
| 144 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
| 143 | + if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) { |
|
| 144 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | return $config; |
@@ -154,15 +154,15 @@ discard block |
||
| 154 | 154 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 155 | 155 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 156 | 156 | */ |
| 157 | - protected function getLocale( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 157 | + protected function getLocale(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 158 | 158 | { |
| 159 | - if( $this->locale === null ) |
|
| 159 | + if ($this->locale === null) |
|
| 160 | 160 | { |
| 161 | - if( \Route::current() !== null ) |
|
| 161 | + if (\Route::current() !== null) |
|
| 162 | 162 | { |
| 163 | - $site = \Route::input( 'site', 'default' ); |
|
| 164 | - $lang = \Route::input( 'locale', '' ); |
|
| 165 | - $currency = \Route::input( 'currency', '' ); |
|
| 163 | + $site = \Route::input('site', 'default'); |
|
| 164 | + $lang = \Route::input('locale', ''); |
|
| 165 | + $currency = \Route::input('currency', ''); |
|
| 166 | 166 | } |
| 167 | 167 | else |
| 168 | 168 | { |
@@ -170,10 +170,10 @@ discard block |
||
| 170 | 170 | $lang = $currency = ''; |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | - $disableSites = $this->config->has( 'shop.disableSites' ); |
|
| 173 | + $disableSites = $this->config->has('shop.disableSites'); |
|
| 174 | 174 | |
| 175 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 176 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites ); |
|
| 175 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 176 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | return $this->locale; |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | return array( |
| 4 | 4 | 'apc_enabled' => false, |
| 5 | 5 | 'apc_prefix' => 'laravel:', |
| 6 | - 'extdir' => ( is_dir(base_path('ext')) ? base_path('ext') : dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'ext' ), |
|
| 6 | + 'extdir' => (is_dir(base_path('ext')) ? base_path('ext') : dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'ext'), |
|
| 7 | 7 | 'uploaddir' => '/', |
| 8 | 8 | |
| 9 | 9 | 'routes' => array( |
@@ -14,16 +14,16 @@ discard block |
||
| 14 | 14 | ), |
| 15 | 15 | |
| 16 | 16 | 'page' => array( |
| 17 | - 'account-index' => array( 'account/history','account/favorite','account/watch','basket/mini','catalog/session' ), |
|
| 18 | - 'basket-index' => array( 'basket/standard','basket/related' ), |
|
| 19 | - 'catalog-count' => array( 'catalog/count' ), |
|
| 20 | - 'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ), |
|
| 21 | - 'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ), |
|
| 22 | - 'catalog-stock' => array( 'catalog/stock' ), |
|
| 23 | - 'catalog-suggest' => array( 'catalog/suggest' ), |
|
| 24 | - 'checkout-confirm' => array( 'checkout/confirm' ), |
|
| 25 | - 'checkout-index' => array( 'checkout/standard' ), |
|
| 26 | - 'checkout-update' => array( 'checkout/update'), |
|
| 17 | + 'account-index' => array('account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'), |
|
| 18 | + 'basket-index' => array('basket/standard', 'basket/related'), |
|
| 19 | + 'catalog-count' => array('catalog/count'), |
|
| 20 | + 'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'), |
|
| 21 | + 'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'), |
|
| 22 | + 'catalog-stock' => array('catalog/stock'), |
|
| 23 | + 'catalog-suggest' => array('catalog/suggest'), |
|
| 24 | + 'checkout-confirm' => array('checkout/confirm'), |
|
| 25 | + 'checkout-index' => array('checkout/standard'), |
|
| 26 | + 'checkout-update' => array('checkout/update'), |
|
| 27 | 27 | ), |
| 28 | 28 | |
| 29 | 29 | 'resource' => array( |
@@ -34,19 +34,19 @@ discard block |
||
| 34 | 34 | 'database' => env('DB_DATABASE', 'laravel'), |
| 35 | 35 | 'username' => env('DB_USERNAME', 'root'), |
| 36 | 36 | 'password' => env('DB_PASSWORD', ''), |
| 37 | - 'stmt' => array( "SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'" ), |
|
| 37 | + 'stmt' => array("SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'"), |
|
| 38 | 38 | 'opt-persistent' => 0, |
| 39 | 39 | 'limit' => 2, |
| 40 | 40 | ), |
| 41 | 41 | 'fs' => array( |
| 42 | 42 | 'adapter' => 'Standard', |
| 43 | 43 | 'basedir' => public_path(), |
| 44 | - 'tempdir' => storage_path( 'aimeos' ), |
|
| 44 | + 'tempdir' => storage_path('aimeos'), |
|
| 45 | 45 | ), |
| 46 | 46 | 'fs-admin' => array( |
| 47 | 47 | 'adapter' => 'Standard', |
| 48 | - 'basedir' => public_path( 'uploads' ), |
|
| 49 | - 'tempdir' => storage_path( 'aimeos' ), |
|
| 48 | + 'basedir' => public_path('uploads'), |
|
| 49 | + 'tempdir' => storage_path('aimeos'), |
|
| 50 | 50 | ), |
| 51 | 51 | /* 'fs-media' => array( |
| 52 | 52 | 'adapter' => 'Standard', |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | 'default' => array( |
| 192 | 192 | 'mimeicon' => array( |
| 193 | 193 | # Directory where icons for the mime types stored |
| 194 | - 'directory' => public_path( '/packages/aimeos/shop/mimeicons' ), |
|
| 194 | + 'directory' => public_path('/packages/aimeos/shop/mimeicons'), |
|
| 195 | 195 | # File extension of mime type icons |
| 196 | 196 | 'extension' => '.png' |
| 197 | 197 | ), |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | # in the "maxwidth" parameter |
| 235 | 235 | # maxheight: 280 |
| 236 | 236 | ), |
| 237 | - 'tempdir' => storage_path( 'aimeos' ), |
|
| 237 | + 'tempdir' => storage_path('aimeos'), |
|
| 238 | 238 | ), |
| 239 | 239 | ), |
| 240 | 240 | 'product' => array( |
@@ -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 | } |
@@ -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 | { |
@@ -33,17 +33,17 @@ discard block |
||
| 33 | 33 | * @param integer $id Unique resource ID |
| 34 | 34 | * @return string Generated output |
| 35 | 35 | */ |
| 36 | - public function copyAction( $site = 'default', $resource, $id ) |
|
| 36 | + public function copyAction($site = 'default', $resource, $id) |
|
| 37 | 37 | { |
| 38 | - if( config( 'shop.authorize', true ) ) { |
|
| 39 | - $this->authorize( 'admin' ); |
|
| 38 | + if (config('shop.authorize', true)) { |
|
| 39 | + $this->authorize('admin'); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - $cntl = $this->createClient( $site, $resource ); |
|
| 43 | - $content = $cntl->copy( $id ); |
|
| 42 | + $cntl = $this->createClient($site, $resource); |
|
| 43 | + $content = $cntl->copy($id); |
|
| 44 | 44 | |
| 45 | - $url = route( 'aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource] ); |
|
| 46 | - return \View::make('shop::admin.jqadm', array( 'content' => $content, 'jsonadmurl' => $url ) ); |
|
| 45 | + $url = route('aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource]); |
|
| 46 | + return \View::make('shop::admin.jqadm', array('content' => $content, 'jsonadmurl' => $url)); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
@@ -54,17 +54,17 @@ discard block |
||
| 54 | 54 | * @param string $sitecode Unique site code |
| 55 | 55 | * @return string Generated output |
| 56 | 56 | */ |
| 57 | - public function createAction( $site = 'default', $resource ) |
|
| 57 | + public function createAction($site = 'default', $resource) |
|
| 58 | 58 | { |
| 59 | - if( config( 'shop.authorize', true ) ) { |
|
| 60 | - $this->authorize( 'admin' ); |
|
| 59 | + if (config('shop.authorize', true)) { |
|
| 60 | + $this->authorize('admin'); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - $cntl = $this->createClient( $site, $resource ); |
|
| 63 | + $cntl = $this->createClient($site, $resource); |
|
| 64 | 64 | $content = $cntl->create(); |
| 65 | 65 | |
| 66 | - $url = route( 'aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource] ); |
|
| 67 | - return \View::make('shop::admin.jqadm', array( 'content' => $content, 'jsonadmurl' => $url ) ); |
|
| 66 | + $url = route('aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource]); |
|
| 67 | + return \View::make('shop::admin.jqadm', array('content' => $content, 'jsonadmurl' => $url)); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | |
@@ -76,17 +76,17 @@ discard block |
||
| 76 | 76 | * @param integer $id Unique resource ID |
| 77 | 77 | * @return string Generated output |
| 78 | 78 | */ |
| 79 | - public function deleteAction( $site = 'default', $resource, $id ) |
|
| 79 | + public function deleteAction($site = 'default', $resource, $id) |
|
| 80 | 80 | { |
| 81 | - if( config( 'shop.authorize', true ) ) { |
|
| 82 | - $this->authorize( 'admin' ); |
|
| 81 | + if (config('shop.authorize', true)) { |
|
| 82 | + $this->authorize('admin'); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - $cntl = $this->createClient( $site, $resource ); |
|
| 86 | - $content = $cntl->delete( $id ) . $cntl->search(); |
|
| 85 | + $cntl = $this->createClient($site, $resource); |
|
| 86 | + $content = $cntl->delete($id) . $cntl->search(); |
|
| 87 | 87 | |
| 88 | - $url = route( 'aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource] ); |
|
| 89 | - return \View::make('shop::admin.jqadm', array( 'content' => $content, 'jsonadmurl' => $url ) ); |
|
| 88 | + $url = route('aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource]); |
|
| 89 | + return \View::make('shop::admin.jqadm', array('content' => $content, 'jsonadmurl' => $url)); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | |
@@ -98,17 +98,17 @@ discard block |
||
| 98 | 98 | * @param integer $id Unique resource ID |
| 99 | 99 | * @return string Generated output |
| 100 | 100 | */ |
| 101 | - public function getAction( $site = 'default', $resource, $id ) |
|
| 101 | + public function getAction($site = 'default', $resource, $id) |
|
| 102 | 102 | { |
| 103 | - if( config( 'shop.authorize', true ) ) { |
|
| 104 | - $this->authorize( 'admin' ); |
|
| 103 | + if (config('shop.authorize', true)) { |
|
| 104 | + $this->authorize('admin'); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - $cntl = $this->createClient( $site, $resource ); |
|
| 108 | - $content = $cntl->get( $id ); |
|
| 107 | + $cntl = $this->createClient($site, $resource); |
|
| 108 | + $content = $cntl->get($id); |
|
| 109 | 109 | |
| 110 | - $url = route( 'aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource] ); |
|
| 111 | - return \View::make('shop::admin.jqadm', array( 'content' => $content, 'jsonadmurl' => $url ) ); |
|
| 110 | + $url = route('aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource]); |
|
| 111 | + return \View::make('shop::admin.jqadm', array('content' => $content, 'jsonadmurl' => $url)); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | |
@@ -119,17 +119,17 @@ discard block |
||
| 119 | 119 | * @param string $sitecode Unique site code |
| 120 | 120 | * @return string Generated output |
| 121 | 121 | */ |
| 122 | - public function saveAction( $site = 'default', $resource ) |
|
| 122 | + public function saveAction($site = 'default', $resource) |
|
| 123 | 123 | { |
| 124 | - if( config( 'shop.authorize', true ) ) { |
|
| 125 | - $this->authorize( 'admin' ); |
|
| 124 | + if (config('shop.authorize', true)) { |
|
| 125 | + $this->authorize('admin'); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - $cntl = $this->createClient( $site, $resource ); |
|
| 129 | - $content = ( $cntl->save() ? : $cntl->search() ); |
|
| 128 | + $cntl = $this->createClient($site, $resource); |
|
| 129 | + $content = ($cntl->save() ?: $cntl->search()); |
|
| 130 | 130 | |
| 131 | - $url = route( 'aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource] ); |
|
| 132 | - return \View::make('shop::admin.jqadm', array( 'content' => $content, 'jsonadmurl' => $url ) ); |
|
| 131 | + $url = route('aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource]); |
|
| 132 | + return \View::make('shop::admin.jqadm', array('content' => $content, 'jsonadmurl' => $url)); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | |
@@ -140,17 +140,17 @@ discard block |
||
| 140 | 140 | * @param string $sitecode Unique site code |
| 141 | 141 | * @return string Generated output |
| 142 | 142 | */ |
| 143 | - public function searchAction( $site = 'default', $resource ) |
|
| 143 | + public function searchAction($site = 'default', $resource) |
|
| 144 | 144 | { |
| 145 | - if( config( 'shop.authorize', true ) ) { |
|
| 146 | - $this->authorize( 'admin' ); |
|
| 145 | + if (config('shop.authorize', true)) { |
|
| 146 | + $this->authorize('admin'); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - $cntl = $this->createClient( $site, $resource ); |
|
| 149 | + $cntl = $this->createClient($site, $resource); |
|
| 150 | 150 | $content = $cntl->search(); |
| 151 | 151 | |
| 152 | - $url = route( 'aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource] ); |
|
| 153 | - return \View::make('shop::admin.jqadm', array( 'content' => $content, 'jsonadmurl' => $url ) ); |
|
| 152 | + $url = route('aimeos_shop_jsonadm_options', ['site' => $site, 'resource' => $resource]); |
|
| 153 | + return \View::make('shop::admin.jqadm', array('content' => $content, 'jsonadmurl' => $url)); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | |
@@ -160,20 +160,20 @@ discard block |
||
| 160 | 160 | * @param string $sitecode Unique site code |
| 161 | 161 | * @return \Aimeos\MShop\Context\Item\Iface Context item |
| 162 | 162 | */ |
| 163 | - protected function createClient( $sitecode, $resource ) |
|
| 163 | + protected function createClient($sitecode, $resource) |
|
| 164 | 164 | { |
| 165 | - $lang = \Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
| 165 | + $lang = \Input::get('lang', config('app.locale', 'en')); |
|
| 166 | 166 | |
| 167 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 168 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
| 167 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 168 | + $templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
| 169 | 169 | |
| 170 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
| 171 | - $context = $this->setLocale( $context, $sitecode, $lang ); |
|
| 170 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
| 171 | + $context = $this->setLocale($context, $sitecode, $lang); |
|
| 172 | 172 | |
| 173 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang ); |
|
| 174 | - $context->setView( $view ); |
|
| 173 | + $view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang); |
|
| 174 | + $context->setView($view); |
|
| 175 | 175 | |
| 176 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
| 176 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | |
@@ -185,23 +185,23 @@ discard block |
||
| 185 | 185 | * @param string $lang ISO language code, e.g. "en" or "en_GB" |
| 186 | 186 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 187 | 187 | */ |
| 188 | - protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang ) |
|
| 188 | + protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang) |
|
| 189 | 189 | { |
| 190 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 190 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 191 | 191 | |
| 192 | 192 | try |
| 193 | 193 | { |
| 194 | - $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); |
|
| 195 | - $localeItem->setLanguageId( null ); |
|
| 196 | - $localeItem->setCurrencyId( null ); |
|
| 194 | + $localeItem = $localeManager->bootstrap($sitecode, '', '', false); |
|
| 195 | + $localeItem->setLanguageId(null); |
|
| 196 | + $localeItem->setCurrencyId(null); |
|
| 197 | 197 | } |
| 198 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 198 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
| 199 | 199 | { |
| 200 | 200 | $localeItem = $localeManager->createItem(); |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - $context->setLocale( $localeItem ); |
|
| 204 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang ) ) ); |
|
| 203 | + $context->setLocale($localeItem); |
|
| 204 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang))); |
|
| 205 | 205 | |
| 206 | 206 | return $context; |
| 207 | 207 | } |
@@ -2,15 +2,15 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | Route::group(config('shop.routes.admin', ['middleware' => 'auth']), function() { |
| 4 | 4 | |
| 5 | - Route::match( array( 'GET' ), 'admin/file', array( |
|
| 5 | + Route::match(array('GET'), 'admin/file', array( |
|
| 6 | 6 | 'as' => 'aimeos_shop_admin_file', |
| 7 | 7 | 'uses' => 'Aimeos\Shop\Controller\AdminController@fileAction' |
| 8 | 8 | )); |
| 9 | - Route::match( array( 'POST' ), 'admin/do', array( |
|
| 9 | + Route::match(array('POST'), 'admin/do', array( |
|
| 10 | 10 | 'as' => 'aimeos_shop_admin_json', |
| 11 | 11 | 'uses' => 'Aimeos\Shop\Controller\AdminController@doAction' |
| 12 | 12 | )); |
| 13 | - Route::match( array( 'GET' ), 'admin', array( |
|
| 13 | + Route::match(array('GET'), 'admin', array( |
|
| 14 | 14 | 'as' => 'aimeos_shop_admin', |
| 15 | 15 | 'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction' |
| 16 | 16 | )); |
@@ -20,85 +20,85 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | Route::group(config('shop.routes.jqadm', ['middleware' => 'auth']), function() { |
| 22 | 22 | |
| 23 | - Route::match( array( 'GET', 'POST' ), 'jqadm/copy/{resource}/{id}', array( |
|
| 23 | + Route::match(array('GET', 'POST'), 'jqadm/copy/{resource}/{id}', array( |
|
| 24 | 24 | 'as' => 'aimeos_shop_jqadm_copy', |
| 25 | 25 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction' |
| 26 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 26 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 27 | 27 | |
| 28 | - Route::match( array( 'GET', 'POST' ), 'jqadm/create/{resource}', array( |
|
| 28 | + Route::match(array('GET', 'POST'), 'jqadm/create/{resource}', array( |
|
| 29 | 29 | 'as' => 'aimeos_shop_jqadm_create', |
| 30 | 30 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction' |
| 31 | - ))->where( array( 'resource' => '[^0-9]+' ) ); |
|
| 31 | + ))->where(array('resource' => '[^0-9]+')); |
|
| 32 | 32 | |
| 33 | - Route::match( array( 'GET', 'POST' ), 'jqadm/delete/{resource}/{id}', array( |
|
| 33 | + Route::match(array('GET', 'POST'), 'jqadm/delete/{resource}/{id}', array( |
|
| 34 | 34 | 'as' => 'aimeos_shop_jqadm_delete', |
| 35 | 35 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction' |
| 36 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 36 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 37 | 37 | |
| 38 | - Route::match( array( 'GET' ), 'jqadm/get/{resource}/{id}', array( |
|
| 38 | + Route::match(array('GET'), 'jqadm/get/{resource}/{id}', array( |
|
| 39 | 39 | 'as' => 'aimeos_shop_jqadm_get', |
| 40 | 40 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction' |
| 41 | - ))->where( array( 'resource' => '[^0-9]*', 'id' => '[0-9]*' ) ); |
|
| 41 | + ))->where(array('resource' => '[^0-9]*', 'id' => '[0-9]*')); |
|
| 42 | 42 | |
| 43 | - Route::match( array( 'POST' ), 'jqadm/save/{resource}', array( |
|
| 43 | + Route::match(array('POST'), 'jqadm/save/{resource}', array( |
|
| 44 | 44 | 'as' => 'aimeos_shop_jqadm_save', |
| 45 | 45 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction' |
| 46 | - ))->where( array( 'resource' => '[^0-9]+' ) ); |
|
| 46 | + ))->where(array('resource' => '[^0-9]+')); |
|
| 47 | 47 | |
| 48 | - Route::match( array( 'GET', 'POST' ), 'jqadm/search/{resource}', array( |
|
| 48 | + Route::match(array('GET', 'POST'), 'jqadm/search/{resource}', array( |
|
| 49 | 49 | 'as' => 'aimeos_shop_jqadm_search', |
| 50 | 50 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction' |
| 51 | - ))->where( array( 'resource' => '[^0-9]+' ) ); |
|
| 51 | + ))->where(array('resource' => '[^0-9]+')); |
|
| 52 | 52 | |
| 53 | 53 | }); |
| 54 | 54 | |
| 55 | 55 | |
| 56 | 56 | Route::group(config('shop.routes.jsonadm', ['middleware' => 'auth']), function() { |
| 57 | 57 | |
| 58 | - Route::match( array( 'DELETE' ), 'jsonadm/{resource}/{id?}', array( |
|
| 58 | + Route::match(array('DELETE'), 'jsonadm/{resource}/{id?}', array( |
|
| 59 | 59 | 'as' => 'aimeos_shop_jsonadm_delete', |
| 60 | 60 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction' |
| 61 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 61 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 62 | 62 | |
| 63 | - Route::match( array( 'GET' ), 'jsonadm/{resource}/{id?}', array( |
|
| 63 | + Route::match(array('GET'), 'jsonadm/{resource}/{id?}', array( |
|
| 64 | 64 | 'as' => 'aimeos_shop_jsonadm_get', |
| 65 | 65 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction' |
| 66 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 66 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 67 | 67 | |
| 68 | - Route::match( array( 'PATCH' ), 'jsonadm/{resource}/{id?}', array( |
|
| 68 | + Route::match(array('PATCH'), 'jsonadm/{resource}/{id?}', array( |
|
| 69 | 69 | 'as' => 'aimeos_shop_jsonadm_patch', |
| 70 | 70 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction' |
| 71 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 71 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 72 | 72 | |
| 73 | - Route::match( array( 'POST' ), 'jsonadm/{resource}/{id?}', array( |
|
| 73 | + Route::match(array('POST'), 'jsonadm/{resource}/{id?}', array( |
|
| 74 | 74 | 'as' => 'aimeos_shop_jsonadm_post', |
| 75 | 75 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction' |
| 76 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 76 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 77 | 77 | |
| 78 | - Route::match( array( 'PUT' ), 'jsonadm/{resource}/{id?}', array( |
|
| 78 | + Route::match(array('PUT'), 'jsonadm/{resource}/{id?}', array( |
|
| 79 | 79 | 'as' => 'aimeos_shop_jsonadm_put', |
| 80 | 80 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction' |
| 81 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 81 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 82 | 82 | |
| 83 | - Route::match( array( 'OPTIONS' ), 'jsonadm/{resource?}', array( |
|
| 83 | + Route::match(array('OPTIONS'), 'jsonadm/{resource?}', array( |
|
| 84 | 84 | 'as' => 'aimeos_shop_jsonadm_options', |
| 85 | 85 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction' |
| 86 | - ))->where( array( 'resource' => '[^0-9]*' ) ); |
|
| 86 | + ))->where(array('resource' => '[^0-9]*')); |
|
| 87 | 87 | |
| 88 | 88 | }); |
| 89 | 89 | |
| 90 | 90 | |
| 91 | 91 | Route::group(config('shop.routes.account', ['middleware' => 'auth']), function() { |
| 92 | 92 | |
| 93 | - Route::match( array( 'GET', 'POST' ), 'myaccount', array( |
|
| 93 | + Route::match(array('GET', 'POST'), 'myaccount', array( |
|
| 94 | 94 | 'as' => 'aimeos_shop_account', |
| 95 | 95 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
| 96 | 96 | )); |
| 97 | - Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 97 | + Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 98 | 98 | 'as' => 'aimeos_shop_account_favorite', |
| 99 | 99 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
| 100 | 100 | )); |
| 101 | - Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 101 | + Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 102 | 102 | 'as' => 'aimeos_shop_account_watch', |
| 103 | 103 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
| 104 | 104 | )); |
@@ -108,45 +108,45 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | Route::group(config('shop.routes.default', []), function() { |
| 110 | 110 | |
| 111 | - Route::match( array( 'GET', 'POST' ), 'basket', array( |
|
| 111 | + Route::match(array('GET', 'POST'), 'basket', array( |
|
| 112 | 112 | 'as' => 'aimeos_shop_basket', |
| 113 | 113 | 'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction' |
| 114 | 114 | )); |
| 115 | 115 | |
| 116 | - Route::match( array( 'GET', 'POST' ), 'count', array( |
|
| 116 | + Route::match(array('GET', 'POST'), 'count', array( |
|
| 117 | 117 | 'as' => 'aimeos_shop_count', |
| 118 | 118 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction' |
| 119 | 119 | )); |
| 120 | - Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array( |
|
| 120 | + Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array( |
|
| 121 | 121 | 'as' => 'aimeos_shop_detail', |
| 122 | 122 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
| 123 | 123 | )); |
| 124 | - Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 124 | + Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 125 | 125 | 'as' => 'aimeos_shop_session_pinned', |
| 126 | 126 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
| 127 | 127 | )); |
| 128 | - Route::match( array( 'GET', 'POST' ), 'list', array( |
|
| 128 | + Route::match(array('GET', 'POST'), 'list', array( |
|
| 129 | 129 | 'as' => 'aimeos_shop_list', |
| 130 | 130 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction' |
| 131 | 131 | )); |
| 132 | - Route::match( array( 'GET', 'POST' ), 'suggest', array( |
|
| 132 | + Route::match(array('GET', 'POST'), 'suggest', array( |
|
| 133 | 133 | 'as' => 'aimeos_shop_suggest', |
| 134 | 134 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction' |
| 135 | 135 | )); |
| 136 | - Route::match( array( 'GET', 'POST' ), 'stock', array( |
|
| 136 | + Route::match(array('GET', 'POST'), 'stock', array( |
|
| 137 | 137 | 'as' => 'aimeos_shop_stock', |
| 138 | 138 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction' |
| 139 | 139 | )); |
| 140 | 140 | |
| 141 | - Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array( |
|
| 141 | + Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array( |
|
| 142 | 142 | 'as' => 'aimeos_shop_checkout', |
| 143 | 143 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction' |
| 144 | 144 | )); |
| 145 | - Route::match( array( 'GET', 'POST' ), 'confirm', array( |
|
| 145 | + Route::match(array('GET', 'POST'), 'confirm', array( |
|
| 146 | 146 | 'as' => 'aimeos_shop_confirm', |
| 147 | 147 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction' |
| 148 | 148 | )); |
| 149 | - Route::match( array( 'GET', 'POST' ), 'update', array( |
|
| 149 | + Route::match(array('GET', 'POST'), 'update', array( |
|
| 150 | 150 | 'as' => 'aimeos_shop_update', |
| 151 | 151 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction' |
| 152 | 152 | )); |