@@ -16,9 +16,9 @@ |
||
16 | 16 | use Eccube\Common\EccubeConfig; |
17 | 17 | use Eccube\Entity\ItemHolderInterface; |
18 | 18 | use Eccube\Entity\Master\OrderStatus; |
19 | +use Eccube\Service\PurchaseFlow\ProcessResult; |
|
19 | 20 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
20 | 21 | use Eccube\Service\PurchaseFlow\PurchaseProcessor; |
21 | -use Eccube\Service\PurchaseFlow\ProcessResult; |
|
22 | 22 | |
23 | 23 | /** |
24 | 24 | * 受注情報の日付更新. |
@@ -14,11 +14,11 @@ |
||
14 | 14 | namespace Eccube\Service\PurchaseFlow\Processor; |
15 | 15 | |
16 | 16 | use Doctrine\ORM\EntityManagerInterface; |
17 | +use Eccube\Entity\BaseInfo; |
|
17 | 18 | use Eccube\Entity\ItemHolderInterface; |
18 | 19 | use Eccube\Entity\Master\OrderItemType; |
19 | 20 | use Eccube\Entity\Master\TaxDisplayType; |
20 | 21 | use Eccube\Entity\Master\TaxType; |
21 | -use Eccube\Entity\BaseInfo; |
|
22 | 22 | use Eccube\Entity\Order; |
23 | 23 | use Eccube\Entity\OrderItem; |
24 | 24 | use Eccube\Service\PurchaseFlow\ItemHolderProcessor; |
@@ -23,6 +23,9 @@ |
||
23 | 23 | |
24 | 24 | protected $message; |
25 | 25 | |
26 | + /** |
|
27 | + * @param string $type |
|
28 | + */ |
|
26 | 29 | private function __construct($type, $message) |
27 | 30 | { |
28 | 31 | $this->type = $type; |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | /** |
266 | 266 | * 非会員情報を取得 |
267 | 267 | * |
268 | - * @param $sesisonKey |
|
268 | + * @param string $sesisonKey |
|
269 | 269 | * |
270 | 270 | * @return $Customer|null |
271 | 271 | */ |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | /** |
283 | 283 | * 受注情報を作成 |
284 | 284 | * |
285 | - * @param $Customer |
|
285 | + * @param null|Customer $Customer |
|
286 | 286 | * |
287 | 287 | * @return \Eccube\Entity\Order |
288 | 288 | */ |
@@ -312,9 +312,9 @@ discard block |
||
312 | 312 | * 仮受注情報作成 |
313 | 313 | * |
314 | 314 | * @param $Customer |
315 | - * @param $preOrderId |
|
315 | + * @param string $preOrderId |
|
316 | 316 | * |
317 | - * @return mixed |
|
317 | + * @return Order |
|
318 | 318 | * |
319 | 319 | * @throws \Doctrine\ORM\NoResultException |
320 | 320 | * @throws \Doctrine\ORM\NonUniqueResultException |
@@ -272,17 +272,13 @@ |
||
272 | 272 | $data['product_name'] = $Product->getName(); |
273 | 273 | $data['product_code'] = $ProductClass->getCode(); |
274 | 274 | $data['class_name1'] = $ProductClass->hasClassCategory1() ? |
275 | - $ProductClass->getClassCategory1()->getClassName() : |
|
276 | - null; |
|
275 | + $ProductClass->getClassCategory1()->getClassName() : null; |
|
277 | 276 | $data['class_name2'] = $ProductClass->hasClassCategory2() ? |
278 | - $ProductClass->getClassCategory2()->getClassName() : |
|
279 | - null; |
|
277 | + $ProductClass->getClassCategory2()->getClassName() : null; |
|
280 | 278 | $data['class_category_name1'] = $ProductClass->hasClassCategory1() ? |
281 | - $ProductClass->getClassCategory1()->getName() : |
|
282 | - null; |
|
279 | + $ProductClass->getClassCategory1()->getName() : null; |
|
283 | 280 | $data['class_category_name2'] = $ProductClass->hasClassCategory2() ? |
284 | - $ProductClass->getClassCategory2()->getName() : |
|
285 | - null; |
|
281 | + $ProductClass->getClassCategory2()->getName() : null; |
|
286 | 282 | $data['price'] = $ProductClass->getPrice02(); |
287 | 283 | $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity']; |
288 | 284 | $data['tax_type'] = TaxType::TAXATION; |