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