Merge pull request #12976 from transcom/B-19889-UI-estimatedprice-MAIN

B 19889 UI estimatedprice main

pkg/handlers/ghcapi/internal/payloads/model_to_payload.go

@@ -1514,6 +1514,7 @@ func MTOServiceItemModel(s *models.MTOServiceItem, storer storage.FileStorer) *g
 		ConvertToCustomerExpense:      *handlers.FmtBool(s.CustomerExpense),
 		CustomerExpenseReason:         handlers.FmtStringPtr(s.CustomerExpenseReason),
 		SitDeliveryMiles:              handlers.FmtIntPtrToInt64(s.SITDeliveryMiles),
+		EstimatedPrice:                handlers.FmtCost(s.PricingEstimate),
 		StandaloneCrate:               s.StandaloneCrate,
 	}
 }

src/components/Office/ServiceItemDetails/ServiceItemDetails.jsx

@@ -12,7 +12,7 @@ import { ShipmentShape } from 'types/shipment';
 import { SitStatusShape } from 'types/sitStatusShape';
 import { formatDateWithUTC } from 'shared/dates';
 import { formatCityStateAndPostalCode } from 'utils/shipmentDisplay';
-import { formatWeight, convertFromThousandthInchToInch } from 'utils/formatters';
+import { formatWeight, convertFromThousandthInchToInch, formatCents, toDollarString } from 'utils/formatters';
 
 function generateDetailText(details, id, className) {
   const detailList = Object.keys(details).map((detail) => (
@@ -453,6 +453,24 @@ const ServiceItemDetails = ({ id, code, details, serviceRequestDocs, shipment, s
       );
       break;
     }
+    case 'DLH':
+    case 'DSH':
+    case 'FSC':
+    case 'DOP':
+    case 'DDP':
+    case 'DPK':
+    case 'DUPK': {
+      detailSection = (
+        <div>
+          <dl>
+            {generateDetailText({
+              'Estimated Price': details.estimatedPrice ? toDollarString(formatCents(details.estimatedPrice)) : '-',
+            })}
+          </dl>
+        </div>
+      );
+      break;
+    }
     default:
       detailSection = (
         <div>

src/components/Office/ServiceItemDetails/ServiceItemDetails.test.jsx

@@ -62,6 +62,7 @@ const details = {
     state: 'FL',
     streetAddress1: 'MacDill',
   },
+  estimatedPrice: 2800,
 };
 
 const submittedServiceItemDetails = {
@@ -405,3 +406,43 @@ describe('ServiceItemDetails Crating Rejected', () => {
     expect(downloadLink).toBeInstanceOf(HTMLAnchorElement);
   });
 });
+
+describe('ServiceItemDetails Estimated Price for DLH, DSH, FSC, DOP, DDP, DPK, DUPK', () => {
+  it.each([['DLH'], ['DSH'], ['FSC'], ['DOP'], ['DDP'], ['DPK'], ['DUPK']])(
+    'renders the formatted estimated price field for the service items',
+    (code) => {
+      render(
+        <ServiceItemDetails
+          id="1"
+          code={code}
+          details={details}
+          shipment={shipment}
+          serviceRequestDocs={serviceRequestDocs}
+        />,
+      );
+
+      expect(screen.getByText('Estimated Price:')).toBeInTheDocument();
+      expect(screen.getByText('$28.00')).toBeInTheDocument();
+    },
+  );
+
+  const noEstimatePriceDetails = {};
+
+  it.each([['DLH'], ['DSH'], ['FSC'], ['DOP'], ['DDP'], ['DPK'], ['DUPK']])(
+    'renders - for estimated price when price is not in details',
+    (code) => {
+      render(
+        <ServiceItemDetails
+          id="1"
+          code={code}
+          details={noEstimatePriceDetails}
+          shipment={shipment}
+          serviceRequestDocs={serviceRequestDocs}
+        />,
+      );
+
+      expect(screen.getByText('Estimated Price:')).toBeInTheDocument();
+      expect(screen.getByText('-')).toBeInTheDocument();
+    },
+  );
+});

src/components/Office/ServiceItemsTable/ServiceItemsTable.test.jsx

@@ -22,7 +22,7 @@ describe('ServiceItemsTable', () => {
     },
   };
 
-  it('renders with no details', () => {
+  it('renders with no estimated price when no estimated price exists', () => {
     const serviceItems = [
       {
         id: 'abc123',
@@ -41,7 +41,31 @@ describe('ServiceItemsTable', () => {
         />
       </MockProviders>,
     );
-    expect(wrapper.find('td').at(1).text()).toBe('—');
+    expect(wrapper.find('td').at(1).text()).toBe('Estimated Price: -');
+  });
+
+  it('renders with estimated price shown when estimated price', () => {
+    const serviceItems = [
+      {
+        id: 'abc123',
+        submittedAt: '2020-11-20',
+        serviceItem: 'Fuel Surcharge',
+        code: 'FSC',
+        details: {
+          estimatedPrice: 2314,
+        },
+      },
+    ];
+    const wrapper = mount(
+      <MockProviders>
+        <ServiceItemsTable
+          {...defaultProps}
+          statusForTableType={SERVICE_ITEM_STATUS.SUBMITTED}
+          serviceItems={serviceItems}
+        />
+      </MockProviders>,
+    );
+    expect(wrapper.find('td').at(1).text()).toBe('Estimated Price: $23.14');
   });
 
   it('renders a thumbnail image with dimensions for item and crating', () => {

src/pages/Office/MoveTaskOrder/MoveTaskOrder.jsx

@@ -169,6 +169,7 @@ export const MoveTaskOrder = (props) => {
         sitRequestedDelivery: item.sitRequestedDelivery,
         sitDeliveryMiles: item.sitDeliveryMiles,
         status: item.status,
+        estimatedPrice: item.estimatedPrice,
         standaloneCrate: item.standaloneCrate,
       };
 

src/types/serviceItems.js

@@ -55,6 +55,7 @@ export const ServiceItemDetailsShape = PropTypes.shape({
     customerContacts: PropTypes.arrayOf(MTOServiceItemCustomerContactShape),
     estimatedWeight: PropTypes.number,
     status: PropTypes.string,
+    estimatedPrice: PropTypes.number,
   }),
   sitAddressUpdates: PropTypes.arrayOf(SitAddressUpdatesShape),
 });

swagger-def/definitions/MTOServiceItem.yaml

@@ -136,3 +136,7 @@ properties:
     x-nullable: true
   serviceRequestDocuments:
     $ref: 'ServiceRequestDocuments.yaml'
+  estimatedPrice:
+    type: integer
+    format: cents
+    x-nullable: true

swagger/ghc.yaml

@@ -7100,6 +7100,10 @@ definitions:
         x-nullable: true
       serviceRequestDocuments:
         $ref: '#/definitions/ServiceRequestDocuments'
+      estimatedPrice:
+        type: integer
+        format: cents
+        x-nullable: true
   MTOServiceItems:
     description: A list of service items connected to this shipment.
     type: array