Skip to content

Commit

Permalink
Merge pull request #50 from algolia/develop
Browse files Browse the repository at this point in the history
Release 23.4.0
  • Loading branch information
ede-somogyi-algolia authored Aug 7, 2023
2 parents 5c2526b + e6d564f commit f7d320d
Show file tree
Hide file tree
Showing 29 changed files with 1,875 additions and 275 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,9 @@
</tbody>
</table>
<isinclude template="algoliabm/dashboard/productLog" />
<isinclude template="algoliabm/dashboard/productDeltaLog" />
<isinclude template="algoliabm/dashboard/productPriceLog" />
<isinclude template="algoliabm/dashboard/productInventoryLog" />
<isinclude template="algoliabm/dashboard/categoryLog" />
</isloop>
</isdecorate>
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
<div class="algolia-bm-log-product">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_header w s tab" nowrap="nowrap" width="100%" colspan="1">
<isprint value="${Resource.msg('algolia.label.productdelta.title.processed', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_header w e s center">
<isprint value="${Resource.msg('algolia.label.date', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_header e s center">
<isprint value="${Resource.msg('algolia.label.result', 'algolia', null)}" encoding="htmlcontent" />
</td>
</tr>
<tr>
<td class="table_detail w s" width="100%" nowrap="nowrap" colspan="1">
<isprint value="${Resource.msg('algolia.label.lastdate', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${logData.productdelta.processedDate}" encoding="htmlcontent" />
</td>
<td class="table_detail e s center">
<isif condition="${logData.productdelta.processedError}">
<isprint value="${Resource.msg('algolia.label.error', 'algolia', null)}" encoding="htmlcontent" />
<iselse/>
<isprint value="${Resource.msg('algolia.label.success', 'algolia', null)}" encoding="htmlcontent" />
</isif>
</td>
</tr>
</tbody>
</table>
<isif condition="${logData.productdelta.processedError}">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_detail w s" nowrap="nowrap" colspan="1">
<isprint value="${Resource.msg('algolia.label.errmessage', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail w e s" width="100%">
<isprint value="${logData.productdelta.processedErrorMessage}" encoding="htmlcontent" />
</td>
</tr>
</tbody>
</table>
</isif>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${Resource.msg('algolia.label.product.processed', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail e s" width="100%">
<isprint value="${logData.productdelta.processedRecords + ' records'}" encoding="htmlcontent" />
</td>
</tr>
<tr>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${Resource.msg('algolia.label.product.toupdate', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail e s" width="100%">
<isprint value="${logData.productdelta.processedToUpdateRecords + ' records'}" encoding="htmlcontent" />
</td>
</tr>
</tbody>
</table>
</div>
<div class="algolia-bm-log-product-send">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_header w s tab" nowrap="nowrap" width="100%" colspan="1">
<isprint value="${Resource.msg('algolia.label.productdelta.title.sent', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_header w e s center">
<isprint value="${Resource.msg('algolia.label.date', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_header e s center">
<isprint value="${Resource.msg('algolia.label.result', 'algolia', null)}" encoding="htmlcontent" />
</td>
</tr>
<tr>
<td class="table_detail w s" width="100%" nowrap="nowrap" colspan="1">
<isprint value="${Resource.msg('algolia.label.lastsentdate', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${logData.productdelta.sendDate}" encoding="htmlcontent" />
</td>
<td class="table_detail e s center">
<isif condition="${logData.productdelta.sendError}">
<isprint value="${Resource.msg('algolia.label.error', 'algolia', null)}" encoding="htmlcontent" />
<iselse/>
<isprint value="${Resource.msg('algolia.label.success', 'algolia', null)}" encoding="htmlcontent" />
</isif>
</td>
</tr>
</tbody>
</table>
<isif condition="${logData.productdelta.sendError}">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_detail w s" nowrap="nowrap" colspan="1">
<isprint value="${Resource.msg('algolia.label.errmessage', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail w e s" width="100%">
<isprint value="${logData.productdelta.sendErrorMessage}" encoding="htmlcontent" />
</td>
</tr>
</tbody>
</table>
</isif>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${Resource.msg('algolia.label.sentsuccessfully', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail e s" width="100%">
<isprint value="${logData.productdelta.sentChunks + ' chunks (' + logData.productdelta.sentRecords + ' records)'}" encoding="htmlcontent" />
</td>
</tr>
<tr>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${Resource.msg('algolia.label.sentfailed', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail e s" width="100%">
<isprint value="${logData.productdelta.failedChunks + ' chunks (' + logData.productdelta.failedRecords + ' records)'}" encoding="htmlcontent" />
</td>
</tr>
</tbody>
</table>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
<div class="algolia-bm-log-product">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_header w s tab" nowrap="nowrap" width="100%" colspan="1">
<isprint value="${Resource.msg('algolia.label.partialproductinventory.title.processed', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_header w e s center">
<isprint value="${Resource.msg('algolia.label.date', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_header e s center">
<isprint value="${Resource.msg('algolia.label.result', 'algolia', null)}" encoding="htmlcontent" />
</td>
</tr>
<tr>
<td class="table_detail w s" width="100%" nowrap="nowrap" colspan="1">
<isprint value="${Resource.msg('algolia.label.lastdate', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${logData.partialproductinventory.processedDate}" encoding="htmlcontent" />
</td>
<td class="table_detail e s center">
<isif condition="${logData.partialproductinventory.processedError}">
<isprint value="${Resource.msg('algolia.label.error', 'algolia', null)}" encoding="htmlcontent" />
<iselse/>
<isprint value="${Resource.msg('algolia.label.success', 'algolia', null)}" encoding="htmlcontent" />
</isif>
</td>
</tr>
</tbody>
</table>
<isif condition="${logData.partialproductinventory.processedError}">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_detail w s" nowrap="nowrap" colspan="1">
<isprint value="${Resource.msg('algolia.label.errmessage', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail w e s" width="100%">
<isprint value="${logData.partialproductinventory.processedErrorMessage}" encoding="htmlcontent" />
</td>
</tr>
</tbody>
</table>
</isif>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${Resource.msg('algolia.label.product.processed', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail e s" width="100%">
<isprint value="${logData.partialproductinventory.processedRecords + ' records'}" encoding="htmlcontent" />
</td>
</tr>
<tr>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${Resource.msg('algolia.label.product.toupdate', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail e s" width="100%">
<isprint value="${logData.partialproductinventory.processedToUpdateRecords + ' records'}" encoding="htmlcontent" />
</td>
</tr>
</tbody>
</table>
</div>
<div class="algolia-bm-log-product-send">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_header w s tab" nowrap="nowrap" width="100%" colspan="1">
<isprint value="${Resource.msg('algolia.label.partialproductinventory.title.sent', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_header w e s center">
<isprint value="${Resource.msg('algolia.label.date', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_header e s center">
<isprint value="${Resource.msg('algolia.label.result', 'algolia', null)}" encoding="htmlcontent" />
</td>
</tr>
<tr>
<td class="table_detail w s" width="100%" nowrap="nowrap" colspan="1">
<isprint value="${Resource.msg('algolia.label.lastsentdate', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${logData.partialproductinventory.sendDate}" encoding="htmlcontent" />
</td>
<td class="table_detail e s center">
<isif condition="${logData.partialproductinventory.sendError}">
<isprint value="${Resource.msg('algolia.label.error', 'algolia', null)}" encoding="htmlcontent" />
<iselse/>
<isprint value="${Resource.msg('algolia.label.success', 'algolia', null)}" encoding="htmlcontent" />
</isif>
</td>
</tr>
</tbody>
</table>
<isif condition="${logData.partialproductinventory.sendError}">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_detail w s" nowrap="nowrap" colspan="1">
<isprint value="${Resource.msg('algolia.label.errmessage', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail w e s" width="100%">
<isprint value="${logData.partialproductinventory.sendErrorMessage}" encoding="htmlcontent" />
</td>
</tr>
</tbody>
</table>
</isif>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${Resource.msg('algolia.label.sentsuccessfully', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail e s" width="100%">
<isprint value="${logData.partialproductinventory.sentChunks + ' chunks (' + logData.partialproductinventory.sentRecords + ' records)'}" encoding="htmlcontent" />
</td>
</tr>
<tr>
<td class="table_detail w e s" nowrap="nowrap">
<isprint value="${Resource.msg('algolia.label.sentfailed', 'algolia', null)}" encoding="htmlcontent" />
</td>
<td class="table_detail e s" width="100%">
<isprint value="${logData.partialproductinventory.failedChunks + ' chunks (' + logData.partialproductinventory.failedRecords + ' records)'}" encoding="htmlcontent" />
</td>
</tr>
</tbody>
</table>
</div>
Loading

0 comments on commit f7d320d

Please sign in to comment.