@@ -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(); |
@@ -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 | /** |
@@ -18,8 +18,8 @@ |
||
18 | 18 | $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode); |
19 | 19 | $migration = new Migration($config); |
20 | 20 | $migration->setNoMigrationException(true); |
21 | - // null 又は 'last' を渡すと最新バージョンまでマイグレートする |
|
22 | - // 0か'first'を渡すと最初に戻る |
|
21 | + // null 又は 'last' を渡すと最新バージョンまでマイグレートする |
|
22 | + // 0か'first'を渡すと最初に戻る |
|
23 | 23 | $migration->migrate($version, false); |
24 | 24 | |
25 | 25 |
@@ -543,13 +543,13 @@ |
||
543 | 543 | $pluginConfigs = PluginConfigManager::getPluginConfigAll($this['debug']); |
544 | 544 | $ormMappings = array(); |
545 | 545 | $ormMappings[] = array( |
546 | - 'type' => 'annotation', |
|
547 | - 'namespace' => 'Eccube\Entity', |
|
548 | - 'path' => array( |
|
549 | - __DIR__.'/Entity' |
|
550 | - ), |
|
551 | - 'use_simple_annotation_reader' => false, |
|
552 | - ); |
|
546 | + 'type' => 'annotation', |
|
547 | + 'namespace' => 'Eccube\Entity', |
|
548 | + 'path' => array( |
|
549 | + __DIR__.'/Entity' |
|
550 | + ), |
|
551 | + 'use_simple_annotation_reader' => false, |
|
552 | + ); |
|
553 | 553 | |
554 | 554 | // TODO namespace は暫定 |
555 | 555 | $ormMappings[] = array( |
@@ -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 | } |
@@ -59,7 +59,6 @@ |
||
59 | 59 | { |
60 | 60 | } |
61 | 61 | /** |
62 | - |
|
63 | 62 | * {@inheritdoc} |
64 | 63 | */ |
65 | 64 | public function buildForm(FormBuilderInterface $builder, array $options) |