@@ -21,10 +21,10 @@ |
||
| 21 | 21 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
| 22 | 22 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
| 23 | 23 | use Symfony\Component\HttpFoundation\RequestStack; |
| 24 | +use Symfony\Component\Security\Core\AuthenticationEvents; |
|
| 24 | 25 | use Symfony\Component\Security\Core\Event\AuthenticationFailureEvent; |
| 25 | 26 | use Symfony\Component\Security\Http\Event\InteractiveLoginEvent; |
| 26 | 27 | use Symfony\Component\Security\Http\SecurityEvents; |
| 27 | -use Symfony\Component\Security\Core\AuthenticationEvents; |
|
| 28 | 28 | |
| 29 | 29 | class SecurityListener implements EventSubscriberInterface |
| 30 | 30 | { |
@@ -19,8 +19,8 @@ |
||
| 19 | 19 | use Eccube\Entity\Master\SaleType; |
| 20 | 20 | use Eccube\Entity\Payment; |
| 21 | 21 | use Eccube\Repository\DeliveryRepository; |
| 22 | -use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 23 | 22 | use Eccube\Service\PurchaseFlow\ItemHolderValidator; |
| 23 | +use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * 支払い方法が一致しない明細がないかどうか. |
@@ -33,19 +33,19 @@ |
||
| 33 | 33 | use Eccube\Repository\OrderRepository; |
| 34 | 34 | use Eccube\Repository\PaymentRepository; |
| 35 | 35 | use Eccube\Service\CsvExportService; |
| 36 | +use Eccube\Service\OrderStateMachine; |
|
| 36 | 37 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
| 37 | 38 | use Eccube\Service\PurchaseFlow\PurchaseException; |
| 38 | 39 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
| 39 | -use Eccube\Service\OrderStateMachine; |
|
| 40 | 40 | use Eccube\Util\FormUtil; |
| 41 | 41 | use Knp\Component\Pager\PaginatorInterface; |
| 42 | 42 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
| 43 | 43 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 44 | 44 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 45 | -use Symfony\Component\HttpFoundation\Response; |
|
| 45 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
| 46 | 46 | use Symfony\Component\HttpFoundation\Request; |
| 47 | +use Symfony\Component\HttpFoundation\Response; |
|
| 47 | 48 | use Symfony\Component\HttpFoundation\StreamedResponse; |
| 48 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
| 49 | 49 | use Symfony\Component\Validator\Constraints as Assert; |
| 50 | 50 | use Symfony\Component\Validator\Validator\ValidatorInterface; |
| 51 | 51 | |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | |
| 16 | 16 | use Eccube\Common\Constant; |
| 17 | 17 | use Eccube\Controller\AbstractController; |
| 18 | -use Eccube\Entity\Master\ShippingStatus; |
|
| 19 | 18 | use Eccube\Entity\OrderItem; |
| 20 | 19 | use Eccube\Entity\Shipping; |
| 21 | 20 | use Eccube\Event\EccubeEvents; |
@@ -13,6 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Controller; |
| 15 | 15 | |
| 16 | +use Eccube\Entity\BaseInfo; |
|
| 16 | 17 | use Eccube\Entity\Cart; |
| 17 | 18 | use Eccube\Entity\ProductClass; |
| 18 | 19 | use Eccube\Event\EccubeEvents; |
@@ -26,7 +27,6 @@ discard block |
||
| 26 | 27 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 27 | 28 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 28 | 29 | use Symfony\Component\HttpFoundation\Request; |
| 29 | -use Eccube\Entity\BaseInfo; |
|
| 30 | 30 | |
| 31 | 31 | class CartController extends AbstractController |
| 32 | 32 | { |
@@ -30,13 +30,13 @@ |
||
| 30 | 30 | use Eccube\Entity\Shipping; |
| 31 | 31 | use Eccube\Repository\DeliveryFeeRepository; |
| 32 | 32 | use Eccube\Repository\DeliveryRepository; |
| 33 | +use Eccube\Repository\Master\DeviceTypeRepository; |
|
| 33 | 34 | use Eccube\Repository\Master\OrderItemTypeRepository; |
| 34 | 35 | use Eccube\Repository\Master\OrderStatusRepository; |
| 35 | 36 | use Eccube\Repository\OrderRepository; |
| 36 | 37 | use Eccube\Repository\PaymentRepository; |
| 37 | 38 | use Eccube\Repository\TaxRuleRepository; |
| 38 | 39 | use Eccube\Util\StringUtil; |
| 39 | -use Eccube\Repository\Master\DeviceTypeRepository; |
|
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * OrderやOrderに関連するエンティティを構築するクラス |