@@ -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; |
@@ -103,7 +103,7 @@ |
||
103 | 103 | /** |
104 | 104 | * Get a plugin |
105 | 105 | * |
106 | - * @param int|string $id Id or plugin code |
|
106 | + * @param string $id Id or plugin code |
|
107 | 107 | * |
108 | 108 | * @return array [$result, $info] |
109 | 109 | */ |
@@ -406,7 +406,7 @@ |
||
406 | 406 | public function getPreOrderId() |
407 | 407 | { |
408 | 408 | $Cart = $this->getCart(); |
409 | - if (!empty($Cart) ) { |
|
409 | + if (!empty($Cart)) { |
|
410 | 410 | return $Cart->getPreOrderId(); |
411 | 411 | } |
412 | 412 |
@@ -377,11 +377,11 @@ |
||
377 | 377 | |
378 | 378 | // forwardすることも可能. |
379 | 379 | if ($dispatcher->isForward()) { |
380 | - log_info('[注文処理] PaymentMethod::applyによりForwardします.', [$dispatcher->getRoute(), $dispatcher->getPathParameters(), $dispatcher->getQueryParameters(),]); |
|
380 | + log_info('[注文処理] PaymentMethod::applyによりForwardします.', [$dispatcher->getRoute(), $dispatcher->getPathParameters(), $dispatcher->getQueryParameters(), ]); |
|
381 | 381 | |
382 | 382 | return $this->forwardToRoute($dispatcher->getRoute(), $dispatcher->getPathParameters(), $dispatcher->getQueryParameters()); |
383 | 383 | } else { |
384 | - log_info('[注文処理] PaymentMethod::applyによりリダイレクトします.', [$dispatcher->getRoute(), $dispatcher->getPathParameters(), $dispatcher->getQueryParameters(),]); |
|
384 | + log_info('[注文処理] PaymentMethod::applyによりリダイレクトします.', [$dispatcher->getRoute(), $dispatcher->getPathParameters(), $dispatcher->getQueryParameters(), ]); |
|
385 | 385 | |
386 | 386 | return $this->redirectToRoute($dispatcher->getRoute(), array_merge($dispatcher->getPathParameters(), $dispatcher->getQueryParameters())); |
387 | 387 | } |