Skip to content

Commit fae8088

Browse files
Merge pull request #5097 in SW/shopware from sw-18915/5.2/fix-sql-changes to 5.2
* commit '2274f7b0dc040f91bf0efc4a1e251bab0877609f': SW-18915 - Fix order search query SW-18915 - Fix customer module detail query
2 parents 1f28ce3 + 2274f7b commit fae8088

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

engine/Shopware/Models/Customer/Repository.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@ public function getOrdersQueryBuilder($customerId, $filter = null, $orderBy = nu
330330
->leftJoin('orders.orderStatus', 'orderStatus')
331331
->leftJoin('orders.paymentStatus', 'paymentStatus');
332332

333-
$expr = Shopware()->Models()->getExpressionBuilder();
334333
//filter the displayed columns with the passed filter string
335334
if (!empty($filter)) {
336335
$builder->where('orders.customerId = :customerId');
@@ -347,11 +346,13 @@ public function getOrdersQueryBuilder($customerId, $filter = null, $orderBy = nu
347346
)
348347
->setParameter(1, $filter . '%')
349348
->setParameter(2, '%' . $filter)
350-
->setParameter(3, str_replace('.', '_', str_replace(',', '_', $filter)) . '%');
349+
->setParameter(3, str_replace('.', '_', str_replace(',', '_', $filter)) . '%')
350+
->setParameter('customerId', $customerId);
351351
} else {
352352
$builder->where('orders.customerId = :customerId')->setParameter('customerId', $customerId);
353353
}
354-
$builder->andWhere('orders.status NOT IN (-1, 4)');
354+
$builder->andWhere('orders.status NOT IN (:stati)');
355+
$builder->setParameter(':stati', [-1, 4], Connection::PARAM_INT_ARRAY);
355356

356357
$this->addOrderBy($builder, $orderBy);
357358

0 commit comments

Comments
 (0)