[PUI] Add more barcode actions (inventree#7741)

- Add to ReturnOrder - Add to SalesOrder - Refactor for BuildOrder
matmair · Jul 26, 2024 · f92d734 · f92d734
1 parent 86fb9f0
commit f92d734
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/src/frontend/src/pages/build/BuildDetail.tsx b/src/frontend/src/pages/build/BuildDetail.tsx
@@ -24,6 +24,7 @@ import { ItemDetailsGrid } from '../../components/details/ItemDetails';
 import NotesEditor from '../../components/editors/NotesEditor';
 import {
   ActionDropdown,
+  BarcodeActionDropdown,
   CancelItemAction,
   DuplicateItemAction,
   EditItemAction,
@@ -366,9 +367,7 @@ export default function BuildDetail() {
   const buildActions = useMemo(() => {
     return [
       <AdminButton model={ModelType.build} pk={build.pk} />,
-      <ActionDropdown
-        tooltip={t`Barcode Actions`}
-        icon={<IconQrcode />}
+      <BarcodeActionDropdown
         actions={[
           ViewBarcodeAction({
             model: ModelType.build,

diff --git a/src/frontend/src/pages/sales/ReturnOrderDetail.tsx b/src/frontend/src/pages/sales/ReturnOrderDetail.tsx
@@ -18,9 +18,13 @@ import { ItemDetailsGrid } from '../../components/details/ItemDetails';
 import NotesEditor from '../../components/editors/NotesEditor';
 import {
   ActionDropdown,
+  BarcodeActionDropdown,
   CancelItemAction,
   DuplicateItemAction,
-  EditItemAction
+  EditItemAction,
+  LinkBarcodeAction,
+  UnlinkBarcodeAction,
+  ViewBarcodeAction
 } from '../../components/items/ActionDropdown';
 import { PlaceholderPanel } from '../../components/items/Placeholder';
 import InstanceDetail from '../../components/nav/InstanceDetail';
@@ -290,6 +294,20 @@ export default function ReturnOrderDetail() {
   const orderActions = useMemo(() => {
     return [
       <AdminButton model={ModelType.returnorder} pk={order.pk} />,
+      <BarcodeActionDropdown
+        actions={[
+          ViewBarcodeAction({
+            model: ModelType.returnorder,
+            pk: order.pk
+          }),
+          LinkBarcodeAction({
+            hidden: order?.barcode_hash
+          }),
+          UnlinkBarcodeAction({
+            hidden: !order?.barcode_hash
+          })
+        ]}
+      />,
       <PrintingActions
         modelType={ModelType.returnorder}
         items={[order.pk]}

diff --git a/src/frontend/src/pages/sales/SalesOrderDetail.tsx b/src/frontend/src/pages/sales/SalesOrderDetail.tsx
@@ -21,9 +21,13 @@ import { ItemDetailsGrid } from '../../components/details/ItemDetails';
 import NotesEditor from '../../components/editors/NotesEditor';
 import {
   ActionDropdown,
+  BarcodeActionDropdown,
   CancelItemAction,
   DuplicateItemAction,
-  EditItemAction
+  EditItemAction,
+  LinkBarcodeAction,
+  UnlinkBarcodeAction,
+  ViewBarcodeAction
 } from '../../components/items/ActionDropdown';
 import { PlaceholderPanel } from '../../components/items/Placeholder';
 import InstanceDetail from '../../components/nav/InstanceDetail';
@@ -298,6 +302,20 @@ export default function SalesOrderDetail() {
   const soActions = useMemo(() => {
     return [
       <AdminButton model={ModelType.salesorder} pk={order.pk} />,
+      <BarcodeActionDropdown
+        actions={[
+          ViewBarcodeAction({
+            model: ModelType.salesorder,
+            pk: order.pk
+          }),
+          LinkBarcodeAction({
+            hidden: order?.barcode_hash
+          }),
+          UnlinkBarcodeAction({
+            hidden: !order?.barcode_hash
+          })
+        ]}
+      />,
       <PrintingActions
         modelType={ModelType.salesorder}
         items={[order.pk]}