From c8a42b0a9fcb6107bc3960217b66d8b8f13fcaab Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 6 May 2021 17:53:09 -0700
Subject: [PATCH] IO-1029 IO-1027

---
 .../bills-list-table.component.jsx            |  20 +--
 .../parts-order-modal.component.jsx           | 127 +++++++++---------
 .../parts-order-modal.container.jsx           |   2 +-
 3 files changed, 75 insertions(+), 74 deletions(-)

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 9170b563b..1ef639de8 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
@@ -51,15 +51,6 @@ export function BillsListTableComponent({
         </Button>
       )}
       <BillDeleteButton bill={record} />
-      {record.isinhouse && (
-        <PrintWrapperComponent
-          templateObject={{
-            name: Templates.inhouse_invoice.key,
-            variables: { id: record.id },
-          }}
-          messageObject={{ subject: Templates.inhouse_invoice.subject }}
-        />
-      )}
       <Button
         disabled={record.is_credit_memo}
         onClick={() =>
@@ -87,6 +78,15 @@ export function BillsListTableComponent({
       >
         {t("bills.actions.return")}
       </Button>
+      {record.isinhouse && (
+        <PrintWrapperComponent
+          templateObject={{
+            name: Templates.inhouse_invoice.key,
+            variables: { id: record.id },
+          }}
+          messageObject={{ subject: Templates.inhouse_invoice.subject }}
+        />
+      )}
     </Space>
   );
   const columns = [
@@ -167,7 +167,7 @@ export function BillsListTableComponent({
           <Button onClick={() => refetch()}>
             <SyncOutlined />
           </Button>
-          {job ? (
+          {job && job.converted ? (
             <>
               <Button
                 onClick={() => {
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 0508d444e..f782bef36 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
@@ -71,73 +71,74 @@ export default function PartsOrderModalComponent({
             <div>
               {fields.map((field, index) => (
                 <Form.Item required={false} key={field.key}>
-                  <div style={{ display: "flex", alignItems: "center" }}>
-                    <LayoutFormRow style={{ flex: 1 }} noDivider>
+                  <LayoutFormRow grow noDivider>
+                    <Form.Item
+                      label={t("parts_orders.fields.line_desc")}
+                      key={`${index}line_desc`}
+                      name={[field.name, "line_desc"]}
+                      rules={[
+                        {
+                          required: true,
+                          message: t("general.validation.required"),
+                        },
+                      ]}
+                    >
+                      <Input />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("parts_orders.fields.line_remarks")}
+                      key={`${index}line_remarks`}
+                      name={[field.name, "line_remarks"]}
+                    >
+                      <Input />
+                    </Form.Item>
+                    {
+                      // <Form.Item
+                      //   label={t("parts_orders.fields.db_price")}
+                      //   key={`${index}db_price`}
+                      //   name={[field.name, "db_price"]}
+                      // >
+                      //   <CurrencyInput />
+                      // </Form.Item>
+                    }
+                    <Form.Item
+                      label={t("parts_orders.fields.quantity")}
+                      key={`${index}quantity`}
+                      name={[field.name, "quantity"]}
+                    >
+                      <InputNumber />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("parts_orders.fields.act_price")}
+                      key={`${index}act_price`}
+                      name={[field.name, "act_price"]}
+                    >
+                      <CurrencyInput />
+                    </Form.Item>
+                    {isReturn && (
                       <Form.Item
-                        label={t("parts_orders.fields.line_desc")}
-                        key={`${index}line_desc`}
-                        name={[field.name, "line_desc"]}
-                        rules={[
-                          {
-                            required: true,
-                            message: t("general.validation.required"),
-                          },
-                        ]}
-                      >
-                        <Input />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("parts_orders.fields.line_remarks")}
-                        key={`${index}line_remarks`}
-                        name={[field.name, "line_remarks"]}
-                      >
-                        <Input />
-                      </Form.Item>
-                      {
-                        // <Form.Item
-                        //   label={t("parts_orders.fields.db_price")}
-                        //   key={`${index}db_price`}
-                        //   name={[field.name, "db_price"]}
-                        // >
-                        //   <CurrencyInput />
-                        // </Form.Item>
-                      }
-                      <Form.Item
-                        label={t("parts_orders.fields.quantity")}
-                        key={`${index}quantity`}
-                        name={[field.name, "quantity"]}
-                      >
-                        <InputNumber />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("parts_orders.fields.act_price")}
-                        key={`${index}act_price`}
-                        name={[field.name, "act_price"]}
+                        label={t("parts_orders.fields.cost")}
+                        key={`${index}cost`}
+                        name={[field.name, "cost"]}
                       >
                         <CurrencyInput />
                       </Form.Item>
-                      {isReturn && (
-                        <Form.Item
-                          label={t("parts_orders.fields.cost")}
-                          key={`${index}cost`}
-                          name={[field.name, "cost"]}
-                        >
-                          <CurrencyInput />
-                        </Form.Item>
-                      )}
-                    </LayoutFormRow>
-                    <DeleteFilled
-                      style={{ margin: "1rem" }}
-                      onClick={() => {
-                        remove(field.name);
-                      }}
-                    />
-                    <FormListMoveArrows
-                      move={move}
-                      index={index}
-                      total={fields.length}
-                    />
-                  </div>
+                    )}
+
+                    <div>
+                      <DeleteFilled
+                        style={{ margin: "1rem" }}
+                        onClick={() => {
+                          remove(field.name);
+                        }}
+                      />
+                      <FormListMoveArrows
+                        move={move}
+                        index={index}
+                        total={fields.length}
+                      />
+                    </div>
+                  </LayoutFormRow>
                 </Form.Item>
               ))}
             </div>
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 2a22c8572..e7905bcc0 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
@@ -236,9 +236,9 @@ export function PartsOrderModalContainer({
           : t("parts_orders.labels.newpartsorder")
       }
       onCancel={() => toggleModalVisible()}
-      width="90%"
       onOk={() => form.submit()}
       destroyOnClose
+      width="50%"
       forceRender
     >
       {error ? <AlertComponent message={error.message} type="error" /> : null}