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

Merged in release/2023-09-15 (pull request #975)

Browse Source 
Release/2023 09 15
This commit is contained in:
Allan Carr
2023-09-15 16:05:02 +00:00
parent 82a0d287d6 f36fb06dd6
commit 46840266ee
15 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/components/jobs-available-table/jobs-available-table.container.jsx
View File

@@ -3,7 +3,7 @@ import {
useApolloClient,
useLazyQuery,
useMutation,
useQuery
useQuery,
} from "@apollo/client";
import { useTreatments } from "@splitsoftware/splitio-react";
import { Col, notification, Row } from "antd";
@@ -20,7 +20,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
import {
DELETE_AVAILABLE_JOB,
QUERY_AVAILABLE_JOBS,
QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK
QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
} from "../../graphql/available-jobs.queries";
import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
@@ -28,7 +28,7 @@ import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
import { insertAuditTrail } from "../../redux/application/application.actions";
import {
selectBodyshop,
selectCurrentUser
selectCurrentUser,
} from "../../redux/user/user.selectors";
import confirmDialog from "../../utils/asyncConfirm";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
@@ -135,6 +135,7 @@ export function JobsAvailableContainer({
owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
job_totals: newTotals,
date_open: moment(),
status: bodyshop.md_ro_statuses.default_imported,
notes: {
data: {
created_by: currentUser.email,

2
client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
View File

@@ -192,7 +192,7 @@ export function JobsCloseExportButton({
});
}
}
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
notification.open({
type: "success",
key: "jobsuccessexport",

2
client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
View File

@@ -190,7 +190,7 @@ export function JobsExportAllButton({
});
}
}
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
notification.open({
type: "success",
key: "jobsuccessexport",

2
client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
View File

@@ -192,7 +192,7 @@ export function PayableExportAll({
});
}
}
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
notification.open({
type: "success",
key: "billsuccessexport",

2
client/src/components/payable-export-button/payable-export-button.component.jsx
View File

@@ -185,7 +185,7 @@ export function PayableExportButton({
});
}
}
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
notification.open({
type: "success",
key: "billsuccessexport",

19
client/src/components/payment-expanded-row/payment-expanded-row.component.jsx
View File

@@ -1,15 +1,17 @@
import React, { useState } from "react";
import { useMutation, useQuery } from "@apollo/client";
import { Button, Descriptions, InputNumber, Modal, notification } from "antd";
import axios from "axios";
import moment from "moment";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import {
GET_REFUNDABLE_AMOUNT_BY_JOBID,
INSERT_PAYMENT_RESPONSE,
QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID,
} from "../../graphql/payment_response.queries";
import { Button, Descriptions, InputNumber, Modal, notification } from "antd";
import moment from "moment";
import axios from "axios";
import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
import { useTranslation } from "react-i18next";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { DateTimeFormatter } from "../../utils/DateFormatter";
const { confirm } = Modal;
@@ -137,10 +139,10 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
{payment_response?.response?.nameOnCard ?? ""}
</Descriptions.Item>
<Descriptions.Item label={t("job_payments.titles.amount")}>
{record.amount}
<CurrencyFormatter>{record.amount}</CurrencyFormatter>
</Descriptions.Item>
<Descriptions.Item label={t("job_payments.titles.dateOfPayment")}>
{moment(record.created_at).format("YYYY-MM-DD HH:mm:ss")}
{<DateTimeFormatter>{record.created_at}</DateTimeFormatter>}
</Descriptions.Item>
<Descriptions.Item label={t("job_payments.titles.transactionid")}>
{record.transactionid}
@@ -151,6 +153,9 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
<Descriptions.Item label={t("job_payments.titles.paymenttype")}>
{record.type}
</Descriptions.Item>
<Descriptions.Item label={t("job_payments.titles.paymenttype")}>
{record.paymentnum}
</Descriptions.Item>
{payment_response && (
<Descriptions.Item label={t("job_payments.titles.refundamount")}>
<InputNumber

2
client/src/components/payment-export-button/payment-export-button.component.jsx
View File

@@ -191,7 +191,7 @@ export function PaymentExportButton({
});
}
}
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
notification.open({
type: "success",
key: "paymentsuccessexport",

2
client/src/components/payments-export-all-button/payments-export-all-button.component.jsx
View File

@@ -179,7 +179,7 @@ export function PaymentsExportAllButton({
});
}
}
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
notification.open({
type: "success",
key: "paymentsuccessexport",

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

@@ -574,7 +574,6 @@ export const GET_JOB_BY_PK = gql`
est_co_nm
est_ct_fn
est_ct_ln
est_ph1
est_ea
selling_dealer
@@ -746,6 +745,7 @@ export const GET_JOB_BY_PK = gql`
jobid
amount
payer
paymentnum
created_at
transactionid
memo

1
client/src/translations/en_us/common.json
View File

@@ -1211,6 +1211,7 @@
"payer": "Payer",
"payername": "Payer Name",
"paymentid": "Payment Reference ID",
"paymentnum": "Payment Number",
"paymenttype": "Payment Type",
"refundamount": "Refund Amount",
"transactionid": "Transaction ID"

1
client/src/translations/es/common.json
View File

@@ -1211,6 +1211,7 @@
"payer": "",
"payername": "",
"paymentid": "",
"paymentnum": "",
"paymenttype": "",
"refundamount": "",
"transactionid": ""

1
client/src/translations/fr/common.json
View File

@@ -1211,6 +1211,7 @@
"payer": "",
"payername": "",
"paymentid": "",
"paymentnum": "",
"paymenttype": "",
"refundamount": "",
"transactionid": ""

3
hasura/metadata/tables.yaml
View File

@@ -3274,6 +3274,7 @@
- cat_no
- category
- cieca_pfl
- cieca_pft
- cieca_stl
- cieca_ttl
- ciecaid
@@ -3541,6 +3542,7 @@
- cat_no
- category
- cieca_pfl
- cieca_pft
- cieca_stl
- cieca_ttl
- ciecaid
@@ -3819,6 +3821,7 @@
- cat_no
- category
- cieca_pfl
- cieca_pft
- cieca_stl
- cieca_ttl
- ciecaid

4
hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/down.sql Normal file
View File

@@ -0,0 +1,4 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- alter table "public"."jobs" add column "cieca_pft" jsonb
-- null default jsonb_build_object();

2
hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/up.sql Normal file
View File

@@ -0,0 +1,2 @@
alter table "public"."jobs" add column "cieca_pft" jsonb
null default jsonb_build_object();