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

Merged in release/2024-09-20 (pull request #1752)

Browse Source 
Release/2024 09 20 IO-2933 IO-2928
This commit is contained in:
Allan Carr
2024-09-20 22:21:22 +00:00
parent ff2e4b9d3a 2e106a5d07
commit 899699a38a
7 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
_reference/prHelper.html Normal file
View File

@@ -0,0 +1,59 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>IMEX IO Extractor</title>
<style>
body {
font-family: Arial, sans-serif;
padding: 20px;
}
textarea {
width: 100%;
height: 200px;
}
.output-box {
margin-top: 20px;
padding: 10px;
border: 1px solid #ccc;
background-color: #f9f9f9;
min-height: 40px;
}
.copy-button {
margin-top: 10px;
}
</style>
</head>
<body>
<h1>IMEX IO Extractor</h1>
<textarea id="inputText" placeholder="Paste your text here..."></textarea>
<br>
<button onclick="extractIO()">Extract</button>
<div class="output-box" id="outputBox" contenteditable="true"></div>
<button class="copy-button" onclick="copyToClipboard()">Copy to Clipboard</button>
<script>
function extractIO() {
const inputText = document.getElementById('inputText').value;
const ioNumbers = [...new Set(inputText.match(/IO-\d{4}/g))] // Extract unique IO-#### matches
.map(io => ({ io, num: parseInt(io.split('-')[1]) })) // Extract number part for sorting
.sort((a, b) => a.num - b.num) // Sort by the number
.map(item => item.io); // Extract sorted IO-####
document.getElementById('outputBox').innerText = ioNumbers.join(', '); // Display horizontally
}
function copyToClipboard() {
const outputBox = document.getElementById('outputBox');
const range = document.createRange();
range.selectNodeContents(outputBox);
const selection = window.getSelection();
selection.removeAllRanges();
selection.addRange(range);
document.execCommand('copy');
}
</script>
</body>
</html>

5
client/src/components/card-payment-modal/card-payment-modal.component..jsx
View File

@@ -45,7 +45,7 @@ const CardPaymentModalComponent = ({
const [, { data, refetch, queryLoading }] = useLazyQuery(QUERY_RO_AND_OWNER_BY_JOB_PKS, { const [, { data, refetch, queryLoading }] = useLazyQuery(QUERY_RO_AND_OWNER_BY_JOB_PKS, {
variables: { jobids: [context.jobid] }, variables: { jobids: [context.jobid] },
skip: true skip: !context?.jobid
}); });
//Initialize the intellipay window. //Initialize the intellipay window.
@@ -244,7 +244,8 @@ const CardPaymentModalComponent = ({
<Form.Item <Form.Item
shouldUpdate={(prevValues, curValues) => shouldUpdate={(prevValues, curValues) =>
prevValues.payments?.map((p) => p?.jobid).join() !== curValues.payments?.map((p) => p?.jobid).join() prevValues.payments?.map((p) => p?.jobid + p?.amount).join() !==
curValues.payments?.map((p) => p?.jobid + p?.amount).join()
} }
> >
{() => { {() => {

3
hasura/migrations/1726868398933_run_sql_migration/down.sql Normal file
View File

@@ -0,0 +1,3 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE INDEX idx_jobs_created_at_desc ON jobs (created_at DESC);

1
hasura/migrations/1726868398933_run_sql_migration/up.sql Normal file
View File

@@ -0,0 +1 @@
CREATE INDEX idx_jobs_created_at_desc ON jobs (created_at DESC);

1
hasura/migrations/1726868654375_create_index_idx_jobs_vehicleid/down.sql Normal file
View File

@@ -0,0 +1 @@
DROP INDEX IF EXISTS "public"."idx_jobs_vehicleid";

2
hasura/migrations/1726868654375_create_index_idx_jobs_vehicleid/up.sql Normal file
View File

@@ -0,0 +1,2 @@
CREATE INDEX "idx_jobs_vehicleid" on
"public"."jobs" using btree ("vehicleid");

2
server/accounting/qbo/qbo-payables.js
View File

@@ -221,7 +221,7 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
Amount: Dinero({ Amount: Dinero({
amount: Math.round( amount: Math.round(
bill.billlines.reduce((acc, val) => { bill.billlines.reduce((acc, val) => {
return acc + val.applicable_taxes?.federal ? (val.actual_cost * val.quantity ?? 0) : 0; return acc + (val.applicable_taxes?.federal ? (val.actual_cost * val.quantity ?? 0) : 0);
}, 0) * 100 }, 0) * 100
) )
}) })