@@ -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 | } |