Skip to content

Commit 85ed945

Browse files
Merge pull request #2949 from coreshop/upmerge/5.0_next
[UPMERGE] 5.0 -> next
2 parents a42887d + 4d1203b commit 85ed945

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

src/CoreShop/Bundle/CoreBundle/Controller/CustomerTransformerController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function checkForNameDuplicatesAction(Request $request): JsonResponse
4040

4141
if ($value !== null) {
4242
$list = $this->getCompanyRepository()->getList();
43-
$list->addConditionParam(sprintf('name LIKE "%%%s%%"', (string) $value));
43+
$list->addConditionParam('name LIKE ?', '%' . $value . '%');
4444
$foundObjects = $list->getData();
4545
}
4646

src/CoreShop/Bundle/CoreBundle/Report/CategoriesReport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ public function getReportData(ParameterBag $parameterBag): array
136136
INNER JOIN object_query_$orderItemClassId AS orderItems ON orderItems.product__id = catProductDependencies.targetId
137137
INNER JOIN object_relations_$orderClassId AS orderRelations ON orderRelations.dest_id = orderItems.oo_id AND orderRelations.fieldname = \"items\"
138138
INNER JOIN object_query_$orderClassId AS `orders` ON `orders`.oo_id = orderRelations.src_id
139-
WHERE orders.store = :storeId" . $orderStateInClause . " AND orders.orderDate > :fromTimestamp AND orders.orderDate < :toTimestamp AND orderItems.product__id IS NOT NULL
139+
WHERE orders.store = :storeId" . $orderStateInClause . ' AND orders.orderDate > :fromTimestamp AND orders.orderDate < :toTimestamp AND orderItems.product__id IS NOT NULL
140140
GROUP BY categories.oo_id
141141
ORDER BY quantityCount DESC
142-
LIMIT " . (int) $offset . ', ' . (int) $limit;
142+
LIMIT ' . (int) $offset . ', ' . (int) $limit;
143143
$results = $this->db->fetchAllAssociative($query, $queryParameters);
144144
}
145145

src/CoreShop/Bundle/CoreBundle/Report/ProductsReport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ public function getReportData(ParameterBag $parameterBag): array
151151
INNER JOIN object_relations_$orderClassId AS orderRelations ON orderRelations.src_id = orders.oo_id AND orderRelations.fieldname = \"items\"
152152
INNER JOIN object_query_$orderItemClassId AS orderItems ON orderRelations.dest_id = orderItems.oo_id
153153
INNER JOIN object_localized_query_" . $orderItemClassId . '_' . $locale . " AS orderItemsTranslated ON orderItems.oo_id = orderItemsTranslated.ooo_id
154-
WHERE `orders`.store = :storeId AND $productTypeCondition" . $orderStateInClauseOrders . " AND `orders`.orderDate > :fromTimestamp AND `orders`.orderDate < :toTimestamp
154+
WHERE `orders`.store = :storeId AND $productTypeCondition" . $orderStateInClauseOrders . ' AND `orders`.orderDate > :fromTimestamp AND `orders`.orderDate < :toTimestamp
155155
GROUP BY orderItems.objectId
156156
ORDER BY orderCount DESC
157-
LIMIT " . (int) $offset . ', ' . (int) $limit;
157+
LIMIT ' . (int) $offset . ', ' . (int) $limit;
158158
}
159159

160160
$queryParameters = array_merge([

src/CoreShop/Bundle/FrontendBundle/Resources/assets/package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)