@@ -21,8 +21,8 @@ |
||
21 | 21 | use Eccube\Event\EventArgs; |
22 | 22 | use Eccube\Form\Type\Admin\MainEditType; |
23 | 23 | use Eccube\Repository\Master\DeviceTypeRepository; |
24 | -use Eccube\Repository\PageRepository; |
|
25 | 24 | use Eccube\Repository\PageLayoutRepository; |
25 | +use Eccube\Repository\PageRepository; |
|
26 | 26 | use Eccube\Util\StringUtil; |
27 | 27 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
28 | 28 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
@@ -20,9 +20,9 @@ |
||
20 | 20 | use Eccube\Repository\ClassCategoryRepository; |
21 | 21 | use Eccube\Repository\ClassNameRepository; |
22 | 22 | use Eccube\Repository\ProductClassRepository; |
23 | +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
23 | 24 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
24 | 25 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
25 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
26 | 26 | use Symfony\Component\HttpFoundation\Request; |
27 | 27 | use Symfony\Component\HttpFoundation\Response; |
28 | 28 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
@@ -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 | { |
@@ -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; |
@@ -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 |
@@ -438,6 +438,9 @@ |
||
438 | 438 | return $user; |
439 | 439 | } |
440 | 440 | |
441 | + /** |
|
442 | + * @param string $allocatedId |
|
443 | + */ |
|
441 | 444 | protected function createCartKey($allocatedId, Customer $Customer = null) |
442 | 445 | { |
443 | 446 | if ($Customer instanceof Customer) { |
@@ -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 | { |