@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | // 支払い方法のプルダウンを生成 |
| 86 | 86 | $builder->addEventListener( |
| 87 | 87 | FormEvents::PRE_SET_DATA, |
| 88 | - function (FormEvent $event) { |
|
| 88 | + function(FormEvent $event) { |
|
| 89 | 89 | /** @var Order $Order */ |
| 90 | 90 | $Order = $event->getData(); |
| 91 | 91 | if (is_null($Order) || !$Order->getId()) { |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | // TODO Calculatorで行うのが適切. |
| 134 | 134 | $builder->addEventListener( |
| 135 | 135 | FormEvents::POST_SUBMIT, |
| 136 | - function (FormEvent $event) { |
|
| 136 | + function(FormEvent $event) { |
|
| 137 | 137 | /** @var Order $Order */ |
| 138 | 138 | $Order = $event->getData(); |
| 139 | 139 | $Payment = $Order->getPayment(); |
@@ -446,7 +446,7 @@ |
||
| 446 | 446 | $session->set('eccube.admin.order.product.search', $searchData); |
| 447 | 447 | $session->set('eccube.admin.order.product.search.page_no', $page_no); |
| 448 | 448 | } else { |
| 449 | - $searchData = (array)$session->get('eccube.admin.order.product.search'); |
|
| 449 | + $searchData = (array) $session->get('eccube.admin.order.product.search'); |
|
| 450 | 450 | if (is_null($page_no)) { |
| 451 | 451 | $page_no = intval($session->get('eccube.admin.order.product.search.page_no')); |
| 452 | 452 | } else { |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | /** |
| 38 | 38 | * |
| 39 | 39 | * @param array $searchData |
| 40 | - * @return QueryBuilder |
|
| 40 | + * @return \Doctrine\ORM\QueryBuilder |
|
| 41 | 41 | */ |
| 42 | 42 | public function getQueryBuilderBySearchDataForAdmin($searchData) |
| 43 | 43 | { |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; |
| 57 | 57 | $qb |
| 58 | 58 | ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' . |
| 59 | - 's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti') |
|
| 59 | + 's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti') |
|
| 60 | 60 | ->setParameter('multi', $multi) |
| 61 | 61 | ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); |
| 62 | 62 | } |
@@ -52,13 +52,13 @@ discard block |
||
| 52 | 52 | ->setParameter('shipping_id_start', $searchData['shipping_id_start']); |
| 53 | 53 | } |
| 54 | 54 | // multi |
| 55 | - if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) { |
|
| 55 | + if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) { |
|
| 56 | 56 | $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; |
| 57 | 57 | $qb |
| 58 | - ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' . |
|
| 58 | + ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR '. |
|
| 59 | 59 | 's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti') |
| 60 | 60 | ->setParameter('multi', $multi) |
| 61 | - ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); |
|
| 61 | + ->setParameter('likemulti', '%'.$searchData['multi'].'%'); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | // shipping_id_end |
@@ -91,42 +91,42 @@ discard block |
||
| 91 | 91 | if (isset($searchData['name']) && Str::isNotBlank($searchData['name'])) { |
| 92 | 92 | $qb |
| 93 | 93 | ->andWhere('CONCAT(s.name01, s.name02) LIKE :name') |
| 94 | - ->setParameter('name', '%' . $searchData['name'] . '%'); |
|
| 94 | + ->setParameter('name', '%'.$searchData['name'].'%'); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | // kana |
| 98 | 98 | if (isset($searchData['kana']) && Str::isNotBlank($searchData['kana'])) { |
| 99 | 99 | $qb |
| 100 | 100 | ->andWhere('CONCAT(s.kana01, s.kana02) LIKE :kana') |
| 101 | - ->setParameter('kana', '%' . $searchData['kana'] . '%'); |
|
| 101 | + ->setParameter('kana', '%'.$searchData['kana'].'%'); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | // order_name |
| 105 | 105 | if (isset($searchData['order_name']) && Str::isNotBlank($searchData['order_name'])) { |
| 106 | 106 | $qb |
| 107 | 107 | ->andWhere('CONCAT(o.name01, o.name02) LIKE :order_name') |
| 108 | - ->setParameter('order_name', '%' . $searchData['order_name'] . '%'); |
|
| 108 | + ->setParameter('order_name', '%'.$searchData['order_name'].'%'); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | // order_kana |
| 112 | 112 | if (isset($searchData['order_kana']) && Str::isNotBlank($searchData['order_kana'])) { |
| 113 | 113 | $qb |
| 114 | 114 | ->andWhere('CONCAT(o.kana01, s.kana02) LIKE :order_kana') |
| 115 | - ->setParameter('kana', '%' . $searchData['order_kana'] . '%'); |
|
| 115 | + ->setParameter('kana', '%'.$searchData['order_kana'].'%'); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | // order_email |
| 119 | 119 | if (isset($searchData['email']) && Str::isNotBlank($searchData['email'])) { |
| 120 | 120 | $qb |
| 121 | 121 | ->andWhere('o.email like :email') |
| 122 | - ->setParameter('email', '%' . $searchData['email'] . '%'); |
|
| 122 | + ->setParameter('email', '%'.$searchData['email'].'%'); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | // tel |
| 126 | 126 | if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) { |
| 127 | 127 | $qb |
| 128 | 128 | ->andWhere('CONCAT(s.tel01, s.tel02, s.tel03) LIKE :tel') |
| 129 | - ->setParameter('tel', '%' . $searchData['tel'] . '%'); |
|
| 129 | + ->setParameter('tel', '%'.$searchData['tel'].'%'); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | // payment |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | if (isset($searchData['buy_product_name']) && Str::isNotBlank($searchData['buy_product_name'])) { |
| 223 | 223 | $qb |
| 224 | 224 | ->andWhere('si.product_name LIKE :buy_product_name') |
| 225 | - ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%'); |
|
| 225 | + ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%'); |
|
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | // Order By |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | { |
| 13 | 13 | public function register(Container $app) |
| 14 | 14 | { |
| 15 | - $app['plugin.entity_event.base_info_listener'] = function (Container $container) { |
|
| 15 | + $app['plugin.entity_event.base_info_listener'] = function(Container $container) { |
|
| 16 | 16 | return new BaseInfoListener(); |
| 17 | 17 | }; |
| 18 | 18 | } |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | { |
| 13 | 13 | public function register(Container $app) |
| 14 | 14 | { |
| 15 | - $app['plugin.query_customize.customer_search'] = function (Container $container) { |
|
| 15 | + $app['plugin.query_customize.customer_search'] = function(Container $container) { |
|
| 16 | 16 | return new AdminCustomerCustomizer(); |
| 17 | 17 | }; |
| 18 | 18 | } |
@@ -94,7 +94,7 @@ |
||
| 94 | 94 | if (strtoupper($orderby) === "PATH") { |
| 95 | 95 | uasort( |
| 96 | 96 | $routes, |
| 97 | - function ($a, $b) { |
|
| 97 | + function($a, $b) { |
|
| 98 | 98 | return strcmp($a->getPath(), $b->getPath()); |
| 99 | 99 | } |
| 100 | 100 | ); |
@@ -12,14 +12,14 @@ |
||
| 12 | 12 | public function register(Container $app) |
| 13 | 13 | { |
| 14 | 14 | // サンプルの空Strategyをコンテナに登録 |
| 15 | - $app['eccube.calculate.strategy.empty'] = function () { |
|
| 15 | + $app['eccube.calculate.strategy.empty'] = function() { |
|
| 16 | 16 | return new EmptyStrategy(); |
| 17 | 17 | }; |
| 18 | 18 | |
| 19 | 19 | // 空Strategyを追加. |
| 20 | 20 | $app->extend( |
| 21 | 21 | 'eccube.calculate.strategies', |
| 22 | - function (CalculateStrategyCollection $Collection, Container $app) { |
|
| 22 | + function(CalculateStrategyCollection $Collection, Container $app) { |
|
| 23 | 23 | $Collection->add($app['eccube.calculate.strategy.empty']); |
| 24 | 24 | |
| 25 | 25 | return $Collection; |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | use Eccube\Entity\Order; |
| 5 | 5 | use Eccube\Entity\PurchaseInterface; |
| 6 | 6 | use Eccube\Entity\ShipmentItem; |
| 7 | -use Eccube\Service\Calculator\Strategy\CalculateStrategyInterface; |
|
| 8 | 7 | |
| 9 | 8 | class CalculateContext |
| 10 | 9 | { |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | $this->buildCalculator($this->CalculateStrategies); |
| 24 | 24 | |
| 25 | 25 | /** @var ShipmentItem $ShipmentItem */ |
| 26 | - foreach($this->ShipmentItems as $ShipmentItem) { |
|
| 26 | + foreach ($this->ShipmentItems as $ShipmentItem) { |
|
| 27 | 27 | if ($ShipmentItem instanceof ShipmentItem) { |
| 28 | 28 | if (!$this->Order->getItems()->contains($ShipmentItem)) { |
| 29 | 29 | $ShipmentItem->setOrder($this->Order); |
@@ -2,13 +2,9 @@ |
||
| 2 | 2 | namespace Eccube\Service\Calculator\Strategy; |
| 3 | 3 | |
| 4 | 4 | use Eccube\Application; |
| 5 | -use Eccube\Entity\Master\OrderItemType; |
|
| 6 | -use Eccube\Entity\Master\TaxType; |
|
| 7 | -use Eccube\Entity\Master\TaxDisplayType; |
|
| 8 | 5 | use Eccube\Entity\Order; |
| 9 | 6 | use Eccube\Entity\PurchaseInterface; |
| 10 | 7 | use Eccube\Entity\ShipmentItem; |
| 11 | -use Eccube\Entity\Shipping; |
|
| 12 | 8 | use Eccube\Repository\Master\OrderItemTypeRepository; |
| 13 | 9 | use Eccube\Service\Calculator\ShipmentItemCollection; |
| 14 | 10 | |