@@ -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%' => '支払方法']); |
@@ -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) |
@@ -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( |