@@ -161,8 +161,7 @@ |
||
161 | 161 | $search->compare( '==', $domain . '.lists.domain', $key ), |
162 | 162 | $search->compare( '==', $domain . '.lists.type', $type ), |
163 | 163 | ] ); |
164 | - } |
|
165 | - else |
|
164 | + } else |
|
166 | 165 | { |
167 | 166 | $type = !strncmp( $type, $domain . '/', $len + 1 ) ? [$type, substr( $type, $len + 1 )] : $type; // remove prefix |
168 | 167 | $list[] = $search->compare( '==', $domain . '.lists.domain', $type ); |
@@ -635,5 +635,5 @@ |
||
635 | 635 | * @see mshop/attribute/manager/newid/ansi |
636 | 636 | * @see mshop/attribute/manager/delete/ansi |
637 | 637 | * @see mshop/attribute/manager/search/ansi |
638 | - */ |
|
638 | + */ |
|
639 | 639 | } |
@@ -612,9 +612,13 @@ |
||
612 | 612 | { |
613 | 613 | if( empty( $item->getInvoiceNumber() ) && $item->getStatusPayment() >= \Aimeos\MShop\Order\Item\Base::PAY_PENDING ) |
614 | 614 | { |
615 | - try { |
|
615 | + try |
|
616 | + { |
|
616 | 617 | $item->setInvoiceNumber( $this->createInvoiceNumber( $item ) ); |
617 | - } catch( \Exception $e ) { // redo on transaction deadlock |
|
618 | + } |
|
619 | + catch( \Exception $e ) |
|
620 | + { |
|
621 | +// redo on transaction deadlock |
|
618 | 622 | $item->setInvoiceNumber( $this->createInvoiceNumber( $item ) ); |
619 | 623 | } |
620 | 624 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $search = $this->object->filter()->slice( 0, 1 ); |
88 | 88 | $conditions = array( |
89 | 89 | $search->compare( '~=', 'plugin.provider', 'Shipping' ), |
90 | - $search->compare( '==', 'plugin.editor', $this->context->editor()) |
|
90 | + $search->compare( '==', 'plugin.editor', $this->context->editor() ) |
|
91 | 91 | ); |
92 | 92 | $search->setConditions( $search->and( $conditions ) ); |
93 | 93 | $expected = $this->object->search( $search, ['plugin/type'] )->first( new \RuntimeException( 'No plugin item including "Shipping" found' ) ); |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | $search = $this->object->filter(); |
105 | 105 | $conditions = array( |
106 | 106 | $search->compare( '~=', 'plugin.provider', 'Shipping' ), |
107 | - $search->compare( '==', 'plugin.editor', $this->context->editor()) |
|
107 | + $search->compare( '==', 'plugin.editor', $this->context->editor() ) |
|
108 | 108 | ); |
109 | 109 | $search->setConditions( $search->and( $conditions ) ); |
110 | 110 | |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | $expr[] = $search->compare( '==', 'plugin.status', 1 ); |
182 | 182 | $expr[] = $search->compare( '>=', 'plugin.mtime', '1970-01-01 00:00:00' ); |
183 | 183 | $expr[] = $search->compare( '>=', 'plugin.ctime', '1970-01-01 00:00:00' ); |
184 | - $expr[] = $search->compare( '==', 'plugin.editor', $this->context->editor()); |
|
184 | + $expr[] = $search->compare( '==', 'plugin.editor', $this->context->editor() ); |
|
185 | 185 | |
186 | 186 | $search->setConditions( $search->and( $expr ) ); |
187 | 187 | $results = $this->object->search( $search, [], $total )->toArray(); |
@@ -195,15 +195,15 @@ discard block |
||
195 | 195 | |
196 | 196 | $expr = $conditions = []; |
197 | 197 | $expr[] = $search->compare( '~=', 'plugin.provider', 'Shipping,Example' ); |
198 | - $expr[] = $search->compare( '==', 'plugin.editor', $this->context->editor()); |
|
198 | + $expr[] = $search->compare( '==', 'plugin.editor', $this->context->editor() ); |
|
199 | 199 | $conditions[] = $search->and( $expr ); |
200 | 200 | $expr = []; |
201 | 201 | $expr[] = $search->compare( '~=', 'plugin.provider', 'ProductLimit,Example' ); |
202 | - $expr[] = $search->compare( '==', 'plugin.editor', $this->context->editor()); |
|
202 | + $expr[] = $search->compare( '==', 'plugin.editor', $this->context->editor() ); |
|
203 | 203 | $conditions[] = $search->and( $expr ); |
204 | 204 | $expr = []; |
205 | 205 | $expr[] = $search->compare( '~=', 'plugin.provider', 'BasketLimits,Example' ); |
206 | - $expr[] = $search->compare( '==', 'plugin.editor', $this->context->editor()); |
|
206 | + $expr[] = $search->compare( '==', 'plugin.editor', $this->context->editor() ); |
|
207 | 207 | $conditions[] = $search->and( $expr ); |
208 | 208 | |
209 | 209 | //search without base criteria |
@@ -170,7 +170,7 @@ |
||
170 | 170 | $expr[] = $search->compare( '==', 'rule.status', 1 ); |
171 | 171 | $expr[] = $search->compare( '>=', 'rule.mtime', '1970-01-01 00:00:00' ); |
172 | 172 | $expr[] = $search->compare( '>=', 'rule.ctime', '1970-01-01 00:00:00' ); |
173 | - $expr[] = $search->compare( '==', 'rule.editor', $this->context->editor()); |
|
173 | + $expr[] = $search->compare( '==', 'rule.editor', $this->context->editor() ); |
|
174 | 174 | |
175 | 175 | $search->setConditions( $search->and( $expr ) ); |
176 | 176 | $this->assertEquals( 1, $this->object->search( $search, [], $total )->count() ); |