From 102b5d3e6ac206ba4371d743048abc877079de5f Mon Sep 17 00:00:00 2001 From: Swift Date: Wed, 21 Feb 2024 15:33:55 +0330 Subject: [PATCH] fix --- pages/account/post/index.vue | 8 +++-- pages/index.vue | 9 ++++-- server/plugins/asanServiceSerialChecker.js | 34 ++++++++++++---------- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/pages/account/post/index.vue b/pages/account/post/index.vue index 984fec7..ab11a5c 100644 --- a/pages/account/post/index.vue +++ b/pages/account/post/index.vue @@ -9,8 +9,12 @@
diff --git a/pages/index.vue b/pages/index.vue index e18deca..70a3c8c 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -19,8 +19,13 @@
diff --git a/server/plugins/asanServiceSerialChecker.js b/server/plugins/asanServiceSerialChecker.js index 265480f..de52a58 100644 --- a/server/plugins/asanServiceSerialChecker.js +++ b/server/plugins/asanServiceSerialChecker.js @@ -4,8 +4,8 @@ const readXlsxFile = require('read-excel-file/node') const guaranteeSerialsPath = './static/uploads/serials' const productSerialsPath = './static/uploads/serials_products' -const serialChecker = async (serial, type = 'guaranteeSerial', g = 1) => { - return new Promise(async (reso, rej) => { +const serialChecker = (serial, type = 'guaranteeSerial', g = 1) => { + return new Promise(async (resolve, reject) => { let exelsPath; if (type === 'guaranteeSerial') exelsPath = guaranteeSerialsPath + `/${g}`; if (type === 'orginality') exelsPath = productSerialsPath + `/${g}`; @@ -14,28 +14,30 @@ const serialChecker = async (serial, type = 'guaranteeSerial', g = 1) => { try { const serialFiles = await fs.readdirSync(exelsPath); - if((serialFiles?.length) <= 0){ - rej("این کد در سامانه موجود نیست") - } - serialFiles.forEach(async(file, i)=>{ + if ((serialFiles?.length) <= 0) { + // eslint-disable-next-line prefer-promise-reject-errors + reject("این کد در سامانه موجود نیست") + } + serialFiles.forEach(async (file, i) => { const exelFile = await readXlsxFile(`${exelsPath}/${file}`); - + for (const row of exelFile) { - for (const col of row) { - if (col == lowerSerial) { - reso(row[2]); + + if ((row[1].toString()).toLowerCase() == lowerSerial) { + resolve(row[2]); return; // Serial found, exit loop } - } + } - if((serialFiles.length - 1) <= i){ - rej("این کد در سامانه موجود نیست") + if ((serialFiles.length - 1) <= i) { + // eslint-disable-next-line prefer-promise-reject-errors + reject("این کد در سامانه موجود نیست") } - }) - + }) + } catch (e) { console.log(e); - rej(e); + reject(e); } }); };