From 5bb47451a48e6dbeed01738b6eb055fd8e3a3da6 Mon Sep 17 00:00:00 2001
From: Damian Borowiecki <dborowiecki@soldevelo.com>
Date: Wed, 9 Oct 2024 13:26:33 +0200
Subject: [PATCH 1/3] OP-2270: Fixed issue with bills search

---
 src/actions.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/actions.js b/src/actions.js
index 8afad07..c59301a 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -204,7 +204,7 @@ const formatPaymentInvoiceGQL = (payment, subjectId, subjectType) =>
   `
     ${!!payment.id ? `id: "${payment.id}"` : ""}
     ${!!subjectId ? `subjectId: "${subjectId}"` : ""}
-    ${!!subjectType ? `subjectType: "${subjectType}"` : ""}
+    ${!!subjectType ? `subjectTypeName "${subjectType}"` : ""}
     ${!!payment.status ? `status: ${payment.status}` : ""}
     ${!!payment.reconciliationStatus ? `reconciliationStatus: ${payment.reconciliationStatus}` : ""}
     ${!!payment.codeExt ? `codeExt: "${payment.codeExt}"` : ""}
@@ -326,7 +326,11 @@ export function createInvoiceEventMessage(invoiceEvent, clientMutationLabel) {
 
 //bill 
 export function fetchBills(params) {
-  const payload = formatPageQueryWithCount("bill", params, BILL_FULL_PROJECTION);
+  let updatedArr = params
+    .map(str => str.includes('subjectType:') ? str.replace('subjectType', 'subjectTypeFilter') : str)
+    .map(str => str.includes('thirdpartyType:') ? str.replace('thirdpartyType', 'thirdpartyTypeFilter') : str);
+
+  const payload = formatPageQueryWithCount("bill", updatedArr, BILL_FULL_PROJECTION);
   return graphql(payload, ACTION_TYPE.SEARCH_BILLS);
 }
 

From d89c0bbcee8709e14cf6c8e885d9b37b3597cd9a Mon Sep 17 00:00:00 2001
From: Oliver Lewandowski <109145288+olewandowski1@users.noreply.github.com>
Date: Fri, 18 Oct 2024 09:51:01 +0200
Subject: [PATCH 2/3] OM-335: change edit button if moldova, change export
 button styles (#55)

---
 src/components/BillSearcher.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/BillSearcher.js b/src/components/BillSearcher.js
index deadfce..20b4ecd 100644
--- a/src/components/BillSearcher.js
+++ b/src/components/BillSearcher.js
@@ -5,6 +5,7 @@ import { injectIntl } from "react-intl";
 
 import { IconButton, Tooltip, Button, Dialog, DialogActions, DialogTitle, DialogContent } from "@material-ui/core";
 import EditIcon from "@material-ui/icons/Edit";
+import VisibilityIcon from '@material-ui/icons/Visibility';
 import DeleteIcon from "@material-ui/icons/Delete";
 
 import {
@@ -176,7 +177,7 @@ const BillSearcher = ({
                 onClick={(e) => e.stopPropagation() && onDoubleClick(bill)}
                 disabled={deletedBillUuids.includes(bill.id)}
               >
-                <EditIcon />
+                {isWorker ? <VisibilityIcon /> : <EditIcon />}
               </IconButton>
             </Tooltip>
           )}
@@ -331,6 +332,7 @@ const BillSearcher = ({
           "status": "Status",
         }}
         additionalExportFields={additionalExportFields}
+        downloadWithIconButton={isWorker}
       />
       {failedExport && (
         <Dialog open={failedExport} fullWidth maxWidth="sm">

From c00e09f42ab838247ce2ec9b960ea237d95e47a3 Mon Sep 17 00:00:00 2001
From: Oliver Lewandowski <109145288+olewandowski1@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:18:18 +0200
Subject: [PATCH 3/3] OM-332: change tedit tooltip (#56)

---
 src/components/BillSearcher.js | 2 +-
 src/translations/en.json       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/BillSearcher.js b/src/components/BillSearcher.js
index 20b4ecd..ab9069d 100644
--- a/src/components/BillSearcher.js
+++ b/src/components/BillSearcher.js
@@ -171,7 +171,7 @@ const BillSearcher = ({
       (bill) => (
         <div style={{ textAlign: "right" }}>
           {rights.includes(RIGHT_BILL_SEARCH) && (
-            <Tooltip title={formatMessage(intl, "invoice", "editButtonTooltip")}>
+            <Tooltip title={formatMessage(intl, "invoice", isWorker ? "viewDetailsButtonTooltip" : "editButtonTooltip")}>
               <IconButton
                 href={billUpdatePageUrl(bill)}
                 onClick={(e) => e.stopPropagation() && onDoubleClick(bill)}
diff --git a/src/translations/en.json b/src/translations/en.json
index af59c7a..c8cd185 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -7,6 +7,7 @@
   "emptyLabel": " ",
   "any": "Any",
   "editButtonTooltip": "Edit",
+  "viewDetailsButtonTooltip": "View details",
   "deleteButtonTooltip": "Delete",
   "dialog": {
     "create": "Create",