Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MERGING develop into release/24.10 #57

Merged
merged 4 commits into from
Oct 22, 2024
Merged

MERGING develop into release/24.10 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bb4745
OP-2270: Fixed issue with bills search
dborowiecki Oct 9, 2024
8f121fe
Finish bugfix/OP-2270
dragos-dobre Oct 10, 2024
d89c0bb
OM-335: change edit button if moldova, change export button styles (#55)
olewandowski1 Oct 18, 2024
c00e09f
OM-332: change tedit tooltip (#56)
olewandowski1 Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"` : ""}
Expand Down Expand Up @@ -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);
}

Expand Down
6 changes: 4 additions & 2 deletions src/components/BillSearcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -170,13 +171,13 @@ 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)}
disabled={deletedBillUuids.includes(bill.id)}
>
<EditIcon />
{isWorker ? <VisibilityIcon /> : <EditIcon />}
</IconButton>
</Tooltip>
)}
Expand Down Expand Up @@ -331,6 +332,7 @@ const BillSearcher = ({
"status": "Status",
}}
additionalExportFields={additionalExportFields}
downloadWithIconButton={isWorker}
/>
{failedExport && (
<Dialog open={failedExport} fullWidth maxWidth="sm">
Expand Down
1 change: 1 addition & 0 deletions src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"emptyLabel": " ",
"any": "Any",
"editButtonTooltip": "Edit",
"viewDetailsButtonTooltip": "View details",
"deleteButtonTooltip": "Delete",
"dialog": {
"create": "Create",
Expand Down
Loading