@@ -32,7 +32,7 @@ |
||
| 32 | 32 | public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) |
| 33 | 33 | { |
| 34 | 34 | if ($targetEntity->reflClass->getName() === 'Eccube\Entity\ProductClass') { |
| 35 | - return $targetTableAlias . '.stock >= 1 OR ' . $targetTableAlias . '.stock_unlimited = 1'; |
|
| 35 | + return $targetTableAlias.'.stock >= 1 OR '.$targetTableAlias.'.stock_unlimited = 1'; |
|
| 36 | 36 | } else { |
| 37 | 37 | return ""; |
| 38 | 38 | } |
@@ -33,12 +33,12 @@ |
||
| 33 | 33 | { |
| 34 | 34 | // 決済処理中/購入処理中を除く. |
| 35 | 35 | if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') { |
| 36 | - return $targetTableAlias . '.status <> 7 AND ' . $targetTableAlias . '.status <> 8'; |
|
| 36 | + return $targetTableAlias.'.status <> 7 AND '.$targetTableAlias.'.status <> 8'; |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | // 決済処理中/購入処理中を除く. |
| 40 | 40 | if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') { |
| 41 | - return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8'; |
|
| 41 | + return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8'; |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | return ''; |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) |
| 47 | 47 | { |
| 48 | 48 | if ($targetEntity->hasField('del_flg') && !in_array($targetEntity->getName(), $this->getExcludes())) { |
| 49 | - return $targetTableAlias . '.del_flg = 0'; |
|
| 49 | + return $targetTableAlias.'.del_flg = 0'; |
|
| 50 | 50 | } else { |
| 51 | 51 | return ""; |
| 52 | 52 | } |
@@ -148,7 +148,7 @@ |
||
| 148 | 148 | 'required' => false, |
| 149 | 149 | 'value' => 1, |
| 150 | 150 | )) |
| 151 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
| 151 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
| 152 | 152 | $form = $event->getForm(); |
| 153 | 153 | $data = $form->getData(); |
| 154 | 154 | |
@@ -62,10 +62,10 @@ |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | if (empty($options['lastname_name'])) { |
| 65 | - $options['lastname_name'] = $builder->getName() . '01'; |
|
| 65 | + $options['lastname_name'] = $builder->getName().'01'; |
|
| 66 | 66 | } |
| 67 | 67 | if (empty($options['firstname_name'])) { |
| 68 | - $options['firstname_name'] = $builder->getName() . '02'; |
|
| 68 | + $options['firstname_name'] = $builder->getName().'02'; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | $builder |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | $app = $this->app; |
| 48 | 48 | |
| 49 | 49 | $builder |
| 50 | - ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) { |
|
| 50 | + ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) { |
|
| 51 | 51 | /** @var \Eccube\Entity\ShipmentItem $data */ |
| 52 | 52 | $data = $event->getData(); |
| 53 | 53 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -274,7 +274,7 @@ |
||
| 274 | 274 | $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; |
| 275 | 275 | $qb |
| 276 | 276 | ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' . |
| 277 | - 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') |
|
| 277 | + 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') |
|
| 278 | 278 | ->setParameter('multi', $multi) |
| 279 | 279 | ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); |
| 280 | 280 | } |
@@ -100,14 +100,14 @@ discard block |
||
| 100 | 100 | if (isset($searchData['name']) && Str::isNotBlank($searchData['name'])) { |
| 101 | 101 | $qb |
| 102 | 102 | ->andWhere('CONCAT(o.name01, o.name02) LIKE :name') |
| 103 | - ->setParameter('name', '%' . $searchData['name'] . '%'); |
|
| 103 | + ->setParameter('name', '%'.$searchData['name'].'%'); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | // kana |
| 107 | 107 | if (isset($searchData['kana']) && Str::isNotBlank($searchData['kana'])) { |
| 108 | 108 | $qb |
| 109 | 109 | ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana') |
| 110 | - ->setParameter('kana', '%' . $searchData['kana'] . '%'); |
|
| 110 | + ->setParameter('kana', '%'.$searchData['kana'].'%'); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | $qb |
| 245 | 245 | ->leftJoin('o.OrderDetails', 'od') |
| 246 | 246 | ->andWhere('od.product_name LIKE :buy_product_name') |
| 247 | - ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%'); |
|
| 247 | + ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%'); |
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | // Order By |
@@ -270,13 +270,13 @@ discard block |
||
| 270 | 270 | ->setParameter('order_id_start', $searchData['order_id_start']); |
| 271 | 271 | } |
| 272 | 272 | // multi |
| 273 | - if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) { |
|
| 273 | + if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) { |
|
| 274 | 274 | $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; |
| 275 | 275 | $qb |
| 276 | - ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' . |
|
| 276 | + ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '. |
|
| 277 | 277 | 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') |
| 278 | 278 | ->setParameter('multi', $multi) |
| 279 | - ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); |
|
| 279 | + ->setParameter('likemulti', '%'.$searchData['multi'].'%'); |
|
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | // order_id_end |
@@ -313,28 +313,28 @@ discard block |
||
| 313 | 313 | if (isset($searchData['name']) && Str::isNotBlank($searchData['name'])) { |
| 314 | 314 | $qb |
| 315 | 315 | ->andWhere('CONCAT(o.name01, o.name02) LIKE :name') |
| 316 | - ->setParameter('name', '%' . $searchData['name'] . '%'); |
|
| 316 | + ->setParameter('name', '%'.$searchData['name'].'%'); |
|
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | // kana |
| 320 | 320 | if (isset($searchData['kana']) && Str::isNotBlank($searchData['kana'])) { |
| 321 | 321 | $qb |
| 322 | 322 | ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana') |
| 323 | - ->setParameter('kana', '%' . $searchData['kana'] . '%'); |
|
| 323 | + ->setParameter('kana', '%'.$searchData['kana'].'%'); |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | |
| 327 | 327 | if (isset($searchData['email']) && Str::isNotBlank($searchData['email'])) { |
| 328 | 328 | $qb |
| 329 | 329 | ->andWhere('o.email like :email') |
| 330 | - ->setParameter('email', '%' . $searchData['email'] . '%'); |
|
| 330 | + ->setParameter('email', '%'.$searchData['email'].'%'); |
|
| 331 | 331 | } |
| 332 | 332 | |
| 333 | 333 | // tel |
| 334 | 334 | if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) { |
| 335 | 335 | $qb |
| 336 | 336 | ->andWhere('CONCAT(o.tel01, o.tel02, o.tel03) LIKE :tel') |
| 337 | - ->setParameter('tel', '%' . $searchData['tel'] . '%'); |
|
| 337 | + ->setParameter('tel', '%'.$searchData['tel'].'%'); |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | // sex |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | $qb |
| 447 | 447 | ->leftJoin('o.OrderDetails', 'od') |
| 448 | 448 | ->andWhere('od.product_name LIKE :buy_product_name') |
| 449 | - ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%'); |
|
| 449 | + ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%'); |
|
| 450 | 450 | } |
| 451 | 451 | |
| 452 | 452 | // Order By |
@@ -257,7 +257,7 @@ |
||
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | foreach ($readPaths as $readPath) { |
| 260 | - $filePath = $readPath . '/' . $fileName . '.twig'; |
|
| 260 | + $filePath = $readPath.'/'.$fileName.'.twig'; |
|
| 261 | 261 | $fs = new Filesystem(); |
| 262 | 262 | if ($fs->exists($filePath)) { |
| 263 | 263 | return array( |
@@ -73,17 +73,17 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | $qb = $this->createQueryBuilder('e'); |
| 75 | 75 | $qb->andWhere("e.priority >= $range_end ") |
| 76 | - ->andWhere("e.priority <= $range_start ") |
|
| 77 | - ->andWhere('e.event = :event') |
|
| 78 | - ->setParameter('event',$event) |
|
| 79 | - ->setMaxResults(1) |
|
| 80 | - ->orderBy('e.priority','ASC'); |
|
| 76 | + ->andWhere("e.priority <= $range_start ") |
|
| 77 | + ->andWhere('e.event = :event') |
|
| 78 | + ->setParameter('event',$event) |
|
| 79 | + ->setMaxResults(1) |
|
| 80 | + ->orderBy('e.priority','ASC'); |
|
| 81 | 81 | |
| 82 | 82 | $result=$qb->getQuery()->getResult(); |
| 83 | 83 | if(count($result)){ |
| 84 | - return $result[0]->getPriority() -1; |
|
| 84 | + return $result[0]->getPriority() -1; |
|
| 85 | 85 | }else{ |
| 86 | - return $range_start; |
|
| 86 | + return $range_start; |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | } |
@@ -96,14 +96,14 @@ discard block |
||
| 96 | 96 | $qb = $this->createQueryBuilder('e'); |
| 97 | 97 | |
| 98 | 98 | $qb->andWhere("e.priority >= $range_end ") |
| 99 | - ->andWhere("e.priority <= $range_start ") |
|
| 100 | - ->andWhere("e.del_flg = 0 ") |
|
| 101 | - ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
| 102 | - ->andWhere('e.event = :event') |
|
| 103 | - ->setParameter('event',$pluginEventHandler->getEvent()) |
|
| 104 | - ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
| 105 | - ->setMaxResults(1) |
|
| 106 | - ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
| 99 | + ->andWhere("e.priority <= $range_start ") |
|
| 100 | + ->andWhere("e.del_flg = 0 ") |
|
| 101 | + ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
| 102 | + ->andWhere('e.event = :event') |
|
| 103 | + ->setParameter('event',$pluginEventHandler->getEvent()) |
|
| 104 | + ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
| 105 | + ->setMaxResults(1) |
|
| 106 | + ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
| 107 | 107 | |
| 108 | 108 | $result=$qb->getQuery()->getResult(); |
| 109 | 109 | |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | $qb = $this->createQueryBuilder('e') |
| 43 | 43 | ->innerJoin('e.Plugin', 'p') |
| 44 | 44 | ->andWhere('e.del_flg = 0 ') |
| 45 | - ->Orderby('e.event','ASC') |
|
| 46 | - ->addOrderby('e.priority','DESC'); |
|
| 45 | + ->Orderby('e.event', 'ASC') |
|
| 46 | + ->addOrderby('e.priority', 'DESC'); |
|
| 47 | 47 | ; |
| 48 | 48 | |
| 49 | 49 | return $qb->getQuery()->getResult(); |
@@ -52,66 +52,66 @@ discard block |
||
| 52 | 52 | public function getPriorityRange($type) |
| 53 | 53 | { |
| 54 | 54 | |
| 55 | - if(PluginEventHandler::EVENT_HANDLER_TYPE_FIRST==$type){ |
|
| 56 | - $range_start=PluginEventHandler::EVENT_PRIORITY_FIRST_START; |
|
| 57 | - $range_end=PluginEventHandler::EVENT_PRIORITY_FIRST_END; |
|
| 58 | - }elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){ |
|
| 59 | - $range_start=PluginEventHandler::EVENT_PRIORITY_LAST_START; |
|
| 60 | - $range_end=PluginEventHandler::EVENT_PRIORITY_LAST_END; |
|
| 61 | - }else{ |
|
| 62 | - $range_start=PluginEventHandler::EVENT_PRIORITY_NORMAL_START; |
|
| 63 | - $range_end=PluginEventHandler::EVENT_PRIORITY_NORMAL_END; |
|
| 55 | + if (PluginEventHandler::EVENT_HANDLER_TYPE_FIRST == $type) { |
|
| 56 | + $range_start = PluginEventHandler::EVENT_PRIORITY_FIRST_START; |
|
| 57 | + $range_end = PluginEventHandler::EVENT_PRIORITY_FIRST_END; |
|
| 58 | + }elseif (PluginEventHandler::EVENT_HANDLER_TYPE_LAST == $type) { |
|
| 59 | + $range_start = PluginEventHandler::EVENT_PRIORITY_LAST_START; |
|
| 60 | + $range_end = PluginEventHandler::EVENT_PRIORITY_LAST_END; |
|
| 61 | + } else { |
|
| 62 | + $range_start = PluginEventHandler::EVENT_PRIORITY_NORMAL_START; |
|
| 63 | + $range_end = PluginEventHandler::EVENT_PRIORITY_NORMAL_END; |
|
| 64 | 64 | } |
| 65 | - return array($range_start,$range_end); |
|
| 65 | + return array($range_start, $range_end); |
|
| 66 | 66 | |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - public function calcNewPriority($event , $type) |
|
| 69 | + public function calcNewPriority($event, $type) |
|
| 70 | 70 | { |
| 71 | 71 | |
| 72 | - list($range_start,$range_end) = $this->getPriorityRange($type); |
|
| 72 | + list($range_start, $range_end) = $this->getPriorityRange($type); |
|
| 73 | 73 | |
| 74 | 74 | $qb = $this->createQueryBuilder('e'); |
| 75 | 75 | $qb->andWhere("e.priority >= $range_end ") |
| 76 | 76 | ->andWhere("e.priority <= $range_start ") |
| 77 | 77 | ->andWhere('e.event = :event') |
| 78 | - ->setParameter('event',$event) |
|
| 78 | + ->setParameter('event', $event) |
|
| 79 | 79 | ->setMaxResults(1) |
| 80 | - ->orderBy('e.priority','ASC'); |
|
| 80 | + ->orderBy('e.priority', 'ASC'); |
|
| 81 | 81 | |
| 82 | - $result=$qb->getQuery()->getResult(); |
|
| 83 | - if(count($result)){ |
|
| 84 | - return $result[0]->getPriority() -1; |
|
| 85 | - }else{ |
|
| 82 | + $result = $qb->getQuery()->getResult(); |
|
| 83 | + if (count($result)) { |
|
| 84 | + return $result[0]->getPriority() - 1; |
|
| 85 | + } else { |
|
| 86 | 86 | return $range_start; |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - public function upPriority($pluginEventHandler,$up=true) |
|
| 91 | + public function upPriority($pluginEventHandler, $up = true) |
|
| 92 | 92 | { |
| 93 | 93 | |
| 94 | - list($range_start,$range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType()); |
|
| 94 | + list($range_start, $range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType()); |
|
| 95 | 95 | |
| 96 | 96 | $qb = $this->createQueryBuilder('e'); |
| 97 | 97 | |
| 98 | 98 | $qb->andWhere("e.priority >= $range_end ") |
| 99 | 99 | ->andWhere("e.priority <= $range_start ") |
| 100 | 100 | ->andWhere("e.del_flg = 0 ") |
| 101 | - ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
| 101 | + ->andWhere('e.priority '.($up ? '>' : '<').' :pri') |
|
| 102 | 102 | ->andWhere('e.event = :event') |
| 103 | - ->setParameter('event',$pluginEventHandler->getEvent()) |
|
| 104 | - ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
| 103 | + ->setParameter('event', $pluginEventHandler->getEvent()) |
|
| 104 | + ->setParameter('pri', $pluginEventHandler->getPriority()) |
|
| 105 | 105 | ->setMaxResults(1) |
| 106 | - ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
| 106 | + ->orderBy('e.priority', ($up ? 'ASC' : 'DESC')); |
|
| 107 | 107 | |
| 108 | - $result=$qb->getQuery()->getResult(); |
|
| 108 | + $result = $qb->getQuery()->getResult(); |
|
| 109 | 109 | |
| 110 | - if(count($result)){ |
|
| 111 | - $em =$this->getEntityManager(); |
|
| 110 | + if (count($result)) { |
|
| 111 | + $em = $this->getEntityManager(); |
|
| 112 | 112 | $em->getConnection()->beginTransaction(); |
| 113 | 113 | // 2個のentityのprioriryを入れ替える |
| 114 | - $tmp=$pluginEventHandler->getPriority(); |
|
| 114 | + $tmp = $pluginEventHandler->getPriority(); |
|
| 115 | 115 | $pluginEventHandler->setPriority($result[0]->getPriority()); |
| 116 | 116 | $result[0]->setPriority($tmp); |
| 117 | 117 | $em->persist($result[0]); |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $em->flush(); |
| 120 | 120 | $em->getConnection()->commit(); |
| 121 | 121 | # 移動する |
| 122 | - }else{ |
|
| 122 | + } else { |
|
| 123 | 123 | # 移動しない |
| 124 | 124 | throw new PluginException("Can't swap"); |
| 125 | 125 | } |