@@ -17,7 +17,14 @@ discard block |
||
17 | 17 | use Eccube\Common\Constant; |
18 | 18 | use Eccube\Controller\AbstractController; |
19 | 19 | use Eccube\Entity\BaseInfo; |
20 | +use Eccube\Entity\ExportCsvRow; |
|
20 | 21 | use Eccube\Entity\Master\CsvType; |
22 | +use Eccube\Entity\Master\ProductStatus; |
|
23 | +use Eccube\Entity\Product; |
|
24 | +use Eccube\Entity\ProductCategory; |
|
25 | +use Eccube\Entity\ProductClass; |
|
26 | +use Eccube\Entity\ProductImage; |
|
27 | +use Eccube\Entity\ProductStock; |
|
21 | 28 | use Eccube\Entity\ProductTag; |
22 | 29 | use Eccube\Event\EccubeEvents; |
23 | 30 | use Eccube\Event\EventArgs; |
@@ -32,28 +39,21 @@ discard block |
||
32 | 39 | use Eccube\Repository\TagRepository; |
33 | 40 | use Eccube\Repository\TaxRuleRepository; |
34 | 41 | use Eccube\Service\CsvExportService; |
42 | +use Eccube\Util\FormUtil; |
|
35 | 43 | use Knp\Component\Pager\Paginator; |
36 | 44 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
37 | 45 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
38 | 46 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
39 | 47 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
40 | -use Eccube\Util\FormUtil; |
|
41 | 48 | use Symfony\Component\Filesystem\Filesystem; |
42 | 49 | use Symfony\Component\HttpFoundation\File\File; |
43 | 50 | use Symfony\Component\HttpFoundation\JsonResponse; |
51 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
44 | 52 | use Symfony\Component\HttpFoundation\Request; |
45 | 53 | use Symfony\Component\HttpFoundation\StreamedResponse; |
46 | 54 | use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; |
47 | 55 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
48 | 56 | use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException; |
49 | -use Eccube\Entity\Product; |
|
50 | -use Eccube\Entity\ProductClass; |
|
51 | -use Eccube\Entity\Master\ProductStatus; |
|
52 | -use Eccube\Entity\ProductStock; |
|
53 | -use Eccube\Entity\ProductImage; |
|
54 | -use Eccube\Entity\ProductCategory; |
|
55 | -use Eccube\Entity\ExportCsvRow; |
|
56 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
57 | 57 | |
58 | 58 | class ProductController extends AbstractController |
59 | 59 | { |
@@ -19,11 +19,11 @@ |
||
19 | 19 | use Eccube\Event\EventArgs; |
20 | 20 | use Eccube\Form\Type\Admin\MailType; |
21 | 21 | use Eccube\Repository\MailTemplateRepository; |
22 | +use Eccube\Util\StringUtil; |
|
22 | 23 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
23 | 24 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
24 | -use Symfony\Component\HttpFoundation\Request; |
|
25 | 25 | use Symfony\Component\Filesystem\Filesystem; |
26 | -use Eccube\Util\StringUtil; |
|
26 | +use Symfony\Component\HttpFoundation\Request; |
|
27 | 27 | use Twig\Environment; |
28 | 28 | |
29 | 29 | /** |
@@ -25,9 +25,9 @@ |
||
25 | 25 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
26 | 26 | use Symfony\Component\Filesystem\Filesystem; |
27 | 27 | use Symfony\Component\HttpFoundation\Request; |
28 | +use Symfony\Component\HttpFoundation\Response; |
|
28 | 29 | use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; |
29 | 30 | use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException; |
30 | -use Symfony\Component\HttpFoundation\Response; |
|
31 | 31 | |
32 | 32 | /** |
33 | 33 | * Class PaymentController |
@@ -23,8 +23,8 @@ |
||
23 | 23 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
24 | 24 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
25 | 25 | use Symfony\Component\HttpFoundation\Request; |
26 | -use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
|
27 | 26 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
27 | +use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
|
28 | 28 | |
29 | 29 | class MemberController extends AbstractController |
30 | 30 | { |
@@ -14,11 +14,11 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin\Shipping; |
15 | 15 | |
16 | 16 | use Eccube\Controller\AbstractController; |
17 | +use Eccube\Exception\CsvImportException; |
|
18 | +use Eccube\Form\Type\Admin\CsvImportType; |
|
17 | 19 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
18 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
19 | -use Eccube\Form\Type\Admin\CsvImportType; |
|
20 | 21 | use Symfony\Component\Filesystem\Filesystem; |
21 | -use Eccube\Exception\CsvImportException; |
|
22 | 22 | |
23 | 23 | class CsvImportController extends AbstractController |
24 | 24 | { |
@@ -24,6 +24,7 @@ discard block |
||
24 | 24 | use Eccube\Repository\Master\ShippingStatusRepository; |
25 | 25 | use Eccube\Repository\OrderItemRepository; |
26 | 26 | use Eccube\Repository\ShippingRepository; |
27 | +use Eccube\Service\MailService; |
|
27 | 28 | use Eccube\Service\TaxRuleService; |
28 | 29 | use Knp\Component\Pager\PaginatorInterface; |
29 | 30 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
@@ -32,7 +33,6 @@ discard block |
||
32 | 33 | use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; |
33 | 34 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
34 | 35 | use Symfony\Component\Serializer\SerializerInterface; |
35 | -use Eccube\Service\MailService; |
|
36 | 36 | |
37 | 37 | class EditController extends AbstractController |
38 | 38 | { |
@@ -16,8 +16,8 @@ |
||
16 | 16 | use Eccube\Common\Constant; |
17 | 17 | use Eccube\Controller\AbstractController; |
18 | 18 | use Eccube\Entity\Master\ShippingStatus; |
19 | -use Eccube\Entity\Shipping; |
|
20 | 19 | use Eccube\Entity\OrderItem; |
20 | +use Eccube\Entity\Shipping; |
|
21 | 21 | use Eccube\Event\EccubeEvents; |
22 | 22 | use Eccube\Event\EventArgs; |
23 | 23 | use Eccube\Form\Type\Admin\SearchShippingType; |
@@ -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. |