@@ -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 | } |
@@ -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 | |
@@ -138,7 +138,7 @@ |
||
| 138 | 138 | 'allow_add' => true, |
| 139 | 139 | 'allow_delete' => true, |
| 140 | 140 | 'data' => $ProductClasses, |
| 141 | - )); |
|
| 141 | + )); |
|
| 142 | 142 | |
| 143 | 143 | $event = new EventArgs( |
| 144 | 144 | array( |
@@ -1155,11 +1155,11 @@ |
||
| 1155 | 1155 | } |
| 1156 | 1156 | |
| 1157 | 1157 | /** |
| 1158 | - * ProductCategory作成 |
|
| 1159 | - * @param \Eccube\Entity\Product $Product |
|
| 1160 | - * @param \Eccube\Entity\Category $Category |
|
| 1161 | - * @return ProductCategory |
|
| 1162 | - */ |
|
| 1158 | + * ProductCategory作成 |
|
| 1159 | + * @param \Eccube\Entity\Product $Product |
|
| 1160 | + * @param \Eccube\Entity\Category $Category |
|
| 1161 | + * @return ProductCategory |
|
| 1162 | + */ |
|
| 1163 | 1163 | private function makeProductCategory($Product, $Category, $rank) |
| 1164 | 1164 | { |
| 1165 | 1165 | $ProductCategory = new ProductCategory(); |
@@ -160,7 +160,7 @@ |
||
| 160 | 160 | $this->paramList = array( |
| 161 | 161 | 'pluginCode' => array( |
| 162 | 162 | 'no' => 1, |
| 163 | - 'label' => '[+]Plugin Code: ', |
|
| 163 | + 'label' => '[+]Plugin Code: ', |
|
| 164 | 164 | 'value' => null, |
| 165 | 165 | 'name' => '[+]Please enter Plugin Name (only pascal case letters numbers are allowed)', |
| 166 | 166 | 'validation' => array( |
@@ -57,8 +57,8 @@ |
||
| 57 | 57 | new Assert\NotBlank(), |
| 58 | 58 | new Assert\Length(array('max' => $this->config['stext_len'])), |
| 59 | 59 | new Assert\Regex(array( |
| 60 | - 'pattern' => "/^[0-9a-zA-Z]+$/", |
|
| 61 | - )), |
|
| 60 | + 'pattern' => "/^[0-9a-zA-Z]+$/", |
|
| 61 | + )), |
|
| 62 | 62 | ), |
| 63 | 63 | )) |
| 64 | 64 | ->add('admin_allow_host', TextareaType::class, array( |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | return $phpinfo; |
| 43 | 43 | |
| 44 | - break; |
|
| 44 | + break; |
|
| 45 | 45 | default: |
| 46 | 46 | break; |
| 47 | 47 | } |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | )); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - public function getSystemInfo(Application $app, Request $request) |
|
| 57 | - { |
|
| 56 | + public function getSystemInfo(Application $app, Request $request) |
|
| 57 | + { |
|
| 58 | 58 | $system = $app['eccube.service.system']; |
| 59 | 59 | |
| 60 | 60 | $arrSystemInfo = array( |
@@ -69,5 +69,5 @@ discard block |
||
| 69 | 69 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $request->headers->get('User-Agent')); |
| 70 | 70 | |
| 71 | 71 | return $arrSystemInfo; |
| 72 | - } |
|
| 72 | + } |
|
| 73 | 73 | } |
@@ -38,21 +38,21 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | public function buildForm(FormBuilderInterface $builder, array $options) |
| 40 | 40 | { |
| 41 | - $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
| 42 | - $options = $event->getForm()->getConfig()->getOptions(); |
|
| 43 | - if (!$event->getData()) { |
|
| 44 | - $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues())); |
|
| 45 | - $event->setData($data); |
|
| 46 | - } |
|
| 47 | - }); |
|
| 48 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
| 49 | - $options = $event->getForm()->getConfig()->getOptions(); |
|
| 50 | - $values = $options['choice_loader']->loadChoiceList()->getValues(); |
|
| 51 | - if (!in_array($event->getData(), $values)) { |
|
| 52 | - $data = current($values); |
|
| 53 | - $event->setData($data); |
|
| 54 | - } |
|
| 55 | - }); |
|
| 41 | + $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
| 42 | + $options = $event->getForm()->getConfig()->getOptions(); |
|
| 43 | + if (!$event->getData()) { |
|
| 44 | + $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues())); |
|
| 45 | + $event->setData($data); |
|
| 46 | + } |
|
| 47 | + }); |
|
| 48 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
| 49 | + $options = $event->getForm()->getConfig()->getOptions(); |
|
| 50 | + $values = $options['choice_loader']->loadChoiceList()->getValues(); |
|
| 51 | + if (!in_array($event->getData(), $values)) { |
|
| 52 | + $data = current($values); |
|
| 53 | + $event->setData($data); |
|
| 54 | + } |
|
| 55 | + }); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
@@ -35,9 +35,9 @@ |
||
| 35 | 35 | public function hasProductByName($productName) |
| 36 | 36 | { |
| 37 | 37 | $OrderDetails = array_filter($this->getArrayCopy(), |
| 38 | - function ($OrderDetail) use ($productName) { |
|
| 39 | - return $OrderDetail->getProductName() == $productName; |
|
| 40 | - }); |
|
| 38 | + function ($OrderDetail) use ($productName) { |
|
| 39 | + return $OrderDetail->getProductName() == $productName; |
|
| 40 | + }); |
|
| 41 | 41 | return !empty($OrderDetails); |
| 42 | 42 | } |
| 43 | 43 | // map, filter, reduce も実装したい |