@@ -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; |
@@ -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; |
@@ -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; |
@@ -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; |
@@ -16,24 +16,24 @@ |
||
| 16 | 16 | use Doctrine\ORM\NoResultException; |
| 17 | 17 | use Eccube\Controller\AbstractController; |
| 18 | 18 | use Eccube\Entity\Layout; |
| 19 | -use Eccube\Form\Type\Admin\LayoutType; |
|
| 20 | 19 | use Eccube\Entity\Master\ProductStatus; |
| 21 | -use Eccube\Repository\BlockRepository; |
|
| 20 | +use Eccube\Form\Type\Admin\LayoutType; |
|
| 22 | 21 | use Eccube\Repository\BlockPositionRepository; |
| 22 | +use Eccube\Repository\BlockRepository; |
|
| 23 | 23 | use Eccube\Repository\LayoutRepository; |
| 24 | +use Eccube\Repository\Master\DeviceTypeRepository; |
|
| 24 | 25 | use Eccube\Repository\PageLayoutRepository; |
| 25 | 26 | use Eccube\Repository\PageRepository; |
| 26 | 27 | use Eccube\Repository\ProductRepository; |
| 27 | -use Eccube\Repository\Master\DeviceTypeRepository; |
|
| 28 | 28 | use Eccube\Util\CacheUtil; |
| 29 | 29 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 30 | 30 | use Symfony\Component\HttpFoundation\JsonResponse; |
| 31 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
| 31 | 32 | use Symfony\Component\HttpFoundation\Request; |
| 32 | 33 | use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; |
| 33 | 34 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 34 | 35 | use Symfony\Component\Routing\Annotation\Route; |
| 35 | 36 | use Twig\Environment as Twig; |
| 36 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
| 37 | 37 | |
| 38 | 38 | class LayoutController extends AbstractController |
| 39 | 39 | { |
@@ -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; |
@@ -64,12 +64,12 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | // SSL強制時は, httpsのみにアクセス制限する |
| 66 | 66 | $accessControl = [ |
| 67 | - ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 68 | - ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'], |
|
| 69 | - ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 70 | - ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 71 | - ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'], |
|
| 72 | - ['path' => '^/mypage/', 'roles' => 'ROLE_USER'], |
|
| 67 | + ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 68 | + ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'], |
|
| 69 | + ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 70 | + ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 71 | + ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'], |
|
| 72 | + ['path' => '^/mypage/', 'roles' => 'ROLE_USER'], |
|
| 73 | 73 | ]; |
| 74 | 74 | if ($forceSSL) { |
| 75 | 75 | foreach ($accessControl as &$control) { |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | // security.ymlでは制御できないため, ここで定義する. |
| 81 | 81 | $container->prependExtensionConfig('security', [ |
| 82 | - 'access_control' => $accessControl, |
|
| 82 | + 'access_control' => $accessControl, |
|
| 83 | 83 | ]); |
| 84 | 84 | } |
| 85 | 85 | |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | namespace Eccube\Controller\Admin\Content; |
| 15 | 15 | |
| 16 | 16 | use Eccube\Controller\AbstractController; |
| 17 | -use Eccube\Form\Type\Admin\MainEditType; |
|
| 18 | 17 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 19 | 18 | use Symfony\Component\Filesystem\Exception\IOException; |
| 20 | 19 | use Symfony\Component\Filesystem\Filesystem; |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | namespace Eccube\Controller\Admin\Content; |
| 15 | 15 | |
| 16 | 16 | use Eccube\Controller\AbstractController; |
| 17 | -use Eccube\Form\Type\Admin\MainEditType; |
|
| 18 | 17 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 19 | 18 | use Symfony\Component\Filesystem\Exception\IOException; |
| 20 | 19 | use Symfony\Component\Filesystem\Filesystem; |