@@ -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"; |
@@ -24,7 +24,6 @@ |
||
| 24 | 24 | use Eccube\Entity\ProductImage; |
| 25 | 25 | use Eccube\Entity\ProductStock; |
| 26 | 26 | use Eccube\Entity\ProductTag; |
| 27 | -use Eccube\Exception\CsvImportException; |
|
| 28 | 27 | use Eccube\Form\Type\Admin\CsvImportType; |
| 29 | 28 | use Eccube\Repository\BaseInfoRepository; |
| 30 | 29 | use Eccube\Repository\CategoryRepository; |
@@ -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 | */ |
@@ -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,9 +105,9 @@ |
||
| 105 | 105 | public function index(Request $request, Paginator $paginator) |
| 106 | 106 | { |
| 107 | 107 | // Doctrine SQLFilter |
| 108 | - if ($this->BaseInfo->isOptionNostockHidden()) { |
|
| 109 | - $this->entityManager->getFilters()->enable('option_nostock_hidden'); |
|
| 110 | - } |
|
| 108 | + if ($this->BaseInfo->isOptionNostockHidden()) { |
|
| 109 | + $this->entityManager->getFilters()->enable('option_nostock_hidden'); |
|
| 110 | + } |
|
| 111 | 111 | |
| 112 | 112 | // handleRequestは空のqueryの場合は無視するため |
| 113 | 113 | if ($request->getMethod() === 'GET') { |