@@ -4,7 +4,6 @@ |
||
| 4 | 4 | use Eccube\Entity\Order; |
| 5 | 5 | use Eccube\Entity\PurchaseInterface; |
| 6 | 6 | use Eccube\Entity\ShipmentItem; |
| 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 ShipmentItem $ShipmentItem */ |
| 26 | - foreach($this->ShipmentItems as $ShipmentItem) { |
|
| 26 | + foreach ($this->ShipmentItems as $ShipmentItem) { |
|
| 27 | 27 | if ($ShipmentItem instanceof ShipmentItem) { |
| 28 | 28 | if (!$this->Order->getItems()->contains($ShipmentItem)) { |
| 29 | 29 | $ShipmentItem->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\ShipmentItem; |
| 11 | -use Eccube\Entity\Shipping; |
|
| 12 | 8 | use Eccube\Repository\Master\OrderItemTypeRepository; |
| 13 | 9 | use Eccube\Service\Calculator\ShipmentItemCollection; |
| 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\ShipmentItem; |
| 12 | -use Eccube\Entity\Shipping; |
|
| 13 | 9 | use Eccube\Repository\Master\OrderItemTypeRepository; |
| 14 | 10 | use Eccube\Service\Calculator\ShipmentItemCollection; |
| 15 | 11 | |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | use Eccube\Entity\Order; |
| 9 | 9 | use Eccube\Entity\PurchaseInterface; |
| 10 | 10 | use Eccube\Entity\ShipmentItem; |
| 11 | -use Eccube\Entity\Shipping; |
|
| 12 | 11 | use Eccube\Repository\Master\OrderItemTypeRepository; |
| 13 | 12 | use Eccube\Service\Calculator\ShipmentItemCollection; |
| 14 | 13 | |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | public function hasProductByName($productName) |
| 64 | 64 | { |
| 65 | 65 | $ShipmentItems = $this->filter( |
| 66 | - function (ItemInterface $ShipmentItem) use ($productName) { |
|
| 66 | + function(ItemInterface $ShipmentItem) use ($productName) { |
|
| 67 | 67 | /* @var ShipmentItem $ShipmentItem */ |
| 68 | 68 | return $ShipmentItem->getProductName() == $productName; |
| 69 | 69 | }); |
@@ -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\ShipmentItem; |
| 11 | -use Eccube\Entity\Shipping; |
|
| 12 | 8 | use Eccube\Repository\Master\OrderItemTypeRepository; |
| 13 | 9 | use Eccube\Service\Calculator\ShipmentItemCollection; |
| 14 | 10 | |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | /** |
| 45 | 45 | * DeliveryFeeProcessor constructor. |
| 46 | 46 | * |
| 47 | - * @param $app |
|
| 47 | + * @param \Pimple\Container $app |
|
| 48 | 48 | */ |
| 49 | 49 | public function __construct($app) |
| 50 | 50 | { |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | { |
| 15 | 15 | $app->extend( |
| 16 | 16 | 'eccube.purchase.flow.cart.item_processors', |
| 17 | - function (ArrayCollection $processors, Container $app) { |
|
| 17 | + function(ArrayCollection $processors, Container $app) { |
|
| 18 | 18 | $processors[] = new EmptyProcessor(); |
| 19 | 19 | $processors[] = new ValidatableEmptyProcessor(); |
| 20 | 20 | return $processors; |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | { |
| 13 | 13 | $app->extend( |
| 14 | 14 | 'form.type.extensions', |
| 15 | - function ($extensions) { |
|
| 15 | + function($extensions) { |
|
| 16 | 16 | $extensions[] = new EntryTypeExtension(); |
| 17 | 17 | |
| 18 | 18 | return $extensions; |