@@ -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; |
@@ -33,8 +33,8 @@ |
||
| 33 | 33 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
| 34 | 34 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 35 | 35 | use Symfony\Component\Form\FormInterface; |
| 36 | -use Symfony\Component\HttpFoundation\Response; |
|
| 37 | 36 | use Symfony\Component\HttpFoundation\Request; |
| 37 | +use Symfony\Component\HttpFoundation\Response; |
|
| 38 | 38 | use Symfony\Component\Routing\Annotation\Route; |
| 39 | 39 | use Symfony\Component\Routing\RouterInterface; |
| 40 | 40 | use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; |
@@ -19,6 +19,9 @@ |
||
| 19 | 19 | { |
| 20 | 20 | protected $trait_proxies_directory; |
| 21 | 21 | |
| 22 | + /** |
|
| 23 | + * @param string $dir |
|
| 24 | + */ |
|
| 22 | 25 | public function setTraitProxiesDirectory($dir) |
| 23 | 26 | { |
| 24 | 27 | $this->trait_proxies_directory = $dir; |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Entity; |
| 15 | 15 | |
| 16 | -use Doctrine\Common\Annotations\Reader; |
|
| 17 | 16 | use Doctrine\Common\Collections\Collection; |
| 18 | 17 | use Doctrine\Common\Inflector\Inflector; |
| 19 | 18 | use Doctrine\ORM\Mapping\Id; |
@@ -1750,7 +1750,7 @@ |
||
| 1750 | 1750 | /** |
| 1751 | 1751 | * Set orderStatus. |
| 1752 | 1752 | * |
| 1753 | - * @param \Eccube\Entity\Master\OrderStatus|null|object $orderStatus |
|
| 1753 | + * @param null|Master\OrderStatus $orderStatus |
|
| 1754 | 1754 | * |
| 1755 | 1755 | * @return Order |
| 1756 | 1756 | */ |
@@ -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 | } |
@@ -110,7 +110,7 @@ |
||
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /** |
| 113 | - * @param $key |
|
| 113 | + * @param string $key |
|
| 114 | 114 | * @param $value |
| 115 | 115 | */ |
| 116 | 116 | public function setParameter($key, $value) |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | /** |
| 90 | 90 | * ルーティング名を取得する. |
| 91 | 91 | * |
| 92 | - * @param $request |
|
| 92 | + * @param \Symfony\Component\HttpFoundation\Request $request |
|
| 93 | 93 | * |
| 94 | 94 | * @return string |
| 95 | 95 | */ |
@@ -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; |
@@ -13,8 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\EventListener; |
| 15 | 15 | |
| 16 | -use Doctrine\Dbal\Connection; |
|
| 17 | 16 | use Doctrine\DBAL\TransactionIsolationLevel; |
| 17 | +use Doctrine\Dbal\Connection; |
|
| 18 | 18 | use Doctrine\ORM\EntityManager; |
| 19 | 19 | use Doctrine\ORM\EntityManagerInterface; |
| 20 | 20 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |