Supplier Details
@@ -3511,19 +3927,19 @@ const StockForm = ({ formType }) => {
options={
SupplierData
? SupplierData.filter(
- (obj, index, self) =>
- index ===
- self.findIndex(
- (t) => t.SuppId === obj.SuppId
- ) // remove dup SuppId
- ).map((option) => ({
- key: `${option.SuppId}-${option.Type}`, // 👈 unique key
- value: option.SuppId,
- label:
- option.Type === 'Branch'
- ? `${option.SuppName} (${option.Type}) [${option.SuppId}]`
- : `${option.SuppName} (${option.Type})`,
- }))
+ (obj, index, self) =>
+ index ===
+ self.findIndex(
+ (t) => t.SuppId === obj.SuppId
+ ) // remove dup SuppId
+ ).map((option) => ({
+ key: `${option.SuppId}-${option.Type}`, // 👈 unique key
+ value: option.SuppId,
+ label:
+ option.Type === 'Branch'
+ ? `${option.SuppName} (${option.Type}) [${option.SuppId}]`
+ : `${option.SuppName} (${option.Type})`,
+ }))
: []
}
label={}
@@ -3682,88 +4098,88 @@ const StockForm = ({ formType }) => {
item.ConfigId === SelectedPurchaseType &&
item.ConfigName === 'Cash'
) && (
- <>
-
- ({
- value: mode.ModeId,
- label: mode.ModeName,
- }))}
- label={
-
- }
- className="field-DropDown"
- onChangeFunction={handlePaymentModeChange}
- valueData={selectedPaymentMode}
- />
-
- {
- if (
- value === undefined ||
- value === null ||
- value === ''
- ) {
- return Promise.resolve();
- }
- if (Number(value) === 0) {
- return Promise.reject(
- 'Payment Amount cannot be 0'
- );
- }
- if (
- isNaN(value) ||
- Number(value) < 0
- ) {
- return Promise.reject(
- 'Payment Amount cannot be less than 0'
- );
- }
- return Promise.resolve();
+ <>
+
-
- Payment Amount
-
- }
- inputMode="decimal"
- disable={!payAmountDisable}
- isOnChange={paymentAmount ? true : false}
- min={0}
- type="number"
- value={paymentAmount}
- onChange={(e) => {
- formRef?.current?.setFieldsValue({
- PaymentAmount: e?.target?.value,
- });
- setPaymentAmount(e?.target?.value);
- }}
- />
-
-
- )}
+ ]}
+ >
+ ({
+ value: mode.ModeId,
+ label: mode.ModeName,
+ }))}
+ label={
+
+ }
+ className="field-DropDown"
+ onChangeFunction={handlePaymentModeChange}
+ valueData={selectedPaymentMode}
+ />
+
+ {
+ if (
+ value === undefined ||
+ value === null ||
+ value === ''
+ ) {
+ return Promise.resolve();
+ }
+ if (Number(value) === 0) {
+ return Promise.reject(
+ 'Payment Amount cannot be 0'
+ );
+ }
+ if (
+ isNaN(value) ||
+ Number(value) < 0
+ ) {
+ return Promise.reject(
+ 'Payment Amount cannot be less than 0'
+ );
+ }
+ return Promise.resolve();
+ },
+ },
+ ]}
+ >
+
+ Payment Amount
+
+ }
+ inputMode="decimal"
+ disable={!payAmountDisable}
+ isOnChange={paymentAmount ? true : false}
+ min={0}
+ type="number"
+ value={paymentAmount}
+ onChange={(e) => {
+ formRef?.current?.setFieldsValue({
+ PaymentAmount: e?.target?.value,
+ });
+ setPaymentAmount(e?.target?.value);
+ }}
+ />
+
+
+ )}
@@ -3791,8 +4207,9 @@ const StockForm = ({ formType }) => {
className="field-DropDown"
value={selectedProductName}
filterOption={(input, option) => {
+ const [prodId, variantName] = option.value.split('_');
const product = productData.find(
- (p) => p.ProdId === option.value
+ (p) => p.ProdId === prodId && (p.ProdVariantName || 'Variant1') === variantName
);
const nameMatch = option.label
?.toLowerCase()
@@ -3805,14 +4222,19 @@ const StockForm = ({ formType }) => {
options={
!scanner
? productData?.map((option) => ({
- value: option.ProdId,
- label: `${option.ProdName} (${option.Size} ${option.UomName})${option?.BrandName ? ` - ${option?.BrandName}` : ''}`,
- }))
+
+ value: `${option.ProdId}_${option.ProdVariantName}`,
+ label: `${option.ProdName} (${option.Size} ${option.UomName})${option?.BrandName ? ` - ${option?.BrandName}` : ''} - ${option.ProdVariantName}`,
+
+ }))
: []
}
onSelect={async (value, option) => {
+ const [prodId, variantName] = value.split('_');
+ const product = productData.find(p => p.ProdId === prodId && (p.ProdVariantName) === variantName);
const newProduct = await ProductDropDownChange(
- value,
+ product?.ProdVariantName,
+ prodId,
option
);
if (newProduct) {
@@ -3851,22 +4273,59 @@ const StockForm = ({ formType }) => {
/>
- {/*
-
- */}
+
- setIsModalOpen(true)} />
+ setIsModalOpen(true)} size={18} />
+
+
+
+
+
{isModalOpen && (
{
onMappingAdded={handleModalSubmited}
/>
)}
- {Variants?.length > 1 && (
-
- ({
- value: option.ProdIdProdName,
- label: option.ProdVariantName,
- }))}
- label={'Variant Name'}
- className="field-DropDown"
- onChangeFunction={(e) =>
- ProductVariantDropDownChange(e)
- }
- valueData={selectedProductVariantData}
- disabled={editstate?.ProdId ? true : false}
- />
- {/*
-
+
+ {
+ setTempSelectedColumns([...selectedAdditionalColumn]);
+ setShowColumnModal(true);
+ }}>
+
+
- */}
-
- )}
+
+
+
+ }
+ onChange={(e) => {
+ const value = e.target.value.toLowerCase();
+ setSearchValue(value);
+ }}
+ style={{ width: '300px' }}
+ />
+
+