diff --git a/package.json b/package.json index 7b9d364..cdf3114 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "nodemon": "nodemon --watch server --exec \"nuxt start\"", "server": "nodemon --watch server --exec \"SET NODE_ENV=devServer&&node ./server/index.js\"", - "dev": "nuxt", + "dev": "nuxt dev", "start": "nuxt start", "generate": "nuxt generate", "build": "nuxt build", diff --git a/server/ArpaWebservice.js b/server/ArpaWebservice.js index d39ec65..32cd9a4 100644 --- a/server/ArpaWebservice.js +++ b/server/ArpaWebservice.js @@ -61,7 +61,7 @@ const panatechAxiosConfig = () => { return { baseURL: panatechBaseUrl, headers: { - Authorization: panatechToken + Authorization: `Bearer ${panatechToken}` } } } @@ -99,7 +99,7 @@ module.exports.saveTransactionToArpa = (data, items, db) => { // "Data": {"TransactionID": null, "BusinessID": 3, "DocAliasId": 144, "Description": "تست", "cAddress1": "تهران", "cTel1": "0218884455", "TransCCustom1": "آقای موسوی"}, // "Items": [{"TransLineID": null, "itemId": 5302, "MjQty": 20, "StockAreaId": 1}, {"TransLineID": null, "itemId": 5302, "MjQty": 20, "StockAreaId": 1}] // } - + return new Promise(async (resolve, reject) => { try { const transaction = await axios.post('/api/NewTransaction', ArpaData, axiosConfig(db)) @@ -141,7 +141,7 @@ module.exports.saveUserToArpa = (userData, db) => { businessCode: ArpaID.data.data.BusinessCode }) } catch (e) { -// console.log(e) + // console.log(e) reject(e) } @@ -165,16 +165,16 @@ module.exports.updateUserOnArpa = (userData, arpa_businessID, db) => { BusinessID: arpa_businessID, CheckExistNationalCode: true } -console.log(data) + console.log(data) return new Promise(async (resolve, reject) => { try { const ArpaUpdate = await axios.post('/api/putBusiness', data, axiosConfig(db)) -console.log(ArpaUpdate) + console.log(ArpaUpdate) if (!ArpaUpdate.data.status) reject(new Error('Cant update user -- There is a problem in ArpaWebService')) resolve('updated successfully') } catch (e) { -console.log(e) + console.log(e) reject(e) } diff --git a/server/controllers/arpaConnectionController.js b/server/controllers/arpaConnectionController.js index 8ed0c28..956ea3a 100644 --- a/server/controllers/arpaConnectionController.js +++ b/server/controllers/arpaConnectionController.js @@ -14,11 +14,13 @@ module.exports.getRouteManager = [ axios .get(url, axiosConfig(db)) .then(arpaRes => { - if (arpaRes.data.error) return res.status(404).json(arpaRes.data.error) - else return res.json(arpaRes.data) + if (arpaRes.data.error) { + console.error(arpaRes) + return res.status(404).json(arpaRes.data.error) + } else return res.json(arpaRes.data) }) .catch(err => { - console.log('🚀 ~ file: arpaConnectionController.js ~ getRouteManager ~ err', err, "-------",url,db) + console.log('🚀 ~ file: arpaConnectionController.js ~ getRouteManager ~ err', err, '-------', url, db) return res.status(500).json({ message: 'WebService Error' }) }) }