@@ -28,7 +28,6 @@ |
||
| 28 | 28 | use Eccube\Entity\Master\DeviceType; |
| 29 | 29 | use Eccube\Util\Str; |
| 30 | 30 | use Symfony\Component\Filesystem\Filesystem; |
| 31 | -use Symfony\Component\Finder\Finder; |
|
| 32 | 31 | use Symfony\Component\Form\FormError; |
| 33 | 32 | use Symfony\Component\HttpFoundation\Request; |
| 34 | 33 | use Symfony\Component\HttpFoundation\Response; |
@@ -26,7 +26,6 @@ |
||
| 26 | 26 | |
| 27 | 27 | use Eccube\Common\Constant; |
| 28 | 28 | use Eccube\Util\EntityUtil; |
| 29 | -use Symfony\Component\Form\FormFactory; |
|
| 30 | 29 | use Symfony\Component\HttpFoundation\Request; |
| 31 | 30 | |
| 32 | 31 | class CsvExportService |
@@ -23,8 +23,6 @@ |
||
| 23 | 23 | |
| 24 | 24 | namespace Eccube\Service; |
| 25 | 25 | |
| 26 | -use Eccube\Application; |
|
| 27 | - |
|
| 28 | 26 | |
| 29 | 27 | /** |
| 30 | 28 | * Copyright (C) 2012-2014 David de Boer <[email protected]> |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | return $phpinfo; |
| 51 | 51 | |
| 52 | - break; |
|
| 52 | + break; |
|
| 53 | 53 | default: |
| 54 | 54 | break; |
| 55 | 55 | } |
@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | )); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public function getSystemInfo(Application $app) |
|
| 65 | - { |
|
| 64 | + public function getSystemInfo(Application $app) |
|
| 65 | + { |
|
| 66 | 66 | $system = $app['eccube.service.system']; |
| 67 | 67 | $server = $app['request']; |
| 68 | 68 | |
@@ -78,5 +78,5 @@ discard block |
||
| 78 | 78 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent')); |
| 79 | 79 | |
| 80 | 80 | return $arrSystemInfo; |
| 81 | - } |
|
| 81 | + } |
|
| 82 | 82 | } |
@@ -55,8 +55,8 @@ |
||
| 55 | 55 | new Assert\NotBlank(), |
| 56 | 56 | new Assert\Length(array('max' => $this->config['stext_len'])), |
| 57 | 57 | new Assert\Regex(array( |
| 58 | - 'pattern' => "/^[0-9a-zA-Z]+$/", |
|
| 59 | - )), |
|
| 58 | + 'pattern' => "/^[0-9a-zA-Z]+$/", |
|
| 59 | + )), |
|
| 60 | 60 | ), |
| 61 | 61 | )) |
| 62 | 62 | ->add('admin_allow_host', 'textarea', array( |
@@ -17,8 +17,8 @@ |
||
| 17 | 17 | $config->registerMigrationsFromDirectory($migrationFilePath ); |
| 18 | 18 | $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode); |
| 19 | 19 | $migration = new Migration($config); |
| 20 | - // null 又は 'last' を渡すと最新バージョンまでマイグレートする |
|
| 21 | - // 0か'first'を渡すと最初に戻る |
|
| 20 | + // null 又は 'last' を渡すと最新バージョンまでマイグレートする |
|
| 21 | + // 0か'first'を渡すと最初に戻る |
|
| 22 | 22 | $migration->migrate($version, false); |
| 23 | 23 | |
| 24 | 24 | |
@@ -274,7 +274,7 @@ |
||
| 274 | 274 | $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; |
| 275 | 275 | $qb |
| 276 | 276 | ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' . |
| 277 | - 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') |
|
| 277 | + 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') |
|
| 278 | 278 | ->setParameter('multi', $multi) |
| 279 | 279 | ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); |
| 280 | 280 | } |
@@ -73,17 +73,17 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | $qb = $this->createQueryBuilder('e'); |
| 75 | 75 | $qb->andWhere("e.priority >= $range_end ") |
| 76 | - ->andWhere("e.priority <= $range_start ") |
|
| 77 | - ->andWhere('e.event = :event') |
|
| 78 | - ->setParameter('event',$event) |
|
| 79 | - ->setMaxResults(1) |
|
| 80 | - ->orderBy('e.priority','ASC'); |
|
| 76 | + ->andWhere("e.priority <= $range_start ") |
|
| 77 | + ->andWhere('e.event = :event') |
|
| 78 | + ->setParameter('event',$event) |
|
| 79 | + ->setMaxResults(1) |
|
| 80 | + ->orderBy('e.priority','ASC'); |
|
| 81 | 81 | |
| 82 | 82 | $result=$qb->getQuery()->getResult(); |
| 83 | 83 | if(count($result)){ |
| 84 | - return $result[0]->getPriority() -1; |
|
| 84 | + return $result[0]->getPriority() -1; |
|
| 85 | 85 | }else{ |
| 86 | - return $range_start; |
|
| 86 | + return $range_start; |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | } |
@@ -96,14 +96,14 @@ discard block |
||
| 96 | 96 | $qb = $this->createQueryBuilder('e'); |
| 97 | 97 | |
| 98 | 98 | $qb->andWhere("e.priority >= $range_end ") |
| 99 | - ->andWhere("e.priority <= $range_start ") |
|
| 100 | - ->andWhere("e.del_flg = 0 ") |
|
| 101 | - ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
| 102 | - ->andWhere('e.event = :event') |
|
| 103 | - ->setParameter('event',$pluginEventHandler->getEvent()) |
|
| 104 | - ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
| 105 | - ->setMaxResults(1) |
|
| 106 | - ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
| 99 | + ->andWhere("e.priority <= $range_start ") |
|
| 100 | + ->andWhere("e.del_flg = 0 ") |
|
| 101 | + ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
| 102 | + ->andWhere('e.event = :event') |
|
| 103 | + ->setParameter('event',$pluginEventHandler->getEvent()) |
|
| 104 | + ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
| 105 | + ->setMaxResults(1) |
|
| 106 | + ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
| 107 | 107 | |
| 108 | 108 | $result=$qb->getQuery()->getResult(); |
| 109 | 109 | |
@@ -138,7 +138,7 @@ |
||
| 138 | 138 | 'allow_add' => true, |
| 139 | 139 | 'allow_delete' => true, |
| 140 | 140 | 'data' => $ProductClasses, |
| 141 | - )); |
|
| 141 | + )); |
|
| 142 | 142 | |
| 143 | 143 | $event = new EventArgs( |
| 144 | 144 | array( |