aimeos /
aimeos-laravel
@@ -32,51 +32,51 @@ discard block |
||
| 32 | 32 | * @param string|null $locale Code of the current language or null for no translation |
| 33 | 33 | * @return \Aimeos\MW\View\Iface View object |
| 34 | 34 | */ |
| 35 | - public function create( \Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null ) |
|
| 35 | + public function create(\Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null) |
|
| 36 | 36 | { |
| 37 | 37 | $params = $fixed = array(); |
| 38 | 38 | |
| 39 | - if( $locale !== null ) |
|
| 39 | + if ($locale !== null) |
|
| 40 | 40 | { |
| 41 | 41 | $params = Route::current()->parameters() + Input::all(); |
| 42 | 42 | $fixed = $this->getFixedParams(); |
| 43 | 43 | |
| 44 | - $i18n = app('\Aimeos\Shop\Base\I18n')->get( array( $locale ) ); |
|
| 44 | + $i18n = app('\Aimeos\Shop\Base\I18n')->get(array($locale)); |
|
| 45 | 45 | $translation = $i18n[$locale]; |
| 46 | 46 | } |
| 47 | 47 | else |
| 48 | 48 | { |
| 49 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
| 49 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | |
| 53 | - $view = new \Aimeos\MW\View\Standard( $templatePaths ); |
|
| 53 | + $view = new \Aimeos\MW\View\Standard($templatePaths); |
|
| 54 | 54 | |
| 55 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
| 56 | - $view->addHelper( 'translate', $helper ); |
|
| 55 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
| 56 | + $view->addHelper('translate', $helper); |
|
| 57 | 57 | |
| 58 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
| 59 | - $view->addHelper( 'url', $helper ); |
|
| 58 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed); |
|
| 59 | + $view->addHelper('url', $helper); |
|
| 60 | 60 | |
| 61 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
| 62 | - $view->addHelper( 'param', $helper ); |
|
| 61 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
| 62 | + $view->addHelper('param', $helper); |
|
| 63 | 63 | |
| 64 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
| 65 | - $view->addHelper( 'config', $helper ); |
|
| 64 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
| 65 | + $view->addHelper('config', $helper); |
|
| 66 | 66 | |
| 67 | - $sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' ); |
|
| 68 | - $sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' ); |
|
| 69 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000 ); |
|
| 70 | - $view->addHelper( 'number', $helper ); |
|
| 67 | + $sepDec = $config->get('client/html/common/format/seperatorDecimal', '.'); |
|
| 68 | + $sep1000 = $config->get('client/html/common/format/seperator1000', ' '); |
|
| 69 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000); |
|
| 70 | + $view->addHelper('number', $helper); |
|
| 71 | 71 | |
| 72 | - $helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() ); |
|
| 73 | - $view->addHelper( 'request', $helper ); |
|
| 72 | + $helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance()); |
|
| 73 | + $view->addHelper('request', $helper); |
|
| 74 | 74 | |
| 75 | - $helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); |
|
| 76 | - $view->addHelper( 'response', $helper ); |
|
| 75 | + $helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view); |
|
| 76 | + $view->addHelper('response', $helper); |
|
| 77 | 77 | |
| 78 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() ); |
|
| 79 | - $view->addHelper( 'csrf', $helper ); |
|
| 78 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token()); |
|
| 79 | + $view->addHelper('csrf', $helper); |
|
| 80 | 80 | |
| 81 | 81 | return $view; |
| 82 | 82 | } |
@@ -91,15 +91,15 @@ discard block |
||
| 91 | 91 | { |
| 92 | 92 | $fixed = array(); |
| 93 | 93 | |
| 94 | - if( ( $value = Route::input( 'site' ) ) !== null ) { |
|
| 94 | + if (($value = Route::input('site')) !== null) { |
|
| 95 | 95 | $fixed['site'] = $value; |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - if( ( $value = Route::input( 'locale' ) ) !== null ) { |
|
| 98 | + if (($value = Route::input('locale')) !== null) { |
|
| 99 | 99 | $fixed['locale'] = $value; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - if( ( $value = Route::input( 'currency' ) ) !== null ) { |
|
| 102 | + if (($value = Route::input('currency')) !== null) { |
|
| 103 | 103 | $fixed['currency'] = $value; |
| 104 | 104 | } |
| 105 | 105 | |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function indexAction() |
| 32 | 32 | { |
| 33 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' ); |
|
| 33 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('account-index'); |
|
| 34 | 34 | return View::make('shop::account.index', $params); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -42,17 +42,17 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function downloadAction() |
| 44 | 44 | { |
| 45 | - $context = app( '\Aimeos\Shop\Base\Context' )->get(); |
|
| 45 | + $context = app('\Aimeos\Shop\Base\Context')->get(); |
|
| 46 | 46 | $langid = $context->getLocale()->getLanguageId(); |
| 47 | 47 | |
| 48 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), array(), $langid ); |
|
| 49 | - $context->setView( $view ); |
|
| 48 | + $view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), array(), $langid); |
|
| 49 | + $context->setView($view); |
|
| 50 | 50 | |
| 51 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' ); |
|
| 52 | - $client->setView( $view ); |
|
| 51 | + $client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download'); |
|
| 52 | + $client->setView($view); |
|
| 53 | 53 | $client->process(); |
| 54 | 54 | |
| 55 | 55 | $response = $view->response(); |
| 56 | - return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() ); |
|
| 56 | + return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders()); |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | \ No newline at end of file |
@@ -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( |
@@ -16,16 +16,16 @@ discard block |
||
| 16 | 16 | ), |
| 17 | 17 | |
| 18 | 18 | 'page' => array( |
| 19 | - 'account-index' => array( 'account/history','account/favorite','account/watch','basket/mini','catalog/session' ), |
|
| 20 | - 'basket-index' => array( 'basket/standard','basket/related' ), |
|
| 21 | - 'catalog-count' => array( 'catalog/count' ), |
|
| 22 | - 'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ), |
|
| 23 | - 'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ), |
|
| 24 | - 'catalog-stock' => array( 'catalog/stock' ), |
|
| 25 | - 'catalog-suggest' => array( 'catalog/suggest' ), |
|
| 26 | - 'checkout-confirm' => array( 'checkout/confirm' ), |
|
| 27 | - 'checkout-index' => array( 'checkout/standard' ), |
|
| 28 | - 'checkout-update' => array( 'checkout/update'), |
|
| 19 | + 'account-index' => array('account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'), |
|
| 20 | + 'basket-index' => array('basket/standard', 'basket/related'), |
|
| 21 | + 'catalog-count' => array('catalog/count'), |
|
| 22 | + 'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'), |
|
| 23 | + 'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'), |
|
| 24 | + 'catalog-stock' => array('catalog/stock'), |
|
| 25 | + 'catalog-suggest' => array('catalog/suggest'), |
|
| 26 | + 'checkout-confirm' => array('checkout/confirm'), |
|
| 27 | + 'checkout-index' => array('checkout/standard'), |
|
| 28 | + 'checkout-update' => array('checkout/update'), |
|
| 29 | 29 | ), |
| 30 | 30 | |
| 31 | 31 | 'resource' => array( |
@@ -36,24 +36,24 @@ discard block |
||
| 36 | 36 | 'database' => env('DB_DATABASE', 'laravel'), |
| 37 | 37 | 'username' => env('DB_USERNAME', 'root'), |
| 38 | 38 | 'password' => env('DB_PASSWORD', ''), |
| 39 | - 'stmt' => array( "SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'" ), |
|
| 39 | + 'stmt' => array("SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'"), |
|
| 40 | 40 | 'opt-persistent' => 0, |
| 41 | 41 | 'limit' => 2, |
| 42 | 42 | ), |
| 43 | 43 | 'fs' => array( |
| 44 | 44 | 'adapter' => 'Standard', |
| 45 | 45 | 'basedir' => public_path(), |
| 46 | - 'tempdir' => storage_path( 'tmp' ), |
|
| 46 | + 'tempdir' => storage_path('tmp'), |
|
| 47 | 47 | ), |
| 48 | 48 | 'fs-admin' => array( |
| 49 | 49 | 'adapter' => 'Standard', |
| 50 | - 'basedir' => public_path( 'uploads' ), |
|
| 51 | - 'tempdir' => storage_path( 'tmp' ), |
|
| 50 | + 'basedir' => public_path('uploads'), |
|
| 51 | + 'tempdir' => storage_path('tmp'), |
|
| 52 | 52 | ), |
| 53 | 53 | 'fs-secure' => array( |
| 54 | 54 | 'adapter' => 'Standard', |
| 55 | - 'basedir' => storage_path( 'secure' ), |
|
| 56 | - 'tempdir' => storage_path( 'tmp' ), |
|
| 55 | + 'basedir' => storage_path('secure'), |
|
| 56 | + 'tempdir' => storage_path('tmp'), |
|
| 57 | 57 | ), |
| 58 | 58 | ), |
| 59 | 59 | |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | 'default' => array( |
| 228 | 228 | 'mimeicon' => array( |
| 229 | 229 | # Directory where icons for the mime types stored |
| 230 | - 'directory' => public_path( '/packages/aimeos/shop/mimeicons' ), |
|
| 230 | + 'directory' => public_path('/packages/aimeos/shop/mimeicons'), |
|
| 231 | 231 | # File extension of mime type icons |
| 232 | 232 | 'extension' => '.png' |
| 233 | 233 | ), |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | # in the "maxwidth" parameter |
| 271 | 271 | # maxheight: 280 |
| 272 | 272 | ), |
| 273 | - 'tempdir' => storage_path( 'aimeos' ), |
|
| 273 | + 'tempdir' => storage_path('aimeos'), |
|
| 274 | 274 | ), |
| 275 | 275 | ), |
| 276 | 276 | 'product' => array( |
