@@ -660,13 +660,13 @@ |
||
| 660 | 660 | $pluginConfigs = PluginConfigManager::getPluginConfigAll($this['debug']); |
| 661 | 661 | $ormMappings = array(); |
| 662 | 662 | $ormMappings[] = array( |
| 663 | - 'type' => 'annotation', |
|
| 664 | - 'namespace' => 'Eccube\Entity', |
|
| 665 | - 'path' => array( |
|
| 666 | - __DIR__.'/Entity' |
|
| 667 | - ), |
|
| 668 | - 'use_simple_annotation_reader' => false, |
|
| 669 | - ); |
|
| 663 | + 'type' => 'annotation', |
|
| 664 | + 'namespace' => 'Eccube\Entity', |
|
| 665 | + 'path' => array( |
|
| 666 | + __DIR__.'/Entity' |
|
| 667 | + ), |
|
| 668 | + 'use_simple_annotation_reader' => false, |
|
| 669 | + ); |
|
| 670 | 670 | |
| 671 | 671 | if (isset($this['config']['vendor_dir']) && file_exists($this['config']['vendor_dir'].'/Entity')) { |
| 672 | 672 | |
@@ -1,31 +1,31 @@ |
||
| 1 | 1 | <?php return [ |
| 2 | - 'root_dir' => '%ROOT_DIR%', |
|
| 3 | - 'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null), |
|
| 4 | - 'template_code' => env('ECCUBE_TEMPLATE_CODE','default'), |
|
| 5 | - 'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'), |
|
| 6 | - 'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'), |
|
| 7 | - 'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html', |
|
| 8 | - 'public_path_realdir' => '%ROOT_DIR%/html', |
|
| 9 | - 'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image', |
|
| 10 | - 'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image', |
|
| 11 | - 'user_data_realdir' => '%ROOT_DIR%/html/user_data', |
|
| 12 | - 'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block', |
|
| 13 | - 'block_realdir' => '%ROOT_DIR%/app/template/default/Block', |
|
| 14 | - 'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default', |
|
| 15 | - 'template_default_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
| 16 | - 'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin', |
|
| 17 | - 'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin', |
|
| 18 | - 'template_realdir' => '%ROOT_DIR%/app/template/default', |
|
| 19 | - 'template_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
| 20 | - 'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template', |
|
| 21 | - 'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv', |
|
| 22 | - 'plugin_realdir' => '%ROOT_DIR%/app/Plugin', |
|
| 23 | - 'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin', |
|
| 24 | - 'plugin_html_realdir' => '%ROOT_DIR%/html/plugin', |
|
| 25 | - 'admin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin', |
|
| 26 | - 'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default', |
|
| 27 | - 'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image', |
|
| 28 | - 'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image', |
|
| 29 | - 'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data', |
|
| 30 | - 'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin', |
|
| 2 | + 'root_dir' => '%ROOT_DIR%', |
|
| 3 | + 'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null), |
|
| 4 | + 'template_code' => env('ECCUBE_TEMPLATE_CODE','default'), |
|
| 5 | + 'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'), |
|
| 6 | + 'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'), |
|
| 7 | + 'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html', |
|
| 8 | + 'public_path_realdir' => '%ROOT_DIR%/html', |
|
| 9 | + 'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image', |
|
| 10 | + 'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image', |
|
| 11 | + 'user_data_realdir' => '%ROOT_DIR%/html/user_data', |
|
| 12 | + 'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block', |
|
| 13 | + 'block_realdir' => '%ROOT_DIR%/app/template/default/Block', |
|
| 14 | + 'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default', |
|
| 15 | + 'template_default_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
| 16 | + 'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin', |
|
| 17 | + 'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin', |
|
| 18 | + 'template_realdir' => '%ROOT_DIR%/app/template/default', |
|
| 19 | + 'template_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
| 20 | + 'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template', |
|
| 21 | + 'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv', |
|
| 22 | + 'plugin_realdir' => '%ROOT_DIR%/app/Plugin', |
|
| 23 | + 'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin', |
|
| 24 | + 'plugin_html_realdir' => '%ROOT_DIR%/html/plugin', |
|
| 25 | + 'admin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin', |
|
| 26 | + 'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default', |
|
| 27 | + 'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image', |
|
| 28 | + 'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image', |
|
| 29 | + 'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data', |
|
| 30 | + 'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin', |
|
| 31 | 31 | ]; |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php return [ |
| 2 | - 'session_handler' => |
|
| 3 | - [ |
|
| 2 | + 'session_handler' => |
|
| 3 | + [ |
|
| 4 | 4 | // PHP/PHP拡張のセッションハンドラを利用する場合, trueに設定します。 |
| 5 | 5 | 'enabled' => false, |
| 6 | 6 | |
@@ -15,5 +15,5 @@ discard block |
||
| 15 | 15 | // redisの設定例 |
| 16 | 16 | //'save_handler' => 'redis', |
| 17 | 17 | //'save_path' => '127.0.0.1:6379', |
| 18 | - ], |
|
| 18 | + ], |
|
| 19 | 19 | ]; |
@@ -114,7 +114,7 @@ |
||
| 114 | 114 | */ |
| 115 | 115 | public function delete($News) |
| 116 | 116 | { |
| 117 | - $this->createQueryBuilder('n') |
|
| 117 | + $this->createQueryBuilder('n') |
|
| 118 | 118 | ->update() |
| 119 | 119 | ->set('n.sort_no', 'n.sort_no - 1') |
| 120 | 120 | ->where('n.sort_no > :sort_no') |
@@ -1206,11 +1206,11 @@ |
||
| 1206 | 1206 | } |
| 1207 | 1207 | |
| 1208 | 1208 | /** |
| 1209 | - * ProductCategory作成 |
|
| 1210 | - * @param \Eccube\Entity\Product $Product |
|
| 1211 | - * @param \Eccube\Entity\Category $Category |
|
| 1212 | - * @return ProductCategory |
|
| 1213 | - */ |
|
| 1209 | + * ProductCategory作成 |
|
| 1210 | + * @param \Eccube\Entity\Product $Product |
|
| 1211 | + * @param \Eccube\Entity\Category $Category |
|
| 1212 | + * @return ProductCategory |
|
| 1213 | + */ |
|
| 1214 | 1214 | private function makeProductCategory($Product, $Category, $sortNo) |
| 1215 | 1215 | { |
| 1216 | 1216 | $ProductCategory = new ProductCategory(); |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null; |
| 60 | 60 | $qb |
| 61 | 61 | ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' . |
| 62 | - 's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti') |
|
| 62 | + 's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti') |
|
| 63 | 63 | ->setParameter('multi', $multi) |
| 64 | 64 | ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); |
| 65 | 65 | } |
@@ -277,8 +277,8 @@ |
||
| 277 | 277 | $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null; |
| 278 | 278 | $qb |
| 279 | 279 | ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' . |
| 280 | - 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR ' . |
|
| 281 | - 'o.code LIKE :likemulti') |
|
| 280 | + 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR ' . |
|
| 281 | + 'o.code LIKE :likemulti') |
|
| 282 | 282 | ->setParameter('multi', $multi) |
| 283 | 283 | ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); |
| 284 | 284 | } |