@@ -16,12 +16,12 @@ |
||
16 | 16 | use Doctrine\Common\Annotations\Reader; |
17 | 17 | use Doctrine\Common\Collections\Collection; |
18 | 18 | use Doctrine\Common\Util\Inflector; |
19 | -use Doctrine\ORM\Mapping\MappedSuperclass; |
|
20 | 19 | use Doctrine\ORM\Mapping\Id; |
20 | +use Doctrine\ORM\Mapping\MappedSuperclass; |
|
21 | 21 | use Doctrine\ORM\Proxy\Proxy; |
22 | -use Symfony\Component\Serializer\Serializer; |
|
23 | 22 | use Symfony\Component\Serializer\Encoder\XmlEncoder; |
24 | 23 | use Symfony\Component\Serializer\Normalizer\PropertyNormalizer; |
24 | +use Symfony\Component\Serializer\Serializer; |
|
25 | 25 | |
26 | 26 | /** @MappedSuperclass */ |
27 | 27 | abstract class AbstractEntity implements \ArrayAccess |
@@ -13,8 +13,8 @@ |
||
13 | 13 | |
14 | 14 | namespace Eccube\Entity; |
15 | 15 | |
16 | -use Doctrine\ORM\Mapping as ORM; |
|
17 | 16 | use Doctrine\Common\Collections\ArrayCollection; |
17 | +use Doctrine\ORM\Mapping as ORM; |
|
18 | 18 | use Eccube\Service\PurchaseFlow\InvalidItemException; |
19 | 19 | use Eccube\Service\PurchaseFlow\ItemCollection; |
20 | 20 |
@@ -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 | { |
@@ -16,7 +16,10 @@ discard block |
||
16 | 16 | use Doctrine\Common\Collections\ArrayCollection; |
17 | 17 | use Doctrine\Common\Util\ClassUtils; |
18 | 18 | use Doctrine\ORM\EntityManagerInterface; |
19 | +use Doctrine\ORM\QueryBuilder; |
|
19 | 20 | use Eccube\Common\EccubeConfig; |
21 | +use Eccube\Entity\Csv; |
|
22 | +use Eccube\Entity\Master\CsvType; |
|
20 | 23 | use Eccube\Form\Type\Admin\SearchProductType; |
21 | 24 | use Eccube\Form\Type\Admin\SearchShippingType; |
22 | 25 | use Eccube\Repository\CsvRepository; |
@@ -29,9 +32,6 @@ discard block |
||
29 | 32 | use Eccube\Util\FormUtil; |
30 | 33 | use Symfony\Component\Form\FormFactoryInterface; |
31 | 34 | use Symfony\Component\HttpFoundation\Request; |
32 | -use Doctrine\ORM\QueryBuilder; |
|
33 | -use Eccube\Entity\Master\CsvType; |
|
34 | -use Eccube\Entity\Csv; |
|
35 | 35 | |
36 | 36 | class CsvExportService |
37 | 37 | { |
@@ -14,9 +14,9 @@ |
||
14 | 14 | namespace Eccube\Service\PurchaseFlow\Processor; |
15 | 15 | |
16 | 16 | use Eccube\Entity\ItemHolderInterface; |
17 | +use Eccube\Service\PurchaseFlow\ProcessResult; |
|
17 | 18 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
18 | 19 | use Eccube\Service\PurchaseFlow\PurchaseProcessor; |
19 | -use Eccube\Service\PurchaseFlow\ProcessResult; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * 管理画面/受注登録/編集画面の完了処理. |