@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | $app = $this->app; |
179 | 179 | // XXX price を priceIncTax にセットし直す |
180 | 180 | // OrderItem::getTotalPrice でもやっているので、どこか一箇所にまとめたい |
181 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($app) { |
|
181 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($app) { |
|
182 | 182 | /** @var \Eccube\Entity\OrderItem $OrderItem */ |
183 | 183 | $OrderItem = $event->getData(); |
184 | 184 | $TaxDisplayType = $OrderItem->getTaxDisplayType(); |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | |
197 | 197 | $event->setData($OrderItem); |
198 | 198 | }); |
199 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
199 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
200 | 200 | // モーダルからのPOST時に、金額等をセットする. |
201 | 201 | if ('modal' === $this->requestStack->getCurrentRequest()->get('modal')) { |
202 | 202 | $data = $event->getData(); |
@@ -266,17 +266,13 @@ discard block |
||
266 | 266 | $data['product_name'] = $Product->getName(); |
267 | 267 | $data['product_code'] = $ProductClass->getCode(); |
268 | 268 | $data['class_name1'] = $ProductClass->hasClassCategory1() ? |
269 | - $ProductClass->getClassCategory1()->getClassName() : |
|
270 | - null; |
|
269 | + $ProductClass->getClassCategory1()->getClassName() : null; |
|
271 | 270 | $data['class_name2'] = $ProductClass->hasClassCategory2() ? |
272 | - $ProductClass->getClassCategory2()->getClassName() : |
|
273 | - null; |
|
271 | + $ProductClass->getClassCategory2()->getClassName() : null; |
|
274 | 272 | $data['class_category_name1'] = $ProductClass->hasClassCategory1() ? |
275 | - $ProductClass->getClassCategory1()->getName() : |
|
276 | - null; |
|
273 | + $ProductClass->getClassCategory1()->getName() : null; |
|
277 | 274 | $data['class_category_name2'] = $ProductClass->hasClassCategory2() ? |
278 | - $ProductClass->getClassCategory2()->getName() : |
|
279 | - null; |
|
275 | + $ProductClass->getClassCategory2()->getName() : null; |
|
280 | 276 | $data['price'] = $ProductClass->getPrice02(); |
281 | 277 | $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity']; |
282 | 278 | $data['tax_type'] = TaxType::TAXATION; |
@@ -46,7 +46,7 @@ |
||
46 | 46 | 'label' => false, |
47 | 47 | 'class' => 'Eccube\Entity\Page', |
48 | 48 | 'choice_label' => 'name', |
49 | - 'query_builder' => function (EntityRepository $er) { |
|
49 | + 'query_builder' => function(EntityRepository $er) { |
|
50 | 50 | return $er |
51 | 51 | ->createQueryBuilder('l') |
52 | 52 | ->where('l.id <> 0') |
@@ -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 |