diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx index e0a44da56..9b52c3460 100644 --- a/client/src/components/header/header.component.jsx +++ b/client/src/components/header/header.component.jsx @@ -202,8 +202,8 @@ function Header({ context: null, }); }} + icon={} > - {t("menus.header.enterpayment")} diff --git a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx index 06d195e8a..fd5cf5b22 100644 --- a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx +++ b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx @@ -15,6 +15,8 @@ import { TemplateList } from "../../utils/TemplateConstants"; import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table-modal.container"; import PrintWrapperComponent from "../print-wrapper/print-wrapper.component"; +const stripeTestEnv = process.env.REACT_APP_STRIPE_PUBLIC_KEY; //.includes("test"); + const mapStateToProps = createStructuredSelector({ //currentUser: selectCurrentUser bodyshop: selectBodyshop, @@ -128,6 +130,18 @@ export function PaymentsListPaginated({ title: t("payments.fields.stripeid"), dataIndex: "stripeid", key: "stripeid", + render: (text, record) => + record.stripeid ? ( + + {record.stripeid} + + ) : null, }, { title: t("payments.fields.created_at"), diff --git a/server/job/job-totals.js b/server/job/job-totals.js index 51f285279..1d4865592 100644 --- a/server/job/job-totals.js +++ b/server/job/job-totals.js @@ -426,12 +426,6 @@ function CalculateTaxesTotals(job, otherTotals) { .add(ret.state_tax) .add(ret.local_tax); - console.log( - "Checking GST", - job.ca_customer_gst !== 0, - job.ca_customer_gst !== null - ); - ret.custPayable = { deductible: Dinero({ amount: Math.round((job.ded_amt || 0) * 100) }) || 0, federal_tax: job.ca_gst_registrant