@@ -14,11 +14,11 @@ |
||
| 14 | 14 | namespace Eccube\Service; |
| 15 | 15 | |
| 16 | 16 | use Doctrine\ORM\EntityManagerInterface; |
| 17 | +use Symfony\Component\DependencyInjection\ContainerInterface; |
|
| 17 | 18 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
| 18 | 19 | use Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector; |
| 19 | -use Symfony\Component\DependencyInjection\ContainerInterface; |
|
| 20 | -use Symfony\Component\HttpKernel\KernelEvents; |
|
| 21 | 20 | use Symfony\Component\HttpKernel\Event\PostResponseEvent; |
| 21 | +use Symfony\Component\HttpKernel\KernelEvents; |
|
| 22 | 22 | |
| 23 | 23 | class SystemService implements EventSubscriberInterface |
| 24 | 24 | { |
@@ -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 | |
@@ -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 |
@@ -114,6 +114,9 @@ |
||
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | + /** |
|
| 118 | + * @param string $outputDir |
|
| 119 | + */ |
|
| 117 | 120 | protected function removeOutputDir($outputDir) |
| 118 | 121 | { |
| 119 | 122 | 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; |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | namespace Eccube\Controller\Admin\Content; |
| 14 | 14 | |
| 15 | 15 | use Eccube\Controller\AbstractController; |
| 16 | -use Eccube\Form\Type\Admin\MainEditType; |
|
| 17 | 16 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 18 | 17 | use Symfony\Component\Filesystem\Exception\IOException; |
| 19 | 18 | use Symfony\Component\Filesystem\Filesystem; |
@@ -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; |
@@ -33,8 +33,8 @@ |
||
| 33 | 33 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
| 34 | 34 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 35 | 35 | use Symfony\Component\Form\FormInterface; |
| 36 | -use Symfony\Component\HttpFoundation\Response; |
|
| 37 | 36 | use Symfony\Component\HttpFoundation\Request; |
| 37 | +use Symfony\Component\HttpFoundation\Response; |
|
| 38 | 38 | use Symfony\Component\Routing\Annotation\Route; |
| 39 | 39 | use Symfony\Component\Routing\RouterInterface; |
| 40 | 40 | use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; |
@@ -19,6 +19,9 @@ |
||
| 19 | 19 | { |
| 20 | 20 | protected $trait_proxies_directory; |
| 21 | 21 | |
| 22 | + /** |
|
| 23 | + * @param string $dir |
|
| 24 | + */ |
|
| 22 | 25 | public function setTraitProxiesDirectory($dir) |
| 23 | 26 | { |
| 24 | 27 | $this->trait_proxies_directory = $dir; |