Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

feat(items): move sales rules card to the Sales tab (#1718)

Brad Barbinea33bb98ebe0
diff --git a/apps/erp/app/modules/items/ui/Consumables/useConsumableNavigation.tsx b/apps/erp/app/modules/items/ui/Consumables/useConsumableNavigation.tsx
index 3f80804cd4..073d0408fe 100644
--- a/apps/erp/app/modules/items/ui/Consumables/useConsumableNavigation.tsx
+++ b/apps/erp/app/modules/items/ui/Consumables/useConsumableNavigation.tsx
@@ -4,6 +4,7 @@ import {
LuChartLine,
LuClipboardCheck,
LuFileText,
+ LuReceipt,
LuShoppingCart,
LuTags
} from "react-icons/lu";
@@ -67,6 +68,13 @@ export function useConsumableNavigation() {
icon: LuBox,
shortcut: DETAIL_TAB_SHORTCUTS.inventory
},
+ {
+ name: t`Sales`,
+ to: path.to.consumableSales(itemId),
+ role: ["employee"],
+ icon: LuReceipt,
+ shortcut: DETAIL_TAB_SHORTCUTS.sales
+ },
{
name: t`Quality`,
to: path.to.consumableQuality(itemId),
diff --git a/apps/erp/app/modules/items/ui/Materials/useMaterialNavigation.tsx b/apps/erp/app/modules/items/ui/Materials/useMaterialNavigation.tsx
index 555c0cead3..a9ea177a30 100644
--- a/apps/erp/app/modules/items/ui/Materials/useMaterialNavigation.tsx
+++ b/apps/erp/app/modules/items/ui/Materials/useMaterialNavigation.tsx
@@ -4,6 +4,7 @@ import {
LuChartLine,
LuClipboardCheck,
LuFileText,
+ LuReceipt,
LuShoppingCart,
LuTags
} from "react-icons/lu";
@@ -67,6 +68,13 @@ export function useMaterialNavigation() {
icon: LuBox,
shortcut: DETAIL_TAB_SHORTCUTS.inventory
},
+ {
+ name: t`Sales`,
+ to: path.to.materialSales(itemId),
+ role: ["employee"],
+ icon: LuReceipt,
+ shortcut: DETAIL_TAB_SHORTCUTS.sales
+ },
{
name: t`Quality`,
to: path.to.materialQuality(itemId),
diff --git a/apps/erp/app/modules/items/ui/Tools/useToolNavigation.tsx b/apps/erp/app/modules/items/ui/Tools/useToolNavigation.tsx
index 378efef3ec..cd9e889c5f 100644
--- a/apps/erp/app/modules/items/ui/Tools/useToolNavigation.tsx
+++ b/apps/erp/app/modules/items/ui/Tools/useToolNavigation.tsx
@@ -4,6 +4,7 @@ import {
LuChartLine,
LuClipboardCheck,
LuFileText,
+ LuReceipt,
LuShoppingCart,
LuTags
} from "react-icons/lu";
@@ -71,6 +72,13 @@ export function useToolNavigation() {
icon: LuBox,
shortcut: DETAIL_TAB_SHORTCUTS.inventory
},
+ {
+ name: t`Sales`,
+ to: path.to.toolSales(itemId),
+ role: ["employee"],
+ icon: LuReceipt,
+ shortcut: DETAIL_TAB_SHORTCUTS.sales
+ },
{
name: t`Quality`,
to: path.to.toolQuality(itemId),
diff --git a/apps/erp/app/modules/sales/ui/SalesRules/SalesRuleAssignmentsList.tsx b/apps/erp/app/modules/sales/ui/SalesRules/SalesRuleAssignmentsList.tsx
index ab2c99b1e6..46cfe6b0bc 100644
--- a/apps/erp/app/modules/sales/ui/SalesRules/SalesRuleAssignmentsList.tsx
+++ b/apps/erp/app/modules/sales/ui/SalesRules/SalesRuleAssignmentsList.tsx
@@ -8,8 +8,11 @@ import {
Badge,
Button,
Card,
+ CardAction,
CardContent,
+ CardDescription,
CardHeader,
+ CardTitle,
Combobox,
HStack,
IconButton,
@@ -118,49 +121,36 @@ export default function SalesRuleAssignmentsList({
const isEmpty = assignments.length === 0;
- const header = (
- <div className="flex items-start justify-between gap-4">
- <div className="min-w-0 flex-1">
- <div className="flex items-center gap-2">
- <h2 className="text-base font-semibold">
- <Trans>Sales rules</Trans>
- </h2>
- {!isEmpty && (
- <span className="text-sm font-normal text-muted-foreground tabular-nums">
- {assignments.length}
- </span>
- )}
- </div>
- <p className="mt-1 max-w-[64ch] text-sm text-muted-foreground text-pretty">
- {description}
- </p>
+ const actions =
+ !isEmpty && canUpdate ? (
+ <div className="flex shrink-0 items-center gap-2">
+ {availableOptions.length > 0 && (
+ <Combobox
+ size="md"
+ value=""
+ options={availableOptions}
+ onChange={handleAssign}
+ placeholder={t`Add from library…`}
+ className="w-[200px]"
+ />
+ )}
+ <Button variant="primary" leftIcon={<LuPlus />} asChild>
+ <Link to={path.to.newSalesRule}>
+ <Trans>Add rule</Trans>
+ </Link>
+ </Button>
</div>
- {!isEmpty && canUpdate && (
- <div className="flex shrink-0 items-center gap-2">
- {availableOptions.length > 0 && (
- <Combobox
- size="md"
- value=""
- options={availableOptions}
- onChange={handleAssign}
- placeholder={t`Add from library…`}
- className="w-[200px]"
- />
- )}
- <Button variant="primary" leftIcon={<LuPlus />} asChild>
- <Link to={path.to.newSalesRule}>
- <Trans>Add rule</Trans>
- </Link>
- </Button>
- </div>
- )}
- </div>
- );
+ ) : null;
if (isGated) {
return (
<Card className="flex-grow">
- <CardHeader>{header}</CardHeader>
+ <CardHeader>
+ <CardTitle>
+ <Trans>Sales Rules</Trans>
+ </CardTitle>
+ <CardDescription>{description}</CardDescription>
+ </CardHeader>
<CardContent>
<div className="flex flex-col items-center justify-center gap-4 py-10 text-center">
<UpgradeOverlayIcon>
@@ -362,7 +352,20 @@ export default function SalesRuleAssignmentsList({
return (
<Card className="flex-grow">
- <CardHeader>{header}</CardHeader>
+ <HStack className="w-full justify-between items-start">
+ <CardHeader>
+ <CardTitle className="flex items-center gap-2">
+ <Trans>Sales Rules</Trans>
+ {!isEmpty && (
+ <span className="text-sm font-normal text-muted-foreground tabular-nums">
+ {assignments.length}
+ </span>
+ )}
+ </CardTitle>
+ <CardDescription>{description}</CardDescription>
+ </CardHeader>
+ {actions && <CardAction>{actions}</CardAction>}
+ </HStack>
<CardContent>{body}</CardContent>
</Card>
);
diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.inventory.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.inventory.tsx
index dbf9b6509f..41da5f5c33 100644
--- a/apps/erp/app/routes/x+/consumable+/$itemId.inventory.tsx
+++ b/apps/erp/app/routes/x+/consumable+/$itemId.inventory.tsx
@@ -1,10 +1,6 @@
import { assertIsPost, error, success } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
-import {
- getSalesRuleAssignmentsForItem,
- getSalesRulesList
-} from "@carbon/ee/rules";
import { getStorageRulesDataForTarget } from "@carbon/ee/rules.server";
import { validationError, validator } from "@carbon/form";
import { VStack } from "@carbon/react";
@@ -32,7 +28,6 @@ import {
} from "~/modules/items";
import { PickMethodForm } from "~/modules/items/ui/Item";
import { getLocationsList } from "~/modules/resources";
-import { SalesRuleAssignmentsList } from "~/modules/sales/ui/SalesRules";
import { getUserDefaults } from "~/modules/users/users.server";
import { getDatabaseClient } from "~/services/database.server";
import { useItems } from "~/stores/items";
@@ -165,9 +160,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
shelfLife,
bomHasShelfLifeManagedInput,
trackedEntityExpirations,
- rulesData,
- salesRuleAssignments,
- salesRuleLibrary
+ rulesData
] = await Promise.all([
getItemShelfLife(client, itemId),
getBomHasShelfLifeManagedInput(client, itemId, companyId),
@@ -176,9 +169,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
targetType: "item",
targetId: itemId,
companyId
- }),
- getSalesRuleAssignmentsForItem(client, { itemId, companyId }),
- getSalesRulesList(client, companyId)
+ })
]);
return {
@@ -191,9 +182,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
itemId,
locationId,
ruleAssignments: rulesData.assignments,
- ruleLibrary: rulesData.library,
- salesRuleAssignments: salesRuleAssignments.data ?? [],
- salesRuleLibrary: salesRuleLibrary.data ?? []
+ ruleLibrary: rulesData.library
};
}
@@ -268,9 +257,7 @@ export default function ConsumableInventoryRoute() {
trackedEntityExpirations,
itemId,
ruleAssignments,
- ruleLibrary,
- salesRuleAssignments,
- salesRuleLibrary
+ ruleLibrary
} = useLoaderData<typeof loader>();
const consumableData = useRouteData<{
@@ -328,11 +315,6 @@ export default function ConsumableInventoryRoute() {
assignments={ruleAssignments as never}
library={ruleLibrary as never}
/>
- <SalesRuleAssignmentsList
- itemId={itemId}
- assignments={salesRuleAssignments as never}
- library={salesRuleLibrary as never}
- />
</VStack>
);
}
diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.sales.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.sales.tsx
new file mode 100644
index 0000000000..933197113b
--- /dev/null
+++ b/apps/erp/app/routes/x+/consumable+/$itemId.sales.tsx
@@ -0,0 +1,131 @@
+import { assertIsPost, error, success } from "@carbon/auth";
+import { requirePermissions } from "@carbon/auth/auth.server";
+import { flash } from "@carbon/auth/session.server";
+import {
+ getSalesRuleAssignmentsForItem,
+ getSalesRulesList
+} from "@carbon/ee/rules";
+import { validationError, validator } from "@carbon/form";
+import { VStack } from "@carbon/react";
+import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";
+import { redirect, useLoaderData } from "react-router";
+import {
+ getItemUnitSalePrice,
+ itemUnitSalePriceValidator,
+ upsertItemUnitSalePrice
+} from "~/modules/items";
+import { ItemSalePriceForm } from "~/modules/items/ui/Item";
+import { SalesRuleAssignmentsList } from "~/modules/sales/ui/SalesRules";
+import { getCustomFields, setCustomFields } from "~/utils/form";
+import { path } from "~/utils/path";
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+ const { client, companyId } = await requirePermissions(request, {
+ view: "parts",
+ role: "employee"
+ });
+
+ const { itemId } = params;
+ if (!itemId) throw new Error("Could not find itemId");
+
+ const [consumableUnitSalePrice, salesRuleAssignments, salesRuleLibrary] =
+ await Promise.all([
+ getItemUnitSalePrice(client, itemId, companyId),
+ getSalesRuleAssignmentsForItem(client, { itemId, companyId }),
+ getSalesRulesList(client, companyId)
+ ]);
+
+ if (consumableUnitSalePrice.error) {
+ throw redirect(
+ path.to.items,
+ await flash(
+ request,
+ error(
+ consumableUnitSalePrice.error,
+ "Failed to load consumable unit sale price"
+ )
+ )
+ );
+ }
+
+ return {
+ consumableUnitSalePrice: consumableUnitSalePrice.data,
+ salesRuleAssignments: salesRuleAssignments.data ?? [],
+ salesRuleLibrary: salesRuleLibrary.data ?? [],
+ itemId
+ };
+}
+
+export async function action({ request, params }: ActionFunctionArgs) {
+ assertIsPost(request);
+ const { client, userId } = await requirePermissions(request, {
+ update: "parts"
+ });
+
+ const { itemId } = params;
+ if (!itemId) throw new Error("Could not find itemId");
+
+ const formData = await request.formData();
+ const validation = await validator(itemUnitSalePriceValidator).validate(
+ formData
+ );
+
+ if (validation.error) {
+ return validationError(validation.error);
+ }
+
+ const updateConsumableUnitSalePrice = await upsertItemUnitSalePrice(client, {
+ ...validation.data,
+ itemId,
+ updatedBy: userId,
+ customFields: setCustomFields(formData)
+ });
+ if (updateConsumableUnitSalePrice.error) {
+ throw redirect(
+ path.to.consumable(itemId),
+ await flash(
+ request,
+ error(
+ updateConsumableUnitSalePrice.error,
+ "Failed to update consumable sale price"
+ )
+ )
+ );
+ }
+
+ throw redirect(
+ path.to.consumableSales(itemId),
+ await flash(request, success("Updated consumable sale price"))
+ );
+}
+
+export default function ConsumableSalesRoute() {
+ const {
+ consumableUnitSalePrice,
+ salesRuleAssignments,
+ salesRuleLibrary,
+ itemId
+ } = useLoaderData<typeof loader>();
+
+ const initialValues = {
+ ...consumableUnitSalePrice,
+ salesUnitOfMeasureCode:
+ consumableUnitSalePrice?.salesUnitOfMeasureCode ?? "",
+ ...getCustomFields(consumableUnitSalePrice.customFields),
+ itemId: itemId
+ };
+
+ return (
+ <VStack spacing={4} className="p-4">
+ <ItemSalePriceForm
+ key={initialValues.itemId}
+ initialValues={initialValues}
+ />
+ <SalesRuleAssignmentsList
+ itemId={itemId}
+ assignments={salesRuleAssignments as never}
+ library={salesRuleLibrary as never}
+ />
+ </VStack>
+ );
+}
diff --git a/apps/erp/app/routes/x+/material+/$itemId.inventory.tsx b/apps/erp/app/routes/x+/material+/$itemId.inventory.tsx
index ec2703d0b2..275199bc6a 100644
--- a/apps/erp/app/routes/x+/material+/$itemId.inventory.tsx
+++ b/apps/erp/app/routes/x+/material+/$itemId.inventory.tsx
@@ -1,10 +1,6 @@
import { assertIsPost, error, success } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
-import {
- getSalesRuleAssignmentsForItem,
- getSalesRulesList
-} from "@carbon/ee/rules";
import { getStorageRulesDataForTarget } from "@carbon/ee/rules.server";
import { validationError, validator } from "@carbon/form";
import { VStack } from "@carbon/react";
@@ -32,7 +28,6 @@ import {
} from "~/modules/items";
import { PickMethodForm } from "~/modules/items/ui/Item";
import { getLocationsList } from "~/modules/resources";
-import { SalesRuleAssignmentsList } from "~/modules/sales/ui/SalesRules";
import { getUserDefaults } from "~/modules/users/users.server";
import { getDatabaseClient } from "~/services/database.server";
import { useItems } from "~/stores";
@@ -162,9 +157,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
shelfLife,
bomHasShelfLifeManagedInput,
trackedEntityExpirations,
- rulesData,
- salesRuleAssignments,
- salesRuleLibrary
+ rulesData
] = await Promise.all([
getItemShelfLife(client, itemId),
getBomHasShelfLifeManagedInput(client, itemId, companyId),
@@ -173,9 +166,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
targetType: "item",
targetId: itemId,
companyId
- }),
- getSalesRuleAssignmentsForItem(client, { itemId, companyId }),
- getSalesRulesList(client, companyId)
+ })
]);
return {
@@ -188,9 +179,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
itemId,
locationId,
ruleAssignments: rulesData.assignments,
- ruleLibrary: rulesData.library,
- salesRuleAssignments: salesRuleAssignments.data ?? [],
- salesRuleLibrary: salesRuleLibrary.data ?? []
+ ruleLibrary: rulesData.library
};
}
@@ -265,9 +254,7 @@ export default function MaterialInventoryRoute() {
trackedEntityExpirations,
itemId,
ruleAssignments,
- ruleLibrary,
- salesRuleAssignments,
- salesRuleLibrary
+ ruleLibrary
} = useLoaderData<typeof loader>();
const materialData = useRouteData<{
@@ -325,11 +312,6 @@ export default function MaterialInventoryRoute() {
assignments={ruleAssignments as never}
library={ruleLibrary as never}
/>
- <SalesRuleAssignmentsList
- itemId={itemId}
- assignments={salesRuleAssignments as never}
- library={salesRuleLibrary as never}
- />
</VStack>
);
}
diff --git a/apps/erp/app/routes/x+/material+/$itemId.sales.tsx b/apps/erp/app/routes/x+/material+/$itemId.sales.tsx
new file mode 100644
index 0000000000..3f96449bd7
--- /dev/null
+++ b/apps/erp/app/routes/x+/material+/$itemId.sales.tsx
@@ -0,0 +1,130 @@
+import { assertIsPost, error, success } from "@carbon/auth";
+import { requirePermissions } from "@carbon/auth/auth.server";
+import { flash } from "@carbon/auth/session.server";
+import {
+ getSalesRuleAssignmentsForItem,
+ getSalesRulesList
+} from "@carbon/ee/rules";
+import { validationError, validator } from "@carbon/form";
+import { VStack } from "@carbon/react";
+import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";
+import { redirect, useLoaderData } from "react-router";
+import {
+ getItemUnitSalePrice,
+ itemUnitSalePriceValidator,
+ upsertItemUnitSalePrice
+} from "~/modules/items";
+import { ItemSalePriceForm } from "~/modules/items/ui/Item";
+import { SalesRuleAssignmentsList } from "~/modules/sales/ui/SalesRules";
+import { getCustomFields, setCustomFields } from "~/utils/form";
+import { path } from "~/utils/path";
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+ const { client, companyId } = await requirePermissions(request, {
+ view: "parts",
+ role: "employee"
+ });
+
+ const { itemId } = params;
+ if (!itemId) throw new Error("Could not find itemId");
+
+ const [materialUnitSalePrice, salesRuleAssignments, salesRuleLibrary] =
+ await Promise.all([
+ getItemUnitSalePrice(client, itemId, companyId),
+ getSalesRuleAssignmentsForItem(client, { itemId, companyId }),
+ getSalesRulesList(client, companyId)
+ ]);
+
+ if (materialUnitSalePrice.error) {
+ throw redirect(
+ path.to.items,
+ await flash(
+ request,
+ error(
+ materialUnitSalePrice.error,
+ "Failed to load material unit sale price"
+ )
+ )
+ );
+ }
+
+ return {
+ materialUnitSalePrice: materialUnitSalePrice.data,
+ salesRuleAssignments: salesRuleAssignments.data ?? [],
+ salesRuleLibrary: salesRuleLibrary.data ?? [],
+ itemId
+ };
+}
+
+export async function action({ request, params }: ActionFunctionArgs) {
+ assertIsPost(request);
+ const { client, userId } = await requirePermissions(request, {
+ update: "parts"
+ });
+
+ const { itemId } = params;
+ if (!itemId) throw new Error("Could not find itemId");
+
+ const formData = await request.formData();
+ const validation = await validator(itemUnitSalePriceValidator).validate(
+ formData
+ );
+
+ if (validation.error) {
+ return validationError(validation.error);
+ }
+
+ const updateMaterialUnitSalePrice = await upsertItemUnitSalePrice(client, {
+ ...validation.data,
+ itemId,
+ updatedBy: userId,
+ customFields: setCustomFields(formData)
+ });
+ if (updateMaterialUnitSalePrice.error) {
+ throw redirect(
+ path.to.material(itemId),
+ await flash(
+ request,
+ error(
+ updateMaterialUnitSalePrice.error,
+ "Failed to update material sale price"
+ )
+ )
+ );
+ }
+
+ throw redirect(
+ path.to.materialSales(itemId),
+ await flash(request, success("Updated material sale price"))
+ );
+}
+
+export default function MaterialSalesRoute() {
+ const {
+ materialUnitSalePrice,
+ salesRuleAssignments,
+ salesRuleLibrary,
+ itemId
+ } = useLoaderData<typeof loader>();
+
+ const initialValues = {
+ ...materialUnitSalePrice,
+ salesUnitOfMeasureCode: materialUnitSalePrice?.salesUnitOfMeasureCode ?? "",
+ ...getCustomFields(materialUnitSalePrice.customFields),
+ itemId: itemId
+ };
+
+ return (
+ <VStack spacing={4} className="p-4">
+ <ItemSalePriceForm
+ key={initialValues.itemId}
+ initialValues={initialValues}
+ />
+ <SalesRuleAssignmentsList
+ itemId={itemId}
+ assignments={salesRuleAssignments as never}
+ library={salesRuleLibrary as never}
+ />
+ </VStack>
+ );
+}
diff --git a/apps/erp/app/routes/x+/part+/$itemId.inventory.tsx b/apps/erp/app/routes/x+/part+/$itemId.inventory.tsx
index d3727202f8..1f4d4a4099 100644
--- a/apps/erp/app/routes/x+/part+/$itemId.inventory.tsx
+++ b/apps/erp/app/routes/x+/part+/$itemId.inventory.tsx
@@ -1,10 +1,6 @@
import { assertIsPost, error, success } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
-import {
- getSalesRuleAssignmentsForItem,
- getSalesRulesList
-} from "@carbon/ee/rules";
import { getStorageRulesDataForTarget } from "@carbon/ee/rules.server";
import { validationError, validator } from "@carbon/form";
import { VStack } from "@carbon/react";
@@ -32,7 +28,6 @@ import {
} from "~/modules/items";
import { PickMethodForm } from "~/modules/items/ui/Item";
import { getLocationsList } from "~/modules/resources";
-import { SalesRuleAssignmentsList } from "~/modules/sales/ui/SalesRules";
import { getUserDefaults } from "~/modules/users/users.server";
import { getDatabaseClient } from "~/services/database.server";
import { useItems } from "~/stores";
@@ -121,9 +116,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
itemStorageUnitQuantities,
shelfLife,
bomHasShelfLifeManagedInput,
- rulesData,
- salesRuleAssignments,
- salesRuleLibrary
+ rulesData
] = await Promise.all([
getItemQuantities(client, itemId, companyId, locationId),
getItemStorageUnitQuantities(client, itemId, companyId, locationId),
@@ -133,9 +126,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
targetType: "item",
targetId: itemId,
companyId
- }),
- getSalesRuleAssignmentsForItem(client, { itemId, companyId }),
- getSalesRulesList(client, companyId)
+ })
]);
if (quantities.error) {
throw redirect(
@@ -173,9 +164,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
itemId,
locationId,
ruleAssignments: rulesData.assignments,
- ruleLibrary: rulesData.library,
- salesRuleAssignments: salesRuleAssignments.data ?? [],
- salesRuleLibrary: salesRuleLibrary.data ?? []
+ ruleLibrary: rulesData.library
};
}
@@ -250,9 +239,7 @@ export default function PartInventoryRoute() {
trackedEntityExpirations,
itemId,
ruleAssignments,
- ruleLibrary,
- salesRuleAssignments,
- salesRuleLibrary
+ ruleLibrary
} = useLoaderData<typeof loader>();
const partData = useRouteData<{
@@ -309,11 +296,6 @@ export default function PartInventoryRoute() {
assignments={ruleAssignments as never}
library={ruleLibrary as never}
/>
- <SalesRuleAssignmentsList
- itemId={itemId}
- assignments={salesRuleAssignments as never}
- library={salesRuleLibrary as never}
- />
</VStack>
);
}
diff --git a/apps/erp/app/routes/x+/part+/$itemId.sales.tsx b/apps/erp/app/routes/x+/part+/$itemId.sales.tsx
index 5a08e83d58..45dfe62770 100644
--- a/apps/erp/app/routes/x+/part+/$itemId.sales.tsx
+++ b/apps/erp/app/routes/x+/part+/$itemId.sales.tsx
@@ -1,6 +1,10 @@
import { assertIsPost, error, success } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
+import {
+ getSalesRuleAssignmentsForItem,
+ getSalesRulesList
+} from "@carbon/ee/rules";
import { validationError, validator } from "@carbon/form";
import { VStack } from "@carbon/react";
import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";
@@ -13,6 +17,7 @@ import {
} from "~/modules/items";
import { ItemSalePriceForm } from "~/modules/items/ui/Item";
import CustomerParts from "~/modules/items/ui/Item/CustomerParts";
+import { SalesRuleAssignmentsList } from "~/modules/sales/ui/SalesRules";
import { getCustomFields, setCustomFields } from "~/utils/form";
import { path } from "~/utils/path";
@@ -25,9 +30,16 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
const { itemId } = params;
if (!itemId) throw new Error("Could not find itemId");
- const [partUnitSalePrice, customerParts] = await Promise.all([
+ const [
+ partUnitSalePrice,
+ customerParts,
+ salesRuleAssignments,
+ salesRuleLibrary
+ ] = await Promise.all([
getItemUnitSalePrice(client, itemId, companyId),
- getItemCustomerParts(client, itemId, companyId)
+ getItemCustomerParts(client, itemId, companyId),
+ getSalesRuleAssignmentsForItem(client, { itemId, companyId }),
+ getSalesRulesList(client, companyId)
]);
if (partUnitSalePrice.error) {
@@ -43,6 +55,8 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
return {
partUnitSalePrice: partUnitSalePrice.data,
customerParts: customerParts.data,
+ salesRuleAssignments: salesRuleAssignments.data ?? [],
+ salesRuleLibrary: salesRuleLibrary.data ?? [],
itemId
};
}
@@ -88,8 +102,13 @@ export async function action({ request, params }: ActionFunctionArgs) {
}
export default function PartSalesRoute() {
- const { customerParts, partUnitSalePrice, itemId } =
- useLoaderData<typeof loader>();
+ const {
+ customerParts,
+ partUnitSalePrice,
+ salesRuleAssignments,
+ salesRuleLibrary,
+ itemId
+ } = useLoaderData<typeof loader>();
const initialValues = {
...partUnitSalePrice,
@@ -107,6 +126,11 @@ export default function PartSalesRoute() {
{customerParts ? (
<CustomerParts customerParts={customerParts} itemId={itemId} />
) : null}
+ <SalesRuleAssignmentsList
+ itemId={itemId}
+ assignments={salesRuleAssignments as never}
+ library={salesRuleLibrary as never}
+ />
</VStack>
);
}
diff --git a/apps/erp/app/routes/x+/tool+/$itemId.inventory.tsx b/apps/erp/app/routes/x+/tool+/$itemId.inventory.tsx
index 1e262714e0..e40b274739 100644
--- a/apps/erp/app/routes/x+/tool+/$itemId.inventory.tsx
+++ b/apps/erp/app/routes/x+/tool+/$itemId.inventory.tsx
@@ -1,10 +1,6 @@
import { assertIsPost, error, success } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
-import {
- getSalesRuleAssignmentsForItem,
- getSalesRulesList
-} from "@carbon/ee/rules";
import { getStorageRulesDataForTarget } from "@carbon/ee/rules.server";
import { validationError, validator } from "@carbon/form";
import { VStack } from "@carbon/react";
@@ -32,7 +28,6 @@ import {
} from "~/modules/items";
import { PickMethodForm } from "~/modules/items/ui/Item";
import { getLocationsList } from "~/modules/resources";
-import { SalesRuleAssignmentsList } from "~/modules/sales/ui/SalesRules";
import { getUserDefaults } from "~/modules/users/users.server";
import { getDatabaseClient } from "~/services/database.server";
import { useItems } from "~/stores/items";
@@ -154,9 +149,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
shelfLife,
bomHasShelfLifeManagedInput,
trackedEntityExpirations,
- rulesData,
- salesRuleAssignments,
- salesRuleLibrary
+ rulesData
] = await Promise.all([
getItemShelfLife(client, itemId),
getBomHasShelfLifeManagedInput(client, itemId, companyId),
@@ -165,9 +158,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
targetType: "item",
targetId: itemId,
companyId
- }),
- getSalesRuleAssignmentsForItem(client, { itemId, companyId }),
- getSalesRulesList(client, companyId)
+ })
]);
return {
@@ -180,9 +171,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
itemId,
locationId,
ruleAssignments: rulesData.assignments,
- ruleLibrary: rulesData.library,
- salesRuleAssignments: salesRuleAssignments.data ?? [],
- salesRuleLibrary: salesRuleLibrary.data ?? []
+ ruleLibrary: rulesData.library
};
}
@@ -257,9 +246,7 @@ export default function ToolInventoryRoute() {
trackedEntityExpirations,
itemId,
ruleAssignments,
- ruleLibrary,
- salesRuleAssignments,
- salesRuleLibrary
+ ruleLibrary
} = useLoaderData<typeof loader>();
const toolData = useRouteData<{
@@ -316,11 +303,6 @@ export default function ToolInventoryRoute() {
assignments={ruleAssignments as never}
library={ruleLibrary as never}
/>
- <SalesRuleAssignmentsList
- itemId={itemId}
- assignments={salesRuleAssignments as never}
- library={salesRuleLibrary as never}
- />
</VStack>
);
}
diff --git a/apps/erp/app/routes/x+/tool+/$itemId.sales.tsx b/apps/erp/app/routes/x+/tool+/$itemId.sales.tsx
new file mode 100644
index 0000000000..47eb7497ae
--- /dev/null
+++ b/apps/erp/app/routes/x+/tool+/$itemId.sales.tsx
@@ -0,0 +1,120 @@
+import { assertIsPost, error, success } from "@carbon/auth";
+import { requirePermissions } from "@carbon/auth/auth.server";
+import { flash } from "@carbon/auth/session.server";
+import {
+ getSalesRuleAssignmentsForItem,
+ getSalesRulesList
+} from "@carbon/ee/rules";
+import { validationError, validator } from "@carbon/form";
+import { VStack } from "@carbon/react";
+import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";
+import { redirect, useLoaderData } from "react-router";
+import {
+ getItemUnitSalePrice,
+ itemUnitSalePriceValidator,
+ upsertItemUnitSalePrice
+} from "~/modules/items";
+import { ItemSalePriceForm } from "~/modules/items/ui/Item";
+import { SalesRuleAssignmentsList } from "~/modules/sales/ui/SalesRules";
+import { getCustomFields, setCustomFields } from "~/utils/form";
+import { path } from "~/utils/path";
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+ const { client, companyId } = await requirePermissions(request, {
+ view: "parts",
+ role: "employee"
+ });
+
+ const { itemId } = params;
+ if (!itemId) throw new Error("Could not find itemId");
+
+ const [toolUnitSalePrice, salesRuleAssignments, salesRuleLibrary] =
+ await Promise.all([
+ getItemUnitSalePrice(client, itemId, companyId),
+ getSalesRuleAssignmentsForItem(client, { itemId, companyId }),
+ getSalesRulesList(client, companyId)
+ ]);
+
+ if (toolUnitSalePrice.error) {
+ throw redirect(
+ path.to.items,
+ await flash(
+ request,
+ error(toolUnitSalePrice.error, "Failed to load tool unit sale price")
+ )
+ );
+ }
+
+ return {
+ toolUnitSalePrice: toolUnitSalePrice.data,
+ salesRuleAssignments: salesRuleAssignments.data ?? [],
+ salesRuleLibrary: salesRuleLibrary.data ?? [],
+ itemId
+ };
+}
+
+export async function action({ request, params }: ActionFunctionArgs) {
+ assertIsPost(request);
+ const { client, userId } = await requirePermissions(request, {
+ update: "parts"
+ });
+
+ const { itemId } = params;
+ if (!itemId) throw new Error("Could not find itemId");
+
+ const formData = await request.formData();
+ const validation = await validator(itemUnitSalePriceValidator).validate(
+ formData
+ );
+
+ if (validation.error) {
+ return validationError(validation.error);
+ }
+
+ const updateToolUnitSalePrice = await upsertItemUnitSalePrice(client, {
+ ...validation.data,
+ itemId,
+ updatedBy: userId,
+ customFields: setCustomFields(formData)
+ });
+ if (updateToolUnitSalePrice.error) {
+ throw redirect(
+ path.to.tool(itemId),
+ await flash(
+ request,
+ error(updateToolUnitSalePrice.error, "Failed to update tool sale price")
+ )
+ );
+ }
+
+ throw redirect(
+ path.to.toolSales(itemId),
+ await flash(request, success("Updated tool sale price"))
+ );
+}
+
+export default function ToolSalesRoute() {
+ const { toolUnitSalePrice, salesRuleAssignments, salesRuleLibrary, itemId } =
+ useLoaderData<typeof loader>();
+
+ const initialValues = {
+ ...toolUnitSalePrice,
+ salesUnitOfMeasureCode: toolUnitSalePrice?.salesUnitOfMeasureCode ?? "",
+ ...getCustomFields(toolUnitSalePrice.customFields),
+ itemId: itemId
+ };
+
+ return (
+ <VStack spacing={4} className="p-4">
+ <ItemSalePriceForm
+ key={initialValues.itemId}
+ initialValues={initialValues}
+ />
+ <SalesRuleAssignmentsList
+ itemId={itemId}
+ assignments={salesRuleAssignments as never}
+ library={salesRuleLibrary as never}
+ />
+ </VStack>
+ );
+}
diff --git a/apps/erp/app/utils/path.ts b/apps/erp/app/utils/path.ts
index d2caaf32c6..64a0be5446 100644
--- a/apps/erp/app/utils/path.ts
+++ b/apps/erp/app/utils/path.ts
@@ -546,6 +546,8 @@ export const path = {
consumableRoot: `${x}/consumable`,
consumableRules: (id: string) =>
generatePath(`${x}/consumable/${id}/rules`),
+ consumableSales: (id: string) =>
+ generatePath(`${x}/consumable/${id}/sales`),
consumableSupplier: (itemId: string, id: string) =>
generatePath(`${x}/consumable/${itemId}/purchasing/${id}`),
consumableSuppliers: (id: string) =>
@@ -1446,6 +1448,7 @@ export const path = {
generatePath(`${x}/material/${id}/quality`),
materialRoot: `${x}/material`,
materialRules: (id: string) => generatePath(`${x}/material/${id}/rules`),
+ materialSales: (id: string) => generatePath(`${x}/material/${id}/sales`),
materialSubstance: (id: string) =>
generatePath(`${x}/items/substances/${id}`),
materialSubstances: `${x}/items/substances`,
@@ -2298,6 +2301,7 @@ export const path = {
toolQuality: (id: string) => generatePath(`${x}/tool/${id}/quality`),
toolRoot: `${x}/tool`,
toolRules: (id: string) => generatePath(`${x}/tool/${id}/rules`),
+ toolSales: (id: string) => generatePath(`${x}/tool/${id}/sales`),
toolSupplier: (itemId: string, id: string) =>
generatePath(`${x}/tool/${itemId}/suppliers/${id}`),
toolSuppliers: (id: string) => generatePath(`${x}/tool/${id}/suppliers`),
diff --git a/packages/locale/locales/de/erp.po b/packages/locale/locales/de/erp.po
index bd65fd49d1..c2798ad7b8 100644
--- a/packages/locale/locales/de/erp.po
+++ b/packages/locale/locales/de/erp.po
@@ -14990,9 +14990,6 @@ msgstr "Umsatzerlöse"
msgid "Sales Rule Violations"
msgstr "Verstöße gegen Verkaufsregeln"
-msgid "Sales rules"
-msgstr "Verkaufsregeln"
-
msgid "Sales Rules"
msgstr "Verkaufsregeln"
diff --git a/packages/locale/locales/en/erp.po b/packages/locale/locales/en/erp.po
index ca3b165f07..c2d66f38f5 100644
--- a/packages/locale/locales/en/erp.po
+++ b/packages/locale/locales/en/erp.po
@@ -14990,9 +14990,6 @@ msgstr "Sales Revenue"
msgid "Sales Rule Violations"
msgstr "Sales Rule Violations"
-msgid "Sales rules"
-msgstr "Sales rules"
-
msgid "Sales Rules"
msgstr "Sales Rules"
diff --git a/packages/locale/locales/es/erp.po b/packages/locale/locales/es/erp.po
index 208d5fb242..75eaaabec4 100644
--- a/packages/locale/locales/es/erp.po
+++ b/packages/locale/locales/es/erp.po
@@ -14990,9 +14990,6 @@ msgstr "Ingresos por ventas"
msgid "Sales Rule Violations"
msgstr "Violaciones de reglas de ventas"
-msgid "Sales rules"
-msgstr "Reglas de ventas"
-
msgid "Sales Rules"
msgstr "Reglas de ventas"
diff --git a/packages/locale/locales/fr/erp.po b/packages/locale/locales/fr/erp.po
index a801b81d6d..4e43c5e092 100644
--- a/packages/locale/locales/fr/erp.po
+++ b/packages/locale/locales/fr/erp.po
@@ -14990,9 +14990,6 @@ msgstr "Revenus des ventes"
msgid "Sales Rule Violations"
msgstr "Violations de règles de vente"
-msgid "Sales rules"
-msgstr "Règles de vente"
-
msgid "Sales Rules"
msgstr "Règles de vente"
diff --git a/packages/locale/locales/hi/erp.po b/packages/locale/locales/hi/erp.po
index 7787f94299..03bea39855 100644
--- a/packages/locale/locales/hi/erp.po
+++ b/packages/locale/locales/hi/erp.po
@@ -14990,9 +14990,6 @@ msgstr "बिक्रय राजस्व"
msgid "Sales Rule Violations"
msgstr "बिक्री नियम उल्लंघन"
-msgid "Sales rules"
-msgstr "बिक्री नियम"
-
msgid "Sales Rules"
msgstr "बिक्री नियम"
diff --git a/packages/locale/locales/it/erp.po b/packages/locale/locales/it/erp.po
index 4fa1e64130..5d0798f1ef 100644
--- a/packages/locale/locales/it/erp.po
+++ b/packages/locale/locales/it/erp.po
@@ -14990,9 +14990,6 @@ msgstr "Ricavi di vendita"
msgid "Sales Rule Violations"
msgstr "Violazioni delle Regole di Vendita"
-msgid "Sales rules"
-msgstr "Regole di vendita"
-
msgid "Sales Rules"
msgstr "Regole di Vendita"
diff --git a/packages/locale/locales/ja/erp.po b/packages/locale/locales/ja/erp.po
index d2859db64b..dc1e831b21 100644
--- a/packages/locale/locales/ja/erp.po
+++ b/packages/locale/locales/ja/erp.po
@@ -14990,9 +14990,6 @@ msgstr "販売売上高"
msgid "Sales Rule Violations"
msgstr "販売ルール違反"
-msgid "Sales rules"
-msgstr "販売ルール"
-
msgid "Sales Rules"
msgstr "販売ルール"
diff --git a/packages/locale/locales/ko/erp.po b/packages/locale/locales/ko/erp.po
index 36740b92e1..85ac2c7f51 100644
--- a/packages/locale/locales/ko/erp.po
+++ b/packages/locale/locales/ko/erp.po
@@ -14990,9 +14990,6 @@ msgstr "매출"
msgid "Sales Rule Violations"
msgstr "판매 규칙 위반"
-msgid "Sales rules"
-msgstr "판매 규칙"
-
msgid "Sales Rules"
msgstr "판매 규칙"
diff --git a/packages/locale/locales/pl/erp.po b/packages/locale/locales/pl/erp.po
index 6ffa91b150..9b757e19e6 100644
--- a/packages/locale/locales/pl/erp.po
+++ b/packages/locale/locales/pl/erp.po
@@ -14990,9 +14990,6 @@ msgstr "Przychód ze sprzedaży"
msgid "Sales Rule Violations"
msgstr "Naruszenia reguł sprzedaży"
-msgid "Sales rules"
-msgstr "Reguły sprzedaży"
-
msgid "Sales Rules"
msgstr "Reguły sprzedaży"
diff --git a/packages/locale/locales/pt/erp.po b/packages/locale/locales/pt/erp.po
index 8efe065bc7..7da1fe72c3 100644
--- a/packages/locale/locales/pt/erp.po
+++ b/packages/locale/locales/pt/erp.po
@@ -14990,9 +14990,6 @@ msgstr "Receita de Vendas"
msgid "Sales Rule Violations"
msgstr "Violações de Regra de Vendas"
-msgid "Sales rules"
-msgstr "Regras de vendas"
-
msgid "Sales Rules"
msgstr "Regras de Vendas"
diff --git a/packages/locale/locales/ru/erp.po b/packages/locale/locales/ru/erp.po
index a9396941b7..daef581bda 100644
--- a/packages/locale/locales/ru/erp.po
+++ b/packages/locale/locales/ru/erp.po
@@ -14990,9 +14990,6 @@ msgstr "Выручка от продаж"
msgid "Sales Rule Violations"
msgstr "Нарушения правил продаж"
-msgid "Sales rules"
-msgstr "Правила продаж"
-
msgid "Sales Rules"
msgstr "Правила продаж"
diff --git a/packages/locale/locales/tr/erp.po b/packages/locale/locales/tr/erp.po
index 18a7cdcd06..795979a139 100644
--- a/packages/locale/locales/tr/erp.po
+++ b/packages/locale/locales/tr/erp.po
@@ -14990,9 +14990,6 @@ msgstr "Satış Hasılat"
msgid "Sales Rule Violations"
msgstr "Satış Kuralı İhlalleri"
-msgid "Sales rules"
-msgstr "Satış kuralları"
-
msgid "Sales Rules"
msgstr "Satış Kuralları"
diff --git a/packages/locale/locales/zh/erp.po b/packages/locale/locales/zh/erp.po
index 69f5fa79fb..abec6b22e0 100644
--- a/packages/locale/locales/zh/erp.po
+++ b/packages/locale/locales/zh/erp.po
@@ -14990,9 +14990,6 @@ msgstr "销售收入"
msgid "Sales Rule Violations"
msgstr "销售规则违规"
-msgid "Sales rules"
-msgstr "销售规则"
-
msgid "Sales Rules"
msgstr "销售规则"