@@ -14,8 +14,8 @@ |
||
| 14 | 14 | namespace Eccube\Controller\Admin\Order; |
| 15 | 15 | |
| 16 | 16 | use Eccube\Controller\Admin\AbstractCsvImportController; |
| 17 | -use Eccube\Entity\Shipping; |
|
| 18 | 17 | use Eccube\Entity\Master\OrderStatus; |
| 18 | +use Eccube\Entity\Shipping; |
|
| 19 | 19 | use Eccube\Form\Type\Admin\CsvImportType; |
| 20 | 20 | use Eccube\Repository\ShippingRepository; |
| 21 | 21 | use Eccube\Service\CsvImportService; |
@@ -36,22 +36,20 @@ |
||
| 36 | 36 | use Eccube\Repository\OrderRepository; |
| 37 | 37 | use Eccube\Repository\PaymentRepository; |
| 38 | 38 | use Eccube\Service\CsvExportService; |
| 39 | -use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 40 | -use Eccube\Service\PurchaseFlow\PurchaseException; |
|
| 41 | -use Eccube\Service\PurchaseFlow\PurchaseFlow; |
|
| 42 | 39 | use Eccube\Service\MailService; |
| 43 | 40 | use Eccube\Service\OrderPdfService; |
| 44 | 41 | use Eccube\Service\OrderStateMachine; |
| 42 | +use Eccube\Service\PurchaseFlow\PurchaseFlow; |
|
| 45 | 43 | use Eccube\Util\FormUtil; |
| 46 | 44 | use Knp\Component\Pager\PaginatorInterface; |
| 47 | 45 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
| 48 | 46 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 49 | 47 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 50 | 48 | use Symfony\Component\Form\FormBuilder; |
| 51 | -use Symfony\Component\HttpFoundation\Response; |
|
| 49 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
| 52 | 50 | use Symfony\Component\HttpFoundation\Request; |
| 51 | +use Symfony\Component\HttpFoundation\Response; |
|
| 53 | 52 | use Symfony\Component\HttpFoundation\StreamedResponse; |
| 54 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
| 55 | 53 | use Symfony\Component\Validator\Constraints as Assert; |
| 56 | 54 | use Symfony\Component\Validator\Validator\ValidatorInterface; |
| 57 | 55 | |
@@ -24,6 +24,7 @@ discard block |
||
| 24 | 24 | use Eccube\Repository\DeliveryRepository; |
| 25 | 25 | use Eccube\Repository\OrderItemRepository; |
| 26 | 26 | use Eccube\Repository\ShippingRepository; |
| 27 | +use Eccube\Service\MailService; |
|
| 27 | 28 | use Eccube\Service\OrderStateMachine; |
| 28 | 29 | use Eccube\Service\TaxRuleService; |
| 29 | 30 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
@@ -37,7 +38,6 @@ discard block |
||
| 37 | 38 | use Symfony\Component\HttpFoundation\Request; |
| 38 | 39 | use Symfony\Component\HttpFoundation\Response; |
| 39 | 40 | use Symfony\Component\Serializer\SerializerInterface; |
| 40 | -use Eccube\Service\MailService; |
|
| 41 | 41 | |
| 42 | 42 | class ShippingController extends AbstractController |
| 43 | 43 | { |
@@ -13,6 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Controller; |
| 15 | 15 | |
| 16 | +use Eccube\Entity\BaseInfo; |
|
| 16 | 17 | use Eccube\Entity\Cart; |
| 17 | 18 | use Eccube\Entity\ProductClass; |
| 18 | 19 | use Eccube\Event\EccubeEvents; |
@@ -26,7 +27,6 @@ discard block |
||
| 26 | 27 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 27 | 28 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 28 | 29 | use Symfony\Component\HttpFoundation\Request; |
| 29 | -use Eccube\Entity\BaseInfo; |
|
| 30 | 30 | |
| 31 | 31 | class CartController extends AbstractController |
| 32 | 32 | { |
@@ -21,10 +21,10 @@ |
||
| 21 | 21 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
| 22 | 22 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
| 23 | 23 | use Symfony\Component\HttpFoundation\RequestStack; |
| 24 | +use Symfony\Component\Security\Core\AuthenticationEvents; |
|
| 24 | 25 | use Symfony\Component\Security\Core\Event\AuthenticationFailureEvent; |
| 25 | 26 | use Symfony\Component\Security\Http\Event\InteractiveLoginEvent; |
| 26 | 27 | use Symfony\Component\Security\Http\SecurityEvents; |
| 27 | -use Symfony\Component\Security\Core\AuthenticationEvents; |
|
| 28 | 28 | |
| 29 | 29 | class SecurityListener implements EventSubscriberInterface |
| 30 | 30 | { |
@@ -34,8 +34,8 @@ |
||
| 34 | 34 | use Symfony\Component\Form\Extension\Core\Type\EmailType; |
| 35 | 35 | use Symfony\Component\Form\Extension\Core\Type\HiddenType; |
| 36 | 36 | use Symfony\Component\Form\Extension\Core\Type\NumberType; |
| 37 | -use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 38 | 37 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
| 38 | +use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 39 | 39 | use Symfony\Component\Form\FormBuilderInterface; |
| 40 | 40 | use Symfony\Component\Form\FormError; |
| 41 | 41 | use Symfony\Component\Form\FormEvent; |
@@ -30,13 +30,13 @@ |
||
| 30 | 30 | use Eccube\Entity\Shipping; |
| 31 | 31 | use Eccube\Repository\DeliveryFeeRepository; |
| 32 | 32 | use Eccube\Repository\DeliveryRepository; |
| 33 | +use Eccube\Repository\Master\DeviceTypeRepository; |
|
| 33 | 34 | use Eccube\Repository\Master\OrderItemTypeRepository; |
| 34 | 35 | use Eccube\Repository\Master\OrderStatusRepository; |
| 35 | 36 | use Eccube\Repository\OrderRepository; |
| 36 | 37 | use Eccube\Repository\PaymentRepository; |
| 37 | 38 | use Eccube\Repository\TaxRuleRepository; |
| 38 | 39 | use Eccube\Util\StringUtil; |
| 39 | -use Eccube\Repository\Master\DeviceTypeRepository; |
|
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * OrderやOrderに関連するエンティティを構築するクラス |
@@ -19,8 +19,8 @@ |
||
| 19 | 19 | use Eccube\Entity\Order; |
| 20 | 20 | use Eccube\Entity\OrderItem; |
| 21 | 21 | use Eccube\Repository\BaseInfoRepository; |
| 22 | -use Eccube\Repository\OrderRepository; |
|
| 23 | 22 | use Eccube\Repository\OrderPdfRepository; |
| 23 | +use Eccube\Repository\OrderRepository; |
|
| 24 | 24 | use Eccube\Twig\Extension\EccubeExtension; |
| 25 | 25 | use setasign\Fpdi\TcpdfFpdi; |
| 26 | 26 | |
@@ -286,12 +286,12 @@ discard block |
||
| 286 | 286 | |
| 287 | 287 | // 電話番号 |
| 288 | 288 | $text = 'TEL: '.$this->baseInfoRepository->getPhoneNumber(); |
| 289 | - $this->lfText(125, 72, $text, 8); //TEL・FAX |
|
| 289 | + $this->lfText(125, 72, $text, 8); //TEL・FAX |
|
| 290 | 290 | |
| 291 | 291 | // メールアドレス |
| 292 | 292 | if (strlen($this->baseInfoRepository->getEmail01()) > 0) { |
| 293 | 293 | $text = 'Email: '.$this->baseInfoRepository->getEmail01(); |
| 294 | - $this->lfText(125, 75, $text, 8); // Email |
|
| 294 | + $this->lfText(125, 75, $text, 8); // Email |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | // ロゴ画像(app配下のロゴ画像を優先して読み込む) |
@@ -306,9 +306,9 @@ discard block |
||
| 306 | 306 | */ |
| 307 | 307 | protected function renderMessageData(array $formData) |
| 308 | 308 | { |
| 309 | - $this->lfText(27, 70, $formData['message1'], 8); //メッセージ1 |
|
| 310 | - $this->lfText(27, 74, $formData['message2'], 8); //メッセージ2 |
|
| 311 | - $this->lfText(27, 78, $formData['message3'], 8); //メッセージ3 |
|
| 309 | + $this->lfText(27, 70, $formData['message1'], 8); //メッセージ1 |
|
| 310 | + $this->lfText(27, 74, $formData['message2'], 8); //メッセージ2 |
|
| 311 | + $this->lfText(27, 78, $formData['message3'], 8); //メッセージ3 |
|
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | /** |
@@ -585,12 +585,12 @@ discard block |
||
| 585 | 585 | $ln = ($i == (count($row) - 1)) ? 1 : 0; |
| 586 | 586 | |
| 587 | 587 | $this->MultiCell( |
| 588 | - $w[$i], // セル幅 |
|
| 589 | - $cellHeight, // セルの最小の高さ |
|
| 590 | - $col, // 文字列 |
|
| 591 | - 1, // 境界線の描画方法を指定 |
|
| 592 | - $align, // テキストの整列 |
|
| 593 | - $fill, // 背景の塗つぶし指定 |
|
| 588 | + $w[$i], // セル幅 |
|
| 589 | + $cellHeight, // セルの最小の高さ |
|
| 590 | + $col, // 文字列 |
|
| 591 | + 1, // 境界線の描画方法を指定 |
|
| 592 | + $align, // テキストの整列 |
|
| 593 | + $fill, // 背景の塗つぶし指定 |
|
| 594 | 594 | $ln // 出力後のカーソルの移動方法 |
| 595 | 595 | ); |
| 596 | 596 | $h = $this->getLastH(); |
@@ -19,8 +19,8 @@ |
||
| 19 | 19 | use Eccube\Entity\Master\SaleType; |
| 20 | 20 | use Eccube\Entity\Payment; |
| 21 | 21 | use Eccube\Repository\DeliveryRepository; |
| 22 | -use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 23 | 22 | use Eccube\Service\PurchaseFlow\ItemHolderValidator; |
| 23 | +use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * 支払い方法が一致しない明細がないかどうか. |