From 617f596b722d0a4e5a1e4ba511e2d197fa06878d Mon Sep 17 00:00:00 2001 From: Mr Swift Date: Sun, 25 Aug 2024 17:19:25 +0330 Subject: [PATCH] Withdraw Page --- components/admin/TheSidebar.vue | 2 +- pages/admin/gps/installed-device/index.vue | 2 +- pages/admin/gps/withdraw/Index.vue | 480 +++++++++++---------- server/controllers/GPS.Withdraw.js | 76 ++-- 4 files changed, 298 insertions(+), 262 deletions(-) diff --git a/components/admin/TheSidebar.vue b/components/admin/TheSidebar.vue index 5b41c81..22ffeef 100644 --- a/components/admin/TheSidebar.vue +++ b/components/admin/TheSidebar.vue @@ -358,7 +358,7 @@ diff --git a/pages/admin/gps/installed-device/index.vue b/pages/admin/gps/installed-device/index.vue index b7b983f..94e0a0e 100644 --- a/pages/admin/gps/installed-device/index.vue +++ b/pages/admin/gps/installed-device/index.vue @@ -218,7 +218,7 @@ export default { console.log(err) return this.$message({ type: 'warning', - message: err.data.msg + message: err.msg }) } }) diff --git a/pages/admin/gps/withdraw/Index.vue b/pages/admin/gps/withdraw/Index.vue index 7b305ed..1213019 100644 --- a/pages/admin/gps/withdraw/Index.vue +++ b/pages/admin/gps/withdraw/Index.vue @@ -1,234 +1,268 @@ - - - - \ No newline at end of file +} + + diff --git a/server/controllers/GPS.Withdraw.js b/server/controllers/GPS.Withdraw.js index d8124eb..b48abbd 100644 --- a/server/controllers/GPS.Withdraw.js +++ b/server/controllers/GPS.Withdraw.js @@ -17,20 +17,24 @@ module.exports.createRequest = [ res.status(400).json({ msg: 'شما درخواست درحال بررسی دارید' }) }else{ const user = await User.findById(req.user_id) - const data = { - card: req.body.card, - userId: req.user_id, - amount: user.walletBalance, - dollarAmount: user.dollarBalance, - status: 0 + if(user.walletBalance < 50000){ + const data = { + card: req.body.card, + userId: req.user_id, + amount: user.walletBalance, + dollarAmount: user.dollarBalance, + status: 0 + } + + const request = await Withdraw.create(data) + user.dollarBalance = 0; + user.walletBalance = 0; + user.save() + // res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) + res.status(201).json(request) + }else{ + res.status(400).json({ msg: 'حداقل موجودی باید 50 هزار تومان باشد' }) } - - const request = await Withdraw.create(data) - user.dollarBalance = 0; - user.walletBalance = 0; - user.save() - // res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) - res.status(201).json(request) } @@ -76,25 +80,25 @@ module.exports.getAllForUser = async (req, res) => { } module.exports.getAllForAdmin = async (req, res) => { - let page; - let rows; - if (!req.query?.rows || req.query?.rows <= 5) { - rows = 10 - } else { - rows = parseInt(req.query.rows) - } + // let page; + // let rows; + // if (!req.query?.rows || req.query?.rows <= 5) { + // rows = 10 + // } else { + // rows = parseInt(req.query.rows) + // } - if (!req.query?.page) { - page = 0 - // eslint-disable-next-line eqeqeq - } else if (req.query.page <= 1) { - page = 0 - } else { - page = req.query.page - page = page * rows - rows - } - const data = await Withdraw.find().sort({ status: 1 }).skip(page).limit(rows) - .populate('userId', 'shopName shopNumber shopAddress birthDate score first_name last_name profilePic') + // if (!req.query?.page) { + // page = 0 + // // eslint-disable-next-line eqeqeq + // } else if (req.query.page <= 1) { + // page = 0 + // } else { + // page = req.query.page + // page = page * rows - rows + // } + const data = await Withdraw.find().sort({ status: 1 }) + .populate('userId', 'shopName national_code first_name last_name mobile_number city_name province_name') const total = Math.ceil((await Withdraw.estimatedDocumentCount())) res.status(200).json({ data, total }) } @@ -115,9 +119,8 @@ module.exports.updateReq = [ case "accept": { request.status = 1; request.save() - // res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) - res.status(201).json(request) - + res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) + break; } case "deposit": { @@ -125,9 +128,8 @@ module.exports.updateReq = [ request.depositDate = new Date(); request.trackingNumber = req.body.trackingNumber || 0; request.save() - // res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) - res.status(201).json(request) - + res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) + break; } default: {