@@ -83,7 +83,7 @@ |
||
83 | 83 | } elseif ($item->isProduct()) { |
84 | 84 | // ポイント = 単価 * ポイント付与率 * 数量 |
85 | 85 | $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity(); |
86 | - } elseif($item->isDiscount()) { |
|
86 | + } elseif ($item->isDiscount()) { |
|
87 | 87 | $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity(); |
88 | 88 | } |
89 | 89 |
@@ -112,6 +112,9 @@ |
||
112 | 112 | } |
113 | 113 | } |
114 | 114 | |
115 | + /** |
|
116 | + * @param string $outputDir |
|
117 | + */ |
|
115 | 118 | protected function removeOutputDir($outputDir) |
116 | 119 | { |
117 | 120 | if (file_exists($outputDir)) { |
@@ -4,10 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Doctrine\Bundle\DoctrineBundle\Command\Proxy\DoctrineCommandHelper; |
6 | 6 | use Doctrine\Bundle\DoctrineBundle\Command\Proxy\UpdateSchemaDoctrineCommand as BaseUpdateSchemaDoctrineCommand; |
7 | -use Doctrine\Common\Annotations\AnnotationReader; |
|
8 | -use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand; |
|
9 | 7 | use Doctrine\ORM\Tools\SchemaTool; |
10 | -use Eccube\Doctrine\ORM\Mapping\Driver\ReloadSafeAnnotationDriver; |
|
11 | 8 | use Eccube\Repository\PluginRepository; |
12 | 9 | use Eccube\Service\PluginService; |
13 | 10 | use Eccube\Service\SchemaService; |
@@ -16,8 +13,8 @@ discard block |
||
16 | 13 | use Symfony\Component\Console\Input\InputOption; |
17 | 14 | use Symfony\Component\Console\Output\OutputInterface; |
18 | 15 | use Symfony\Component\Console\Style\SymfonyStyle; |
19 | -use Symfony\Component\Finder\Finder; |
|
20 | 16 | use Symfony\Component\Filesystem\Filesystem; |
17 | +use Symfony\Component\Finder\Finder; |
|
21 | 18 | |
22 | 19 | /** |
23 | 20 | * Command to generate the SQL needed to update the database schema to match |
@@ -14,7 +14,6 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin\Content; |
15 | 15 | |
16 | 16 | use Eccube\Controller\AbstractController; |
17 | -use Eccube\Form\Type\Admin\MainEditType; |
|
18 | 17 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
19 | 18 | use Symfony\Component\Filesystem\Exception\IOException; |
20 | 19 | use Symfony\Component\Filesystem\Filesystem; |
@@ -14,7 +14,6 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin\Content; |
15 | 15 | |
16 | 16 | use Eccube\Controller\AbstractController; |
17 | -use Eccube\Form\Type\Admin\MainEditType; |
|
18 | 17 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
19 | 18 | use Symfony\Component\Filesystem\Exception\IOException; |
20 | 19 | use Symfony\Component\Filesystem\Filesystem; |
@@ -25,8 +25,8 @@ |
||
25 | 25 | use Eccube\Util\CacheUtil; |
26 | 26 | use Eccube\Util\StringUtil; |
27 | 27 | use Symfony\Component\DependencyInjection\ContainerInterface; |
28 | -use Symfony\Component\Finder\Finder; |
|
29 | 28 | use Symfony\Component\Filesystem\Filesystem; |
29 | +use Symfony\Component\Finder\Finder; |
|
30 | 30 | |
31 | 31 | class PluginService |
32 | 32 | { |
@@ -391,7 +391,7 @@ |
||
391 | 391 | 'DiscountProcessor' => $this->discountProcessors->map($callback)->toArray(), |
392 | 392 | 'ItemHolderPostValidator' => $this->itemHolderPostValidators->map($callback)->toArray() |
393 | 393 | ]; |
394 | - $tree = new \RecursiveTreeIterator(new \RecursiveArrayIterator($flows)); |
|
394 | + $tree = new \RecursiveTreeIterator(new \RecursiveArrayIterator($flows)); |
|
395 | 395 | $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_RIGHT, ' '); |
396 | 396 | $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_MID_LAST, ' '); |
397 | 397 | $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_MID_HAS_NEXT, '│'); |
@@ -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 |
@@ -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; |
@@ -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] = ''; |