@@ -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に関連するエンティティを構築するクラス |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | * 明細追加処理. |
217 | 217 | * |
218 | 218 | * @param ItemHolderInterface $itemHolder |
219 | - * @param $discount |
|
219 | + * @param integer $discount |
|
220 | 220 | */ |
221 | 221 | private function addPointDiscountItem(ItemHolderInterface $itemHolder, $discount) |
222 | 222 | { |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | /** |
256 | 256 | * ポイントを金額に変換する. |
257 | 257 | * |
258 | - * @param $point int ポイント |
|
258 | + * @param integer $point int ポイント |
|
259 | 259 | * |
260 | 260 | * @return int 金額 |
261 | 261 | */ |
@@ -83,7 +83,6 @@ |
||
83 | 83 | * @param EccubeConfig $eccubeConfig |
84 | 84 | * @param ProductClassRepository $productClassRepository |
85 | 85 | * @param OrderItemRepository $orderItemRepository |
86 | - * @param RequestStack $requestStack |
|
87 | 86 | */ |
88 | 87 | public function __construct( |
89 | 88 | EntityManagerInterface $entityManager, |
@@ -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; |
@@ -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 | { |
@@ -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; |
@@ -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(); |