Merge pull request #160 from folio-org/UIOR-93-remove-status-fields-f…

…rom-line-screens UIOR-93 remove status field from PO Line screens
folio-org · Jan 15, 2019 · 8e4fe27 · 8e4fe27
2 parents 818f1ea + 03ddde3
commit 8e4fe27
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 53 deletions.
diff --git a/src/components/POLine/POLineDetails/FieldWorkflowStatus.js b/src/components/POLine/POLineDetails/FieldWorkflowStatus.js
diff --git a/src/components/POLine/POLineDetails/POLineDetails.js b/src/components/POLine/POLineDetails/POLineDetails.js
@@ -49,12 +49,6 @@ class POLineDetails extends Component {
               value={get(initialValues, 'order_format')}
             />
           </Col>
-          <Col xs={6}>
-            <KeyValue
-              label={<FormattedMessage id="ui-orders.poLine.poLineWorkflowStatus" />}
-              value={get(initialValues, 'po_line_workflow_status')}
-            />
-          </Col>
         </Row>
         <Row>
           <Col xs={6}>

diff --git a/src/components/POLine/POLineDetails/POLineDetailsForm.js b/src/components/POLine/POLineDetails/POLineDetailsForm.js
@@ -16,7 +16,6 @@ import {
 import FolioFormattedTime from '../../FolioFormattedTime';
 import FieldPaymentStatus from './FieldPaymentStatus';
 import FieldReceiptStatus from './FieldReceiptStatus';
-import FieldWorkflowStatus from './FieldWorkflowStatus';
 import FieldOrderFormat from './FieldOrderFormat';
 import FieldAcquisitionMethod from './FieldAcquisitionMethod';
 // import FieldSource from './FieldSource';
@@ -84,9 +83,6 @@ class POLineDetailsForm extends Component {
               orderVendorId={order.vendor}
             />
           </Col>
-          <Col xs={6}>
-            <FieldWorkflowStatus />
-          </Col>
         </Row>
         <Row>
           <Col xs={6}>

diff --git a/src/components/PurchaseOrder/CloseOrder/CloseOrderModal.js b/src/components/PurchaseOrder/CloseOrder/CloseOrderModal.js
@@ -11,7 +11,7 @@ import {
   TextArea,
 } from '@folio/stripes/components';
 
-import { WORKFLOW_STATUS } from '../../POLine/POLineDetails/FieldWorkflowStatus';
+import { WORKFLOW_STATUS } from '../Summary/FieldWorkflowStatus';
 import css from './CloseOrderModal.css';
 
 const DEFAULT_REASONS = {

diff --git a/src/components/PurchaseOrder/Summary/FieldWorkflowStatus.js b/src/components/PurchaseOrder/Summary/FieldWorkflowStatus.js
@@ -4,7 +4,7 @@ import { Field } from 'redux-form';
 
 import { Select } from '@folio/stripes/components';
 
-const WORKFLOW_STATUS = {
+export const WORKFLOW_STATUS = {
   closed: 'Closed',
   open: 'Open',
   pending: 'Pending',

diff --git a/translations/ui-orders/en.json b/translations/ui-orders/en.json
@@ -440,9 +440,6 @@
   "physical.removeBtn": "Remove",
   "physical.volume": "Volume",
   "physical.volumes": "Volumes",
-  "po_line_workflow_status.closed": "Closed",
-  "po_line_workflow_status.open": "Open",
-  "po_line_workflow_status.pending": "Pending",
   "poLine.acquisitionMethod": "Acquisition Method*",
   "poLine.cancellationRestriction": "Cancellation Restriction",
   "poLine.cancellationRestrictionNote": "Cancellation Description",
@@ -454,7 +451,6 @@
   "poLine.paymentStatus": "Payment Status",
   "poLine.poLineDescription": "Line Description",
   "poLine.poLineNumber": "PO Line ID",
-  "poLine.poLineWorkflowStatus": "Status",
   "poLine.receiptDate": "Receipt Date",
   "poLine.receiptStatus": "Receipt Status",
   "poLine.requester": "Requester",