@@ -1,7 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | use Codeception\Util\Fixtures; |
| 4 | -use Page\Front\CartPage; |
|
| 5 | 4 | use Page\Front\ProductDetailPage; |
| 6 | 5 | use Page\Front\ProductListPage; |
| 7 | 6 | use Page\Front\TopPage; |
@@ -75,7 +75,7 @@ |
||
| 75 | 75 | |
| 76 | 76 | public function 規格管理() |
| 77 | 77 | { |
| 78 | - $this->tester->scrollTo(['css' => '#standardConfig > div > div.d-block.text-center > a'],0, 200); |
|
| 78 | + $this->tester->scrollTo(['css' => '#standardConfig > div > div.d-block.text-center > a'], 0, 200); |
|
| 79 | 79 | $this->tester->click(['css' => '#standardConfig > div > div.d-block.text-center > a']); |
| 80 | 80 | $this->tester->waitForElement(['css' => '#standardConfig > div > div.d-block.text-center > a']); |
| 81 | 81 | $this->tester->wait(1); |
@@ -97,7 +97,7 @@ |
||
| 97 | 97 | $password = substr(str_shuffle('1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 20); |
| 98 | 98 | |
| 99 | 99 | // メルアド・新パスワード設定 |
| 100 | - $I->submitForm('#form1',[ |
|
| 100 | + $I->submitForm('#form1', [ |
|
| 101 | 101 | 'login_email' => $customer->getEmail(), |
| 102 | 102 | 'password[first]' => $password, |
| 103 | 103 | 'password[second]' => $password |
@@ -15,8 +15,8 @@ |
||
| 15 | 15 | |
| 16 | 16 | use Doctrine\ORM\EntityManagerInterface; |
| 17 | 17 | use Eccube\Entity\BaseInfo; |
| 18 | -use Eccube\Entity\ItemHolderInterface; |
|
| 19 | 18 | use Eccube\Entity\BaseInfoRepository; |
| 19 | +use Eccube\Entity\ItemHolderInterface; |
|
| 20 | 20 | use Eccube\Service\PurchaseFlow\ItemHolderProcessor; |
| 21 | 21 | use Eccube\Service\PurchaseFlow\ProcessResult; |
| 22 | 22 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | * @param null $category2 |
| 80 | 80 | * @return ProductDetailPage |
| 81 | 81 | */ |
| 82 | - public function カートに入れる($num, $category1 = null, $category2= null) |
|
| 82 | + public function カートに入れる($num, $category1 = null, $category2 = null) |
|
| 83 | 83 | { |
| 84 | 84 | $this->tester->fillField(['id' => 'quantity'], $num); |
| 85 | 85 | if (!is_null($category1)) { |
@@ -13,18 +13,18 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Service\PurchaseFlow\Processor; |
| 15 | 15 | |
| 16 | -use Eccube\Service\PurchaseFlow\ItemHolderPreprocessor; |
|
| 17 | 16 | use Eccube\Entity\ItemHolderInterface; |
| 18 | -use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 19 | -use Eccube\Entity\OrderItem; |
|
| 20 | -use Eccube\Repository\Master\OrderItemTypeRepository; |
|
| 21 | -use Eccube\Repository\Master\TaxDisplayTypeRepository; |
|
| 22 | 17 | use Eccube\Entity\Master\OrderItemType; |
| 23 | 18 | use Eccube\Entity\Master\TaxDisplayType; |
| 19 | +use Eccube\Entity\Master\TaxType; |
|
| 24 | 20 | use Eccube\Entity\Order; |
| 21 | +use Eccube\Entity\OrderItem; |
|
| 25 | 22 | use Eccube\Entity\Payment; |
| 23 | +use Eccube\Repository\Master\OrderItemTypeRepository; |
|
| 24 | +use Eccube\Repository\Master\TaxDisplayTypeRepository; |
|
| 26 | 25 | use Eccube\Repository\Master\TaxTypeRepository; |
| 27 | -use Eccube\Entity\Master\TaxType; |
|
| 26 | +use Eccube\Service\PurchaseFlow\ItemHolderPreprocessor; |
|
| 27 | +use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 28 | 28 | |
| 29 | 29 | class PaymentChargePreprocessor implements ItemHolderPreprocessor |
| 30 | 30 | { |
@@ -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 | */ |
@@ -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 | { |