@@ -20,10 +20,10 @@ |
||
20 | 20 | use Eccube\Repository\BaseInfoRepository; |
21 | 21 | use Eccube\Repository\ProductClassRepository; |
22 | 22 | use Eccube\Service\CartService; |
23 | +use Eccube\Service\OrderHelper; |
|
23 | 24 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
24 | 25 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
25 | 26 | use Eccube\Service\PurchaseFlow\PurchaseFlowResult; |
26 | -use Eccube\Service\OrderHelper; |
|
27 | 27 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
28 | 28 | use Symfony\Component\HttpFoundation\Request; |
29 | 29 | use Symfony\Component\Routing\Annotation\Route; |
@@ -16,8 +16,8 @@ |
||
16 | 16 | use Eccube\Controller\AbstractController; |
17 | 17 | use Eccube\Entity\BaseInfo; |
18 | 18 | use Eccube\Entity\Customer; |
19 | -use Eccube\Entity\Product; |
|
20 | 19 | use Eccube\Entity\Order; |
20 | +use Eccube\Entity\Product; |
|
21 | 21 | use Eccube\Event\EccubeEvents; |
22 | 22 | use Eccube\Event\EventArgs; |
23 | 23 | use Eccube\Exception\CartException; |
@@ -26,9 +26,9 @@ |
||
26 | 26 | use Eccube\Repository\Master\PrefRepository; |
27 | 27 | use Eccube\Repository\OrderRepository; |
28 | 28 | use Eccube\Service\CartService; |
29 | +use Eccube\Service\OrderHelper; |
|
29 | 30 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
30 | 31 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
31 | -use Eccube\Service\OrderHelper; |
|
32 | 32 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
33 | 33 | use Symfony\Component\Form\Extension\Core\Type\CollectionType; |
34 | 34 | use Symfony\Component\HttpFoundation\Request; |
@@ -33,8 +33,8 @@ |
||
33 | 33 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
34 | 34 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
35 | 35 | use Symfony\Component\Form\FormInterface; |
36 | -use Symfony\Component\HttpFoundation\Response; |
|
37 | 36 | use Symfony\Component\HttpFoundation\Request; |
37 | +use Symfony\Component\HttpFoundation\Response; |
|
38 | 38 | use Symfony\Component\Routing\Annotation\Route; |
39 | 39 | use Symfony\Component\Routing\RouterInterface; |
40 | 40 | use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; |
@@ -13,7 +13,6 @@ |
||
13 | 13 | |
14 | 14 | namespace Eccube\Entity; |
15 | 15 | |
16 | -use Doctrine\Common\Annotations\Reader; |
|
17 | 16 | use Doctrine\Common\Collections\Collection; |
18 | 17 | use Doctrine\Common\Inflector\Inflector; |
19 | 18 | use Doctrine\ORM\Mapping\Id; |
@@ -17,9 +17,9 @@ |
||
17 | 17 | use Eccube\Entity\Customer; |
18 | 18 | use Eccube\Entity\Member; |
19 | 19 | use Eccube\Service\CartService; |
20 | +use Eccube\Service\OrderHelper; |
|
20 | 21 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
21 | 22 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
22 | -use Eccube\Service\OrderHelper; |
|
23 | 23 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
24 | 24 | use Symfony\Component\HttpFoundation\RequestStack; |
25 | 25 | use Symfony\Component\Security\Core\AuthenticationEvents; |
@@ -13,8 +13,8 @@ |
||
13 | 13 | |
14 | 14 | namespace Eccube\EventListener; |
15 | 15 | |
16 | -use Doctrine\Dbal\Connection; |
|
17 | 16 | use Doctrine\DBAL\TransactionIsolationLevel; |
17 | +use Doctrine\Dbal\Connection; |
|
18 | 18 | use Doctrine\ORM\EntityManager; |
19 | 19 | use Doctrine\ORM\EntityManagerInterface; |
20 | 20 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
@@ -38,8 +38,8 @@ |
||
38 | 38 | use Symfony\Component\Form\FormEvents; |
39 | 39 | use Symfony\Component\Form\FormInterface; |
40 | 40 | use Symfony\Component\OptionsResolver\OptionsResolver; |
41 | -use Symfony\Component\Validator\Constraints as Assert; |
|
42 | 41 | use Symfony\Component\Validator\ConstraintViolationListInterface; |
42 | +use Symfony\Component\Validator\Constraints as Assert; |
|
43 | 43 | use Symfony\Component\Validator\Validator\ValidatorInterface; |
44 | 44 | |
45 | 45 | class OrderItemType extends AbstractType |
@@ -33,8 +33,8 @@ |
||
33 | 33 | use Symfony\Component\Form\FormEvents; |
34 | 34 | use Symfony\Component\Form\FormInterface; |
35 | 35 | use Symfony\Component\OptionsResolver\OptionsResolver; |
36 | -use Symfony\Component\Validator\Constraints as Assert; |
|
37 | 36 | use Symfony\Component\Validator\ConstraintViolationListInterface; |
37 | +use Symfony\Component\Validator\Constraints as Assert; |
|
38 | 38 | use Symfony\Component\Validator\Validator\ValidatorInterface; |
39 | 39 | |
40 | 40 | class ProductClassEditType extends AbstractType |