@@ -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; |
@@ -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 | { |
@@ -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,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) |