@@ -27,7 +27,6 @@ discard block |
||
| 27 | 27 | use Eccube\Annotation\Inject; |
| 28 | 28 | use Eccube\Annotation\Component; |
| 29 | 29 | use Eccube\Application; |
| 30 | -use Eccube\Common\Constant; |
|
| 31 | 30 | use Eccube\Controller\AbstractController; |
| 32 | 31 | use Eccube\Entity\CustomerAddress; |
| 33 | 32 | use Eccube\Event\EccubeEvents; |
@@ -36,7 +35,6 @@ discard block |
||
| 36 | 35 | use Eccube\Repository\CustomerRepository; |
| 37 | 36 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 38 | 37 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 39 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
| 40 | 38 | use Symfony\Component\EventDispatcher\EventDispatcher; |
| 41 | 39 | use Symfony\Component\Form\FormFactory; |
| 42 | 40 | use Symfony\Component\HttpFoundation\Request; |
@@ -28,7 +28,6 @@ |
||
| 28 | 28 | use Eccube\Annotation\Component; |
| 29 | 29 | use Eccube\Annotation\Inject; |
| 30 | 30 | use Eccube\Application; |
| 31 | -use Eccube\Common\Constant; |
|
| 32 | 31 | use Eccube\Controller\AbstractController; |
| 33 | 32 | use Eccube\Entity\Delivery; |
| 34 | 33 | use Eccube\Event\EccubeEvents; |
@@ -28,14 +28,12 @@ |
||
| 28 | 28 | use Eccube\Annotation\Component; |
| 29 | 29 | use Eccube\Annotation\Inject; |
| 30 | 30 | use Eccube\Application; |
| 31 | -use Eccube\Common\Constant; |
|
| 32 | 31 | use Eccube\Controller\AbstractController; |
| 33 | 32 | use Eccube\Entity\Master\CustomerStatus; |
| 34 | 33 | use Eccube\Event\EccubeEvents; |
| 35 | 34 | use Eccube\Event\EventArgs; |
| 36 | 35 | use Eccube\Repository\Master\CustomerStatusRepository; |
| 37 | 36 | use Eccube\Service\MailService; |
| 38 | -use Eccube\Util\Str; |
|
| 39 | 37 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 40 | 38 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 41 | 39 | use Symfony\Component\EventDispatcher\EventDispatcher; |
@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use Doctrine\ORM\EntityManager; |
| 28 | 28 | use Eccube\Annotation\Inject; |
| 29 | 29 | use Eccube\Annotation\Repository; |
| 30 | -use Eccube\Common\Constant; |
|
| 31 | 30 | use Eccube\Doctrine\Query\Queries; |
| 32 | 31 | use Eccube\Entity\Customer; |
| 33 | 32 | use Eccube\Entity\Master\CustomerStatus; |
@@ -26,7 +26,6 @@ |
||
| 26 | 26 | |
| 27 | 27 | use Eccube\Annotation\Repository; |
| 28 | 28 | use Eccube\Annotation\Inject; |
| 29 | -use Eccube\Common\Constant; |
|
| 30 | 29 | use Eccube\Entity\Member; |
| 31 | 30 | use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
| 32 | 31 | use Symfony\Component\Security\Core\Exception\UnsupportedUserException; |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Doctrine\ORM\EntityManager; |
| 7 | 7 | use Eccube\Annotation\Inject; |
| 8 | 8 | use Eccube\Annotation\Service; |
| 9 | -use Eccube\Common\Constant; |
|
| 10 | 9 | use Eccube\Entity\CartItem; |
| 11 | 10 | use Eccube\Entity\Customer; |
| 12 | 11 | use Eccube\Entity\CustomerAddress; |
@@ -31,7 +31,6 @@ |
||
| 31 | 31 | use Eccube\Repository\BaseInfoRepository; |
| 32 | 32 | use Eccube\Repository\DeliveryRepository; |
| 33 | 33 | use Eccube\Service\PurchaseFlow\Processor\AdminOrderRegisterPurchaseProcessor; |
| 34 | -use Eccube\Service\PurchaseFlow\Processor\DeletedProductValidator; |
|
| 35 | 34 | use Eccube\Service\PurchaseFlow\Processor\DeliveryFeeFreeProcessor; |
| 36 | 35 | use Eccube\Service\PurchaseFlow\Processor\DeliveryFeeProcessor; |
| 37 | 36 | use Eccube\Service\PurchaseFlow\Processor\DeliverySettingValidator; |
@@ -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,13 +96,13 @@ 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.priority '.($up ? '>' : '<' ).' :pri') |
|
| 101 | - ->andWhere('e.event = :event') |
|
| 102 | - ->setParameter('event',$pluginEventHandler->getEvent()) |
|
| 103 | - ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
| 104 | - ->setMaxResults(1) |
|
| 105 | - ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
| 99 | + ->andWhere("e.priority <= $range_start ") |
|
| 100 | + ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
| 101 | + ->andWhere('e.event = :event') |
|
| 102 | + ->setParameter('event',$pluginEventHandler->getEvent()) |
|
| 103 | + ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
| 104 | + ->setMaxResults(1) |
|
| 105 | + ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
| 106 | 106 | |
| 107 | 107 | $result=$qb->getQuery()->getResult(); |
| 108 | 108 | |