@@ -27,12 +27,6 @@ |
||
| 27 | 27 | use Eccube\Annotation\Inject; |
| 28 | 28 | use Eccube\Entity\BaseInfo; |
| 29 | 29 | use Eccube\Entity\ItemHolderInterface; |
| 30 | -use Eccube\Entity\Master\OrderItemType; |
|
| 31 | -use Eccube\Entity\Master\TaxDisplayType; |
|
| 32 | -use Eccube\Entity\Master\TaxType; |
|
| 33 | -use Eccube\Entity\Order; |
|
| 34 | -use Eccube\Entity\OrderItem; |
|
| 35 | -use Eccube\Entity\Shipping; |
|
| 36 | 30 | use Eccube\Service\PurchaseFlow\ItemHolderProcessor; |
| 37 | 31 | use Eccube\Service\PurchaseFlow\ProcessResult; |
| 38 | 32 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | * @param integer $pointRate ポイント付与率(%) |
| 92 | 92 | * @param integer $price 単価 |
| 93 | 93 | * @param integer $quantity 数量 |
| 94 | - * @return integer additional point |
|
| 94 | + * @return double additional point |
|
| 95 | 95 | */ |
| 96 | 96 | protected function priceToAddPoint($pointRate, $price, $quantity) |
| 97 | 97 | { |
@@ -17,11 +17,11 @@ discard block |
||
| 17 | 17 | { |
| 18 | 18 | public function register(Container $app) |
| 19 | 19 | { |
| 20 | - $app['eccube.purchase.context'] = $app->protect(function (ItemHolderInterface $origin = null, Customer $user = null) { |
|
| 20 | + $app['eccube.purchase.context'] = $app->protect(function(ItemHolderInterface $origin = null, Customer $user = null) { |
|
| 21 | 21 | return new PurchaseContext($origin, $user); |
| 22 | 22 | }); |
| 23 | 23 | |
| 24 | - $app['eccube.purchase.flow.cart.item_processors'] = function (Container $app) { |
|
| 24 | + $app['eccube.purchase.flow.cart.item_processors'] = function(Container $app) { |
|
| 25 | 25 | $processors = new ArrayCollection(); |
| 26 | 26 | $processors[] = new Processor\DisplayStatusValidator(); |
| 27 | 27 | $processors[] = new Processor\SaleLimitValidator(); |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | return $processors; |
| 32 | 32 | }; |
| 33 | 33 | |
| 34 | - $app['eccube.purchase.flow.cart.holder_processors'] = function (Container $app) { |
|
| 34 | + $app['eccube.purchase.flow.cart.holder_processors'] = function(Container $app) { |
|
| 35 | 35 | $processors = new ArrayCollection(); |
| 36 | 36 | $processors[] = new Processor\PaymentProcessor($app[DeliveryRepository::class]); |
| 37 | 37 | $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']); |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | return $processors; |
| 42 | 42 | }; |
| 43 | 43 | |
| 44 | - $app['eccube.purchase.flow.cart'] = function (Container $app) { |
|
| 44 | + $app['eccube.purchase.flow.cart'] = function(Container $app) { |
|
| 45 | 45 | $flow = new PurchaseFlow(); |
| 46 | 46 | $flow->setItemProcessors($app['eccube.purchase.flow.cart.item_processors']); |
| 47 | 47 | $flow->setItemHolderProcessors($app['eccube.purchase.flow.cart.holder_processors']); |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | return $flow; |
| 50 | 50 | }; |
| 51 | 51 | |
| 52 | - $app['eccube.purchase.flow.shopping.item_processors'] = function (Container $app) { |
|
| 52 | + $app['eccube.purchase.flow.shopping.item_processors'] = function(Container $app) { |
|
| 53 | 53 | $processors = new ArrayCollection(); |
| 54 | 54 | $processors[] = new Processor\StockValidator(); |
| 55 | 55 | $processors[] = new Processor\DisplayStatusValidator(); |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | return $processors; |
| 58 | 58 | }; |
| 59 | 59 | |
| 60 | - $app['eccube.purchase.flow.shopping.holder_processors'] = function (Container $app) { |
|
| 60 | + $app['eccube.purchase.flow.shopping.holder_processors'] = function(Container $app) { |
|
| 61 | 61 | $processors = new ArrayCollection(); |
| 62 | 62 | $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']); |
| 63 | 63 | $processors[] = new Processor\DeliveryFeeProcessor($app['orm.em']); |
@@ -67,13 +67,13 @@ discard block |
||
| 67 | 67 | return $processors; |
| 68 | 68 | }; |
| 69 | 69 | |
| 70 | - $app['eccube.purchase.flow.shopping.purchase'] = function (Container $app) { |
|
| 70 | + $app['eccube.purchase.flow.shopping.purchase'] = function(Container $app) { |
|
| 71 | 71 | $processors = new ArrayCollection(); |
| 72 | 72 | $processors[] = new Processor\UsePointToCustomerPurchaseProcessor(); |
| 73 | 73 | return $processors; |
| 74 | 74 | }; |
| 75 | 75 | |
| 76 | - $app['eccube.purchase.flow.shopping'] = function (Container $app) { |
|
| 76 | + $app['eccube.purchase.flow.shopping'] = function(Container $app) { |
|
| 77 | 77 | $flow = new PurchaseFlow(); |
| 78 | 78 | $flow->setItemProcessors($app['eccube.purchase.flow.shopping.item_processors']); |
| 79 | 79 | $flow->setItemHolderProcessors($app['eccube.purchase.flow.shopping.holder_processors']); |
@@ -82,14 +82,14 @@ discard block |
||
| 82 | 82 | return $flow; |
| 83 | 83 | }; |
| 84 | 84 | |
| 85 | - $app['eccube.purchase.flow.order.item_processors'] = function (Container $app) { |
|
| 85 | + $app['eccube.purchase.flow.order.item_processors'] = function(Container $app) { |
|
| 86 | 86 | $processors = new ArrayCollection(); |
| 87 | 87 | $processors[] = new Processor\StockValidator(); |
| 88 | 88 | |
| 89 | 89 | return $processors; |
| 90 | 90 | }; |
| 91 | 91 | |
| 92 | - $app['eccube.purchase.flow.order.holder_processors'] = function (Container $app) { |
|
| 92 | + $app['eccube.purchase.flow.order.holder_processors'] = function(Container $app) { |
|
| 93 | 93 | $processors = new ArrayCollection(); |
| 94 | 94 | $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']); |
| 95 | 95 | $processors[] = new Processor\UpdateDatePurchaseProcessor($app['config']); |
@@ -97,14 +97,14 @@ discard block |
||
| 97 | 97 | return $processors; |
| 98 | 98 | }; |
| 99 | 99 | |
| 100 | - $app['eccube.purchase.flow.order.purchase'] = function (Container $app) { |
|
| 100 | + $app['eccube.purchase.flow.order.purchase'] = function(Container $app) { |
|
| 101 | 101 | $processors = new ArrayCollection(); |
| 102 | 102 | $processors[] = new Processor\AdminOrderRegisterPurchaseProcessor($app); |
| 103 | 103 | |
| 104 | 104 | return $processors; |
| 105 | 105 | }; |
| 106 | 106 | |
| 107 | - $app['eccube.purchase.flow.order'] = function (Container $app) { |
|
| 107 | + $app['eccube.purchase.flow.order'] = function(Container $app) { |
|
| 108 | 108 | $flow = new PurchaseFlow(); |
| 109 | 109 | $flow->setItemProcessors($app['eccube.purchase.flow.order.item_processors']); |
| 110 | 110 | $flow->setItemHolderProcessors($app['eccube.purchase.flow.order.holder_processors']); |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | 'class' => 'Eccube\Entity\Master\OrderStatus', |
| 239 | 239 | 'choice_label' => 'name', |
| 240 | 240 | 'placeholder' => '選択してください', |
| 241 | - 'query_builder' => function ($er) { |
|
| 241 | + 'query_builder' => function($er) { |
|
| 242 | 242 | return $er->createQueryBuilder('o') |
| 243 | 243 | ->orderBy('o.rank', 'ASC'); |
| 244 | 244 | }, |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | ))); |
| 275 | 275 | |
| 276 | 276 | // 選択された支払い方法の名称をエンティティにコピーする |
| 277 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 277 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 278 | 278 | $Order = $event->getData(); |
| 279 | 279 | $Payment = $Order->getPayment(); |
| 280 | 280 | if (!is_null($Payment)) { |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | } |
| 283 | 283 | }); |
| 284 | 284 | // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする |
| 285 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 285 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 286 | 286 | $Order = $event->getData(); |
| 287 | 287 | $Customer = $Order->getCustomer(); |
| 288 | 288 | if (!is_null($Customer)) { |
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | |
| 24 | 24 | namespace Eccube\Controller\Admin\Order; |
| 25 | 25 | |
| 26 | -use Doctrine\Common\Collections\ArrayCollection; |
|
| 27 | 26 | use Doctrine\ORM\EntityManager; |
| 28 | 27 | use Eccube\Annotation\Inject; |
| 29 | 28 | use Eccube\Application; |
@@ -11,11 +11,9 @@ |
||
| 11 | 11 | use Eccube\Entity\BaseInfo; |
| 12 | 12 | use Eccube\Entity\Order; |
| 13 | 13 | use Eccube\Entity\OrderItem; |
| 14 | -use Eccube\Entity\Shipping; |
|
| 15 | 14 | use Eccube\Service\PurchaseFlow\ItemHolderProcessor; |
| 16 | 15 | use Eccube\Service\PurchaseFlow\ProcessResult; |
| 17 | 16 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
| 18 | -use Eccube\Util\EntityUtil; |
|
| 19 | 17 | |
| 20 | 18 | /** |
| 21 | 19 | * 使用ポイント値引明細追加. |