@@ -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 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | /** |
97 | 97 | * 金額をポイントに変換する. |
98 | 98 | * |
99 | - * @param $price |
|
99 | + * @param double $price |
|
100 | 100 | * |
101 | 101 | * @return float ポイント |
102 | 102 | * |
@@ -153,6 +153,9 @@ discard block |
||
153 | 153 | } |
154 | 154 | } |
155 | 155 | |
156 | + /** |
|
157 | + * @param integer $point |
|
158 | + */ |
|
156 | 159 | public function prepare(ItemHolderInterface $itemHolder, $point) |
157 | 160 | { |
158 | 161 | // ユーザの保有ポイントを減算 |
@@ -160,6 +163,9 @@ discard block |
||
160 | 163 | $Customer->setPoint($Customer->getPoint() - $point); |
161 | 164 | } |
162 | 165 | |
166 | + /** |
|
167 | + * @param integer $point |
|
168 | + */ |
|
163 | 169 | public function rollback(ItemHolderInterface $itemHolder, $point) |
164 | 170 | { |
165 | 171 | // 利用したポイントをユーザに戻す. |
@@ -250,6 +250,9 @@ |
||
250 | 250 | $this->updatePluginStatus('/status/uninstalled', $Plugin); |
251 | 251 | } |
252 | 252 | |
253 | + /** |
|
254 | + * @param string $url |
|
255 | + */ |
|
253 | 256 | private function updatePluginStatus($url, Plugin $Plugin) |
254 | 257 | { |
255 | 258 | if ($Plugin->getSource()) { |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param MailService $mailService |
57 | 57 | * @param MailHistoryRepository $mailHistoryRepository |
58 | 58 | * @param OrderRepository $orderRepository |
59 | - * @param twig $twig |
|
59 | + * @param Environment $twig |
|
60 | 60 | */ |
61 | 61 | public function __construct( |
62 | 62 | MailService $mailService, |
@@ -227,6 +227,9 @@ discard block |
||
227 | 227 | ]; |
228 | 228 | } |
229 | 229 | |
230 | + /** |
|
231 | + * @param Order $Order |
|
232 | + */ |
|
230 | 233 | private function createBody($Order, $twig = 'Mail/order.twig') |
231 | 234 | { |
232 | 235 | return $this->renderView($twig, [ |
@@ -81,7 +81,7 @@ |
||
81 | 81 | * |
82 | 82 | * @throws PluginException |
83 | 83 | * |
84 | - * @param string $command |
|
84 | + * @param string[] $commands |
|
85 | 85 | */ |
86 | 86 | public function runCommand($commands, $output = null, $init = true) |
87 | 87 | { |
@@ -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; |