@@ -14,7 +14,6 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin\Order; |
15 | 15 | |
16 | 16 | use Doctrine\Common\Collections\ArrayCollection; |
17 | -use Doctrine\Common\Collections\Criteria; |
|
18 | 17 | use Eccube\Controller\AbstractController; |
19 | 18 | use Eccube\Entity\Master\CustomerStatus; |
20 | 19 | use Eccube\Entity\Master\OrderItemType; |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | */ |
106 | 106 | public function getTaxableDiscountItems() |
107 | 107 | { |
108 | - return array_filter($this->getTaxableItems(), function(OrderItem $Item) { |
|
108 | + return array_filter($this->getTaxableItems(), function (OrderItem $Item) { |
|
109 | 109 | return $Item->isDiscount(); |
110 | 110 | }); |
111 | 111 | } |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | */ |
130 | 130 | public function getTaxFreeDiscountItems() |
131 | 131 | { |
132 | - return array_filter($this->OrderItems->toArray(), function(OrderItem $Item) { |
|
132 | + return array_filter($this->OrderItems->toArray(), function (OrderItem $Item) { |
|
133 | 133 | return $Item->isPoint() || ($Item->isDiscount() && $Item->getTaxType()->getId() != TaxType::TAXATION); |
134 | 134 | }); |
135 | 135 | } |
@@ -557,7 +557,7 @@ |
||
557 | 557 | $arrOrder[$i][2] = ''; |
558 | 558 | $arrOrder[$i][3] = ''; |
559 | 559 | |
560 | - foreach($Order->getTaxFreeDiscountItems() as $Item) { |
|
560 | + foreach ($Order->getTaxFreeDiscountItems() as $Item) { |
|
561 | 561 | ++$i; |
562 | 562 | $arrOrder[$i][0] = ''; |
563 | 563 | $arrOrder[$i][1] = ''; |