From 448ba68f69d511dbc6b8729ee188a8aceabb86a1 Mon Sep 17 00:00:00 2001
From: Daniel Jordan <daniel.jordan@caci.com>
Date: Wed, 16 Oct 2024 15:29:55 +0000
Subject: [PATCH 1/2] initial commit, styling added, should be g2g

---
 src/components/ShipmentList/ShipmentList.jsx  | 10 +++---
 .../ShipmentList/ShipmentList.module.scss     | 29 +++++++++--------
 swagger/prime_v3.yaml                         | 32 +++++++++++++++++++
 3 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/src/components/ShipmentList/ShipmentList.jsx b/src/components/ShipmentList/ShipmentList.jsx
index fb7cf1366c8..2c7610b4575 100644
--- a/src/components/ShipmentList/ShipmentList.jsx
+++ b/src/components/ShipmentList/ShipmentList.jsx
@@ -57,11 +57,11 @@ export const ShipmentListItem = ({
       }`}
       data-testid="shipment-list-item-container"
     >
-      <div>
+      <div className={styles['shipment-info']}>
         <strong>
           {shipmentTypes[shipment.shipmentType]}
           {showNumber && ` ${shipmentNumber}`}
-        </strong>{' '}
+        </strong>
         <br />
         {(shipment.shipmentType === SHIPMENT_OPTIONS.HHG ||
           shipment.shipmentType === SHIPMENT_OPTIONS.NTS ||
@@ -80,7 +80,9 @@ export const ShipmentListItem = ({
       </div>
       {/* use substring of the UUID until actual shipment code is available */}
       {!showShipmentWeight && !showIncomplete && (
-        <span className={styles['shipment-code']}>#{shipment.shipmentLocator}</span>
+        <div className={styles['shipment-locator']}>
+          <span>#{shipment.shipmentLocator}</span>
+        </div>
       )}
       {showIncomplete && <Tag>Incomplete</Tag>}
       {showShipmentWeight && (
@@ -111,7 +113,7 @@ export const ShipmentListItem = ({
         </div>
       )}
       {canEditOrDelete ? (
-        <div className={styles['shipment-btns']}>
+        <div className={styles['shipment-buttons']}>
           <Button className={styles['edit-btn']} onClick={onDeleteClick} type="button">
             Delete
           </Button>
diff --git a/src/components/ShipmentList/ShipmentList.module.scss b/src/components/ShipmentList/ShipmentList.module.scss
index 2e2e1cd6cc3..5b27130a091 100644
--- a/src/components/ShipmentList/ShipmentList.module.scss
+++ b/src/components/ShipmentList/ShipmentList.module.scss
@@ -8,30 +8,33 @@
   align-items: center;
   border-radius: 0 5px 5px 0;
   border: 1px solid $base-lighter;
-  padding-left: 6px;
-  padding-right: 13px;
-  padding-top: 12px;
-  padding-bottom: 12px;
+  padding: 12px 12px;
   height: 52px;
   @include u-margin-bottom(1);
 
-  strong {
-    white-space: nowrap;
-    @media (min-width: $tablet) {
-      @include u-minw(15);
-    }
-    @include u-minw(7);
-    text-align: left;
+  .shipment-info {
+    flex: 1;
   }
 
-  &:last-child {
-    margin-bottom: 0px;
+  .shipment-buttons {
+    flex: 1;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    margin: 0;
   }
 
   &.shipment-display {
     cursor: default;
     justify-content: start;
   }
+
+  @media (max-width: 768px) {
+    .shipment-buttons {
+      margin-left: 3vw;
+      margin-right: -3vw;
+    }
+  }
 }
 
 .shipment-btns {
diff --git a/swagger/prime_v3.yaml b/swagger/prime_v3.yaml
index 354f1322d02..9742f3c5fdc 100644
--- a/swagger/prime_v3.yaml
+++ b/swagger/prime_v3.yaml
@@ -923,6 +923,16 @@ definitions:
           goods exist.
         allOf:
           - $ref: '#/definitions/Address'
+      hasTertiaryPickupAddress:
+        type: boolean
+        x-omitempty: false
+        x-nullable: true
+      tertiaryPickupAddress:
+        description: >
+          An optional third pickup location near the origin where additional
+          goods exist.
+        allOf:
+          - $ref: '#/definitions/Address'
       destinationAddress:
         description: >
           The address of the destination location where goods are being
@@ -939,6 +949,16 @@ definitions:
           dropped off.
         allOf:
           - $ref: '#/definitions/Address'
+      hasTertiaryDestinationAddress:
+        type: boolean
+        x-omitempty: false
+        x-nullable: true
+      tertiaryDestinationAddress:
+        description: >
+          An optional third address near the destination where goods will be
+          dropped off.
+        allOf:
+          - $ref: '#/definitions/Address'
       sitExpected:
         description: >
           Captures whether some or all of the PPM shipment will require
@@ -1106,6 +1126,18 @@ definitions:
           one. An optional field.
         allOf:
           - $ref: '#/definitions/Address'
+      tertiaryPickupAddress:
+        description: >-
+          A third pickup address for this shipment, if the customer entered one.
+          An optional field.
+        allOf:
+          - $ref: '#/definitions/Address'
+      tertiaryDeliveryAddress:
+        description: >-
+          A third delivery address for this shipment, if the customer entered
+          one. An optional field.
+        allOf:
+          - $ref: '#/definitions/Address'
       storageFacility:
         allOf:
           - x-nullable: true

From 80816c211c812d7998cc362d7e241733bf34b69d Mon Sep 17 00:00:00 2001
From: Daniel Jordan <daniel.jordan@caci.com>
Date: Wed, 16 Oct 2024 17:51:34 +0000
Subject: [PATCH 2/2] removed unused css styling after update

---
 src/components/ShipmentList/ShipmentList.module.scss | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/ShipmentList/ShipmentList.module.scss b/src/components/ShipmentList/ShipmentList.module.scss
index 5b27130a091..6210215fd83 100644
--- a/src/components/ShipmentList/ShipmentList.module.scss
+++ b/src/components/ShipmentList/ShipmentList.module.scss
@@ -37,12 +37,6 @@
   }
 }
 
-.shipment-btns {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
 :global(.usa-button).edit-btn {
   background-color: transparent;
   color: $primary;