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

Merge branch 'release/2021-10-22' into test

Browse Source
This commit is contained in:
Patrick Fic
2021-10-22 10:00:42 -07:00
parent 8ec524061a 9d4a59ca16
commit e4eac5714a
7 changed files with 21 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ export function JobsCloseExportButton({
{
jobIds: [jobId],
},
{ withCredentials: true }
);
} else {
//Default is QBD

12
client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.exportcustdata.component.jsx
View File

@@ -23,14 +23,10 @@ export function JobsDetailHeaderActionexportCustomerData({
logImEXEvent("job_export_cust_data");
let PartnerResponse;
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(
`/qbo/receivables`,
{
jobIds: [job.id],
custDataOnly: true,
},
{ withCredentials: true }
);
PartnerResponse = await axios.post(`/qbo/receivables`, {
jobIds: [job.id],
custDataOnly: true,
});
} else {
//Default is QBD

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

@@ -11,7 +11,7 @@ import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
import { UPDATE_JOBS } from "../../graphql/jobs.queries";
import {
selectBodyshop,
selectCurrentUser
selectCurrentUser,
} from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
@@ -30,7 +30,6 @@ export function JobsExportAllButton({
const { t } = useTranslation();
const [updateJob] = useMutation(UPDATE_JOBS);
const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
const [loading, setLoading] = useState(false);
const handleQbxml = async () => {
@@ -38,13 +37,9 @@ export function JobsExportAllButton({
let PartnerResponse;
setLoading(true);
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(
`/qbo/receivables`,
{
jobIds: jobIds,
},
{ withCredentials: true }
);
PartnerResponse = await axios.post(`/qbo/receivables`, {
jobIds: jobIds,
});
} else {
let QbXmlResponse;
try {

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

@@ -15,7 +15,6 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
import _ from "lodash";
import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
currentUser: selectCurrentUser,
@@ -34,7 +33,6 @@ export function PayableExportAll({
const [loading, setLoading] = useState(false);
const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
const handleQbxml = async () => {
logImEXEvent("accounting_payables_export_all");
let PartnerResponse;
@@ -42,13 +40,9 @@ export function PayableExportAll({
setLoading(true);
if (!!loadingCallback) loadingCallback(true);
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(
`/qbo/receivables`,
{
bills: billids,
},
{ withCredentials: true }
);
PartnerResponse = await axios.post(`/qbo/receivables`, {
bills: billids,
});
} else {
let QbXmlResponse;
try {

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

@@ -14,7 +14,6 @@ import {
import { logImEXEvent } from "../../firebase/firebase.utils";
import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
currentUser: selectCurrentUser,
@@ -32,7 +31,6 @@ export function PayableExportButton({
const [updateBill] = useMutation(UPDATE_BILLS);
const [loading, setLoading] = useState(false);
const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
const handleQbxml = async () => {
logImEXEvent("accounting_export_payable");
@@ -43,13 +41,9 @@ export function PayableExportButton({
//Check if it's a QBO Setup.
let PartnerResponse;
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(
`/qbo/payables`,
{
bills: [billId],
},
{ withCredentials: true }
);
PartnerResponse = await axios.post(`/qbo/payables`, {
bills: [billId],
});
} else {
//Default is QBD

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

@@ -9,7 +9,6 @@ import { auth, logImEXEvent } from "../../firebase/firebase.utils";
import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
import { UPDATE_PAYMENTS } from "../../graphql/payments.queries";
import {
selectBodyshop,
selectCurrentUser,
@@ -33,20 +32,15 @@ export function PaymentExportButton({
const [loading, setLoading] = useState(false);
const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
const handleQbxml = async () => {
logImEXEvent("accounting_payment_export");
setLoading(true);
//Check if it's a QBO Setup.
let PartnerResponse;
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(
`/qbo/payments`,
{
payments: [paymentId],
},
{ withCredentials: true }
);
PartnerResponse = await axios.post(`/qbo/payments`, {
payments: [paymentId],
});
} else {
//Default is QBD

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

@@ -9,7 +9,6 @@ import { createStructuredSelector } from "reselect";
import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
import { UPDATE_PAYMENTS } from "../../graphql/payments.queries";
import {
selectBodyshop,
selectCurrentUser,
@@ -32,19 +31,14 @@ export function PaymentsExportAllButton({
const [loading, setLoading] = useState(false);
const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
const handleQbxml = async () => {
setLoading(true);
if (!!loadingCallback) loadingCallback(true);
let PartnerResponse;
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(
`/qbo/payments`,
{
payments: paymentIds,
},
{ withCredentials: true }
);
PartnerResponse = await axios.post(`/qbo/payments`, {
payments: paymentIds,
});
} else {
let QbXmlResponse;
try {