@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | $num = $this->productClassRepository->createQueryBuilder('pc') |
| 183 | 183 | ->select('count(pc.id)') |
| 184 | 184 | ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id') |
| 185 | - ->setParameter('id',$id) |
|
| 185 | + ->setParameter('id', $id) |
|
| 186 | 186 | ->getQuery() |
| 187 | 187 | ->getSingleScalarResult(); |
| 188 | 188 | if ($num > 0) { |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | log_error('規格分類削除エラー', array($id, $e)); |
| 209 | 209 | |
| 210 | 210 | $message = $app->trans('admin.delete.failed.foreign_key', ['%name%' => '規格分類']); |
| 211 | - $app->addError($message, 'admin'); } |
|
| 211 | + $app->addError($message, 'admin'); } |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | return $app->redirect($app->url('admin_product_class_category', array('class_name_id' => $ClassName->getId()))); |
@@ -148,7 +148,7 @@ |
||
| 148 | 148 | try { |
| 149 | 149 | $this->classNameRepository->delete($ClassName); |
| 150 | 150 | |
| 151 | - $event = new EventArgs(['ClassName' => $ClassName,], $request); |
|
| 151 | + $event = new EventArgs(['ClassName' => $ClassName, ], $request); |
|
| 152 | 152 | $this->eventDispatcher->dispatch(EccubeEvents::ADMIN_PRODUCT_CLASS_NAME_DELETE_COMPLETE, $event); |
| 153 | 153 | |
| 154 | 154 | $app->addSuccess('admin.class_name.delete.complete', 'admin'); |
@@ -242,7 +242,7 @@ |
||
| 242 | 242 | $this->eventDispatcher->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event); |
| 243 | 243 | |
| 244 | 244 | $app->addSuccess('admin.delete.complete', 'admin'); |
| 245 | - } catch(ForeignKeyConstraintViolationException $e) { |
|
| 245 | + } catch (ForeignKeyConstraintViolationException $e) { |
|
| 246 | 246 | $this->entityManager->rollback(); |
| 247 | 247 | |
| 248 | 248 | $message = $app->trans('admin.delete.failed.foreign_key', ['%name%' => '支払方法']); |
@@ -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) |
@@ -257,7 +257,7 @@ |
||
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | foreach ($readPaths as $readPath) { |
| 260 | - $filePath = $readPath . '/' . $fileName . '.twig'; |
|
| 260 | + $filePath = $readPath.'/'.$fileName.'.twig'; |
|
| 261 | 261 | $fs = new Filesystem(); |
| 262 | 262 | if ($fs->exists($filePath)) { |
| 263 | 263 | return array( |
@@ -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()) { |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | $app = $this->app; |
| 62 | 62 | |
| 63 | 63 | $builder |
| 64 | - ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) { |
|
| 64 | + ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) { |
|
| 65 | 65 | /** @var \Eccube\Entity\OrderItem $data */ |
| 66 | 66 | $data = $event->getData(); |
| 67 | 67 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -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; |