@@ -32,6 +32,9 @@ |
||
32 | 32 | { |
33 | 33 | protected $trait_proxies_directory; |
34 | 34 | |
35 | + /** |
|
36 | + * @param string $dir |
|
37 | + */ |
|
35 | 38 | public function setTraitProxiesDirectory($dir) |
36 | 39 | { |
37 | 40 | $this->trait_proxies_directory = $dir; |
@@ -88,7 +88,7 @@ |
||
88 | 88 | * @param BlockRepository $blockRepository |
89 | 89 | * @param LayoutRepository $layoutRepository |
90 | 90 | * @param PageLayoutRepository $pageLayoutRepository |
91 | - * @param pageRepository $pageRepository |
|
91 | + * @param PageRepository $pageRepository |
|
92 | 92 | * @param ProductRepository $productRepository |
93 | 93 | * @param DeviceTypeRepository $deviceTypeRepository |
94 | 94 | */ |
@@ -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 | { |
@@ -389,7 +389,6 @@ discard block |
||
389 | 389 | } |
390 | 390 | |
391 | 391 | /** |
392 | - * @param \Doctrine\ORM\EntityManagerInterface $em |
|
393 | 392 | * @param array $excludes |
394 | 393 | * |
395 | 394 | * @return null|Request |
@@ -422,9 +421,9 @@ discard block |
||
422 | 421 | } |
423 | 422 | |
424 | 423 | /** |
425 | - * @param $dateTime |
|
424 | + * @param \DateTime $dateTime |
|
426 | 425 | * |
427 | - * @return array|mixed |
|
426 | + * @return null|Request |
|
428 | 427 | * |
429 | 428 | * @throws \Doctrine\ORM\NonUniqueResultException |
430 | 429 | */ |
@@ -460,9 +459,9 @@ discard block |
||
460 | 459 | } |
461 | 460 | |
462 | 461 | /** |
463 | - * @param $dateTime |
|
462 | + * @param \DateTime $dateTime |
|
464 | 463 | * |
465 | - * @return array|mixed |
|
464 | + * @return null|Request |
|
466 | 465 | * |
467 | 466 | * @throws \Doctrine\ORM\NonUniqueResultException |
468 | 467 | */ |
@@ -500,7 +499,7 @@ discard block |
||
500 | 499 | /** |
501 | 500 | * 在庫切れ商品数を取得 |
502 | 501 | * |
503 | - * @return mixed |
|
502 | + * @return null|Request |
|
504 | 503 | * |
505 | 504 | * @throws \Doctrine\ORM\NonUniqueResultException |
506 | 505 | */ |
@@ -518,7 +517,7 @@ discard block |
||
518 | 517 | /** |
519 | 518 | * 商品数を取得 |
520 | 519 | * |
521 | - * @return mixed |
|
520 | + * @return null|Request |
|
522 | 521 | * |
523 | 522 | * @throws \Doctrine\ORM\NonUniqueResultException |
524 | 523 | */ |
@@ -535,7 +534,7 @@ discard block |
||
535 | 534 | /** |
536 | 535 | * 本会員数を取得 |
537 | 536 | * |
538 | - * @return mixed |
|
537 | + * @return null|Request |
|
539 | 538 | * |
540 | 539 | * @throws \Doctrine\ORM\NonUniqueResultException |
541 | 540 | */ |
@@ -554,7 +553,7 @@ discard block |
||
554 | 553 | * |
555 | 554 | * @param Carbon $fromDate |
556 | 555 | * @param Carbon $toDate |
557 | - * @param $format |
|
556 | + * @param string $format |
|
558 | 557 | * |
559 | 558 | * @return array |
560 | 559 | */ |
@@ -126,7 +126,7 @@ |
||
126 | 126 | } |
127 | 127 | |
128 | 128 | /** |
129 | - * @param $Carts |
|
129 | + * @param \Eccube\Entity\Cart[] $Carts |
|
130 | 130 | * |
131 | 131 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
132 | 132 | */ |
@@ -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; |
@@ -59,6 +59,9 @@ discard block |
||
59 | 59 | return $this; |
60 | 60 | } |
61 | 61 | |
62 | + /** |
|
63 | + * @param integer $value |
|
64 | + */ |
|
62 | 65 | public function 詳細検索_ステータス($value) |
63 | 66 | { |
64 | 67 | $this->tester->click(self::$詳細検索ボタン); |
@@ -155,6 +158,9 @@ discard block |
||
155 | 158 | return $this; |
156 | 159 | } |
157 | 160 | |
161 | + /** |
|
162 | + * @param integer $rowNum |
|
163 | + */ |
|
158 | 164 | public function Accept_複製する($rowNum) |
159 | 165 | { |
160 | 166 | $modalCssSelector = "#page_admin_product > div.c-container > div.c-contentsArea > div.c-contentsArea__cols > div > div > form > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pr-3 > div > div:nth-child(2) div.modal"; |
@@ -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; |
@@ -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; |
@@ -1639,7 +1639,7 @@ |
||
1639 | 1639 | /** |
1640 | 1640 | * Set orderStatus. |
1641 | 1641 | * |
1642 | - * @param \Eccube\Entity\Master\OrderStatus|null|object $orderStatus |
|
1642 | + * @param null|Master\OrderStatus $orderStatus |
|
1643 | 1643 | * |
1644 | 1644 | * @return Order |
1645 | 1645 | */ |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | */ |
106 | 106 | public function getTaxableDiscountItems() |
107 | 107 | { |
108 | - return array_filter($this->getTaxableItems(), function(OrderItem $Item) { |
|
108 | + return array_filter($this->getTaxableItems(), function (OrderItem $Item) { |
|
109 | 109 | return $Item->isDiscount(); |
110 | 110 | }); |
111 | 111 | } |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | */ |
130 | 130 | public function getTaxFreeDiscountItems() |
131 | 131 | { |
132 | - return array_filter($this->OrderItems->toArray(), function(OrderItem $Item) { |
|
132 | + return array_filter($this->OrderItems->toArray(), function (OrderItem $Item) { |
|
133 | 133 | return $Item->isPoint() || ($Item->isDiscount() && $Item->getTaxType()->getId() != TaxType::TAXATION); |
134 | 134 | }); |
135 | 135 | } |