admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-1167 Resolve sorting on payments table.

Browse Source
This commit is contained in:
Patrick Fic
2021-06-02 09:07:29 -07:00
parent 8770e95ee3
commit 9d4f98d3ee
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
View File

@@ -54,7 +54,7 @@ export default function AccountingPayablesTableComponent({
ellipsis: true, ellipsis: true,
sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln), sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "ownr_ln" && state.sortedInfo.order, state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
render: (text, record) => { render: (text, record) => {
return record.job.owner ? ( return record.job.owner ? (
<Link to={"/manage/owners/" + record.job.owner.id}> <Link to={"/manage/owners/" + record.job.owner.id}>

18
client/src/components/job-payments/job-payments.component.jsx
View File

@@ -8,8 +8,8 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
import { setModalContext } from "../../redux/modals/modals.actions"; import { setModalContext } from "../../redux/modals/modals.actions";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import CurrencyFormatter from "../../utils/CurrencyFormatter"; import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { DateTimeFormatter } from "../../utils/DateFormatter"; import { DateFormatter } from "../../utils/DateFormatter";
import { alphaSort } from "../../utils/sorters"; import { alphaSort, dateSort } from "../../utils/sorters";
import { TemplateList } from "../../utils/TemplateConstants"; import { TemplateList } from "../../utils/TemplateConstants";
import DataLabel from "../data-label/data-label.component"; import DataLabel from "../data-label/data-label.component";
import PrintWrapperComponent from "../print-wrapper/print-wrapper.component"; import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
@@ -40,14 +40,14 @@ export function JobPayments({
}); });
const columns = [ const columns = [
{ {
title: t("payments.fields.created_at"), title: t("payments.fields.date"),
dataIndex: "created_at", dataIndex: "date",
key: "created_at", key: "date",
sorter: (a, b) => dateSort(a.date, b.date),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "created_at" && state.sortedInfo.order, state.sortedInfo.columnKey === "date" && state.sortedInfo.order,
render: (text, record) => ( render: (text, record) => <DateFormatter>{record.date}</DateFormatter>,
<DateTimeFormatter>{record.created_at}</DateTimeFormatter>
),
}, },
{ {
title: t("payments.fields.payer"), title: t("payments.fields.payer"),

1
client/src/graphql/jobs.queries.js
View File

@@ -565,6 +565,7 @@ export const GET_JOB_BY_PK = gql`
stripeid stripeid
transactionid transactionid
memo memo
date
} }
cccontracts { cccontracts {
id id