From 62738c50a99b0eafc4b4dbb5050560165dbc8371 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 18 Mar 2021 10:19:02 -0700
Subject: [PATCH] IO-764 Added cost to parts return.

---
 bodyshop_translations.babel                   | 23 +++++++++-
 .../bills-list-table.component.jsx            |  1 +
 .../parts-order-list-table.component.jsx      | 21 ++++++++-
 .../parts-order-modal.component.jsx           | 10 +++++
 .../parts-order-modal.container.jsx           |  1 +
 client/src/graphql/bills.queries.js           |  1 +
 .../src/pages/bills/bills.page.component.jsx  |  1 +
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 .../down.yaml                                 |  5 +++
 .../up.yaml                                   |  5 +++
 .../down.yaml                                 | 41 ++++++++++++++++++
 .../up.yaml                                   | 42 ++++++++++++++++++
 .../down.yaml                                 | 42 ++++++++++++++++++
 .../up.yaml                                   | 43 +++++++++++++++++++
 .../down.yaml                                 | 41 ++++++++++++++++++
 .../up.yaml                                   | 42 ++++++++++++++++++
 hasura/migrations/metadata.yaml               |  3 ++
 19 files changed, 323 insertions(+), 2 deletions(-)
 create mode 100644 hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/down.yaml
 create mode 100644 hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/up.yaml
 create mode 100644 hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/down.yaml
 create mode 100644 hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/up.yaml
 create mode 100644 hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/down.yaml
 create mode 100644 hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/up.yaml
 create mode 100644 hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/down.yaml
 create mode 100644 hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/up.yaml

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 9574b557d..81ac10113 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -24230,6 +24230,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>cost</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>db_price</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx
index d279d33b1..e6c3064a3 100644
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -288,6 +288,7 @@ export function BillsListTableComponent({
                       line_desc: i.line_desc,
                       // db_price: i.actual_price,
                       act_price: i.actual_price,
+                      cost: i.actual_cost,
                       quantity: i.quantity,
                       joblineid: i.joblineid,
                     };
diff --git a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
index 78552bb98..1a0e6e194 100644
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
@@ -185,6 +185,10 @@ export function PartsOrderListTableComponent({
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
+  const selectedPartsOrderRecord = parts_orders.find(
+    (r) => r.id === selectedpartsorder
+  );
+
   const rowExpander = (record) => {
     const columns = [
       {
@@ -206,6 +210,7 @@ export function PartsOrderListTableComponent({
           <CurrencyFormatter>{record.db_price}</CurrencyFormatter>
         ),
       },
+
       {
         title: t("parts_orders.fields.act_price"),
         dataIndex: "act_price",
@@ -217,7 +222,21 @@ export function PartsOrderListTableComponent({
           <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
         ),
       },
-
+      ...(selectedPartsOrderRecord && selectedPartsOrderRecord.isReturn
+        ? [
+            {
+              title: t("parts_orders.fields.cost"),
+              dataIndex: "cost",
+              key: "cost",
+              sorter: (a, b) => a.cost - b.cost,
+              sortOrder:
+                state.sortedInfo.columnKey === "cost" && state.sortedInfo.order,
+              render: (text, record) => (
+                <CurrencyFormatter>{record.cost}</CurrencyFormatter>
+              ),
+            },
+          ]
+        : []),
       {
         title: t("parts_orders.fields.oem_partno"),
         dataIndex: "oem_partno",
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index 2805f22a2..33accf3f7 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -98,6 +98,16 @@ export default function PartsOrderModalComponent({
                       >
                         <CurrencyInput />
                       </Form.Item>
+                      {isReturn && (
+                        <Form.Item
+                          label={t("parts_orders.fields.cost")}
+                          key={`${index}cost`}
+                          name={[field.name, "cost"]}
+                        >
+                          <CurrencyInput />
+                        </Form.Item>
+                      )}
+
                       <Form.Item
                         label={t("parts_orders.fields.quantity")}
                         key={`${index}quantity`}
diff --git a/client/src/components/parts-order-modal/parts-order-modal.container.jsx b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
index bd9a341f5..1d1d08563 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
@@ -212,6 +212,7 @@ export function PartsOrderModalContainer({
               oem_partno: value.oem_partno,
               db_price: value.db_price,
               act_price: value.act_price,
+              cost: value.cost,
               quantity: value.part_qty,
               job_line_id: isReturn ? value.joblineid : value.id,
             });
diff --git a/client/src/graphql/bills.queries.js b/client/src/graphql/bills.queries.js
index 9992a8308..3165354bb 100644
--- a/client/src/graphql/bills.queries.js
+++ b/client/src/graphql/bills.queries.js
@@ -92,6 +92,7 @@ export const QUERY_BILLS_BY_JOBID = gql`
         line_remarks
         quantity
         job_line_id
+        cost
         jobline {
           id
           part_type
diff --git a/client/src/pages/bills/bills.page.component.jsx b/client/src/pages/bills/bills.page.component.jsx
index 7a1651c24..7ed19fca5 100644
--- a/client/src/pages/bills/bills.page.component.jsx
+++ b/client/src/pages/bills/bills.page.component.jsx
@@ -158,6 +158,7 @@ export function BillsListPage({
                       line_desc: i.line_desc,
                       //  db_price: i.actual_price,
                       act_price: i.actual_price,
+                      cost: i.actual_cost,
                       quantity: i.quantity,
                       joblineid: i.joblineid,
                     };
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index f97f3c650..eb2c10880 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1463,6 +1463,7 @@
 				"act_price": "Price",
 				"backordered_eta": "B.O. ETA",
 				"backordered_on": "B.O. On",
+				"cost": "Cost",
 				"db_price": "List Price",
 				"deliver_by": "Date",
 				"job_line_id": "Job Line Id",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 4e747cc21..f23591572 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1463,6 +1463,7 @@
 				"act_price": "",
 				"backordered_eta": "",
 				"backordered_on": "",
+				"cost": "",
 				"db_price": "",
 				"deliver_by": "",
 				"job_line_id": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index ce0351225..33ea8081a 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1463,6 +1463,7 @@
 				"act_price": "",
 				"backordered_eta": "",
 				"backordered_on": "",
+				"cost": "",
 				"db_price": "",
 				"deliver_by": "",
 				"job_line_id": "",
diff --git a/hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/down.yaml b/hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/down.yaml
new file mode 100644
index 000000000..4846b0d67
--- /dev/null
+++ b/hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_order_lines" DROP COLUMN "cost";
+  type: run_sql
diff --git a/hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/up.yaml b/hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/up.yaml
new file mode 100644
index 000000000..b6c03a222
--- /dev/null
+++ b/hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."parts_order_lines" ADD COLUMN "cost" numeric NULL;
+  type: run_sql
diff --git a/hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/down.yaml b/hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/down.yaml
new file mode 100644
index 000000000..03a2bc485
--- /dev/null
+++ b/hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/down.yaml
@@ -0,0 +1,41 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      columns:
+      - act_price
+      - backordered_eta
+      - backordered_on
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - part_type
+      - quantity
+      - status
+      - updated_at
+      set: {}
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/up.yaml b/hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/up.yaml
new file mode 100644
index 000000000..84d338991
--- /dev/null
+++ b/hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/up.yaml
@@ -0,0 +1,42 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      columns:
+      - act_price
+      - backordered_eta
+      - backordered_on
+      - cost
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - part_type
+      - quantity
+      - status
+      - updated_at
+      set: {}
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/down.yaml b/hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/down.yaml
new file mode 100644
index 000000000..9d5d7c6a7
--- /dev/null
+++ b/hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/down.yaml
@@ -0,0 +1,42 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - act_price
+      - backordered_eta
+      - backordered_on
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - part_type
+      - quantity
+      - status
+      - updated_at
+      computed_fields: []
+      filter:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/up.yaml b/hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/up.yaml
new file mode 100644
index 000000000..1561ce9e7
--- /dev/null
+++ b/hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/up.yaml
@@ -0,0 +1,43 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - act_price
+      - backordered_eta
+      - backordered_on
+      - cost
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - part_type
+      - quantity
+      - status
+      - updated_at
+      computed_fields: []
+      filter:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/down.yaml b/hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/down.yaml
new file mode 100644
index 000000000..1277d7f95
--- /dev/null
+++ b/hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/down.yaml
@@ -0,0 +1,41 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - act_price
+      - backordered_eta
+      - backordered_on
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - part_type
+      - quantity
+      - status
+      - updated_at
+      filter:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      set: {}
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/up.yaml b/hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/up.yaml
new file mode 100644
index 000000000..16b49ed8b
--- /dev/null
+++ b/hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/up.yaml
@@ -0,0 +1,42 @@
+- args:
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - act_price
+      - backordered_eta
+      - backordered_on
+      - cost
+      - created_at
+      - db_price
+      - id
+      - job_line_id
+      - line_desc
+      - line_remarks
+      - oem_partno
+      - orderid
+      - part_type
+      - quantity
+      - status
+      - updated_at
+      filter:
+        parts_order:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      set: {}
+    role: user
+    table:
+      name: parts_order_lines
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index dfff958f5..ab5d2c563 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -3354,6 +3354,7 @@ tables:
       - act_price
       - backordered_eta
       - backordered_on
+      - cost
       - created_at
       - db_price
       - id
@@ -3373,6 +3374,7 @@ tables:
       - act_price
       - backordered_eta
       - backordered_on
+      - cost
       - created_at
       - db_price
       - id
@@ -3403,6 +3405,7 @@ tables:
       - act_price
       - backordered_eta
       - backordered_on
+      - cost
       - created_at
       - db_price
       - id