gitea-admin/lti-web-client
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-web-client.git synced 2026-05-22 06:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(resolve): fix resolve merge

Browse Source
This commit is contained in:
rstubryan
2025-11-24 08:34:50 +07:00
parent 274322606d
commit 824eed910a
5 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/pages/inventory/movement/form/MovementForm.schema.ts
+3 -1
View File
@@ -177,7 +177,9 @@ export const MovementFormSchema: Yup.ObjectSchema<MovementFormSchemaType> =
'Gudang tujuan tidak boleh sama dengan gudang asal!',
function (value) {
const { source_warehouse_id } = this.parent;
return !value || !source_warehouse_id || value !== source_warehouse_id;
return (
!value || !source_warehouse_id || value !== source_warehouse_id
);
}
),
products: Yup.array()
src/components/pages/purchase/form/request/PurchaseRequestForm.schema.ts
+27 -25
View File
@@ -140,29 +140,31 @@ export const getPurchaseRequestFormInitialValues = (
: null,
location_id: initialValues?.location?.id ?? undefined,
notes: initialValues?.notes ?? null,
items: initialValues?.items?.length ? initialValues.items.map((item) => ({
warehouse: item.warehouse
? {
value: item.warehouse.id,
label: item.warehouse.name,
}
: null,
warehouse_id: item.warehouse?.id ?? 0,
product: item.product
? {
value: item.product.id,
label: item.product.name,
}
: null,
product_id: item.product?.id ?? 0,
qty: item.qty ?? 0,
})) : [
{
warehouse: null,
warehouse_id: 0,
product: null,
product_id: 0,
qty: 0,
},
],
items: initialValues?.items?.length
? initialValues.items.map((item) => ({
warehouse: item.warehouse
? {
value: item.warehouse.id,
label: item.warehouse.name,
}
: null,
warehouse_id: item.warehouse?.id ?? 0,
product: item.product
? {
value: item.product.id,
label: item.product.name,
}
: null,
product_id: item.product?.id ?? 0,
qty: item.qty ?? 0,
}))
: [
{
warehouse: null,
warehouse_id: 0,
product: null,
product_id: 0,
qty: 0,
},
],
});
src/components/pages/purchase/form/request/PurchaseRequestForm.tsx
+4 -4
View File
@@ -781,7 +781,8 @@ const PurchaseRequestForm = ({
? formatNumber(
supplierProductData[item.product_id]
.ProductPrice *
(parseFloat(item.qty?.toString() || '0') || 0)
(parseFloat(item.qty?.toString() || '0') ||
0)
)
: ''
}
@@ -803,9 +804,8 @@ const PurchaseRequestForm = ({
item.product_id &&
supplierProductData[item.product_id]
? `Harga per unit: Rp ${formatNumber(
supplierProductData[
item.product_id
].ProductPrice
supplierProductData[item.product_id]
.ProductPrice
)}`
: ''
}