5675.2 link requisition modal #6330

roxy-dao · 2025-01-29T02:33:47Z

Part of #5675

👩🏻‍💻 What does this PR do?

Columns displaying existing Internal Orders for the supplier if they exist for users to link to the Internal Order
Show table of Internal Orders if there are Internal Orders being sent to selected supplier and the preference is on
Clicking on a row in this table will link the Internal selected to the invoice
Next button allows users to create a normal Inbound Shipment without linking IO

🧪 Testing

Have the store pref Link requisition to Supplier Invoice turned off
Try create Inbound Shipments from suppliers both with/without Internal Orders
Should be able to create Inbound Shipments
Now turn on store pref -> Sync -> possibly log out and log back in to be extra sure the pref has been synced through
Create IS from suppliers with/without Internal Orders
For suppliers with Internal Orders, another modal should pop up for you to select the Internal Order you wish to link
Clicking on a row here will create an Inbound Shipment linked to the selected IO (Can confirm from Related documents section of the More panel
Clicking on Next will allow you to create an Inbound Shipment without linking an Internal Order
For suppliers without Internal Orders, should be redirected to Inbound Shipment as per usual workflow

📃 Documentation

Part of an epic: documentation will be completed for the feature as a whole
No documentation required: no user facing changes or a bug fix which isn't a change in behaviour
These areas should be updated or checked:
1.
2.

client/packages/common/src/intl/locales/en/common.json

roxy-dao · 2025-01-29T02:35:05Z

client/packages/invoices/src/InboundShipment/ListView/AppBarButtons.tsx

+  useEffect(() => {
+    if (name && (data?.totalCount === 0 || !manuallyLinkInternalOrder)) {
+      createInvoice(name.id);
+    }
+  }, [name, data]);


Tried to think of a way of doing this without useEffect... but.. yeah can't call in the supplier's modal onChange since it will never stay on the 'list view' page

roxy-dao · 2025-01-29T02:36:46Z

client/packages/invoices/src/InboundShipment/ListView/LinkInternalOrderModal.tsx

+  const { Modal } = useDialog({ isOpen, onClose });
+
+  const columns = useColumns<LinkedRequestRowFragment>([
+    {


Have removed the selection box from design and have used onRowClick instead as per our pattern. Design also doesn't allow users to create an IS without linking from this modal. SO have added a next button with message to state what it does

Looks great! On first pass, it wasn't obvious to me that the next button would allow you to create a linked in bound shipment. I wonder if maybe some UX to show this better?

Nevermind! I just saw now your latest commit adds messaging

I am still thinking a different text for next button would be better (and then doesn't require messaging) would be preferred - but this still works great

Continue or next. Either way it's not clear and we don't wanna put lots of text into a button

github-actions · 2025-01-29T02:38:28Z

Bundle size difference

Comparing this PR to main

Old size	New size	Diff
5.26 MB	5.26 MB	3.32 KB (0.06%)

….2-link-requisition-modal

client/packages/invoices/src/InboundShipment/api/hooks/document/useListInternalOrders.ts

fergie-nz · 2025-01-30T20:33:58Z

client/packages/common/src/intl/locales/en/common.json

@@ -1193,6 +1194,7 @@
  "message.confirm-delete-encounter": "Are you sure?",
  "message.confirm-save-new": "Click OK to save the new item, or Cancel to continue editing",
  "message.contact-support": "Please contact [email protected] about configuring reports",
+  "message.continue-to-make-inbound-shipment": "Click Next to continue to make an Inbound Dhipment without linking an Internal Order.",


Typo on Shipment :)

Spelling is hard Ferg 🤣

fergie-nz

Looks awesome, thanks Roxy.

Approved but FYI typo on the translation string

roxy-dao added 6 commits January 29, 2025 13:19

Linked request hook

62e8375

Link request modal controller

3e6e78e

Modal containing internal orders to supplier

1553051

Show internal order modal

4c0c3d4

Create invoice if pref not on

0dfe489

Allow users to create IS without linking IO

2bbe6e6

github-actions bot added Release Testing For Release Testing issues, created for testing suites Build Tested: Issues Found Issue has been build tested with new issue(s) made for failed tests. Tester: Anusha Tester: Santosh Tester: Maria Tester: Alain Alain is testing this labels Jan 29, 2025

roxy-dao commented Jan 29, 2025

View reviewed changes

github-actions bot added this to the v2.6.0 milestone Jan 29, 2025

github-actions bot added enhancement New feature or request Team Ruru 🦉 Roxy, Ferg, Noel feature: CIV labels Jan 29, 2025

roxy-dao removed Release Testing For Release Testing issues, created for testing suites Build Tested: Issues Found Issue has been build tested with new issue(s) made for failed tests. Tester: Anusha Tester: Santosh Tester: Maria Tester: Alain Alain is testing this labels Jan 29, 2025

roxy-dao added 3 commits January 30, 2025 09:13

Remove plural + wider

b2ea7e0

Merge branch '5675.1-pass-requisition-id-on-insert-inbound' into 5675…

7f86a6e

….2-link-requisition-modal

Remove modal is on in condition

11fdd12

fergie-nz self-assigned this Jan 30, 2025

Message about what the next button does

681320d

Base automatically changed from 5675.1-pass-requisition-id-on-insert-inbound to develop January 30, 2025 19:01

fergie-nz reviewed Jan 30, 2025

View reviewed changes

client/packages/invoices/src/InboundShipment/api/hooks/document/useListInternalOrders.ts Show resolved Hide resolved

fergie-nz reviewed Jan 30, 2025

View reviewed changes

fergie-nz approved these changes Jan 30, 2025

View reviewed changes

typo

451d9f1

roxy-dao merged commit 01ad9b4 into develop Jan 30, 2025
3 checks passed

roxy-dao deleted the 5675.2-link-requisition-modal branch January 30, 2025 20:40

roxy-dao mentioned this pull request Feb 3, 2025

5675.4 frontend #6390

Open

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

5675.2 link requisition modal #6330

5675.2 link requisition modal #6330

roxy-dao commented Jan 29, 2025 •

edited

Loading

roxy-dao Jan 29, 2025

roxy-dao Jan 29, 2025 •

edited

Loading

fergie-nz Jan 30, 2025

fergie-nz Jan 30, 2025

fergie-nz Jan 30, 2025

roxy-dao Jan 30, 2025 •

edited

Loading

github-actions bot commented Jan 29, 2025 •

edited

Loading

fergie-nz Jan 30, 2025

roxy-dao Jan 30, 2025 •

edited

Loading

fergie-nz left a comment

5675.2 link requisition modal #6330

5675.2 link requisition modal #6330

Conversation

roxy-dao commented Jan 29, 2025 • edited Loading

👩🏻‍💻 What does this PR do?

🧪 Testing

📃 Documentation

roxy-dao Jan 29, 2025

Choose a reason for hiding this comment

roxy-dao Jan 29, 2025 • edited Loading

Choose a reason for hiding this comment

fergie-nz Jan 30, 2025

Choose a reason for hiding this comment

fergie-nz Jan 30, 2025

Choose a reason for hiding this comment

fergie-nz Jan 30, 2025

Choose a reason for hiding this comment

roxy-dao Jan 30, 2025 • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Jan 29, 2025 • edited Loading

Bundle size difference

fergie-nz Jan 30, 2025

Choose a reason for hiding this comment

roxy-dao Jan 30, 2025 • edited Loading

Choose a reason for hiding this comment

fergie-nz left a comment

Choose a reason for hiding this comment

roxy-dao commented Jan 29, 2025 •

edited

Loading

roxy-dao Jan 29, 2025 •

edited

Loading

roxy-dao Jan 30, 2025 •

edited

Loading

github-actions bot commented Jan 29, 2025 •

edited

Loading

roxy-dao Jan 30, 2025 •

edited

Loading