@@ -27,7 +27,6 @@ discard block |
||
27 | 27 | use Doctrine\ORM\EntityRepository; |
28 | 28 | use Eccube\Annotation\FormType; |
29 | 29 | use Eccube\Annotation\Inject; |
30 | -use Eccube\Application; |
|
31 | 30 | use Eccube\Common\Constant; |
32 | 31 | use Eccube\Entity\BaseInfo; |
33 | 32 | use Eccube\Form\Type\AddressType; |
@@ -35,7 +34,6 @@ discard block |
||
35 | 34 | use Eccube\Form\Type\NameType; |
36 | 35 | use Eccube\Form\Type\TelType; |
37 | 36 | use Eccube\Form\Type\ZipType; |
38 | -use Eccube\Repository\BaseInfoRepository; |
|
39 | 37 | use Eccube\Repository\DeliveryRepository; |
40 | 38 | use Symfony\Bridge\Doctrine\Form\Type\EntityType; |
41 | 39 | use Symfony\Component\Form\AbstractType; |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | 'prototype' => true, |
200 | 200 | )) |
201 | 201 | |
202 | - ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
202 | + ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) { |
|
203 | 203 | if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
204 | 204 | $form = $event->getForm(); |
205 | 205 | $form->add('OrderItems', CollectionType::class, array( |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | )); |
211 | 211 | } |
212 | 212 | }) |
213 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
213 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
214 | 214 | /** @var \Eccube\Entity\Shipping $data */ |
215 | 215 | $data = $event->getData(); |
216 | 216 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | 'choice_label' => 'delivery_time', |
230 | 230 | 'placeholder' => '指定なし', |
231 | 231 | 'required' => false, |
232 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
232 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
233 | 233 | return $er->createQueryBuilder('dt') |
234 | 234 | ->where('dt.Delivery = :Delivery') |
235 | 235 | ->setParameter('Delivery', $Delivery); |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | )); |
238 | 238 | |
239 | 239 | }) |
240 | - ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
240 | + ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
241 | 241 | $data = $event->getData(); |
242 | 242 | $form = $event->getForm(); |
243 | 243 | if (!$data) { |
@@ -257,14 +257,14 @@ discard block |
||
257 | 257 | 'choice_label' => 'delivery_time', |
258 | 258 | 'placeholder' => '指定なし', |
259 | 259 | 'required' => false, |
260 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
260 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
261 | 261 | return $er->createQueryBuilder('dt') |
262 | 262 | ->where('dt.Delivery = :Delivery') |
263 | 263 | ->setParameter('Delivery', $Delivery); |
264 | 264 | }, |
265 | 265 | )); |
266 | 266 | }) |
267 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
267 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
268 | 268 | if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
269 | 269 | $form = $event->getForm(); |
270 | 270 | $OrderItems = $form['OrderItems']->getData(); |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | } |
276 | 276 | } |
277 | 277 | }) |
278 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
278 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
279 | 279 | $Shipping = $event->getData(); |
280 | 280 | $Delivery = $Shipping->getDelivery(); |
281 | 281 | $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null); |
@@ -4,7 +4,6 @@ |
||
4 | 4 | use Eccube\Entity\Order; |
5 | 5 | use Eccube\Entity\PurchaseInterface; |
6 | 6 | use Eccube\Entity\OrderItem; |
7 | -use Eccube\Service\Calculator\Strategy\CalculateStrategyInterface; |
|
8 | 7 | |
9 | 8 | class CalculateContext |
10 | 9 | { |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $this->buildCalculator($this->CalculateStrategies); |
24 | 24 | |
25 | 25 | /** @var OrderItem $OrderItem */ |
26 | - foreach($this->OrderItems as $OrderItem) { |
|
26 | + foreach ($this->OrderItems as $OrderItem) { |
|
27 | 27 | if ($OrderItem instanceof OrderItem) { |
28 | 28 | if (!$this->Order->getItems()->contains($OrderItem)) { |
29 | 29 | $OrderItem->setOrder($this->Order); |
@@ -2,13 +2,9 @@ |
||
2 | 2 | namespace Eccube\Service\Calculator\Strategy; |
3 | 3 | |
4 | 4 | use Eccube\Application; |
5 | -use Eccube\Entity\Master\OrderItemType; |
|
6 | -use Eccube\Entity\Master\TaxType; |
|
7 | -use Eccube\Entity\Master\TaxDisplayType; |
|
8 | 5 | use Eccube\Entity\Order; |
9 | 6 | use Eccube\Entity\PurchaseInterface; |
10 | 7 | use Eccube\Entity\OrderItem; |
11 | -use Eccube\Entity\Shipping; |
|
12 | 8 | use Eccube\Repository\Master\OrderItemTypeRepository; |
13 | 9 | use Eccube\Service\Calculator\OrderItemCollection; |
14 | 10 |
@@ -2,14 +2,10 @@ |
||
2 | 2 | namespace Eccube\Service\Calculator\Strategy; |
3 | 3 | |
4 | 4 | use Eccube\Application; |
5 | -use Eccube\Entity\Master\OrderItemType; |
|
6 | -use Eccube\Entity\Master\TaxType; |
|
7 | -use Eccube\Entity\Master\TaxDisplayType; |
|
8 | 5 | use Eccube\Entity\Cart; |
9 | 6 | use Eccube\Entity\Order; |
10 | 7 | use Eccube\Entity\PurchaseInterface; |
11 | 8 | use Eccube\Entity\OrderItem; |
12 | -use Eccube\Entity\Shipping; |
|
13 | 9 | use Eccube\Repository\Master\OrderItemTypeRepository; |
14 | 10 | use Eccube\Service\Calculator\OrderItemCollection; |
15 | 11 |
@@ -8,7 +8,6 @@ |
||
8 | 8 | use Eccube\Entity\Order; |
9 | 9 | use Eccube\Entity\PurchaseInterface; |
10 | 10 | use Eccube\Entity\OrderItem; |
11 | -use Eccube\Entity\Shipping; |
|
12 | 11 | use Eccube\Repository\Master\OrderItemTypeRepository; |
13 | 12 | use Eccube\Service\Calculator\OrderItemCollection; |
14 | 13 |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Eccube\Service\PurchaseFlow\Processor; |
4 | 4 | |
5 | 5 | use Doctrine\DBAL\LockMode; |
6 | -use Eccube\Annotation\Inject; |
|
7 | 6 | use Eccube\Common\Constant; |
8 | 7 | use Eccube\Entity\ItemInterface; |
9 | 8 | use Eccube\Entity\OrderItem; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | * @param int|null|\Eccube\Entity\ProductClass $productClass 商品規格 |
66 | 66 | * @param int|null|\Eccube\Entity\Master\Pref $pref 都道府県 |
67 | 67 | * @param int|null|\Eccube\Entity\Master\Country $country 国 |
68 | - * @return int |
|
68 | + * @return double |
|
69 | 69 | */ |
70 | 70 | public function getPriceIncTax($price, $product = null, $productClass = null, $pref = null, $country = null) |
71 | 71 | { |
@@ -92,8 +92,8 @@ discard block |
||
92 | 92 | /** |
93 | 93 | * 課税規則に応じて端数処理を行う |
94 | 94 | * |
95 | - * @param float|integer $value 端数処理を行う数値 |
|
96 | - * @param integer $calcRule 課税規則 |
|
95 | + * @param integer $value 端数処理を行う数値 |
|
96 | + * @param integer $RoundingType |
|
97 | 97 | * @return double 端数処理後の数値 |
98 | 98 | */ |
99 | 99 | public function roundByRoundingType($value, $RoundingType) |
@@ -63,7 +63,7 @@ |
||
63 | 63 | public function hasProductByName($productName) |
64 | 64 | { |
65 | 65 | $OrderItems = $this->filter( |
66 | - function (ItemInterface $OrderItem) use ($productName) { |
|
66 | + function(ItemInterface $OrderItem) use ($productName) { |
|
67 | 67 | /* @var OrderItem $OrderItem */ |
68 | 68 | return $OrderItem->getProductName() == $productName; |
69 | 69 | }); |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | public function getProductClasses() |
32 | 32 | { |
33 | 33 | return $this->filter( |
34 | - function (ItemInterface $OrderItem) { |
|
34 | + function(ItemInterface $OrderItem) { |
|
35 | 35 | return $OrderItem->isProduct(); |
36 | 36 | }); |
37 | 37 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | public function getDeliveryFees() |
40 | 40 | { |
41 | 41 | return $this->filter( |
42 | - function (ItemInterface $OrderItem) { |
|
42 | + function(ItemInterface $OrderItem) { |
|
43 | 43 | return $OrderItem->isDeliveryFee(); |
44 | 44 | }); |
45 | 45 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | public function getCharges() |
48 | 48 | { |
49 | 49 | return $this->filter( |
50 | - function (ItemInterface $OrderItem) { |
|
50 | + function(ItemInterface $OrderItem) { |
|
51 | 51 | return $OrderItem->isCharge(); |
52 | 52 | }); |
53 | 53 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | public function getDiscounts() |
56 | 56 | { |
57 | 57 | return $this->filter( |
58 | - function (ItemInterface $OrderItem) { |
|
58 | + function(ItemInterface $OrderItem) { |
|
59 | 59 | return $OrderItem->isDiscount(); |
60 | 60 | }); |
61 | 61 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | public function hasProductByName($productName) |
69 | 69 | { |
70 | 70 | $OrderItems = $this->filter( |
71 | - function (ItemInterface $OrderItem) use ($productName) { |
|
71 | + function(ItemInterface $OrderItem) use ($productName) { |
|
72 | 72 | /* @var OrderItem $OrderItem */ |
73 | 73 | return $OrderItem->getProductName() == $productName; |
74 | 74 | }); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | */ |
86 | 86 | public function hasItemByOrderItemType($OrderItemType) |
87 | 87 | { |
88 | - $filteredItems = $this->filter(function (ItemInterface $OrderItem) use ($OrderItemType) { |
|
88 | + $filteredItems = $this->filter(function(ItemInterface $OrderItem) use ($OrderItemType) { |
|
89 | 89 | /* @var OrderItem $OrderItem */ |
90 | 90 | return $OrderItem->getOrderItemType() && $OrderItem->getOrderItemType()->getId() == $OrderItemType->getId(); |
91 | 91 | }); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | public function sort() |
102 | 102 | { |
103 | 103 | $Items = $this->toArray(); |
104 | - usort($Items, function (ItemInterface $a, ItemInterface $b) { |
|
104 | + usort($Items, function(ItemInterface $a, ItemInterface $b) { |
|
105 | 105 | if ($a->getOrderItemType() === $b->getOrderItemType()) { |
106 | 106 | return ($a->getId() < $b->getId()) ? -1 : 1; |
107 | 107 | } elseif ($a->isProduct()) { |