@@ -284,7 +284,7 @@ |
||
| 284 | 284 | $filename = $this->convertStrToServer($file->getClientOriginalName()); |
| 285 | 285 | try { |
| 286 | 286 | $file->move($nowDir, $filename); |
| 287 | - $successCount ++; |
|
| 287 | + $successCount++; |
|
| 288 | 288 | } catch (FileException $e) { |
| 289 | 289 | $this->errors[] = ['message' => trans('admin.content.file.upload_error', [ |
| 290 | 290 | '%file_name%' => $filename, |
@@ -11,6 +11,7 @@ discard block |
||
| 11 | 11 | * file that was distributed with this source code. |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | +use Codeception\Util\Fixtures; |
|
| 14 | 15 | use Page\Admin\CsvSettingsPage; |
| 15 | 16 | use Page\Admin\DeliveryEditPage; |
| 16 | 17 | use Page\Admin\DeliveryManagePage; |
@@ -19,7 +20,6 @@ discard block |
||
| 19 | 20 | use Page\Admin\PaymentManagePage; |
| 20 | 21 | use Page\Admin\ShopSettingPage; |
| 21 | 22 | use Page\Admin\TaxManagePage; |
| 22 | -use Codeception\Util\Fixtures; |
|
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * @group admin |
@@ -27,9 +27,9 @@ |
||
| 27 | 27 | use Eccube\Repository\OrderRepository; |
| 28 | 28 | use Eccube\Repository\TaxRuleRepository; |
| 29 | 29 | use Eccube\Service\CartService; |
| 30 | +use Eccube\Service\OrderHelper; |
|
| 30 | 31 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
| 31 | 32 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
| 32 | -use Eccube\Service\OrderHelper; |
|
| 33 | 33 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 34 | 34 | use Symfony\Component\Form\Extension\Core\Type\CollectionType; |
| 35 | 35 | use Symfony\Component\HttpFoundation\Request; |
@@ -13,19 +13,19 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Service\PurchaseFlow\Processor; |
| 15 | 15 | |
| 16 | -use Eccube\Repository\TaxRuleRepository; |
|
| 17 | -use Eccube\Service\PurchaseFlow\ItemHolderPreprocessor; |
|
| 18 | 16 | use Eccube\Entity\ItemHolderInterface; |
| 19 | -use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 20 | -use Eccube\Entity\OrderItem; |
|
| 21 | -use Eccube\Repository\Master\OrderItemTypeRepository; |
|
| 22 | -use Eccube\Repository\Master\TaxDisplayTypeRepository; |
|
| 23 | 17 | use Eccube\Entity\Master\OrderItemType; |
| 24 | 18 | use Eccube\Entity\Master\TaxDisplayType; |
| 19 | +use Eccube\Entity\Master\TaxType; |
|
| 25 | 20 | use Eccube\Entity\Order; |
| 21 | +use Eccube\Entity\OrderItem; |
|
| 26 | 22 | use Eccube\Entity\Payment; |
| 23 | +use Eccube\Repository\Master\OrderItemTypeRepository; |
|
| 24 | +use Eccube\Repository\Master\TaxDisplayTypeRepository; |
|
| 27 | 25 | use Eccube\Repository\Master\TaxTypeRepository; |
| 28 | -use Eccube\Entity\Master\TaxType; |
|
| 26 | +use Eccube\Repository\TaxRuleRepository; |
|
| 27 | +use Eccube\Service\PurchaseFlow\ItemHolderPreprocessor; |
|
| 28 | +use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 29 | 29 | |
| 30 | 30 | class PaymentChargePreprocessor implements ItemHolderPreprocessor |
| 31 | 31 | { |