| @@ -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]> | 
| @@ -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( | 
| @@ -1155,11 +1155,11 @@ | ||
| 1155 | 1155 | } | 
| 1156 | 1156 | |
| 1157 | 1157 | /** | 
| 1158 | - * ProductCategory作成 | |
| 1159 | - * @param \Eccube\Entity\Product $Product | |
| 1160 | - * @param \Eccube\Entity\Category $Category | |
| 1161 | - * @return ProductCategory | |
| 1162 | - */ | |
| 1158 | + * ProductCategory作成 | |
| 1159 | + * @param \Eccube\Entity\Product $Product | |
| 1160 | + * @param \Eccube\Entity\Category $Category | |
| 1161 | + * @return ProductCategory | |
| 1162 | + */ | |
| 1163 | 1163 | private function makeProductCategory($Product, $Category, $rank) | 
| 1164 | 1164 |      { | 
| 1165 | 1165 | $ProductCategory = new ProductCategory(); | 
| @@ -160,7 +160,7 @@ | ||
| 160 | 160 | $this->paramList = array( | 
| 161 | 161 | 'pluginCode' => array( | 
| 162 | 162 | 'no' => 1, | 
| 163 | - 'label' => '[+]Plugin Code: ', | |
| 163 | + 'label' => '[+]Plugin Code: ', | |
| 164 | 164 | 'value' => null, | 
| 165 | 165 | 'name' => '[+]Please enter Plugin Name (only pascal case letters numbers are allowed)', | 
| 166 | 166 | 'validation' => array( | 
| @@ -33,7 +33,6 @@ | ||
| 33 | 33 | use Symfony\Component\Console\Input\InputOption; | 
| 34 | 34 | use Symfony\Component\Console\Output\OutputInterface; | 
| 35 | 35 | use Symfony\Component\Console\Question\Question; | 
| 36 | -use Symfony\Component\Validator\Constraints as Assert; | |
| 37 | 36 | |
| 38 | 37 | class PluginCommand extends \Knp\Command\Command | 
| 39 | 38 |  { | 
| @@ -2,15 +2,9 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Eccube\Application; | 
| 4 | 4 | |
| 5 | -use Eccube\Event\TemplateEvent; | |
| 6 | -use Monolog\Logger; | |
| 7 | -use Symfony\Component\Form\FormBuilder; | |
| 8 | 5 | use Symfony\Component\HttpFoundation\Request; | 
| 9 | 6 | use Symfony\Component\HttpFoundation\Response; | 
| 10 | -use Symfony\Component\HttpFoundation\StreamedResponse; | |
| 11 | 7 | use Symfony\Component\HttpKernel\HttpKernelInterface; | 
| 12 | -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; | |
| 13 | -use Symfony\Component\Security\Core\User\UserInterface; | |
| 14 | 8 | |
| 15 | 9 | trait ApplicationTrait | 
| 16 | 10 |  { |