@@ -162,9 +162,9 @@ discard block |
||
| 162 | 162 | // 削除 |
| 163 | 163 | $OrderNumForDel = $OrderListPage->一覧_注文番号(1); |
| 164 | 164 | $OrderListPage |
| 165 | - ->一覧_選択(1) |
|
| 166 | - ->一覧_削除() |
|
| 167 | - ->Accept_削除(); |
|
| 165 | + ->一覧_選択(1) |
|
| 166 | + ->一覧_削除() |
|
| 167 | + ->Accept_削除(); |
|
| 168 | 168 | |
| 169 | 169 | $I->see('受注情報を削除しました', ['css' => '#page_admin_order > div > div.c-contentsArea > div.alert.alert-success.alert-dismissible.fade.show.m-3 > span']); |
| 170 | 170 | $I->assertNotEquals($OrderNumForDel, $OrderListPage->一覧_注文番号(1)); |
@@ -172,9 +172,9 @@ discard block |
||
| 172 | 172 | // 削除キャンセル |
| 173 | 173 | $OrderNumForDontDel = $OrderListPage->一覧_注文番号(1); |
| 174 | 174 | $OrderListPage |
| 175 | - ->一覧_選択(1) |
|
| 176 | - ->一覧_削除() |
|
| 177 | - ->Cancel_削除(); |
|
| 175 | + ->一覧_選択(1) |
|
| 176 | + ->一覧_削除() |
|
| 177 | + ->Cancel_削除(); |
|
| 178 | 178 | |
| 179 | 179 | $I->assertEquals($OrderNumForDontDel, $OrderListPage->一覧_注文番号(1)); |
| 180 | 180 | } |
@@ -150,8 +150,8 @@ |
||
| 150 | 150 | */ |
| 151 | 151 | public function 検索結果_削除($rowNum) |
| 152 | 152 | { |
| 153 | - $this->tester->click("#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(3) > a"); |
|
| 154 | - return $this; |
|
| 153 | + $this->tester->click("#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(3) > a"); |
|
| 154 | + return $this; |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | public function Accept_削除($rowNum) |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | { |
| 21 | 21 | use _generated\UnitTesterActions; |
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Define custom actions here |
|
| 25 | - */ |
|
| 23 | + /** |
|
| 24 | + * Define custom actions here |
|
| 25 | + */ |
|
| 26 | 26 | } |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | { |
| 21 | 21 | use _generated\FunctionalTesterActions; |
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Define custom actions here |
|
| 25 | - */ |
|
| 23 | + /** |
|
| 24 | + * Define custom actions here |
|
| 25 | + */ |
|
| 26 | 26 | } |
@@ -290,8 +290,8 @@ |
||
| 290 | 290 | $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null; |
| 291 | 291 | $qb |
| 292 | 292 | ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '. |
| 293 | - 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR '. |
|
| 294 | - 'o.code LIKE :likemulti') |
|
| 293 | + 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR '. |
|
| 294 | + 'o.code LIKE :likemulti') |
|
| 295 | 295 | ->setParameter('multi', $multi) |
| 296 | 296 | ->setParameter('likemulti', '%'.$searchData['multi'].'%'); |
| 297 | 297 | } |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null; |
| 66 | 66 | $qb |
| 67 | 67 | ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR '. |
| 68 | - 's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti') |
|
| 68 | + 's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti') |
|
| 69 | 69 | ->setParameter('multi', $multi) |
| 70 | 70 | ->setParameter('likemulti', '%'.$searchData['multi'].'%'); |
| 71 | 71 | } |
@@ -75,11 +75,11 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | $qb = $this->createQueryBuilder('e'); |
| 77 | 77 | $qb->andWhere("e.priority >= $range_end ") |
| 78 | - ->andWhere("e.priority <= $range_start ") |
|
| 79 | - ->andWhere('e.event = :event') |
|
| 80 | - ->setParameter('event', $event) |
|
| 81 | - ->setMaxResults(1) |
|
| 82 | - ->orderBy('e.priority', 'ASC'); |
|
| 78 | + ->andWhere("e.priority <= $range_start ") |
|
| 79 | + ->andWhere('e.event = :event') |
|
| 80 | + ->setParameter('event', $event) |
|
| 81 | + ->setMaxResults(1) |
|
| 82 | + ->orderBy('e.priority', 'ASC'); |
|
| 83 | 83 | |
| 84 | 84 | $result = $qb->getQuery()->getResult(); |
| 85 | 85 | if (count($result)) { |
@@ -96,13 +96,13 @@ discard block |
||
| 96 | 96 | $qb = $this->createQueryBuilder('e'); |
| 97 | 97 | |
| 98 | 98 | $qb->andWhere("e.priority >= $range_end ") |
| 99 | - ->andWhere("e.priority <= $range_start ") |
|
| 100 | - ->andWhere('e.priority '.($up ? '>' : '<').' :pri') |
|
| 101 | - ->andWhere('e.event = :event') |
|
| 102 | - ->setParameter('event', $pluginEventHandler->getEvent()) |
|
| 103 | - ->setParameter('pri', $pluginEventHandler->getPriority()) |
|
| 104 | - ->setMaxResults(1) |
|
| 105 | - ->orderBy('e.priority', ($up ? 'ASC' : 'DESC')); |
|
| 99 | + ->andWhere("e.priority <= $range_start ") |
|
| 100 | + ->andWhere('e.priority '.($up ? '>' : '<').' :pri') |
|
| 101 | + ->andWhere('e.event = :event') |
|
| 102 | + ->setParameter('event', $pluginEventHandler->getEvent()) |
|
| 103 | + ->setParameter('pri', $pluginEventHandler->getPriority()) |
|
| 104 | + ->setMaxResults(1) |
|
| 105 | + ->orderBy('e.priority', ($up ? 'ASC' : 'DESC')); |
|
| 106 | 106 | |
| 107 | 107 | $result = $qb->getQuery()->getResult(); |
| 108 | 108 | |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | ], |
| 113 | 113 | 'constraints' => [ |
| 114 | 114 | new Assert\Length([ |
| 115 | - 'max' => $this->eccubeConfig['eccube_name_len'], |
|
| 115 | + 'max' => $this->eccubeConfig['eccube_name_len'], |
|
| 116 | 116 | ]), |
| 117 | 117 | new Assert\Regex([ |
| 118 | 118 | 'pattern' => '/^[^\s ]+$/u', |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | ], |
| 127 | 127 | 'constraints' => [ |
| 128 | 128 | new Assert\Length([ |
| 129 | - 'max' => $this->eccubeConfig['eccube_name_len'], |
|
| 129 | + 'max' => $this->eccubeConfig['eccube_name_len'], |
|
| 130 | 130 | ]), |
| 131 | 131 | new Assert\Regex([ |
| 132 | 132 | 'pattern' => '/^[^\s ]+$/u', |
@@ -79,8 +79,8 @@ |
||
| 79 | 79 | new Assert\NotBlank(), |
| 80 | 80 | new Assert\Length(['max' => $this->eccubeConfig['eccube_stext_len']]), |
| 81 | 81 | new Assert\Regex([ |
| 82 | - 'pattern' => '/^[0-9a-zA-Z]+$/', |
|
| 83 | - ]), |
|
| 82 | + 'pattern' => '/^[0-9a-zA-Z]+$/', |
|
| 83 | + ]), |
|
| 84 | 84 | ], |
| 85 | 85 | 'data' => $this->eccubeConfig->get('eccube_admin_route'), |
| 86 | 86 | ]) |