diff --git a/src/app/api/quickbooks/invoice/invoice.service.ts b/src/app/api/quickbooks/invoice/invoice.service.ts index 6d9a43e6..3b63aae3 100644 --- a/src/app/api/quickbooks/invoice/invoice.service.ts +++ b/src/app/api/quickbooks/invoice/invoice.service.ts @@ -151,12 +151,12 @@ export class InvoiceService extends BaseService { // check if the flag is on for create new item const settingService = new SettingService(this.user) const setting = await settingService.getOneByPortalId([ - 'createInvoiceItemFlag', + 'createNewProductFlag', ]) - if (!setting?.createInvoiceItemFlag) { + if (!setting?.createNewProductFlag) { console.info( - 'WebhookService#getInvoiceItemRef | Create new invoice item flag is false', + 'WebhookService#getInvoiceItemRef | Create new product flag is false', ) return { ref: oneOffItem } } diff --git a/src/app/api/quickbooks/setting/setting.controller.ts b/src/app/api/quickbooks/setting/setting.controller.ts index 363a9542..703b5e25 100644 --- a/src/app/api/quickbooks/setting/setting.controller.ts +++ b/src/app/api/quickbooks/setting/setting.controller.ts @@ -12,17 +12,17 @@ export async function getSettings(req: NextRequest) { const settingService = new SettingService(user) const type = req.nextUrl.searchParams.get('type') const parsedType = z.nativeEnum(SettingType).safeParse(type) - const returnigFields: (keyof typeof QBSetting)[] = [] + const returningFields: (keyof typeof QBSetting)[] = [] if (parsedType.success) { // return attributes as per the type. If type not provided, return all attributes - returnigFields.push('id', 'initialSettingMap') + returningFields.push('id', 'initialSettingMap') if (parsedType.data === SettingType.INVOICE) - returnigFields.push('absorbedFeeFlag', 'useCompanyNameFlag') + returningFields.push('absorbedFeeFlag', 'useCompanyNameFlag') if (parsedType.data === SettingType.PRODUCT) - returnigFields.push('createNewProductFlag', 'createInvoiceItemFlag') + returningFields.push('createNewProductFlag') } - const setting = await settingService.getOneByPortalId(returnigFields) + const setting = await settingService.getOneByPortalId(returningFields) return NextResponse.json({ setting }) } diff --git a/src/components/dashboard/settings/sections/product/ProductMapping.tsx b/src/components/dashboard/settings/sections/product/ProductMapping.tsx index 74e30a43..cb3a0ee3 100644 --- a/src/components/dashboard/settings/sections/product/ProductMapping.tsx +++ b/src/components/dashboard/settings/sections/product/ProductMapping.tsx @@ -58,9 +58,8 @@ export default function ProductMapping({
setting.changeSettings( @@ -70,20 +69,6 @@ export default function ProductMapping({ } />
-
- - setting.changeSettings( - 'createInvoiceItemFlag', - !setting.settingState.createInvoiceItemFlag, - ) - } - /> -
{/* Product Mapping table */} { const intialProductSetting = { - createInvoiceItemFlag: false, createNewProductFlag: false, } const [openDropdowns, setOpenDropdowns] = useState<{ diff --git a/src/type/common.ts b/src/type/common.ts index 2d041d7d..6989fc1f 100644 --- a/src/type/common.ts +++ b/src/type/common.ts @@ -269,7 +269,6 @@ export const SettingRequestSchema = z absorbedFeeFlag: z.boolean().optional(), useCompanyNameFlag: z.boolean().optional(), createNewProductFlag: z.boolean().optional(), - createInvoiceItemFlag: z.boolean().optional(), }) .superRefine((val, ctx) => { if (val.type === SettingType.INVOICE) { @@ -296,13 +295,6 @@ export const SettingRequestSchema = z message: 'createNewProductFlag is required when type is product', }) } - if (typeof val.createInvoiceItemFlag !== 'boolean') { - ctx.addIssue({ - path: ['createInvoiceItemFlag'], - code: z.ZodIssueCode.custom, - message: 'createInvoiceItemFlag is required when type is product', - }) - } } }) @@ -313,7 +305,7 @@ export type InvoiceSettingType = Required< > & { id?: string } export type ProductSettingType = Required< - Pick + Pick > & { id?: string } export enum TransactionType {