apps/logistics/src/components/investigation/shipment/parcel/transportOrganisation/ParcelTransportOrganisation.tsx

@@ -175,6 +175,11 @@ export function ParcelTransportOrganisation({
                           body: {
                             ...parcel,
                             isReimbursed: e.currentTarget.checked,
+                            returnParcelInformation: {
+                              returnType: undefined,
+                              forwarderName: undefined,
+                              plannedPickupDate: undefined,
+                            },
                           },
                         });
                         if (e.currentTarget.checked) {
@@ -198,7 +203,7 @@ export function ParcelTransportOrganisation({
               reference={reference}
             />
           )}
-          {parcel.returnAddress && paidByFacility !== true && (
+          {parcel.returnAddress && (
             <>
               <Row className="mt-1">
                 <Col>
@@ -214,13 +219,15 @@ export function ParcelTransportOrganisation({
                     label={`I will prepare the transport documents using my forwarder account, and ${facilityName} will organise the return using the return documents I prepared (daily pickups from ${facilityName} exist for ${faciltyTransporters}).`}
                     name="radio-parcel-papers-included"
                     id="radio-parcel-papers-included"
-                    checked={parcelPapersManaged}
+                    checked={!paidByFacility && parcelPapersManaged}
                     onChange={(e) => {
                       setParcelPapersManaged(e.currentTarget.checked);
+                      setPaidByFacility(false);
                       setPickup(!e.currentTarget.checked);
                       mutate({
                         body: {
                           ...parcel,
+                          isReimbursed: false,
                           returnParcelInformation: {
                             returnType: RETURN_PARCEL_TYPE_MANAGE,
                             forwarderName: undefined,
@@ -241,13 +248,15 @@ export function ParcelTransportOrganisation({
                     label={`I will prepare the transport documents using my forwarder account, and I will organise the return directly with the fowarder (if not ${faciltyTransporters}).`}
                     name="radio-parcel-papers-oganized"
                     id="radio-parcel-papers-oganized"
-                    checked={pickup}
+                    checked={!paidByFacility && pickup}
                     onChange={(e) => {
                       setPickup(e.currentTarget.checked);
+                      setPaidByFacility(false);
                       setParcelPapersManaged(!e.currentTarget.checked);
                       mutate({
                         body: {
                           ...parcel,
+                          isReimbursed: false,
                           returnParcelInformation: {
                             returnType: RETURN_PARCEL_TYPE_ORGANIZE,
                           },