Added payment list to jobs BOD-146
This commit is contained in:
Patrick Fic
@@ -12826,6 +12826,27 @@
|
|||||||
</translation>
|
</translation>
|
||||||
</translations>
|
</translations>
|
||||||
</concept_node>
|
</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>
|
<concept_node>
|
||||||
<name>productionlist</name>
|
<name>productionlist</name>
|
||||||
<definition_loaded>false</definition_loaded>
|
<definition_loaded>false</definition_loaded>
|
||||||
@@ -14683,6 +14704,48 @@
|
|||||||
</translation>
|
</translation>
|
||||||
</translations>
|
</translations>
|
||||||
</concept_node>
|
</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>
|
<concept_node>
|
||||||
<name>memo</name>
|
<name>memo</name>
|
||||||
<definition_loaded>false</definition_loaded>
|
<definition_loaded>false</definition_loaded>
|
||||||
@@ -14704,6 +14767,48 @@
|
|||||||
</translation>
|
</translation>
|
||||||
</translations>
|
</translations>
|
||||||
</concept_node>
|
</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>
|
<concept_node>
|
||||||
<name>transactionid</name>
|
<name>transactionid</name>
|
||||||
<definition_loaded>false</definition_loaded>
|
<definition_loaded>false</definition_loaded>
|
||||||
@@ -14793,6 +14898,74 @@
|
|||||||
</translation>
|
</translation>
|
||||||
</translations>
|
</translations>
|
||||||
</concept_node>
|
</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>
|
</children>
|
||||||
</folder_node>
|
</folder_node>
|
||||||
</children>
|
</children>
|
||||||
@@ -16295,6 +16468,27 @@
|
|||||||
</translation>
|
</translation>
|
||||||
</translations>
|
</translations>
|
||||||
</concept_node>
|
</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>
|
<concept_node>
|
||||||
<name>productionboard</name>
|
<name>productionboard</name>
|
||||||
<definition_loaded>false</definition_loaded>
|
<definition_loaded>false</definition_loaded>
|
||||||
@@ -16843,6 +17037,27 @@
|
|||||||
</translation>
|
</translation>
|
||||||
</translations>
|
</translations>
|
||||||
</concept_node>
|
</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>
|
<concept_node>
|
||||||
<name>productionboard</name>
|
<name>productionboard</name>
|
||||||
<definition_loaded>false</definition_loaded>
|
<definition_loaded>false</definition_loaded>
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ function Header({
|
|||||||
<Row>
|
<Row>
|
||||||
<Col {...logoSpan}>
|
<Col {...logoSpan}>
|
||||||
<img
|
<img
|
||||||
className='header-shop-logo'
|
className="header-shop-logo"
|
||||||
alt={bodyshop ? bodyshop.shopname : "ImEX Online Logo"}
|
alt={bodyshop ? bodyshop.shopname : "ImEX Online Logo"}
|
||||||
src={
|
src={
|
||||||
bodyshop && bodyshop.logo_img_path
|
bodyshop && bodyshop.logo_img_path
|
||||||
@@ -92,12 +92,13 @@ function Header({
|
|||||||
</Col>
|
</Col>
|
||||||
<Col {...menuSpan}>
|
<Col {...menuSpan}>
|
||||||
<Menu
|
<Menu
|
||||||
mode='horizontal'
|
mode="horizontal"
|
||||||
theme='dark'
|
theme="dark"
|
||||||
className='header-main-menu'
|
className="header-main-menu"
|
||||||
onClick={handleMenuClick}>
|
onClick={handleMenuClick}
|
||||||
<Menu.Item key='home'>
|
>
|
||||||
<Link to='/manage'>
|
<Menu.Item key="home">
|
||||||
|
<Link to="/manage">
|
||||||
<HomeFilled />
|
<HomeFilled />
|
||||||
{t("menus.header.home")}
|
{t("menus.header.home")}
|
||||||
</Link>
|
</Link>
|
||||||
@@ -108,40 +109,41 @@ function Header({
|
|||||||
<Icon component={FaCarCrash} />
|
<Icon component={FaCarCrash} />
|
||||||
<span>{t("menus.header.jobs")}</span>
|
<span>{t("menus.header.jobs")}</span>
|
||||||
</span>
|
</span>
|
||||||
}>
|
}
|
||||||
<Menu.Item key='schedule'>
|
>
|
||||||
<Link to='/manage/schedule'>
|
<Menu.Item key="schedule">
|
||||||
|
<Link to="/manage/schedule">
|
||||||
<Icon component={FaCalendarAlt} />
|
<Icon component={FaCalendarAlt} />
|
||||||
{t("menus.header.schedule")}
|
{t("menus.header.schedule")}
|
||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='production'>
|
<Menu.Item key="production">
|
||||||
<Link to='/manage/production/list'>
|
<Link to="/manage/production/list">
|
||||||
<Icon component={FaCalendarAlt} />
|
<Icon component={FaCalendarAlt} />
|
||||||
{t("menus.header.productionlist")}
|
{t("menus.header.productionlist")}
|
||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='activejobs'>
|
<Menu.Item key="activejobs">
|
||||||
<Link to='/manage/jobs'>{t("menus.header.activejobs")}</Link>
|
<Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='alljobs'>
|
<Menu.Item key="alljobs">
|
||||||
<Link to='/manage/jobs/all'>{t("menus.header.alljobs")}</Link>
|
<Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='availablejobs'>
|
<Menu.Item key="availablejobs">
|
||||||
<Link to='/manage/available'>
|
<Link to="/manage/available">
|
||||||
{t("menus.header.availablejobs")}
|
{t("menus.header.availablejobs")}
|
||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
</Menu.SubMenu>
|
</Menu.SubMenu>
|
||||||
<Menu.SubMenu title={t("menus.header.customers")}>
|
<Menu.SubMenu title={t("menus.header.customers")}>
|
||||||
<Menu.Item key='owners'>
|
<Menu.Item key="owners">
|
||||||
<Link to='/manage/owners'>
|
<Link to="/manage/owners">
|
||||||
<TeamOutlined />
|
<TeamOutlined />
|
||||||
{t("menus.header.owners")}
|
{t("menus.header.owners")}
|
||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='vehicles'>
|
<Menu.Item key="vehicles">
|
||||||
<Link to='/manage/vehicles'>
|
<Link to="/manage/vehicles">
|
||||||
<CarFilled />
|
<CarFilled />
|
||||||
{t("menus.header.vehicles")}
|
{t("menus.header.vehicles")}
|
||||||
</Link>
|
</Link>
|
||||||
@@ -153,21 +155,22 @@ function Header({
|
|||||||
<CarFilled />
|
<CarFilled />
|
||||||
<span>{t("menus.header.courtesycars")}</span>
|
<span>{t("menus.header.courtesycars")}</span>
|
||||||
</span>
|
</span>
|
||||||
}>
|
}
|
||||||
<Menu.Item key='courtesycarsall'>
|
>
|
||||||
<Link to='/manage/courtesycars'>
|
<Menu.Item key="courtesycarsall">
|
||||||
|
<Link to="/manage/courtesycars">
|
||||||
<CarFilled />
|
<CarFilled />
|
||||||
{t("menus.header.courtesycars-all")}
|
{t("menus.header.courtesycars-all")}
|
||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='contracts'>
|
<Menu.Item key="contracts">
|
||||||
<Link to='/manage/courtesycars/contracts'>
|
<Link to="/manage/courtesycars/contracts">
|
||||||
<FileFilled />
|
<FileFilled />
|
||||||
{t("menus.header.courtesycars-contracts")}
|
{t("menus.header.courtesycars-contracts")}
|
||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='newcontract'>
|
<Menu.Item key="newcontract">
|
||||||
<Link to='/manage/courtesycars/contracts/new'>
|
<Link to="/manage/courtesycars/contracts/new">
|
||||||
<FileAddFilled />
|
<FileAddFilled />
|
||||||
{t("menus.header.courtesycars-newcontract")}
|
{t("menus.header.courtesycars-newcontract")}
|
||||||
</Link>
|
</Link>
|
||||||
@@ -179,68 +182,75 @@ function Header({
|
|||||||
<DollarCircleFilled />
|
<DollarCircleFilled />
|
||||||
<span>{t("menus.header.accounting")}</span>
|
<span>{t("menus.header.accounting")}</span>
|
||||||
</span>
|
</span>
|
||||||
}>
|
}
|
||||||
|
>
|
||||||
<Menu.Item
|
<Menu.Item
|
||||||
key='enterpayments'
|
key="enterpayments"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setPaymentContext({
|
setPaymentContext({
|
||||||
actions: {},
|
actions: {},
|
||||||
context: {},
|
context: {},
|
||||||
});
|
});
|
||||||
}}>
|
}}
|
||||||
|
>
|
||||||
{t("menus.header.enterpayment")}
|
{t("menus.header.enterpayment")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
|
|
||||||
<Menu.Item
|
<Menu.Item
|
||||||
key='enterinvoices'
|
key="enterinvoices"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setInvoiceEnterContext({
|
setInvoiceEnterContext({
|
||||||
actions: {},
|
actions: {},
|
||||||
context: {},
|
context: {},
|
||||||
});
|
});
|
||||||
}}>
|
}}
|
||||||
|
>
|
||||||
{t("menus.header.enterinvoices")}
|
{t("menus.header.enterinvoices")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='invoices'>
|
<Menu.Item key="invoices">
|
||||||
<Link to='/manage/invoices'>{t("menus.header.invoices")}</Link>
|
<Link to="/manage/invoices">{t("menus.header.invoices")}</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item
|
<Menu.Item
|
||||||
key='entertimetickets'
|
key="entertimetickets"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setTimeTicketContext({
|
setTimeTicketContext({
|
||||||
actions: {},
|
actions: {},
|
||||||
context: {},
|
context: {},
|
||||||
});
|
});
|
||||||
}}>
|
}}
|
||||||
|
>
|
||||||
{t("menus.header.entertimeticket")}
|
{t("menus.header.entertimeticket")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='receivables'>
|
<Menu.Item key="receivables">
|
||||||
<Link to='/manage/accounting/receivables'>
|
<Link to="/manage/accounting/receivables">
|
||||||
{t("menus.header.accounting-receivables")}
|
{t("menus.header.accounting-receivables")}
|
||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='payables'>
|
<Menu.Item key="payables">
|
||||||
<Link to='/manage/accounting/payables'>
|
<Link to="/manage/accounting/payables">
|
||||||
{t("menus.header.accounting-payables")}
|
{t("menus.header.accounting-payables")}
|
||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
|
<Menu.Item key="payments">
|
||||||
|
<Link to="/manage/payments">{t("menus.header.payments")}</Link>
|
||||||
|
</Menu.Item>
|
||||||
</Menu.SubMenu>
|
</Menu.SubMenu>
|
||||||
<Menu.SubMenu title={t("menus.header.shop")}>
|
<Menu.SubMenu title={t("menus.header.shop")}>
|
||||||
<Menu.Item key='shop'>
|
<Menu.Item key="shop">
|
||||||
<Link to='/manage/shop'>{t("menus.header.shop_config")}</Link>
|
<Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='shop-templates'>
|
<Menu.Item key="shop-templates">
|
||||||
<Link to='/manage/shop/templates'>
|
<Link to="/manage/shop/templates">
|
||||||
{t("menus.header.shop_templates")}
|
{t("menus.header.shop_templates")}
|
||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='shop-vendors'>
|
<Menu.Item key="shop-vendors">
|
||||||
<Link to='/manage/shop/vendors'>
|
<Link to="/manage/shop/vendors">
|
||||||
{t("menus.header.shop_vendors")}
|
{t("menus.header.shop_vendors")}
|
||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key='shop-csi'>
|
<Menu.Item key="shop-csi">
|
||||||
<Link to='/manage/shop/csi'>{t("menus.header.shop_csi")}</Link>
|
<Link to="/manage/shop/csi">{t("menus.header.shop_csi")}</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
</Menu.SubMenu>
|
</Menu.SubMenu>
|
||||||
<Menu.SubMenu
|
<Menu.SubMenu
|
||||||
@@ -265,12 +275,13 @@ function Header({
|
|||||||
|
|
||||||
{currentUser.displayName || t("general.labels.unknown")}
|
{currentUser.displayName || t("general.labels.unknown")}
|
||||||
</div>
|
</div>
|
||||||
}>
|
}
|
||||||
|
>
|
||||||
<Menu.Item danger onClick={() => signOutStart()}>
|
<Menu.Item danger onClick={() => signOutStart()}>
|
||||||
{t("user.actions.signout")}
|
{t("user.actions.signout")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item>
|
<Menu.Item>
|
||||||
<Link to='/manage/profile'>
|
<Link to="/manage/profile">
|
||||||
{t("menus.currentuser.profile")}
|
{t("menus.currentuser.profile")}
|
||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
@@ -280,14 +291,15 @@ function Header({
|
|||||||
<GlobalOutlined />
|
<GlobalOutlined />
|
||||||
<span>{t("menus.currentuser.languageselector")}</span>
|
<span>{t("menus.currentuser.languageselector")}</span>
|
||||||
</span>
|
</span>
|
||||||
}>
|
}
|
||||||
<Menu.Item actiontype='lang-select' key='en-US'>
|
>
|
||||||
|
<Menu.Item actiontype="lang-select" key="en-US">
|
||||||
{t("general.languages.english")}
|
{t("general.languages.english")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item actiontype='lang-select' key='fr-CA'>
|
<Menu.Item actiontype="lang-select" key="fr-CA">
|
||||||
{t("general.languages.french")}
|
{t("general.languages.french")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item actiontype='lang-select' key='es-MX'>
|
<Menu.Item actiontype="lang-select" key="es-MX">
|
||||||
{t("general.languages.spanish")}
|
{t("general.languages.spanish")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
</Menu.SubMenu>
|
</Menu.SubMenu>
|
||||||
|
|||||||
@@ -1,130 +1,204 @@
|
|||||||
import { Col, Form, Input, Row } from "antd";
|
import { Col, Form, Input, Row, Divider } from "antd";
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
||||||
import JobTotalsTable from "../job-totals-table/job-totals-table.component";
|
import JobTotalsTable from "../job-totals-table/job-totals-table.component";
|
||||||
import FormRow from "../layout-form-row/layout-form-row.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 { t } = useTranslation();
|
||||||
|
|
||||||
|
const colSpan = {
|
||||||
|
sm: { span: 24 },
|
||||||
|
lg: { span: 12 },
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Row gutter={[32, 32]}>
|
<div>
|
||||||
<Col span={12}>
|
<Row>
|
||||||
<FormRow header={t("jobs.forms.dedinfo")}>
|
<Col span={24}>
|
||||||
<Form.Item label={t("jobs.fields.ded_status")} name='ded_status'>
|
<FormRow header={t("payments.labels.title")}>
|
||||||
<Input />
|
<table style={{ width: "100%" }}>
|
||||||
</Form.Item>
|
<thead>
|
||||||
<Form.Item label={t("jobs.fields.ded_amt")} name='ded_amt'>
|
<tr>
|
||||||
<CurrencyInput />
|
<th>{t("payments.fields.created_at")}</th>
|
||||||
</Form.Item>
|
<th>{t("payments.fields.payer")}</th>
|
||||||
</FormRow>
|
<th>{t("payments.fields.amount")}</th>
|
||||||
<FormRow>
|
<th>{t("payments.fields.memo")}</th>
|
||||||
<Form.Item
|
<th>{t("payments.fields.transactionid")}</th>
|
||||||
label={t("jobs.fields.depreciation_taxes")}
|
<th>{t("payments.fields.stripeid")}</th>
|
||||||
name='depreciation_taxes'>
|
</tr>
|
||||||
<CurrencyInput />
|
</thead>
|
||||||
</Form.Item>
|
<tbody>
|
||||||
<Form.Item
|
{job.payments.map((p, idx) => (
|
||||||
label={t("jobs.fields.other_amount_payable")}
|
<tr key={idx}>
|
||||||
name='other_amount_payable'>
|
<td>
|
||||||
<CurrencyInput />
|
<DateTimeFormatter>{p.created_at}</DateTimeFormatter>
|
||||||
</Form.Item>
|
</td>
|
||||||
<Form.Item
|
<td>{p.payer}</td>
|
||||||
label={t("jobs.fields.towing_payable")}
|
<td>
|
||||||
name='towing_payable'>
|
<CurrencyFormatter>{p.amount}</CurrencyFormatter>
|
||||||
<CurrencyInput />
|
</td>
|
||||||
</Form.Item>
|
<td>{p.memo}</td>
|
||||||
<Form.Item
|
<td>{p.transactionid}</td>
|
||||||
label={t("jobs.fields.storage_payable")}
|
<td>
|
||||||
name='storage_payable'>
|
{p.stripeid ? (
|
||||||
<CurrencyInput />
|
<a
|
||||||
</Form.Item>
|
href={
|
||||||
<Form.Item
|
stripeTestEnv
|
||||||
label={t("jobs.fields.federal_tax_payable")}
|
? `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/test/payments/${p.stripeid}`
|
||||||
name='federal_tax_payable'>
|
: `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/payments/${p.stripeid}`
|
||||||
<CurrencyInput />
|
}
|
||||||
</Form.Item>
|
>
|
||||||
<Form.Item
|
{p.stripeid}
|
||||||
label={t("jobs.fields.adjustment_bottom_line")}
|
</a>
|
||||||
name='adjustment_bottom_line'>
|
) : null}
|
||||||
<CurrencyInput />
|
</td>
|
||||||
</Form.Item>
|
</tr>
|
||||||
</FormRow>
|
))}
|
||||||
<FormRow header={t("jobs.forms.laborrates")}>
|
</tbody>
|
||||||
<Form.Item label={t("jobs.fields.rate_laa")} name='rate_laa'>
|
</table>
|
||||||
<CurrencyInput />
|
</FormRow>
|
||||||
</Form.Item>
|
</Col>
|
||||||
<Form.Item label={t("jobs.fields.rate_lab")} name='rate_lab'>
|
</Row>
|
||||||
<CurrencyInput />
|
<Divider />
|
||||||
</Form.Item>
|
<Row gutter={[32, 32]}>
|
||||||
<Form.Item label={t("jobs.fields.rate_lad")} name='rate_lad'>
|
<Col {...colSpan}>
|
||||||
<CurrencyInput />
|
<FormRow header={t("jobs.forms.dedinfo")}>
|
||||||
</Form.Item>
|
<Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
|
||||||
<Form.Item label={t("jobs.fields.rate_lae")} name='rate_lae'>
|
<Input />
|
||||||
<CurrencyInput />
|
</Form.Item>
|
||||||
</Form.Item>
|
<Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
|
||||||
<Form.Item label={t("jobs.fields.rate_lar")} name='rate_lar'>
|
<CurrencyInput />
|
||||||
<CurrencyInput />
|
</Form.Item>
|
||||||
</Form.Item>
|
</FormRow>
|
||||||
<Form.Item label={t("jobs.fields.rate_las")} name='rate_las'>
|
<FormRow>
|
||||||
<CurrencyInput />
|
<Form.Item
|
||||||
</Form.Item>
|
label={t("jobs.fields.depreciation_taxes")}
|
||||||
<Form.Item label={t("jobs.fields.rate_laf")} name='rate_laf'>
|
name="depreciation_taxes"
|
||||||
<CurrencyInput />
|
>
|
||||||
</Form.Item>
|
<CurrencyInput />
|
||||||
<Form.Item label={t("jobs.fields.rate_lam")} name='rate_lam'>
|
</Form.Item>
|
||||||
<CurrencyInput />
|
<Form.Item
|
||||||
</Form.Item>
|
label={t("jobs.fields.other_amount_payable")}
|
||||||
<Form.Item label={t("jobs.fields.rate_lag")} name='rate_lag'>
|
name="other_amount_payable"
|
||||||
<CurrencyInput />
|
>
|
||||||
</Form.Item>
|
<CurrencyInput />
|
||||||
<Form.Item label={t("jobs.fields.rate_la1")} name='rate_la1'>
|
</Form.Item>
|
||||||
<CurrencyInput />
|
<Form.Item
|
||||||
</Form.Item>
|
label={t("jobs.fields.towing_payable")}
|
||||||
<Form.Item label={t("jobs.fields.rate_la2")} name='rate_la2'>
|
name="towing_payable"
|
||||||
<CurrencyInput />
|
>
|
||||||
</Form.Item>
|
<CurrencyInput />
|
||||||
<Form.Item label={t("jobs.fields.rate_la3")} name='rate_la3'>
|
</Form.Item>
|
||||||
<CurrencyInput />
|
<Form.Item
|
||||||
</Form.Item>
|
label={t("jobs.fields.storage_payable")}
|
||||||
<Form.Item label={t("jobs.fields.rate_la4")} name='rate_la4'>
|
name="storage_payable"
|
||||||
<CurrencyInput />
|
>
|
||||||
</Form.Item>
|
<CurrencyInput />
|
||||||
<Form.Item label={t("jobs.fields.rate_atp")} name='rate_atp'>
|
</Form.Item>
|
||||||
<CurrencyInput />
|
<Form.Item
|
||||||
</Form.Item>
|
label={t("jobs.fields.federal_tax_payable")}
|
||||||
<Form.Item label={t("jobs.fields.rate_lau")} name='rate_lau'>
|
name="federal_tax_payable"
|
||||||
<CurrencyInput />
|
>
|
||||||
</Form.Item>
|
<CurrencyInput />
|
||||||
<Form.Item label={t("jobs.fields.rate_mapa")} name='rate_mapa'>
|
</Form.Item>
|
||||||
<CurrencyInput />
|
<Form.Item
|
||||||
</Form.Item>
|
label={t("jobs.fields.adjustment_bottom_line")}
|
||||||
<Form.Item label={t("jobs.fields.rate_mash")} name='rate_mash'>
|
name="adjustment_bottom_line"
|
||||||
<CurrencyInput />
|
>
|
||||||
</Form.Item>
|
<CurrencyInput />
|
||||||
<Form.Item label={t("jobs.fields.rate_mahw")} name='rate_mahw'>
|
</Form.Item>
|
||||||
<CurrencyInput />
|
</FormRow>
|
||||||
</Form.Item>
|
<FormRow header={t("jobs.forms.laborrates")}>
|
||||||
<Form.Item label={t("jobs.fields.rate_ma2s")} name='rate_ma2s'>
|
<Form.Item label={t("jobs.fields.rate_laa")} name="rate_laa">
|
||||||
<CurrencyInput />
|
<CurrencyInput />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label={t("jobs.fields.rate_ma3s")} name='rate_ma3s'>
|
<Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab">
|
||||||
<CurrencyInput />
|
<CurrencyInput />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label={t("jobs.fields.rate_mabl")} name='rate_mabl'>
|
<Form.Item label={t("jobs.fields.rate_lad")} name="rate_lad">
|
||||||
<CurrencyInput />
|
<CurrencyInput />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label={t("jobs.fields.rate_macs")} name='rate_macs'>
|
<Form.Item label={t("jobs.fields.rate_lae")} name="rate_lae">
|
||||||
<CurrencyInput />
|
<CurrencyInput />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label={t("jobs.fields.rate_matd")} name='rate_matd'>
|
<Form.Item label={t("jobs.fields.rate_lar")} name="rate_lar">
|
||||||
<CurrencyInput />
|
<CurrencyInput />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</FormRow>
|
<Form.Item label={t("jobs.fields.rate_las")} name="rate_las">
|
||||||
</Col>
|
<CurrencyInput />
|
||||||
<Col span={12}>
|
</Form.Item>
|
||||||
<JobTotalsTable job={job} />
|
<Form.Item label={t("jobs.fields.rate_laf")} name="rate_laf">
|
||||||
</Col>
|
<CurrencyInput />
|
||||||
</Row>
|
</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);
|
||||||
|
|||||||
@@ -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 React from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
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 { connect } from "react-redux";
|
||||||
import { createStructuredSelector } from "reselect";
|
import { createStructuredSelector } from "reselect";
|
||||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
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({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop,
|
bodyshop: selectBodyshop,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -47,9 +47,10 @@ function InvoiceEnterModalContainer({
|
|||||||
const cardValid = !!!stripeState.error && stripeState.cardComplete;
|
const cardValid = !!!stripeState.error && stripeState.cardComplete;
|
||||||
|
|
||||||
const handleFinish = async (values) => {
|
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.
|
// Stripe.js has not yet loaded.
|
||||||
// Make sure to disable form submission until Stripe.js has loaded.
|
// Make sure to disable form submission until Stripe.js has loaded.
|
||||||
return;
|
return;
|
||||||
@@ -57,8 +58,6 @@ function InvoiceEnterModalContainer({
|
|||||||
|
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
|
|
||||||
const { useStripe, ...paymentObj } = values;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let stripePayment;
|
let stripePayment;
|
||||||
if (useStripe && bodyshop.stripe_acct_id) {
|
if (useStripe && bodyshop.stripe_acct_id) {
|
||||||
|
|||||||
@@ -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>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
|
import { Button, Popover } from "antd";
|
||||||
import React from "react";
|
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 CurrencyFormatter from "../../utils/CurrencyFormatter";
|
||||||
import PhoneFormatter from "../../utils/PhoneFormatter";
|
import PhoneFormatter from "../../utils/PhoneFormatter";
|
||||||
import { Link } from "react-router-dom";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import DataLabel from "../data-label/data-label.component";
|
import DataLabel from "../data-label/data-label.component";
|
||||||
|
|
||||||
export default function ScheduleEventComponent({ event, handleCancel }) {
|
export default function ScheduleEventComponent({ event, handleCancel }) {
|
||||||
|
|||||||
@@ -269,6 +269,15 @@ export const GET_JOB_BY_PK = gql`
|
|||||||
lbr_amt
|
lbr_amt
|
||||||
op_code_desc
|
op_code_desc
|
||||||
}
|
}
|
||||||
|
payments {
|
||||||
|
id
|
||||||
|
amount
|
||||||
|
payer
|
||||||
|
created_at
|
||||||
|
stripeid
|
||||||
|
transactionid
|
||||||
|
memo
|
||||||
|
}
|
||||||
cccontracts {
|
cccontracts {
|
||||||
id
|
id
|
||||||
status
|
status
|
||||||
|
|||||||
@@ -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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|||||||
@@ -109,6 +109,9 @@ const JobsClose = lazy(() => import("../jobs-close/jobs-close.container"));
|
|||||||
const ShopCsiPageContainer = lazy(() =>
|
const ShopCsiPageContainer = lazy(() =>
|
||||||
import("../shop-csi/shop-csi.container.page")
|
import("../shop-csi/shop-csi.container.page")
|
||||||
);
|
);
|
||||||
|
const PaymentsAll = lazy(() =>
|
||||||
|
import("../payments-all/payments-all.container.page")
|
||||||
|
);
|
||||||
|
|
||||||
const { Content } = Layout;
|
const { Content } = Layout;
|
||||||
|
|
||||||
@@ -134,11 +137,11 @@ export function Manage({ match, conflict }) {
|
|||||||
}, [t]);
|
}, [t]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout className='layout-container'>
|
<Layout className="layout-container">
|
||||||
<HeaderContainer />
|
<HeaderContainer />
|
||||||
<BreadCrumbs />
|
<BreadCrumbs />
|
||||||
|
|
||||||
<Content className='content-container'>
|
<Content className="content-container">
|
||||||
<FcmNotification />
|
<FcmNotification />
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
{conflict ? (
|
{conflict ? (
|
||||||
@@ -147,7 +150,8 @@ export function Manage({ match, conflict }) {
|
|||||||
<Suspense
|
<Suspense
|
||||||
fallback={
|
fallback={
|
||||||
<LoadingSpinner message={t("general.labels.loadingapp")} />
|
<LoadingSpinner message={t("general.labels.loadingapp")} />
|
||||||
}>
|
}
|
||||||
|
>
|
||||||
<EnterInvoiceModalContainer />
|
<EnterInvoiceModalContainer />
|
||||||
<EmailOverlayContainer />
|
<EmailOverlayContainer />
|
||||||
<TimeTicketModalContainer />
|
<TimeTicketModalContainer />
|
||||||
@@ -296,6 +300,11 @@ export function Manage({ match, conflict }) {
|
|||||||
path={`${match.path}/accounting/payables`}
|
path={`${match.path}/accounting/payables`}
|
||||||
component={AccountingPayables}
|
component={AccountingPayables}
|
||||||
/>
|
/>
|
||||||
|
<Route
|
||||||
|
exact
|
||||||
|
path={`${match.path}/payments`}
|
||||||
|
component={PaymentsAll}
|
||||||
|
/>
|
||||||
</Suspense>
|
</Suspense>
|
||||||
)}
|
)}
|
||||||
</ErrorBoundary>
|
</ErrorBoundary>
|
||||||
|
|||||||
@@ -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);
|
||||||
@@ -779,6 +779,7 @@
|
|||||||
"invoices": "Invoices",
|
"invoices": "Invoices",
|
||||||
"jobs": "Jobs",
|
"jobs": "Jobs",
|
||||||
"owners": "Owners",
|
"owners": "Owners",
|
||||||
|
"payments": "All Payments",
|
||||||
"productionlist": "Production - List",
|
"productionlist": "Production - List",
|
||||||
"schedule": "Schedule",
|
"schedule": "Schedule",
|
||||||
"shop": "My Shop",
|
"shop": "My Shop",
|
||||||
@@ -915,13 +916,22 @@
|
|||||||
"payments": {
|
"payments": {
|
||||||
"fields": {
|
"fields": {
|
||||||
"amount": "Amount",
|
"amount": "Amount",
|
||||||
|
"created_at": "Created At",
|
||||||
|
"exportedat": "Exported At",
|
||||||
"memo": "Memo",
|
"memo": "Memo",
|
||||||
"transactionid": "Transaction Reference"
|
"payer": "Payer",
|
||||||
|
"stripeid": "Stripe ID",
|
||||||
|
"transactionid": "Transaction ID"
|
||||||
},
|
},
|
||||||
"labels": {
|
"labels": {
|
||||||
"electronicpayment": "Use Electronic Payment Processing?",
|
"electronicpayment": "Use Electronic Payment Processing?",
|
||||||
"new": "New Payment",
|
"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": {
|
"printcenter": {
|
||||||
@@ -1027,6 +1037,7 @@
|
|||||||
"jobs-new": "Create a New Job",
|
"jobs-new": "Create a New Job",
|
||||||
"owner-detail": "{{name}}",
|
"owner-detail": "{{name}}",
|
||||||
"owners": "Owners",
|
"owners": "Owners",
|
||||||
|
"payments-all": "All Payments",
|
||||||
"productionboard": "Production Board",
|
"productionboard": "Production Board",
|
||||||
"productionlist": "Production - List",
|
"productionlist": "Production - List",
|
||||||
"schedule": "Schedule",
|
"schedule": "Schedule",
|
||||||
@@ -1054,6 +1065,7 @@
|
|||||||
"manageroot": "Home | $t(titles.app)",
|
"manageroot": "Home | $t(titles.app)",
|
||||||
"owners": "All Owners | $t(titles.app)",
|
"owners": "All Owners | $t(titles.app)",
|
||||||
"owners-detail": "{{name}} | $t(titles.app)",
|
"owners-detail": "{{name}} | $t(titles.app)",
|
||||||
|
"payments-all": "Payments | $t(titles.app)",
|
||||||
"productionboard": "Production - Board",
|
"productionboard": "Production - Board",
|
||||||
"productionlist": "Production - List View | $t(titles.app)",
|
"productionlist": "Production - List View | $t(titles.app)",
|
||||||
"profile": "My Profile | $t(titles.app)",
|
"profile": "My Profile | $t(titles.app)",
|
||||||
|
|||||||
@@ -779,6 +779,7 @@
|
|||||||
"invoices": "",
|
"invoices": "",
|
||||||
"jobs": "Trabajos",
|
"jobs": "Trabajos",
|
||||||
"owners": "propietarios",
|
"owners": "propietarios",
|
||||||
|
"payments": "",
|
||||||
"productionlist": "",
|
"productionlist": "",
|
||||||
"schedule": "Programar",
|
"schedule": "Programar",
|
||||||
"shop": "Mi tienda",
|
"shop": "Mi tienda",
|
||||||
@@ -915,13 +916,22 @@
|
|||||||
"payments": {
|
"payments": {
|
||||||
"fields": {
|
"fields": {
|
||||||
"amount": "",
|
"amount": "",
|
||||||
|
"created_at": "",
|
||||||
|
"exportedat": "",
|
||||||
"memo": "",
|
"memo": "",
|
||||||
|
"payer": "",
|
||||||
|
"stripeid": "",
|
||||||
"transactionid": ""
|
"transactionid": ""
|
||||||
},
|
},
|
||||||
"labels": {
|
"labels": {
|
||||||
"electronicpayment": "",
|
"electronicpayment": "",
|
||||||
"new": "",
|
"new": "",
|
||||||
"signup": ""
|
"signup": "",
|
||||||
|
"title": ""
|
||||||
|
},
|
||||||
|
"successes": {
|
||||||
|
"payment": "",
|
||||||
|
"stripe": ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"printcenter": {
|
"printcenter": {
|
||||||
@@ -1027,6 +1037,7 @@
|
|||||||
"jobs-new": "",
|
"jobs-new": "",
|
||||||
"owner-detail": "",
|
"owner-detail": "",
|
||||||
"owners": "",
|
"owners": "",
|
||||||
|
"payments-all": "",
|
||||||
"productionboard": "",
|
"productionboard": "",
|
||||||
"productionlist": "",
|
"productionlist": "",
|
||||||
"schedule": "",
|
"schedule": "",
|
||||||
@@ -1054,6 +1065,7 @@
|
|||||||
"manageroot": "Casa | $t(titles.app)",
|
"manageroot": "Casa | $t(titles.app)",
|
||||||
"owners": "Todos los propietarios | $t(titles.app)",
|
"owners": "Todos los propietarios | $t(titles.app)",
|
||||||
"owners-detail": "",
|
"owners-detail": "",
|
||||||
|
"payments-all": "",
|
||||||
"productionboard": "",
|
"productionboard": "",
|
||||||
"productionlist": "",
|
"productionlist": "",
|
||||||
"profile": "Mi perfil | $t(titles.app)",
|
"profile": "Mi perfil | $t(titles.app)",
|
||||||
|
|||||||
@@ -779,6 +779,7 @@
|
|||||||
"invoices": "",
|
"invoices": "",
|
||||||
"jobs": "Emplois",
|
"jobs": "Emplois",
|
||||||
"owners": "Propriétaires",
|
"owners": "Propriétaires",
|
||||||
|
"payments": "",
|
||||||
"productionlist": "",
|
"productionlist": "",
|
||||||
"schedule": "Programme",
|
"schedule": "Programme",
|
||||||
"shop": "Mon magasin",
|
"shop": "Mon magasin",
|
||||||
@@ -915,13 +916,22 @@
|
|||||||
"payments": {
|
"payments": {
|
||||||
"fields": {
|
"fields": {
|
||||||
"amount": "",
|
"amount": "",
|
||||||
|
"created_at": "",
|
||||||
|
"exportedat": "",
|
||||||
"memo": "",
|
"memo": "",
|
||||||
|
"payer": "",
|
||||||
|
"stripeid": "",
|
||||||
"transactionid": ""
|
"transactionid": ""
|
||||||
},
|
},
|
||||||
"labels": {
|
"labels": {
|
||||||
"electronicpayment": "",
|
"electronicpayment": "",
|
||||||
"new": "",
|
"new": "",
|
||||||
"signup": ""
|
"signup": "",
|
||||||
|
"title": ""
|
||||||
|
},
|
||||||
|
"successes": {
|
||||||
|
"payment": "",
|
||||||
|
"stripe": ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"printcenter": {
|
"printcenter": {
|
||||||
@@ -1027,6 +1037,7 @@
|
|||||||
"jobs-new": "",
|
"jobs-new": "",
|
||||||
"owner-detail": "",
|
"owner-detail": "",
|
||||||
"owners": "",
|
"owners": "",
|
||||||
|
"payments-all": "",
|
||||||
"productionboard": "",
|
"productionboard": "",
|
||||||
"productionlist": "",
|
"productionlist": "",
|
||||||
"schedule": "",
|
"schedule": "",
|
||||||
@@ -1054,6 +1065,7 @@
|
|||||||
"manageroot": "Accueil | $t(titles.app)",
|
"manageroot": "Accueil | $t(titles.app)",
|
||||||
"owners": "Tous les propriétaires | $t(titles.app)",
|
"owners": "Tous les propriétaires | $t(titles.app)",
|
||||||
"owners-detail": "",
|
"owners-detail": "",
|
||||||
|
"payments-all": "",
|
||||||
"productionboard": "",
|
"productionboard": "",
|
||||||
"productionlist": "",
|
"productionlist": "",
|
||||||
"profile": "Mon profil | $t(titles.app)",
|
"profile": "Mon profil | $t(titles.app)",
|
||||||
|
|||||||
@@ -2,9 +2,13 @@ import React from "react";
|
|||||||
import Moment from "react-moment";
|
import Moment from "react-moment";
|
||||||
|
|
||||||
export function DateFormatter(props) {
|
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) {
|
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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
- args:
|
||||||
|
cascade: false
|
||||||
|
read_only: false
|
||||||
|
sql: ALTER TABLE "public"."payments" DROP COLUMN "payer";
|
||||||
|
type: run_sql
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
- args:
|
||||||
|
cascade: false
|
||||||
|
read_only: false
|
||||||
|
sql: ALTER TABLE "public"."payments" ADD COLUMN "payer" text NULL;
|
||||||
|
type: run_sql
|
||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
@@ -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
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
12
hasura/migrations/1592325045380_run_sql_migration/up.yaml
Normal file
12
hasura/migrations/1592325045380_run_sql_migration/up.yaml
Normal 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
|
||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
@@ -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
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
@@ -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
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
- args:
|
||||||
|
cascade: false
|
||||||
|
read_only: false
|
||||||
|
sql: ALTER TABLE "public"."payments" DROP COLUMN "exportedat";
|
||||||
|
type: run_sql
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
- args:
|
||||||
|
cascade: false
|
||||||
|
read_only: false
|
||||||
|
sql: ALTER TABLE "public"."payments" ADD COLUMN "exportedat" timestamptz NULL;
|
||||||
|
type: run_sql
|
||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -3214,26 +3214,30 @@ tables:
|
|||||||
- active:
|
- active:
|
||||||
_eq: true
|
_eq: true
|
||||||
columns:
|
columns:
|
||||||
- id
|
|
||||||
- created_at
|
|
||||||
- updated_at
|
|
||||||
- jobid
|
|
||||||
- amount
|
- amount
|
||||||
- transactionid
|
- created_at
|
||||||
|
- exportedat
|
||||||
|
- id
|
||||||
|
- jobid
|
||||||
- memo
|
- memo
|
||||||
|
- payer
|
||||||
- stripeid
|
- stripeid
|
||||||
|
- transactionid
|
||||||
|
- updated_at
|
||||||
select_permissions:
|
select_permissions:
|
||||||
- role: user
|
- role: user
|
||||||
permission:
|
permission:
|
||||||
columns:
|
columns:
|
||||||
- amount
|
- amount
|
||||||
- memo
|
|
||||||
- stripeid
|
|
||||||
- transactionid
|
|
||||||
- created_at
|
- created_at
|
||||||
- updated_at
|
- exportedat
|
||||||
- id
|
- id
|
||||||
- jobid
|
- jobid
|
||||||
|
- memo
|
||||||
|
- payer
|
||||||
|
- stripeid
|
||||||
|
- transactionid
|
||||||
|
- updated_at
|
||||||
filter:
|
filter:
|
||||||
job:
|
job:
|
||||||
bodyshop:
|
bodyshop:
|
||||||
@@ -3244,18 +3248,21 @@ tables:
|
|||||||
_eq: X-Hasura-User-Id
|
_eq: X-Hasura-User-Id
|
||||||
- active:
|
- active:
|
||||||
_eq: true
|
_eq: true
|
||||||
|
allow_aggregations: true
|
||||||
update_permissions:
|
update_permissions:
|
||||||
- role: user
|
- role: user
|
||||||
permission:
|
permission:
|
||||||
columns:
|
columns:
|
||||||
- amount
|
- amount
|
||||||
- memo
|
|
||||||
- stripeid
|
|
||||||
- transactionid
|
|
||||||
- created_at
|
- created_at
|
||||||
- updated_at
|
- exportedat
|
||||||
- id
|
- id
|
||||||
- jobid
|
- jobid
|
||||||
|
- memo
|
||||||
|
- payer
|
||||||
|
- stripeid
|
||||||
|
- transactionid
|
||||||
|
- updated_at
|
||||||
filter:
|
filter:
|
||||||
job:
|
job:
|
||||||
bodyshop:
|
bodyshop:
|
||||||
@@ -3870,3 +3877,6 @@ functions:
|
|||||||
- function:
|
- function:
|
||||||
schema: public
|
schema: public
|
||||||
name: search_owner
|
name: search_owner
|
||||||
|
- function:
|
||||||
|
schema: public
|
||||||
|
name: search_payments
|
||||||
|
|||||||
Reference in New Issue
Block a user