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

Added payment list to jobs BOD-146

Browse Source
This commit is contained in:
Patrick Fic
2020-06-16 10:51:54 -07:00
parent ef81991046
commit 951fce539b
42 changed files with 1403 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
bodyshop_translations.babel
View File

@@ -12826,6 +12826,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>payments</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>productionlist</name>
<definition_loaded>false</definition_loaded>
@@ -14683,6 +14704,48 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>created_at</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>exportedat</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>memo</name>
<definition_loaded>false</definition_loaded>
@@ -14704,6 +14767,48 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>payer</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripeid</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>transactionid</name>
<definition_loaded>false</definition_loaded>
@@ -14793,6 +14898,74 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>title</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node>
<name>successes</name>
<children>
<concept_node>
<name>payment</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
</children>
@@ -16295,6 +16468,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>payments-all</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>productionboard</name>
<definition_loaded>false</definition_loaded>
@@ -16843,6 +17037,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>payments-all</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>productionboard</name>
<definition_loaded>false</definition_loaded>

124
client/src/components/header/header.component.jsx
View File

@@ -81,7 +81,7 @@ function Header({
<Row>
<Col {...logoSpan}>
<img
className='header-shop-logo'
className="header-shop-logo"
alt={bodyshop ? bodyshop.shopname : "ImEX Online Logo"}
src={
bodyshop && bodyshop.logo_img_path
@@ -92,12 +92,13 @@ function Header({
</Col>
<Col {...menuSpan}>
<Menu
mode='horizontal'
theme='dark'
className='header-main-menu'
onClick={handleMenuClick}>
<Menu.Item key='home'>
<Link to='/manage'>
mode="horizontal"
theme="dark"
className="header-main-menu"
onClick={handleMenuClick}
>
<Menu.Item key="home">
<Link to="/manage">
<HomeFilled />
{t("menus.header.home")}
</Link>
@@ -108,40 +109,41 @@ function Header({
<Icon component={FaCarCrash} />
<span>{t("menus.header.jobs")}</span>
</span>
}>
<Menu.Item key='schedule'>
<Link to='/manage/schedule'>
}
>
<Menu.Item key="schedule">
<Link to="/manage/schedule">
<Icon component={FaCalendarAlt} />
{t("menus.header.schedule")}
</Link>
</Menu.Item>
<Menu.Item key='production'>
<Link to='/manage/production/list'>
<Menu.Item key="production">
<Link to="/manage/production/list">
<Icon component={FaCalendarAlt} />
{t("menus.header.productionlist")}
</Link>
</Menu.Item>
<Menu.Item key='activejobs'>
<Link to='/manage/jobs'>{t("menus.header.activejobs")}</Link>
<Menu.Item key="activejobs">
<Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
</Menu.Item>
<Menu.Item key='alljobs'>
<Link to='/manage/jobs/all'>{t("menus.header.alljobs")}</Link>
<Menu.Item key="alljobs">
<Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
</Menu.Item>
<Menu.Item key='availablejobs'>
<Link to='/manage/available'>
<Menu.Item key="availablejobs">
<Link to="/manage/available">
{t("menus.header.availablejobs")}
</Link>
</Menu.Item>
</Menu.SubMenu>
<Menu.SubMenu title={t("menus.header.customers")}>
<Menu.Item key='owners'>
<Link to='/manage/owners'>
<Menu.Item key="owners">
<Link to="/manage/owners">
<TeamOutlined />
{t("menus.header.owners")}
</Link>
</Menu.Item>
<Menu.Item key='vehicles'>
<Link to='/manage/vehicles'>
<Menu.Item key="vehicles">
<Link to="/manage/vehicles">
<CarFilled />
{t("menus.header.vehicles")}
</Link>
@@ -153,21 +155,22 @@ function Header({
<CarFilled />
<span>{t("menus.header.courtesycars")}</span>
</span>
}>
<Menu.Item key='courtesycarsall'>
<Link to='/manage/courtesycars'>
}
>
<Menu.Item key="courtesycarsall">
<Link to="/manage/courtesycars">
<CarFilled />
{t("menus.header.courtesycars-all")}
</Link>
</Menu.Item>
<Menu.Item key='contracts'>
<Link to='/manage/courtesycars/contracts'>
<Menu.Item key="contracts">
<Link to="/manage/courtesycars/contracts">
<FileFilled />
{t("menus.header.courtesycars-contracts")}
</Link>
</Menu.Item>
<Menu.Item key='newcontract'>
<Link to='/manage/courtesycars/contracts/new'>
<Menu.Item key="newcontract">
<Link to="/manage/courtesycars/contracts/new">
<FileAddFilled />
{t("menus.header.courtesycars-newcontract")}
</Link>
@@ -179,68 +182,75 @@ function Header({
<DollarCircleFilled />
<span>{t("menus.header.accounting")}</span>
</span>
}>
}
>
<Menu.Item
key='enterpayments'
key="enterpayments"
onClick={() => {
setPaymentContext({
actions: {},
context: {},
});
}}>
}}
>
{t("menus.header.enterpayment")}
</Menu.Item>
<Menu.Item
key='enterinvoices'
key="enterinvoices"
onClick={() => {
setInvoiceEnterContext({
actions: {},
context: {},
});
}}>
}}
>
{t("menus.header.enterinvoices")}
</Menu.Item>
<Menu.Item key='invoices'>
<Link to='/manage/invoices'>{t("menus.header.invoices")}</Link>
<Menu.Item key="invoices">
<Link to="/manage/invoices">{t("menus.header.invoices")}</Link>
</Menu.Item>
<Menu.Item
key='entertimetickets'
key="entertimetickets"
onClick={() => {
setTimeTicketContext({
actions: {},
context: {},
});
}}>
}}
>
{t("menus.header.entertimeticket")}
</Menu.Item>
<Menu.Item key='receivables'>
<Link to='/manage/accounting/receivables'>
<Menu.Item key="receivables">
<Link to="/manage/accounting/receivables">
{t("menus.header.accounting-receivables")}
</Link>
</Menu.Item>
<Menu.Item key='payables'>
<Link to='/manage/accounting/payables'>
<Menu.Item key="payables">
<Link to="/manage/accounting/payables">
{t("menus.header.accounting-payables")}
</Link>
</Menu.Item>
<Menu.Item key="payments">
<Link to="/manage/payments">{t("menus.header.payments")}</Link>
</Menu.Item>
</Menu.SubMenu>
<Menu.SubMenu title={t("menus.header.shop")}>
<Menu.Item key='shop'>
<Link to='/manage/shop'>{t("menus.header.shop_config")}</Link>
<Menu.Item key="shop">
<Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
</Menu.Item>
<Menu.Item key='shop-templates'>
<Link to='/manage/shop/templates'>
<Menu.Item key="shop-templates">
<Link to="/manage/shop/templates">
{t("menus.header.shop_templates")}
</Link>
</Menu.Item>
<Menu.Item key='shop-vendors'>
<Link to='/manage/shop/vendors'>
<Menu.Item key="shop-vendors">
<Link to="/manage/shop/vendors">
{t("menus.header.shop_vendors")}
</Link>
</Menu.Item>
<Menu.Item key='shop-csi'>
<Link to='/manage/shop/csi'>{t("menus.header.shop_csi")}</Link>
<Menu.Item key="shop-csi">
<Link to="/manage/shop/csi">{t("menus.header.shop_csi")}</Link>
</Menu.Item>
</Menu.SubMenu>
<Menu.SubMenu
@@ -265,12 +275,13 @@ function Header({
{currentUser.displayName || t("general.labels.unknown")}
</div>
}>
}
>
<Menu.Item danger onClick={() => signOutStart()}>
{t("user.actions.signout")}
</Menu.Item>
<Menu.Item>
<Link to='/manage/profile'>
<Link to="/manage/profile">
{t("menus.currentuser.profile")}
</Link>
</Menu.Item>
@@ -280,14 +291,15 @@ function Header({
<GlobalOutlined />
<span>{t("menus.currentuser.languageselector")}</span>
</span>
}>
<Menu.Item actiontype='lang-select' key='en-US'>
}
>
<Menu.Item actiontype="lang-select" key="en-US">
{t("general.languages.english")}
</Menu.Item>
<Menu.Item actiontype='lang-select' key='fr-CA'>
<Menu.Item actiontype="lang-select" key="fr-CA">
{t("general.languages.french")}
</Menu.Item>
<Menu.Item actiontype='lang-select' key='es-MX'>
<Menu.Item actiontype="lang-select" key="es-MX">
{t("general.languages.spanish")}
</Menu.Item>
</Menu.SubMenu>

314
client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
View File

@@ -1,130 +1,204 @@
import { Col, Form, Input, Row } from "antd";
import { Col, Form, Input, Row, Divider } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import JobTotalsTable from "../job-totals-table/job-totals-table.component";
import FormRow from "../layout-form-row/layout-form-row.component";
export default function JobsDetailFinancials({ job }) {
import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
const stripeTestEnv = process.env.REACT_APP_STRIPE_PUBLIC_KEY; //.includes("test");
export function JobsDetailFinancials({ job, bodyshop }) {
const { t } = useTranslation();
const colSpan = {
sm: { span: 24 },
lg: { span: 12 },
};
return (
<Row gutter={[32, 32]}>
<Col span={12}>
<FormRow header={t("jobs.forms.dedinfo")}>
<Form.Item label={t("jobs.fields.ded_status")} name='ded_status'>
<Input />
</Form.Item>
<Form.Item label={t("jobs.fields.ded_amt")} name='ded_amt'>
<CurrencyInput />
</Form.Item>
</FormRow>
<FormRow>
<Form.Item
label={t("jobs.fields.depreciation_taxes")}
name='depreciation_taxes'>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.other_amount_payable")}
name='other_amount_payable'>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.towing_payable")}
name='towing_payable'>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.storage_payable")}
name='storage_payable'>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.federal_tax_payable")}
name='federal_tax_payable'>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.adjustment_bottom_line")}
name='adjustment_bottom_line'>
<CurrencyInput />
</Form.Item>
</FormRow>
<FormRow header={t("jobs.forms.laborrates")}>
<Form.Item label={t("jobs.fields.rate_laa")} name='rate_laa'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lab")} name='rate_lab'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lad")} name='rate_lad'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lae")} name='rate_lae'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lar")} name='rate_lar'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_las")} name='rate_las'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_laf")} name='rate_laf'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lam")} name='rate_lam'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lag")} name='rate_lag'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la1")} name='rate_la1'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la2")} name='rate_la2'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la3")} name='rate_la3'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la4")} name='rate_la4'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_atp")} name='rate_atp'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lau")} name='rate_lau'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mapa")} name='rate_mapa'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mash")} name='rate_mash'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mahw")} name='rate_mahw'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_ma2s")} name='rate_ma2s'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_ma3s")} name='rate_ma3s'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mabl")} name='rate_mabl'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_macs")} name='rate_macs'>
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_matd")} name='rate_matd'>
<CurrencyInput />
</Form.Item>
</FormRow>
</Col>
<Col span={12}>
<JobTotalsTable job={job} />
</Col>
</Row>
<div>
<Row>
<Col span={24}>
<FormRow header={t("payments.labels.title")}>
<table style={{ width: "100%" }}>
<thead>
<tr>
<th>{t("payments.fields.created_at")}</th>
<th>{t("payments.fields.payer")}</th>
<th>{t("payments.fields.amount")}</th>
<th>{t("payments.fields.memo")}</th>
<th>{t("payments.fields.transactionid")}</th>
<th>{t("payments.fields.stripeid")}</th>
</tr>
</thead>
<tbody>
{job.payments.map((p, idx) => (
<tr key={idx}>
<td>
<DateTimeFormatter>{p.created_at}</DateTimeFormatter>
</td>
<td>{p.payer}</td>
<td>
<CurrencyFormatter>{p.amount}</CurrencyFormatter>
</td>
<td>{p.memo}</td>
<td>{p.transactionid}</td>
<td>
{p.stripeid ? (
<a
href={
stripeTestEnv
? `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/test/payments/${p.stripeid}`
: `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/payments/${p.stripeid}`
}
>
{p.stripeid}
</a>
) : null}
</td>
</tr>
))}
</tbody>
</table>
</FormRow>
</Col>
</Row>
<Divider />
<Row gutter={[32, 32]}>
<Col {...colSpan}>
<FormRow header={t("jobs.forms.dedinfo")}>
<Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
<Input />
</Form.Item>
<Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
<CurrencyInput />
</Form.Item>
</FormRow>
<FormRow>
<Form.Item
label={t("jobs.fields.depreciation_taxes")}
name="depreciation_taxes"
>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.other_amount_payable")}
name="other_amount_payable"
>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.towing_payable")}
name="towing_payable"
>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.storage_payable")}
name="storage_payable"
>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.federal_tax_payable")}
name="federal_tax_payable"
>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.adjustment_bottom_line")}
name="adjustment_bottom_line"
>
<CurrencyInput />
</Form.Item>
</FormRow>
<FormRow header={t("jobs.forms.laborrates")}>
<Form.Item label={t("jobs.fields.rate_laa")} name="rate_laa">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lad")} name="rate_lad">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lae")} name="rate_lae">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lar")} name="rate_lar">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_las")} name="rate_las">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_laf")} name="rate_laf">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lam")} name="rate_lam">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lag")} name="rate_lag">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la1")} name="rate_la1">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la2")} name="rate_la2">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la3")} name="rate_la3">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la4")} name="rate_la4">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_atp")} name="rate_atp">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lau")} name="rate_lau">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mapa")} name="rate_mapa">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mash")} name="rate_mash">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mahw")} name="rate_mahw">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_ma2s")} name="rate_ma2s">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_ma3s")} name="rate_ma3s">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mabl")} name="rate_mabl">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_macs")} name="rate_macs">
<CurrencyInput />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_matd")} name="rate_matd">
<CurrencyInput />
</Form.Item>
</FormRow>
</Col>
<Col {...colSpan}>
<JobTotalsTable job={job} />
</Col>
</Row>
</div>
);
}
export default connect(mapStateToProps, null)(JobsDetailFinancials);

13
client/src/components/payment-form/payment-form.component.jsx
View File

@@ -1,15 +1,14 @@
import { Form, Input, Checkbox } from "antd";
import { CardElement } from "@stripe/react-stripe-js";
import { Checkbox, Form, Input } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import JobSearchSelect from "../job-search-select/job-search-select.component";
import { CardElement } from "@stripe/react-stripe-js";
import FormLayoutRow from "../layout-form-row/layout-form-row.component";
import Alert from "../alert/alert.component";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
import Alert from "../alert/alert.component";
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import JobSearchSelect from "../job-search-select/job-search-select.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});

7
client/src/components/payment-modal/payment-modal.container.jsx
View File

@@ -47,9 +47,10 @@ function InvoiceEnterModalContainer({
const cardValid = !!!stripeState.error && stripeState.cardComplete;
const handleFinish = async (values) => {
if (!cardValid) return;
const { useStripe, ...paymentObj } = values;
if (useStripe && !cardValid) return;
if (!stripe || !elements) {
if ((useStripe && !stripe) || !elements) {
// Stripe.js has not yet loaded.
// Make sure to disable form submission until Stripe.js has loaded.
return;
@@ -57,8 +58,6 @@ function InvoiceEnterModalContainer({
setLoading(true);
const { useStripe, ...paymentObj } = values;
try {
let stripePayment;
if (useStripe && bodyshop.stripe_acct_id) {

154
client/src/components/payments-list-paginated/payment-list-paginated.component.jsx Normal file
View File

@@ -0,0 +1,154 @@
import { SyncOutlined } from "@ant-design/icons";
import { Button, Input, Table } from "antd";
import queryString from "query-string";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { Link, useHistory, useLocation } from "react-router-dom";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import { alphaSort } from "../../utils/sorters";
export default function PaymentsListPaginated({
refetch,
loading,
payments,
total,
}) {
const search = queryString.parse(useLocation().search);
const { page, sortcolumn, sortorder } = search;
const history = useHistory();
const [state, setState] = useState({
sortedInfo: {},
filteredInfo: { text: "" },
});
const { t } = useTranslation();
const columns = [
{
title: t("jobs.fields.ro_number"),
dataIndex: "ro_number",
key: "ro_number",
sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
sortOrder: sortcolumn === "ro_number" && sortorder,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.job.id}>{record.job.ro_number}</Link>
),
},
{
title: t("jobs.fields.est_number"),
dataIndex: "est_number",
key: "est_number",
sorter: (a, b) => a.job.est_number - b.job.est_number,
sortOrder: sortcolumn === "est_number" && sortorder,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.job.id}>
{record.job.est_number}
</Link>
),
},
{
title: t("jobs.fields.owner"),
dataIndex: "owner",
key: "owner",
ellipsis: true,
sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
sortOrder: sortcolumn === "owner" && sortorder,
render: (text, record) => {
return record.job.owner ? (
<Link to={"/manage/owners/" + record.job.owner.id}>
{`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""}`}
</Link>
) : (
<span>{`${record.job.ownr_fn || ""} ${
record.job.ownr_ln || ""
}`}</span>
);
},
},
{
title: t("payments.fields.amount"),
dataIndex: "amount",
key: "amount",
render: (text, record) => (
<CurrencyFormatter>{record.amount}</CurrencyFormatter>
),
},
{
title: t("payments.fields.memo"),
dataIndex: "memo",
key: "memo",
},
{
title: t("payments.fields.transactionid"),
dataIndex: "transactionid",
key: "transactionid",
},
{
title: t("payments.fields.stripeid"),
dataIndex: "stripeid",
key: "stripeid",
},
{
title: t("payments.fields.created_at"),
dataIndex: "created_at",
key: "created_at",
render: (text, record) => (
<DateTimeFormatter>{record.created_at}</DateTimeFormatter>
),
},
{
title: t("payments.fields.exportedat"),
dataIndex: "exportedat",
key: "exportedat",
render: (text, record) => (
<DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
),
},
];
const handleTableChange = (pagination, filters, sorter) => {
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
search.page = pagination.current;
search.sortcolumn = sorter.columnKey;
search.sortorder = sorter.order;
history.push({ search: queryString.stringify(search) });
};
return (
<div>
<Table
loading={loading}
size="small"
scroll={{ x: true }}
pagination={{
position: "top",
pageSize: 25,
current: parseInt(page || 1),
total: total,
}}
columns={columns}
rowKey="id"
dataSource={payments}
onChange={handleTableChange}
title={() => {
return (
<div className="imex-table-header">
<Button onClick={() => refetch()}>
<SyncOutlined />
</Button>
<Input.Search
className="imex-table-header__search"
placeholder={t("general.labels.search")}
onSearch={(value) => {
search.search = value;
history.push({ search: queryString.stringify(search) });
}}
enterButton
/>
</div>
);
}}
/>
</div>
);
}

6
client/src/components/schedule-event/schedule-event.component.jsx
View File

@@ -1,9 +1,9 @@
import { Button, Popover } from "antd";
import React from "react";
import { Popover, Button, Progress } from "antd";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
import PhoneFormatter from "../../utils/PhoneFormatter";
import { Link } from "react-router-dom";
import { useTranslation } from "react-i18next";
import DataLabel from "../data-label/data-label.component";
export default function ScheduleEventComponent({ event, handleCancel }) {

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

@@ -269,6 +269,15 @@ export const GET_JOB_BY_PK = gql`
lbr_amt
op_code_desc
}
payments {
id
amount
payer
created_at
stripeid
transactionid
memo
}
cccontracts {
id
status

39
client/src/graphql/payments.queries.js
View File

@@ -9,3 +9,42 @@ export const INSERT_NEW_PAYMENT = gql`
}
}
`;
export const QUERY_ALL_PAYMENTS_PAGINATED = gql`
query QUERY_ALL_PAYMENTS_PAGINATED(
$search: String
$offset: Int
$limit: Int
$order: [payments_order_by!]!
) {
search_payments(
args: { search: $search }
offset: $offset
limit: $limit
order_by: $order
) {
id
created_at
jobid
job {
id
ro_number
est_number
ownr_fn
ownr_ln
ownr_co_nm
}
transactionid
memo
amount
stripeid
exportedat
stripeid
}
search_payments_aggregate(args: { search: $search }) {
aggregate {
count(distinct: true)
}
}
}
`;

15
client/src/pages/manage/manage.page.component.jsx
View File

@@ -109,6 +109,9 @@ const JobsClose = lazy(() => import("../jobs-close/jobs-close.container"));
const ShopCsiPageContainer = lazy(() =>
import("../shop-csi/shop-csi.container.page")
);
const PaymentsAll = lazy(() =>
import("../payments-all/payments-all.container.page")
);
const { Content } = Layout;
@@ -134,11 +137,11 @@ export function Manage({ match, conflict }) {
}, [t]);
return (
<Layout className='layout-container'>
<Layout className="layout-container">
<HeaderContainer />
<BreadCrumbs />
<Content className='content-container'>
<Content className="content-container">
<FcmNotification />
<ErrorBoundary>
{conflict ? (
@@ -147,7 +150,8 @@ export function Manage({ match, conflict }) {
<Suspense
fallback={
<LoadingSpinner message={t("general.labels.loadingapp")} />
}>
}
>
<EnterInvoiceModalContainer />
<EmailOverlayContainer />
<TimeTicketModalContainer />
@@ -296,6 +300,11 @@ export function Manage({ match, conflict }) {
path={`${match.path}/accounting/payables`}
component={AccountingPayables}
/>
<Route
exact
path={`${match.path}/payments`}
component={PaymentsAll}
/>
</Suspense>
)}
</ErrorBoundary>

68
client/src/pages/payments-all/payments-all.container.page.jsx Normal file
View File

@@ -0,0 +1,68 @@
import { useQuery } from "@apollo/react-hooks";
import queryString from "query-string";
import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import AlertComponent from "../../components/alert/alert.component";
import PaymentsListPaginated from "../../components/payments-list-paginated/payment-list-paginated.component";
import { QUERY_ALL_PAYMENTS_PAGINATED } from "../../graphql/payments.queries";
import { setBreadcrumbs } from "../../redux/application/application.actions";
import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
});
export function AllJobs({ bodyshop, setBreadcrumbs }) {
const searchParams = queryString.parse(useLocation().search);
const { page, sortcolumn, sortorder, search } = searchParams;
const { loading, error, data, refetch } = useQuery(
QUERY_ALL_PAYMENTS_PAGINATED,
{
variables: {
search: search || "",
offset: page ? (page - 1) * 25 : 0,
limit: 25,
order: [
{
[sortcolumn || "created_at"]: sortorder
? sortorder === "descend"
? "desc"
: "asc"
: "desc",
},
],
},
}
);
const { t } = useTranslation();
useEffect(() => {
document.title = t("titles.payments-all");
setBreadcrumbs([
{ link: "/manage/payments", label: t("titles.bc.payments-all") },
]);
}, [t, setBreadcrumbs]);
if (error) return <AlertComponent message={error.message} type="error" />;
return (
<div>
<PaymentsListPaginated
refetch={refetch}
loading={loading}
searchParams={searchParams}
total={data ? data.search_payments_aggregate.aggregate.count : 0}
payments={data ? data.search_payments : []}
/>
</div>
);
}
export default connect(mapStateToProps, mapDispatchToProps)(AllJobs);

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

@@ -779,6 +779,7 @@
"invoices": "Invoices",
"jobs": "Jobs",
"owners": "Owners",
"payments": "All Payments",
"productionlist": "Production - List",
"schedule": "Schedule",
"shop": "My Shop",
@@ -915,13 +916,22 @@
"payments": {
"fields": {
"amount": "Amount",
"created_at": "Created At",
"exportedat": "Exported At",
"memo": "Memo",
"transactionid": "Transaction Reference"
"payer": "Payer",
"stripeid": "Stripe ID",
"transactionid": "Transaction ID"
},
"labels": {
"electronicpayment": "Use Electronic Payment Processing?",
"new": "New Payment",
"signup": "Please contact support to sign up for electronic payments."
"signup": "Please contact support to sign up for electronic payments.",
"title": "Payments"
},
"successes": {
"payment": "Payment created successfully. ",
"stripe": "Credit card transaction charged successfully."
}
},
"printcenter": {
@@ -1027,6 +1037,7 @@
"jobs-new": "Create a New Job",
"owner-detail": "{{name}}",
"owners": "Owners",
"payments-all": "All Payments",
"productionboard": "Production Board",
"productionlist": "Production - List",
"schedule": "Schedule",
@@ -1054,6 +1065,7 @@
"manageroot": "Home | $t(titles.app)",
"owners": "All Owners | $t(titles.app)",
"owners-detail": "{{name}} | $t(titles.app)",
"payments-all": "Payments | $t(titles.app)",
"productionboard": "Production - Board",
"productionlist": "Production - List View | $t(titles.app)",
"profile": "My Profile | $t(titles.app)",

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

@@ -779,6 +779,7 @@
"invoices": "",
"jobs": "Trabajos",
"owners": "propietarios",
"payments": "",
"productionlist": "",
"schedule": "Programar",
"shop": "Mi tienda",
@@ -915,13 +916,22 @@
"payments": {
"fields": {
"amount": "",
"created_at": "",
"exportedat": "",
"memo": "",
"payer": "",
"stripeid": "",
"transactionid": ""
},
"labels": {
"electronicpayment": "",
"new": "",
"signup": ""
"signup": "",
"title": ""
},
"successes": {
"payment": "",
"stripe": ""
}
},
"printcenter": {
@@ -1027,6 +1037,7 @@
"jobs-new": "",
"owner-detail": "",
"owners": "",
"payments-all": "",
"productionboard": "",
"productionlist": "",
"schedule": "",
@@ -1054,6 +1065,7 @@
"manageroot": "Casa | $t(titles.app)",
"owners": "Todos los propietarios | $t(titles.app)",
"owners-detail": "",
"payments-all": "",
"productionboard": "",
"productionlist": "",
"profile": "Mi perfil | $t(titles.app)",

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

@@ -779,6 +779,7 @@
"invoices": "",
"jobs": "Emplois",
"owners": "Propriétaires",
"payments": "",
"productionlist": "",
"schedule": "Programme",
"shop": "Mon magasin",
@@ -915,13 +916,22 @@
"payments": {
"fields": {
"amount": "",
"created_at": "",
"exportedat": "",
"memo": "",
"payer": "",
"stripeid": "",
"transactionid": ""
},
"labels": {
"electronicpayment": "",
"new": "",
"signup": ""
"signup": "",
"title": ""
},
"successes": {
"payment": "",
"stripe": ""
}
},
"printcenter": {
@@ -1027,6 +1037,7 @@
"jobs-new": "",
"owner-detail": "",
"owners": "",
"payments-all": "",
"productionboard": "",
"productionlist": "",
"schedule": "",
@@ -1054,6 +1065,7 @@
"manageroot": "Accueil | $t(titles.app)",
"owners": "Tous les propriétaires | $t(titles.app)",
"owners-detail": "",
"payments-all": "",
"productionboard": "",
"productionlist": "",
"profile": "Mon profil | $t(titles.app)",

8
client/src/utils/DateFormatter.jsx
View File

@@ -2,9 +2,13 @@ import React from "react";
import Moment from "react-moment";
export function DateFormatter(props) {
return <Moment format="MM/DD/YYYY">{props.children || null}</Moment>;
return props.children ? (
<Moment format="MM/DD/YYYY ">{props.children}</Moment>
) : null;
}
export function DateTimeFormatter(props) {
return <Moment format="MM/DD/YYYY @ HH:mm">{props.children || ""}</Moment>;
return props.children ? (
<Moment format="MM/DD/YYYY @ HH:mm">{props.children}</Moment>
) : null;
}

5
hasura/migrations/1592324594982_alter_table_public_payments_add_column_payer/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."payments" DROP COLUMN "payer";
type: run_sql

5
hasura/migrations/1592324594982_alter_table_public_payments_add_column_payer/up.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."payments" ADD COLUMN "payer" text NULL;
type: run_sql

36
hasura/migrations/1592324603137_update_permission_user_public_table_payments/down.yaml Normal file
View File

@@ -0,0 +1,36 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_insert_permission
- args:
permission:
check:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- id
- created_at
- updated_at
- jobid
- amount
- transactionid
- memo
- stripeid
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: payments
schema: public
type: create_insert_permission

37
hasura/migrations/1592324603137_update_permission_user_public_table_payments/up.yaml Normal file
View File

@@ -0,0 +1,37 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_insert_permission
- args:
permission:
check:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- amount
- created_at
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: payments
schema: public
type: create_insert_permission

34
hasura/migrations/1592324618856_update_permission_user_public_table_payments/down.yaml Normal file
View File

@@ -0,0 +1,34 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- amount
- memo
- stripeid
- transactionid
- created_at
- updated_at
- id
- jobid
computed_fields: []
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: payments
schema: public
type: create_select_permission

35
hasura/migrations/1592324618856_update_permission_user_public_table_payments/up.yaml Normal file
View File

@@ -0,0 +1,35 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- amount
- created_at
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
computed_fields: []
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: payments
schema: public
type: create_select_permission

36
hasura/migrations/1592324625348_update_permission_user_public_table_payments/down.yaml Normal file
View File

@@ -0,0 +1,36 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_update_permission
- args:
permission:
columns:
- amount
- memo
- stripeid
- transactionid
- created_at
- updated_at
- id
- jobid
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: payments
schema: public
type: create_update_permission

37
hasura/migrations/1592324625348_update_permission_user_public_table_payments/up.yaml Normal file
View File

@@ -0,0 +1,37 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_update_permission
- args:
permission:
columns:
- amount
- created_at
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: payments
schema: public
type: create_update_permission

1
hasura/migrations/1592324679227_run_sql_migration/down.yaml Normal file
View File

@@ -0,0 +1 @@
[]

5
hasura/migrations/1592324679227_run_sql_migration/up.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: true
read_only: false
sql: CREATE INDEX idx_payments_payer ON payments USING GIN (payer gin_trgm_ops);
type: run_sql

1
hasura/migrations/1592325045380_run_sql_migration/down.yaml Normal file
View File

@@ -0,0 +1 @@
[]

12
hasura/migrations/1592325045380_run_sql_migration/up.yaml Normal file
View File

@@ -0,0 +1,12 @@
- args:
cascade: true
read_only: false
sql: "CREATE OR REPLACE FUNCTION public.search_payments(search text)\n RETURNS
SETOF payments\n LANGUAGE plpgsql\n STABLE\nAS $function$\n\nBEGIN\n if search
= '' then\n return query select * from payments ;\n else \n return query
SELECT\n *\nFROM\n payments\nWHERE\n search <% (payer) ;\n end if;\n\n\tEND\n$function$;"
type: run_sql
- args:
name: search_payments
schema: public
type: track_function

35
hasura/migrations/1592325133932_update_permission_user_public_table_payments/down.yaml Normal file
View File

@@ -0,0 +1,35 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- amount
- created_at
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
computed_fields: []
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: payments
schema: public
type: create_select_permission

35
hasura/migrations/1592325133932_update_permission_user_public_table_payments/up.yaml Normal file
View File

@@ -0,0 +1,35 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- amount
- created_at
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
computed_fields: []
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: payments
schema: public
type: create_select_permission

1
hasura/migrations/1592325262313_run_sql_migration/down.yaml Normal file
View File

@@ -0,0 +1 @@
[]

7
hasura/migrations/1592325262313_run_sql_migration/up.yaml Normal file
View File

@@ -0,0 +1,7 @@
- args:
cascade: true
read_only: false
sql: |-
CREATE INDEX idx_payments_memo ON payments USING GIN (memo gin_trgm_ops);
CREATE INDEX idx_payments_txnid ON payments USING GIN (transactionid gin_trgm_ops);
type: run_sql

1
hasura/migrations/1592325288329_run_sql_migration/down.yaml Normal file
View File

@@ -0,0 +1 @@
[]

9
hasura/migrations/1592325288329_run_sql_migration/up.yaml Normal file
View File

@@ -0,0 +1,9 @@
- args:
cascade: true
read_only: false
sql: "CREATE OR REPLACE FUNCTION public.search_payments(search text)\n RETURNS
SETOF payments\n LANGUAGE plpgsql\n STABLE\nAS $function$\n\nBEGIN\n if search
= '' then\n return query select * from payments ;\n else \n return query
SELECT\n *\nFROM\n payments\nWHERE\n search <% (payer) OR\n search <% (transactionid)
OR\n search <% (memo);\n end if;\n\n\tEND\n$function$;"
type: run_sql

5
hasura/migrations/1592325952533_alter_table_public_payments_add_column_exportedat/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."payments" DROP COLUMN "exportedat";
type: run_sql

5
hasura/migrations/1592325952533_alter_table_public_payments_add_column_exportedat/up.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."payments" ADD COLUMN "exportedat" timestamptz NULL;
type: run_sql

37
hasura/migrations/1592325964121_update_permission_user_public_table_payments/down.yaml Normal file
View File

@@ -0,0 +1,37 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_insert_permission
- args:
permission:
check:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- amount
- created_at
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: payments
schema: public
type: create_insert_permission

38
hasura/migrations/1592325964121_update_permission_user_public_table_payments/up.yaml Normal file
View File

@@ -0,0 +1,38 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_insert_permission
- args:
permission:
check:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- amount
- created_at
- exportedat
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: payments
schema: public
type: create_insert_permission

35
hasura/migrations/1592325969484_update_permission_user_public_table_payments/down.yaml Normal file
View File

@@ -0,0 +1,35 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- amount
- created_at
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
computed_fields: []
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: payments
schema: public
type: create_select_permission

36
hasura/migrations/1592325969484_update_permission_user_public_table_payments/up.yaml Normal file
View File

@@ -0,0 +1,36 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- amount
- created_at
- exportedat
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
computed_fields: []
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: payments
schema: public
type: create_select_permission

37
hasura/migrations/1592325975305_update_permission_user_public_table_payments/down.yaml Normal file
View File

@@ -0,0 +1,37 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_update_permission
- args:
permission:
columns:
- amount
- created_at
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: payments
schema: public
type: create_update_permission

38
hasura/migrations/1592325975305_update_permission_user_public_table_payments/up.yaml Normal file
View File

@@ -0,0 +1,38 @@
- args:
role: user
table:
name: payments
schema: public
type: drop_update_permission
- args:
permission:
columns:
- amount
- created_at
- exportedat
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: payments
schema: public
type: create_update_permission

36
hasura/migrations/metadata.yaml
View File

@@ -3214,26 +3214,30 @@ tables:
- active:
_eq: true
columns:
- id
- created_at
- updated_at
- jobid
- amount
- transactionid
- created_at
- exportedat
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
select_permissions:
- role: user
permission:
columns:
- amount
- memo
- stripeid
- transactionid
- created_at
- updated_at
- exportedat
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
filter:
job:
bodyshop:
@@ -3244,18 +3248,21 @@ tables:
_eq: X-Hasura-User-Id
- active:
_eq: true
allow_aggregations: true
update_permissions:
- role: user
permission:
columns:
- amount
- memo
- stripeid
- transactionid
- created_at
- updated_at
- exportedat
- id
- jobid
- memo
- payer
- stripeid
- transactionid
- updated_at
filter:
job:
bodyshop:
@@ -3870,3 +3877,6 @@ functions:
- function:
schema: public
name: search_owner
- function:
schema: public
name: search_payments