@@ -237,27 +237,27 @@ discard block |
||
| 237 | 237 | */ |
| 238 | 238 | |
| 239 | 239 | /** mshop/group/manager/submanagers |
| 240 | - * List of manager names that can be instantiated by the group manager |
|
| 241 | - * |
|
| 242 | - * Managers provide a generic interface to the underlying storage. |
|
| 243 | - * Each manager has or can have sub-managers caring about particular |
|
| 244 | - * aspects. Each of these sub-managers can be instantiated by its |
|
| 245 | - * parent manager using the getSubManager() method. |
|
| 246 | - * |
|
| 247 | - * The search keys from sub-managers can be normally used in the |
|
| 248 | - * manager as well. It allows you to search for items of the manager |
|
| 249 | - * using the search keys of the sub-managers to further limit the |
|
| 250 | - * retrieved list of items. |
|
| 251 | - * |
|
| 252 | - * @param array List of sub-manager names |
|
| 253 | - * @since 2024.04 |
|
| 254 | - */ |
|
| 240 | + * List of manager names that can be instantiated by the group manager |
|
| 241 | + * |
|
| 242 | + * Managers provide a generic interface to the underlying storage. |
|
| 243 | + * Each manager has or can have sub-managers caring about particular |
|
| 244 | + * aspects. Each of these sub-managers can be instantiated by its |
|
| 245 | + * parent manager using the getSubManager() method. |
|
| 246 | + * |
|
| 247 | + * The search keys from sub-managers can be normally used in the |
|
| 248 | + * manager as well. It allows you to search for items of the manager |
|
| 249 | + * using the search keys of the sub-managers to further limit the |
|
| 250 | + * retrieved list of items. |
|
| 251 | + * |
|
| 252 | + * @param array List of sub-manager names |
|
| 253 | + * @since 2024.04 |
|
| 254 | + */ |
|
| 255 | 255 | |
| 256 | 256 | /** mshop/group/manager/insert/mysql |
| 257 | - * Inserts a new group record into the database table |
|
| 258 | - * |
|
| 259 | - * @see mshop/group/manager/insert/ansi |
|
| 260 | - */ |
|
| 257 | + * Inserts a new group record into the database table |
|
| 258 | + * |
|
| 259 | + * @see mshop/group/manager/insert/ansi |
|
| 260 | + */ |
|
| 261 | 261 | |
| 262 | 262 | /** mshop/group/manager/insert/ansi |
| 263 | 263 | * Inserts a new group record into the database table |
@@ -289,10 +289,10 @@ discard block |
||
| 289 | 289 | */ |
| 290 | 290 | |
| 291 | 291 | /** mshop/group/manager/update/mysql |
| 292 | - * Updates an existing group record in the database |
|
| 293 | - * |
|
| 294 | - * @see mshop/group/manager/update/ansi |
|
| 295 | - */ |
|
| 292 | + * Updates an existing group record in the database |
|
| 293 | + * |
|
| 294 | + * @see mshop/group/manager/update/ansi |
|
| 295 | + */ |
|
| 296 | 296 | |
| 297 | 297 | /** mshop/group/manager/update/ansi |
| 298 | 298 | * Updates an existing group record in the database |
@@ -265,8 +265,7 @@ |
||
| 265 | 265 | */ |
| 266 | 266 | $path = 'mshop/locale/manager/currency/insert'; |
| 267 | 267 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 268 | - } |
|
| 269 | - else |
|
| 268 | + } else |
|
| 270 | 269 | { |
| 271 | 270 | /** mshop/locale/manager/currency/update/mysql |
| 272 | 271 | * Updates an existing currency record in the database |
@@ -264,8 +264,7 @@ |
||
| 264 | 264 | */ |
| 265 | 265 | $path = 'mshop/locale/manager/language/insert'; |
| 266 | 266 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 267 | - } |
|
| 268 | - else |
|
| 267 | + } else |
|
| 269 | 268 | { |
| 270 | 269 | /** mshop/locale/manager/language/update/mysql |
| 271 | 270 | * Updates an existing language record in the database |
@@ -158,8 +158,7 @@ |
||
| 158 | 158 | { |
| 159 | 159 | $path = 'mshop/customer/manager/address/insert'; |
| 160 | 160 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 161 | - } |
|
| 162 | - else |
|
| 161 | + } else |
|
| 163 | 162 | { |
| 164 | 163 | $path = 'mshop/customer/manager/address/update'; |
| 165 | 164 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ), false ); |
@@ -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 | } |
@@ -89,9 +89,11 @@ |
||
| 89 | 89 | return map(); |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - if( self::$lastRefresh < ( $time = time() ) - 60 ) // clear cache regularly for Laravel Octane |
|
| 92 | + if( self::$lastRefresh < ( $time = time() ) - 60 ) { |
|
| 93 | + // clear cache regularly for Laravel Octane |
|
| 93 | 94 | { |
| 94 | 95 | self::$lastRefresh = $time; |
| 96 | + } |
|
| 95 | 97 | self::$siteInactive = []; |
| 96 | 98 | } |
| 97 | 99 | |
@@ -45,9 +45,12 @@ |
||
| 45 | 45 | { |
| 46 | 46 | $db->for( ['mariadb', 'mysql'], 'CREATE FULLTEXT INDEX `idx_msindte_content` ON `mshop_index_text` (`content`)' ); |
| 47 | 47 | |
| 48 | - try { |
|
| 48 | + try |
|
| 49 | + { |
|
| 49 | 50 | $db->for( 'postgresql', 'CREATE INDEX "idx_msindte_content" ON "mshop_index_text" USING GIN (to_tsvector(\'english\', "content"))' ); |
| 50 | - } catch( \Exception $e ) { |
|
| 51 | + } |
|
| 52 | + catch( \Exception $e ) |
|
| 53 | + { |
|
| 51 | 54 | // Doctrine DBAL bug: https://github.com/doctrine/dbal/issues/5351 |
| 52 | 55 | } |
| 53 | 56 | } |