@@ -26,11 +26,11 @@ |
||
26 | 26 | use Eccube\Repository\Master\OrderItemTypeRepository; |
27 | 27 | use Eccube\Repository\Master\PrefRepository; |
28 | 28 | use Eccube\Repository\OrderRepository; |
29 | +use Eccube\Service\CartService; |
|
30 | +use Eccube\Service\OrderHelper; |
|
29 | 31 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
30 | 32 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
31 | 33 | use Eccube\Service\ShoppingService; |
32 | -use Eccube\Service\CartService; |
|
33 | -use Eccube\Service\OrderHelper; |
|
34 | 34 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
35 | 35 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
36 | 36 | use Symfony\Component\Form\Extension\Core\Type\CollectionType; |
@@ -15,9 +15,9 @@ |
||
15 | 15 | |
16 | 16 | use Doctrine\ORM\NoResultException; |
17 | 17 | use Doctrine\ORM\Query; |
18 | +use Doctrine\ORM\QueryBuilder; |
|
18 | 19 | use Doctrine\ORM\Query\Parser; |
19 | 20 | use Doctrine\ORM\Query\ResultSetMapping; |
20 | -use Doctrine\ORM\QueryBuilder; |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * The paginator can handle various complex scenarios with DQL. |
@@ -13,8 +13,8 @@ |
||
13 | 13 | |
14 | 14 | namespace Eccube\Doctrine\Query; |
15 | 15 | |
16 | -use Doctrine\ORM\Query\Expr; |
|
17 | 16 | use Doctrine\ORM\QueryBuilder; |
17 | +use Doctrine\ORM\Query\Expr; |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * WHERE句を組み立てるクラス。 |
@@ -32,8 +32,8 @@ |
||
32 | 32 | use Symfony\Component\Form\FormEvents; |
33 | 33 | use Symfony\Component\Form\FormInterface; |
34 | 34 | use Symfony\Component\OptionsResolver\OptionsResolver; |
35 | -use Symfony\Component\Validator\Constraints as Assert; |
|
36 | 35 | use Symfony\Component\Validator\ConstraintViolationListInterface; |
36 | +use Symfony\Component\Validator\Constraints as Assert; |
|
37 | 37 | use Symfony\Component\Validator\Validator\ValidatorInterface; |
38 | 38 | |
39 | 39 | class ProductClassEditType extends AbstractType |
@@ -22,8 +22,8 @@ |
||
22 | 22 | use Symfony\Component\Form\Extension\Core\Type\EmailType; |
23 | 23 | use Symfony\Component\Form\Extension\Core\Type\RepeatedType; |
24 | 24 | use Symfony\Component\Form\Extension\Core\Type\SubmitType; |
25 | -use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
26 | 25 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
26 | +use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
27 | 27 | use Symfony\Component\Form\FormBuilderInterface; |
28 | 28 | use Symfony\Component\Validator\Constraints as Assert; |
29 | 29 |
@@ -15,8 +15,8 @@ |
||
15 | 15 | |
16 | 16 | use Doctrine\ORM\QueryBuilder; |
17 | 17 | use Eccube\Doctrine\Query\Queries; |
18 | -use Eccube\Entity\Order; |
|
19 | 18 | use Eccube\Entity\Master\OrderStatus; |
19 | +use Eccube\Entity\Order; |
|
20 | 20 | use Eccube\Util\StringUtil; |
21 | 21 | use Symfony\Bridge\Doctrine\RegistryInterface; |
22 | 22 |
@@ -13,10 +13,10 @@ |
||
13 | 13 | |
14 | 14 | namespace Eccube\Repository; |
15 | 15 | |
16 | +use Doctrine\ORM\QueryBuilder; |
|
16 | 17 | use Eccube\Entity\Shipping; |
17 | 18 | use Eccube\Util\StringUtil; |
18 | 19 | use Symfony\Bridge\Doctrine\RegistryInterface; |
19 | -use Doctrine\ORM\QueryBuilder; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * ShippingRepository |
@@ -15,12 +15,12 @@ |
||
15 | 15 | |
16 | 16 | use Doctrine\ORM\NoResultException; |
17 | 17 | use Eccube\Common\EccubeConfig; |
18 | +use Eccube\Entity\BaseInfo; |
|
18 | 19 | use Eccube\Entity\Customer; |
19 | 20 | use Eccube\Entity\TaxRule; |
20 | 21 | use Symfony\Bridge\Doctrine\RegistryInterface; |
21 | 22 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
22 | 23 | use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; |
23 | -use Eccube\Entity\BaseInfo; |
|
24 | 24 | |
25 | 25 | /** |
26 | 26 | * TaxRuleRepository |
@@ -13,6 +13,7 @@ discard block |
||
13 | 13 | |
14 | 14 | namespace Eccube\Service; |
15 | 15 | |
16 | +use Doctrine\ORM\EntityManagerInterface; |
|
16 | 17 | use Doctrine\ORM\UnitOfWork; |
17 | 18 | use Eccube\Entity\Cart; |
18 | 19 | use Eccube\Entity\CartItem; |
@@ -20,15 +21,14 @@ discard block |
||
20 | 21 | use Eccube\Entity\ItemHolderInterface; |
21 | 22 | use Eccube\Entity\ProductClass; |
22 | 23 | use Eccube\Repository\CartRepository; |
23 | -use Eccube\Repository\ProductClassRepository; |
|
24 | 24 | use Eccube\Repository\OrderRepository; |
25 | +use Eccube\Repository\ProductClassRepository; |
|
25 | 26 | use Eccube\Service\Cart\CartItemAllocator; |
26 | 27 | use Eccube\Service\Cart\CartItemComparator; |
27 | 28 | use Eccube\Util\StringUtil; |
28 | 29 | use Symfony\Component\HttpFoundation\Session\SessionInterface; |
29 | 30 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
30 | 31 | use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; |
31 | -use Doctrine\ORM\EntityManagerInterface; |
|
32 | 32 | |
33 | 33 | class CartService |
34 | 34 | { |