Skip to content

Commit

Permalink
Merge branch 'develop' into partial-product-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
supercid authored Oct 14, 2024
2 parents 810adf0 + 1bc18ec commit 82bdbf7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.

### 7.6.1
* Remove whitespaces from category strings
* Make rabbitmq publishing error message more clear

### 7.6.0
* Deprecate MySQL as message queue provider, the extension now uses RabbitMQ as the default message queue provider
* Add command to clear the Nosto message queue
Expand Down
3 changes: 2 additions & 1 deletion Model/Service/Product/Category/DefaultCategoryService.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ public function getCategory(Category $category, StoreInterface $store)
['categoryString' => $nostoCategory, 'magentoCategory' => $category]
);
}
return $nostoCategory;

return $nostoCategory ? trim($nostoCategory) : $nostoCategory;
}

/**
Expand Down
3 changes: 2 additions & 1 deletion Model/Service/Sync/AbstractBulkPublisher.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,9 @@ private function publishCollectionToMessageQueue(
$bulkDescription
);
if (!$result) {
$msg = 'Something went wrong while publishing bulk to RabbitMQ. Please check your connection';
/** @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal */
throw new LocalizedException(__('Something went wrong while processing the request.'));
throw new LocalizedException(__($msg));
}
}

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "nosto/module-nostotagging",
"description": "Increase your conversion rate and average order value by delivering your customers personalized product recommendations throughout their shopping journey.",
"type": "magento2-module",
"version": "7.6.0",
"version": "7.6.1",
"require-dev": {
"phpmd/phpmd": "^2.5",
"sebastian/phpcpd": "*",
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@
<!--suppress XmlUnboundNsPrefix -->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Nosto_Tagging" setup_version="7.6.0"/>
<module name="Nosto_Tagging" setup_version="7.6.1"/>
</config>

0 comments on commit 82bdbf7

Please sign in to comment.