@@ -14,7 +14,6 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin\Order; |
15 | 15 | |
16 | 16 | use Doctrine\Common\Collections\ArrayCollection; |
17 | -use Doctrine\Common\Collections\Criteria; |
|
18 | 17 | use Eccube\Controller\AbstractController; |
19 | 18 | use Eccube\Entity\Master\CustomerStatus; |
20 | 19 | use Eccube\Entity\Master\OrderItemType; |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param MailService $mailService |
57 | 57 | * @param MailHistoryRepository $mailHistoryRepository |
58 | 58 | * @param OrderRepository $orderRepository |
59 | - * @param twig $twig |
|
59 | + * @param Environment $twig |
|
60 | 60 | */ |
61 | 61 | public function __construct( |
62 | 62 | MailService $mailService, |
@@ -227,6 +227,9 @@ discard block |
||
227 | 227 | ]; |
228 | 228 | } |
229 | 229 | |
230 | + /** |
|
231 | + * @param Order $Order |
|
232 | + */ |
|
230 | 233 | private function createBody($Order, $twig = 'Mail/order.twig') |
231 | 234 | { |
232 | 235 | return $this->renderView($twig, [ |
@@ -1347,6 +1347,7 @@ |
||
1347 | 1347 | |
1348 | 1348 | /** |
1349 | 1349 | * 登録、更新時のエラー画面表示 |
1350 | + * @param string $message |
|
1350 | 1351 | */ |
1351 | 1352 | protected function addErrors($message) |
1352 | 1353 | { |
@@ -17,9 +17,9 @@ |
||
17 | 17 | use Eccube\Event\EccubeEvents; |
18 | 18 | use Eccube\Event\EventArgs; |
19 | 19 | use Eccube\Form\Type\Admin\LogType; |
20 | -use Symfony\Component\Routing\Annotation\Route; |
|
21 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
22 | 21 | use Symfony\Component\HttpFoundation\Request; |
22 | +use Symfony\Component\Routing\Annotation\Route; |
|
23 | 23 | |
24 | 24 | class LogController extends AbstractController |
25 | 25 | { |
@@ -19,9 +19,9 @@ |
||
19 | 19 | use Eccube\Event\EventArgs; |
20 | 20 | use Eccube\Form\Type\Admin\MasterdataEditType; |
21 | 21 | use Eccube\Form\Type\Admin\MasterdataType; |
22 | -use Symfony\Component\Routing\Annotation\Route; |
|
23 | 22 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
24 | 23 | use Symfony\Component\HttpFoundation\Request; |
24 | +use Symfony\Component\Routing\Annotation\Route; |
|
25 | 25 | |
26 | 26 | class MasterdataController extends AbstractController |
27 | 27 | { |
@@ -20,9 +20,9 @@ |
||
20 | 20 | use Eccube\Event\EventArgs; |
21 | 21 | use Eccube\Form\Type\Admin\MemberType; |
22 | 22 | use Eccube\Repository\MemberRepository; |
23 | -use Symfony\Component\Routing\Annotation\Route; |
|
24 | 23 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
25 | 24 | use Symfony\Component\HttpFoundation\Request; |
25 | +use Symfony\Component\Routing\Annotation\Route; |
|
26 | 26 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
27 | 27 | use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
28 | 28 |
@@ -15,10 +15,10 @@ |
||
15 | 15 | |
16 | 16 | use Eccube\Common\Constant; |
17 | 17 | use Eccube\Service\SystemService; |
18 | -use Symfony\Component\Routing\Annotation\Route; |
|
19 | 18 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
20 | 19 | use Symfony\Component\HttpFoundation\Request; |
21 | 20 | use Symfony\Component\HttpFoundation\Response; |
21 | +use Symfony\Component\Routing\Annotation\Route; |
|
22 | 22 | |
23 | 23 | class SystemController |
24 | 24 | { |
@@ -128,7 +128,7 @@ |
||
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
131 | - * @param $Carts |
|
131 | + * @param \Eccube\Entity\Cart[] $Carts |
|
132 | 132 | * |
133 | 133 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
134 | 134 | */ |
@@ -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; |
@@ -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; |