diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 4b4dd25ad..63076ed45 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -3088,6 +3088,27 @@ fields + + actax + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + actualreturn false @@ -3193,6 +3214,111 @@ + + cleanupcharge + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + coverage + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + dailyfreekm + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + dailyrate + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + damagewaiver + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + driver false @@ -3466,6 +3592,48 @@ + + excesskmrate + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + federaltax + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + kmend false @@ -3508,6 +3676,48 @@ + + localtax + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + refuelcharge + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + scheduledreturn false @@ -3550,6 +3760,27 @@ + + statetax + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + status false diff --git a/client/src/components/contract-form/contract-form.component.jsx b/client/src/components/contract-form/contract-form.component.jsx index 9006c9a4b..ffd7ff00d 100644 --- a/client/src/components/contract-form/contract-form.component.jsx +++ b/client/src/components/contract-form/contract-form.component.jsx @@ -254,6 +254,55 @@ export default function ContractFormComponent({ form }) { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); } diff --git a/client/src/components/contracts-list/contracts-list.component.jsx b/client/src/components/contracts-list/contracts-list.component.jsx index 24933a769..e9e9e2944 100644 --- a/client/src/components/contracts-list/contracts-list.component.jsx +++ b/client/src/components/contracts-list/contracts-list.component.jsx @@ -1,11 +1,11 @@ -import { Table, Button, Input } from "antd"; +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 { DateTimeFormatter } from "../../utils/DateFormatter"; import { alphaSort } from "../../utils/sorters"; -import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter"; -import queryString from "query-string"; -import { SyncOutlined } from "@ant-design/icons"; import TimeTicketsDatesSelector from "../ticket-tickets-dates-selector/time-tickets-dates-selector.component"; export default function ContractsList({ loading, contracts, refetch, total }) { diff --git a/client/src/graphql/cccontracts.queries.js b/client/src/graphql/cccontracts.queries.js index ebd6656b0..07d7747bc 100644 --- a/client/src/graphql/cccontracts.queries.js +++ b/client/src/graphql/cccontracts.queries.js @@ -68,6 +68,17 @@ export const QUERY_CONTRACT_BY_PK = gql` driver_zip id jobid + dailyrate + actax + dailyfreekm + refuelcharge + excesskmrate + cleanupcharge + damagewaiver + federaltax + statetax + localtax + coverage job { id est_number diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 3b49ad54f..ae3b5bf7a 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -199,11 +199,17 @@ "selectjobandcar": "Please ensure both a car and job are selected." }, "fields": { + "actax": "A/C Tax", "actualreturn": "Actual Return Date", "agreementnumber": "Agreement Number", "cc_cardholder": "Cardholder Name", "cc_expiry": "Credit Card Expiry Date", "cc_num": "Credit Card Number", + "cleanupcharge": "Clean Up Charge", + "coverage": "Coverage", + "dailyfreekm": "Daily Free Mileage", + "dailyrate": "Daily Rate", + "damagewaiver": "Damage Waiver", "driver": "Driver", "driver_addr1": "Driver Address 1", "driver_addr2": "Driver Address 2", @@ -217,10 +223,15 @@ "driver_ph1": "Driver's Phone", "driver_state": "Driver's State ", "driver_zip": "Driver's Postal/ZIP Code", + "excesskmrate": "Excess Mileage", + "federaltax": "Federal Taxes", "kmend": "Mileage End", "kmstart": "Mileage Start", + "localtax": "Local Taxes", + "refuelcharge": "Refuel Charge (per liter/gallon)", "scheduledreturn": "Scheduled Return", "start": "Contract Start", + "statetax": "State Taxes", "status": "Status" }, "labels": { diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 0bdfe81fc..fdcbfc6c7 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -199,11 +199,17 @@ "selectjobandcar": "" }, "fields": { + "actax": "", "actualreturn": "", "agreementnumber": "", "cc_cardholder": "", "cc_expiry": "", "cc_num": "", + "cleanupcharge": "", + "coverage": "", + "dailyfreekm": "", + "dailyrate": "", + "damagewaiver": "", "driver": "", "driver_addr1": "", "driver_addr2": "", @@ -217,10 +223,15 @@ "driver_ph1": "", "driver_state": "", "driver_zip": "", + "excesskmrate": "", + "federaltax": "", "kmend": "", "kmstart": "", + "localtax": "", + "refuelcharge": "", "scheduledreturn": "", "start": " ", + "statetax": "", "status": "" }, "labels": { diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 181c8e931..5f27d98aa 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -199,11 +199,17 @@ "selectjobandcar": "" }, "fields": { + "actax": "", "actualreturn": "", "agreementnumber": "", "cc_cardholder": "", "cc_expiry": "", "cc_num": "", + "cleanupcharge": "", + "coverage": "", + "dailyfreekm": "", + "dailyrate": "", + "damagewaiver": "", "driver": "", "driver_addr1": "", "driver_addr2": "", @@ -217,10 +223,15 @@ "driver_ph1": "", "driver_state": "", "driver_zip": "", + "excesskmrate": "", + "federaltax": "", "kmend": "", "kmstart": "", + "localtax": "", + "refuelcharge": "", "scheduledreturn": "", "start": "", + "statetax": "", "status": "" }, "labels": { diff --git a/hasura/migrations/1596046286851_alter_table_public_cccontracts_add_column_dailyrate/down.yaml b/hasura/migrations/1596046286851_alter_table_public_cccontracts_add_column_dailyrate/down.yaml new file mode 100644 index 000000000..dd1e5b4be --- /dev/null +++ b/hasura/migrations/1596046286851_alter_table_public_cccontracts_add_column_dailyrate/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "dailyrate"; + type: run_sql diff --git a/hasura/migrations/1596046286851_alter_table_public_cccontracts_add_column_dailyrate/up.yaml b/hasura/migrations/1596046286851_alter_table_public_cccontracts_add_column_dailyrate/up.yaml new file mode 100644 index 000000000..57501317b --- /dev/null +++ b/hasura/migrations/1596046286851_alter_table_public_cccontracts_add_column_dailyrate/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "dailyrate" numeric NULL; + type: run_sql diff --git a/hasura/migrations/1596046305024_alter_table_public_cccontracts_add_column_actax/down.yaml b/hasura/migrations/1596046305024_alter_table_public_cccontracts_add_column_actax/down.yaml new file mode 100644 index 000000000..2ba091dae --- /dev/null +++ b/hasura/migrations/1596046305024_alter_table_public_cccontracts_add_column_actax/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "actax"; + type: run_sql diff --git a/hasura/migrations/1596046305024_alter_table_public_cccontracts_add_column_actax/up.yaml b/hasura/migrations/1596046305024_alter_table_public_cccontracts_add_column_actax/up.yaml new file mode 100644 index 000000000..bcc852b3e --- /dev/null +++ b/hasura/migrations/1596046305024_alter_table_public_cccontracts_add_column_actax/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "actax" numeric NULL; + type: run_sql diff --git a/hasura/migrations/1596046319740_alter_table_public_cccontracts_add_column_dailyfreekm/down.yaml b/hasura/migrations/1596046319740_alter_table_public_cccontracts_add_column_dailyfreekm/down.yaml new file mode 100644 index 000000000..e84609937 --- /dev/null +++ b/hasura/migrations/1596046319740_alter_table_public_cccontracts_add_column_dailyfreekm/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "dailyfreekm"; + type: run_sql diff --git a/hasura/migrations/1596046319740_alter_table_public_cccontracts_add_column_dailyfreekm/up.yaml b/hasura/migrations/1596046319740_alter_table_public_cccontracts_add_column_dailyfreekm/up.yaml new file mode 100644 index 000000000..3863a4a65 --- /dev/null +++ b/hasura/migrations/1596046319740_alter_table_public_cccontracts_add_column_dailyfreekm/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "dailyfreekm" integer NULL; + type: run_sql diff --git a/hasura/migrations/1596046346591_alter_table_public_cccontracts_add_column_refuelcharge/down.yaml b/hasura/migrations/1596046346591_alter_table_public_cccontracts_add_column_refuelcharge/down.yaml new file mode 100644 index 000000000..1e88ae955 --- /dev/null +++ b/hasura/migrations/1596046346591_alter_table_public_cccontracts_add_column_refuelcharge/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "refuelcharge"; + type: run_sql diff --git a/hasura/migrations/1596046346591_alter_table_public_cccontracts_add_column_refuelcharge/up.yaml b/hasura/migrations/1596046346591_alter_table_public_cccontracts_add_column_refuelcharge/up.yaml new file mode 100644 index 000000000..53cab530d --- /dev/null +++ b/hasura/migrations/1596046346591_alter_table_public_cccontracts_add_column_refuelcharge/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "refuelcharge" numeric NULL; + type: run_sql diff --git a/hasura/migrations/1596046359901_alter_table_public_cccontracts_add_column_excesskmrate/down.yaml b/hasura/migrations/1596046359901_alter_table_public_cccontracts_add_column_excesskmrate/down.yaml new file mode 100644 index 000000000..39772daee --- /dev/null +++ b/hasura/migrations/1596046359901_alter_table_public_cccontracts_add_column_excesskmrate/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "excesskmrate"; + type: run_sql diff --git a/hasura/migrations/1596046359901_alter_table_public_cccontracts_add_column_excesskmrate/up.yaml b/hasura/migrations/1596046359901_alter_table_public_cccontracts_add_column_excesskmrate/up.yaml new file mode 100644 index 000000000..9ab273f39 --- /dev/null +++ b/hasura/migrations/1596046359901_alter_table_public_cccontracts_add_column_excesskmrate/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "excesskmrate" numeric NULL; + type: run_sql diff --git a/hasura/migrations/1596046371231_alter_table_public_cccontracts_add_column_cleanupcharge/down.yaml b/hasura/migrations/1596046371231_alter_table_public_cccontracts_add_column_cleanupcharge/down.yaml new file mode 100644 index 000000000..ab1f933b8 --- /dev/null +++ b/hasura/migrations/1596046371231_alter_table_public_cccontracts_add_column_cleanupcharge/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "cleanupcharge"; + type: run_sql diff --git a/hasura/migrations/1596046371231_alter_table_public_cccontracts_add_column_cleanupcharge/up.yaml b/hasura/migrations/1596046371231_alter_table_public_cccontracts_add_column_cleanupcharge/up.yaml new file mode 100644 index 000000000..91ea00b95 --- /dev/null +++ b/hasura/migrations/1596046371231_alter_table_public_cccontracts_add_column_cleanupcharge/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "cleanupcharge" numeric NULL; + type: run_sql diff --git a/hasura/migrations/1596046651239_alter_table_public_cccontracts_add_column_damangewaiver/down.yaml b/hasura/migrations/1596046651239_alter_table_public_cccontracts_add_column_damangewaiver/down.yaml new file mode 100644 index 000000000..de45fb105 --- /dev/null +++ b/hasura/migrations/1596046651239_alter_table_public_cccontracts_add_column_damangewaiver/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "damangewaiver"; + type: run_sql diff --git a/hasura/migrations/1596046651239_alter_table_public_cccontracts_add_column_damangewaiver/up.yaml b/hasura/migrations/1596046651239_alter_table_public_cccontracts_add_column_damangewaiver/up.yaml new file mode 100644 index 000000000..b45cfc7ad --- /dev/null +++ b/hasura/migrations/1596046651239_alter_table_public_cccontracts_add_column_damangewaiver/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "damangewaiver" numeric NULL; + type: run_sql diff --git a/hasura/migrations/1596046679135_alter_table_public_cccontracts_add_column_federaltax/down.yaml b/hasura/migrations/1596046679135_alter_table_public_cccontracts_add_column_federaltax/down.yaml new file mode 100644 index 000000000..54336543c --- /dev/null +++ b/hasura/migrations/1596046679135_alter_table_public_cccontracts_add_column_federaltax/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "federaltax"; + type: run_sql diff --git a/hasura/migrations/1596046679135_alter_table_public_cccontracts_add_column_federaltax/up.yaml b/hasura/migrations/1596046679135_alter_table_public_cccontracts_add_column_federaltax/up.yaml new file mode 100644 index 000000000..ff80c606c --- /dev/null +++ b/hasura/migrations/1596046679135_alter_table_public_cccontracts_add_column_federaltax/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "federaltax" numeric NULL; + type: run_sql diff --git a/hasura/migrations/1596046689469_alter_table_public_cccontracts_add_column_statetax/down.yaml b/hasura/migrations/1596046689469_alter_table_public_cccontracts_add_column_statetax/down.yaml new file mode 100644 index 000000000..60a096607 --- /dev/null +++ b/hasura/migrations/1596046689469_alter_table_public_cccontracts_add_column_statetax/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "statetax"; + type: run_sql diff --git a/hasura/migrations/1596046689469_alter_table_public_cccontracts_add_column_statetax/up.yaml b/hasura/migrations/1596046689469_alter_table_public_cccontracts_add_column_statetax/up.yaml new file mode 100644 index 000000000..5437a46af --- /dev/null +++ b/hasura/migrations/1596046689469_alter_table_public_cccontracts_add_column_statetax/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "statetax" numeric NULL; + type: run_sql diff --git a/hasura/migrations/1596046701676_alter_table_public_cccontracts_add_column_localtax/down.yaml b/hasura/migrations/1596046701676_alter_table_public_cccontracts_add_column_localtax/down.yaml new file mode 100644 index 000000000..dc473a6d3 --- /dev/null +++ b/hasura/migrations/1596046701676_alter_table_public_cccontracts_add_column_localtax/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "localtax"; + type: run_sql diff --git a/hasura/migrations/1596046701676_alter_table_public_cccontracts_add_column_localtax/up.yaml b/hasura/migrations/1596046701676_alter_table_public_cccontracts_add_column_localtax/up.yaml new file mode 100644 index 000000000..91eb9ab40 --- /dev/null +++ b/hasura/migrations/1596046701676_alter_table_public_cccontracts_add_column_localtax/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "localtax" numeric NULL; + type: run_sql diff --git a/hasura/migrations/1596046750711_alter_table_public_cccontracts_add_column_coverage/down.yaml b/hasura/migrations/1596046750711_alter_table_public_cccontracts_add_column_coverage/down.yaml new file mode 100644 index 000000000..d75e3cf51 --- /dev/null +++ b/hasura/migrations/1596046750711_alter_table_public_cccontracts_add_column_coverage/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "coverage"; + type: run_sql diff --git a/hasura/migrations/1596046750711_alter_table_public_cccontracts_add_column_coverage/up.yaml b/hasura/migrations/1596046750711_alter_table_public_cccontracts_add_column_coverage/up.yaml new file mode 100644 index 000000000..ae0caa716 --- /dev/null +++ b/hasura/migrations/1596046750711_alter_table_public_cccontracts_add_column_coverage/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "coverage" numeric NULL; + type: run_sql diff --git a/hasura/migrations/1596046794495_update_permission_user_public_table_cccontracts/down.yaml b/hasura/migrations/1596046794495_update_permission_user_public_table_cccontracts/down.yaml new file mode 100644 index 000000000..c1a342491 --- /dev/null +++ b/hasura/migrations/1596046794495_update_permission_user_public_table_cccontracts/down.yaml @@ -0,0 +1,53 @@ +- args: + role: user + table: + name: cccontracts + schema: public + type: drop_insert_permission +- args: + permission: + check: + courtesycar: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + columns: + - actualreturn + - agreementnumber + - cc_cardholder + - cc_expiry + - cc_num + - contract_date + - courtesycarid + - created_at + - driver_addr1 + - driver_addr2 + - driver_city + - driver_dlexpiry + - driver_dlnumber + - driver_dlst + - driver_dob + - driver_fn + - driver_ln + - driver_ph1 + - driver_state + - driver_zip + - id + - jobid + - kmend + - kmstart + - scheduledreturn + - start + - status + - updated_at + set: {} + role: user + table: + name: cccontracts + schema: public + type: create_insert_permission diff --git a/hasura/migrations/1596046794495_update_permission_user_public_table_cccontracts/up.yaml b/hasura/migrations/1596046794495_update_permission_user_public_table_cccontracts/up.yaml new file mode 100644 index 000000000..1f31599a2 --- /dev/null +++ b/hasura/migrations/1596046794495_update_permission_user_public_table_cccontracts/up.yaml @@ -0,0 +1,64 @@ +- args: + role: user + table: + name: cccontracts + schema: public + type: drop_insert_permission +- args: + permission: + check: + courtesycar: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + columns: + - id + - created_at + - updated_at + - agreementnumber + - courtesycarid + - jobid + - status + - start + - scheduledreturn + - actualreturn + - kmstart + - kmend + - driver_dlnumber + - driver_dlexpiry + - driver_dlst + - driver_fn + - driver_ln + - driver_addr1 + - driver_addr2 + - driver_city + - driver_state + - driver_zip + - driver_ph1 + - driver_dob + - cc_num + - cc_expiry + - cc_cardholder + - contract_date + - dailyrate + - actax + - dailyfreekm + - refuelcharge + - excesskmrate + - cleanupcharge + - damangewaiver + - federaltax + - statetax + - localtax + - coverage + set: {} + role: user + table: + name: cccontracts + schema: public + type: create_insert_permission diff --git a/hasura/migrations/1596046801517_update_permission_user_public_table_cccontracts/down.yaml b/hasura/migrations/1596046801517_update_permission_user_public_table_cccontracts/down.yaml new file mode 100644 index 000000000..7c8f665fe --- /dev/null +++ b/hasura/migrations/1596046801517_update_permission_user_public_table_cccontracts/down.yaml @@ -0,0 +1,54 @@ +- args: + role: user + table: + name: cccontracts + schema: public + type: drop_select_permission +- args: + permission: + allow_aggregations: true + columns: + - actualreturn + - agreementnumber + - cc_cardholder + - cc_expiry + - cc_num + - contract_date + - courtesycarid + - created_at + - driver_addr1 + - driver_addr2 + - driver_city + - driver_dlexpiry + - driver_dlnumber + - driver_dlst + - driver_dob + - driver_fn + - driver_ln + - driver_ph1 + - driver_state + - driver_zip + - id + - jobid + - kmend + - kmstart + - scheduledreturn + - start + - status + - updated_at + computed_fields: [] + filter: + courtesycar: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + role: user + table: + name: cccontracts + schema: public + type: create_select_permission diff --git a/hasura/migrations/1596046801517_update_permission_user_public_table_cccontracts/up.yaml b/hasura/migrations/1596046801517_update_permission_user_public_table_cccontracts/up.yaml new file mode 100644 index 000000000..57c62258d --- /dev/null +++ b/hasura/migrations/1596046801517_update_permission_user_public_table_cccontracts/up.yaml @@ -0,0 +1,65 @@ +- args: + role: user + table: + name: cccontracts + schema: public + type: drop_select_permission +- args: + permission: + allow_aggregations: true + columns: + - contract_date + - driver_dlexpiry + - driver_dob + - agreementnumber + - dailyfreekm + - actax + - cleanupcharge + - coverage + - dailyrate + - damangewaiver + - excesskmrate + - federaltax + - kmend + - kmstart + - localtax + - refuelcharge + - statetax + - cc_cardholder + - cc_expiry + - cc_num + - driver_addr1 + - driver_addr2 + - driver_city + - driver_dlnumber + - driver_dlst + - driver_fn + - driver_ln + - driver_ph1 + - driver_state + - driver_zip + - status + - actualreturn + - created_at + - scheduledreturn + - start + - updated_at + - courtesycarid + - id + - jobid + computed_fields: [] + filter: + courtesycar: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + role: user + table: + name: cccontracts + schema: public + type: create_select_permission diff --git a/hasura/migrations/1596046808521_update_permission_user_public_table_cccontracts/down.yaml b/hasura/migrations/1596046808521_update_permission_user_public_table_cccontracts/down.yaml new file mode 100644 index 000000000..940a40c86 --- /dev/null +++ b/hasura/migrations/1596046808521_update_permission_user_public_table_cccontracts/down.yaml @@ -0,0 +1,53 @@ +- args: + role: user + table: + name: cccontracts + schema: public + type: drop_update_permission +- args: + permission: + columns: + - actualreturn + - agreementnumber + - cc_cardholder + - cc_expiry + - cc_num + - contract_date + - courtesycarid + - created_at + - driver_addr1 + - driver_addr2 + - driver_city + - driver_dlexpiry + - driver_dlnumber + - driver_dlst + - driver_dob + - driver_fn + - driver_ln + - driver_ph1 + - driver_state + - driver_zip + - id + - jobid + - kmend + - kmstart + - scheduledreturn + - start + - status + - updated_at + filter: + courtesycar: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + set: {} + role: user + table: + name: cccontracts + schema: public + type: create_update_permission diff --git a/hasura/migrations/1596046808521_update_permission_user_public_table_cccontracts/up.yaml b/hasura/migrations/1596046808521_update_permission_user_public_table_cccontracts/up.yaml new file mode 100644 index 000000000..9af4cf599 --- /dev/null +++ b/hasura/migrations/1596046808521_update_permission_user_public_table_cccontracts/up.yaml @@ -0,0 +1,64 @@ +- args: + role: user + table: + name: cccontracts + schema: public + type: drop_update_permission +- args: + permission: + columns: + - contract_date + - driver_dlexpiry + - driver_dob + - agreementnumber + - dailyfreekm + - actax + - cleanupcharge + - coverage + - dailyrate + - damangewaiver + - excesskmrate + - federaltax + - kmend + - kmstart + - localtax + - refuelcharge + - statetax + - cc_cardholder + - cc_expiry + - cc_num + - driver_addr1 + - driver_addr2 + - driver_city + - driver_dlnumber + - driver_dlst + - driver_fn + - driver_ln + - driver_ph1 + - driver_state + - driver_zip + - status + - actualreturn + - created_at + - scheduledreturn + - start + - updated_at + - courtesycarid + - id + - jobid + filter: + courtesycar: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + set: {} + role: user + table: + name: cccontracts + schema: public + type: create_update_permission diff --git a/hasura/migrations/1596047154427_alter_table_public_cccontracts_alter_column_damangewaiver/down.yaml b/hasura/migrations/1596047154427_alter_table_public_cccontracts_alter_column_damangewaiver/down.yaml new file mode 100644 index 000000000..060b8dd59 --- /dev/null +++ b/hasura/migrations/1596047154427_alter_table_public_cccontracts_alter_column_damangewaiver/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: alter table "public"."cccontracts" rename column "damagewaiver" to "damangewaiver"; + type: run_sql diff --git a/hasura/migrations/1596047154427_alter_table_public_cccontracts_alter_column_damangewaiver/up.yaml b/hasura/migrations/1596047154427_alter_table_public_cccontracts_alter_column_damangewaiver/up.yaml new file mode 100644 index 000000000..e9eb4f677 --- /dev/null +++ b/hasura/migrations/1596047154427_alter_table_public_cccontracts_alter_column_damangewaiver/up.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: alter table "public"."cccontracts" rename column "damangewaiver" to "damagewaiver"; + type: run_sql diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml index b34ec5777..c4a3896f3 100644 --- a/hasura/migrations/metadata.yaml +++ b/hasura/migrations/metadata.yaml @@ -564,66 +564,88 @@ tables: - active: _eq: true columns: - - actualreturn - - agreementnumber - - cc_cardholder - - cc_expiry - - cc_num - - contract_date - - courtesycarid + - id - created_at + - updated_at + - agreementnumber + - courtesycarid + - jobid + - status + - start + - scheduledreturn + - actualreturn + - kmstart + - kmend + - driver_dlnumber + - driver_dlexpiry + - driver_dlst + - driver_fn + - driver_ln - driver_addr1 - driver_addr2 - driver_city - - driver_dlexpiry - - driver_dlnumber - - driver_dlst - - driver_dob - - driver_fn - - driver_ln - - driver_ph1 - driver_state - driver_zip - - id - - jobid - - kmend - - kmstart - - scheduledreturn - - start - - status - - updated_at + - driver_ph1 + - driver_dob + - cc_num + - cc_expiry + - cc_cardholder + - contract_date + - dailyrate + - actax + - dailyfreekm + - refuelcharge + - excesskmrate + - cleanupcharge + - damagewaiver + - federaltax + - statetax + - localtax + - coverage select_permissions: - role: user permission: columns: - - actualreturn + - contract_date + - driver_dlexpiry + - driver_dob - agreementnumber + - dailyfreekm + - actax + - cleanupcharge + - coverage + - dailyrate + - damagewaiver + - excesskmrate + - federaltax + - kmend + - kmstart + - localtax + - refuelcharge + - statetax - cc_cardholder - cc_expiry - cc_num - - contract_date - - courtesycarid - - created_at - driver_addr1 - driver_addr2 - driver_city - - driver_dlexpiry - driver_dlnumber - driver_dlst - - driver_dob - driver_fn - driver_ln - driver_ph1 - driver_state - driver_zip - - id - - jobid - - kmend - - kmstart + - status + - actualreturn + - created_at - scheduledreturn - start - - status - updated_at + - courtesycarid + - id + - jobid filter: courtesycar: bodyshop: @@ -639,34 +661,45 @@ tables: - role: user permission: columns: - - actualreturn + - contract_date + - driver_dlexpiry + - driver_dob - agreementnumber + - dailyfreekm + - actax + - cleanupcharge + - coverage + - dailyrate + - damagewaiver + - excesskmrate + - federaltax + - kmend + - kmstart + - localtax + - refuelcharge + - statetax - cc_cardholder - cc_expiry - cc_num - - contract_date - - courtesycarid - - created_at - driver_addr1 - driver_addr2 - driver_city - - driver_dlexpiry - driver_dlnumber - driver_dlst - - driver_dob - driver_fn - driver_ln - driver_ph1 - driver_state - driver_zip - - id - - jobid - - kmend - - kmstart + - status + - actualreturn + - created_at - scheduledreturn - start - - status - updated_at + - courtesycarid + - id + - jobid filter: courtesycar: bodyshop: