diff --git a/components/admin/TheSidebar.vue b/components/admin/TheSidebar.vue
index dc1f107..0b5d76b 100644
--- a/components/admin/TheSidebar.vue
+++ b/components/admin/TheSidebar.vue
@@ -337,13 +337,13 @@
:badge="pendingUsers ? { text: pendingUsers, color: 'danger' } : null"
/>
-
+ /> -->
+
+
+
+
+
+ تنظیم هزینه نصب
+
+
+
+
+
+
+
+
+ فیلتر ها
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatCurrency(form.amount) }}
+
+
+ ثبت
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/admin/gps/installed-device/index.vue b/pages/admin/gps/installed-device/index.vue
index edb1882..3a1b9ee 100644
--- a/pages/admin/gps/installed-device/index.vue
+++ b/pages/admin/gps/installed-device/index.vue
@@ -65,6 +65,7 @@
{{ scope?.row?.deviceId?.model }}
+ {{ scope?.row?.deviceType }}
@@ -106,7 +107,7 @@
-
-
+ -->
درانتظار
+
+
+ {{new Date(scope.row.created_at).toLocaleString('fa-IR') }}
+
+
diff --git a/server/controllers/GPS.Fee.js b/server/controllers/GPS.Fee.js
new file mode 100644
index 0000000..3a3fc75
--- /dev/null
+++ b/server/controllers/GPS.Fee.js
@@ -0,0 +1,25 @@
+const { body, validationResult } = require('express-validator')
+const Fee = require('../models/GPS.Fee')
+const titleKey = 'install_fee'
+const { checkValidations } = require('../plugins/controllersHelperFunctions')
+
+module.exports.setFee = [
+ [body('amount').notEmpty().isInt().withMessage('مقدار هزینه را وارد کنید')],
+ checkValidations(validationResult),
+ async (req, res) => {
+ const { amount } = req.body
+ const fee = await Fee.findOne({ title: titleKey })
+ if (fee) {
+ fee.amount = amount
+ await fee.save()
+ return res.status(200).json(fee)
+ }
+ const newFee = await Fee.create({ title: titleKey, amount })
+ res.status(201).json(newFee)
+ }
+]
+
+module.exports.getFee = async (req, res) => {
+ const fee = await Fee.findOne({ title: titleKey })
+ res.status(200).json(fee)
+}
\ No newline at end of file
diff --git a/server/controllers/GPS.InstalledDevice.js b/server/controllers/GPS.InstalledDevice.js
index 24961db..cb62e3f 100644
--- a/server/controllers/GPS.InstalledDevice.js
+++ b/server/controllers/GPS.InstalledDevice.js
@@ -4,64 +4,63 @@ const User = require('../models/GPS.User')
const InstalledDevice = require('../models/GPS.InstalledDevice')
const Device = require('../models/GPS.Device')
const userGPS = require('../models/GPS.User')
+const Fee = require('../models/GPS.Fee')
const Score = require('../models/GPS.Score')
const { _sr } = require('../plugins/serverResponses')
const { notifyAdmin } = require('../WebSocket/controllers/admin_EventsController')
-const { isDeviceRegisteredOnKoja } = require('../kojaWebService')
+const { findDeviceByImeiOnKoja } = require('../kojaWebService')
module.exports.deviceRegistration = [
[body('IMEI').notEmpty().isString().withMessage('لطفا IMEI را وارد یا تصحیح کنید')],
checkValidations(validationResult),
async (req, res) => {
const IMEI = req.body.IMEI
-
+ console.log('IMEI ******************', IMEI)
try {
- const device = await Device.findOne({ IMEI })
- if (!device) {
- return res.status(404).json({ msg: 'این IMEI وجود ندارد' })
- }
- if (device.status === 1) {
+ const installedDevice = await InstalledDevice.findOne({ IMEI })
+ // // const installedDevice = false
+ if (installedDevice) {
return res.status(400).json({ msg: 'این IMEI قبلا ثبت شده ' })
}
- const isRegistered = await isDeviceRegisteredOnKoja(IMEI)
-
- if (isRegistered) {
- let installedDeviceId = null
- try {
- const data = {
- deviceId: device.id,
- status: 0,
- registerDate: new Date(),
- userId: req.user_id,
- IMEI: req.body.IMEI
- }
- // 1.add to installed device
- const installedDevice = await InstalledDevice.create(data)
- installedDeviceId = installedDevice._id
- // 2. change status
- await Device.findOneAndUpdate({ IMEI }, { status: 1 })
-
- // 3. add to wallet
- await userGPS.findByIdAndUpdate(req.user_id, { $inc: { walletBalance: 100_000 } })
-
- notifyAdmin('newInstallDeviceRequest')
- res.status(201).json({ msg: 'مبلغ صد هزار تومان به کیف پول شما اضافه شد' })
- } catch (err) {
- console.log('Error in Db Transactions', err?.message)
- if (installedDeviceId) {
- try {
- await InstalledDevice.deleteOne({ _id: installedDeviceId })
- console.log('Rollback 1/2: InstalledDevice deleted.')
- await Device.findOneAndUpdate({ IMEI }, { status: 0 })
- console.log('Rollback 2/2: Device status reset to 0.')
- } catch (error) {
- console.error('CRITICAL: Rollback failed for some changes. MANUAL INTERVENTION REQUIRED.', error)
- }
- }
- return res.status(err?.status || 500).json({ msg: err?.msg || 'خطا در تراکنش های دیتابیس ' })
+ // const isRegisteredOnKoja = true
+ const RegisteredDevice = await findDeviceByImeiOnKoja(IMEI)
+ if (!RegisteredDevice) {
+ return res.status(400).json({ msg: 'هنوز در سامانه ردیاب ثبت نشده است.' })
+ }
+ let installedDeviceId = null
+ try {
+ const fee = await Fee.findOne({ title: 'install_fee' })
+ if (!fee) {
+ return res.status(400).json({ msg: 'هزینه نصب یافت نشد' })
}
- } else {
- res.status(400).json({ msg: 'هنوز در سامانه ردیاب ثبت نشده است.' })
+ const data = {
+ // deviceId: RegisteredDevice.deviceId,
+ deviceType: RegisteredDevice.device_type.name,
+ status: 1,
+ registerDate: new Date(),
+ userId: req.user_id,
+ IMEI: req.body.IMEI
+ }
+ // 1.add to installed device
+ const installedDevice = await InstalledDevice.create(data)
+ installedDeviceId = installedDevice._id
+
+ // 2. add to wallet
+ await userGPS.findByIdAndUpdate(req.user_id, { $inc: { walletBalance:fee.amount } })
+
+ notifyAdmin('newInstallDeviceRequest')
+ res.status(201).json({ msg: 'مبلغ صد هزار تومان به کیف پول شما اضافه شد' })
+ } catch (err) {
+ console.log('Error in Db Transactions', err?.message)
+ if (installedDeviceId) {
+ try {
+ await InstalledDevice.deleteOne({ _id: installedDeviceId })
+ console.log('Rollback: InstalledDevice deleted.')
+ } catch (error) {
+ console.error('CRITICAL: Rollback failed for some changes. MANUAL INTERVENTION REQUIRED.', error)
+ }
+ }
+ return res.status(err?.status || 500).json({ msg: err?.msg || 'خطا در تراکنش های دیتابیس ' })
}
} catch (err) {
console.log('deviceRegistration Error: ', err?.message)
@@ -147,7 +146,7 @@ module.exports.getAllForAdmin = async (req, res) => {
// }
const data = await InstalledDevice.find()
- // .sort({ [sortField]: sortOrder })
+ .sort({ created_at: -1 })
.populate('deviceId')
.populate('userId', 'shopName national_code first_name last_name mobile_number city_name province_name')
// .skip(skip)
diff --git a/server/controllers/GPS.Withdraw.js b/server/controllers/GPS.Withdraw.js
index f96aef0..eb9bd10 100644
--- a/server/controllers/GPS.Withdraw.js
+++ b/server/controllers/GPS.Withdraw.js
@@ -18,6 +18,12 @@ module.exports.createRequest = [
res.status(400).json({ msg: 'شما درخواست درحال بررسی دارید' })
} else {
const user = await User.findById(req.user_id)
+ if (!user) {
+ return res.status(400).json({ msg: 'کاربر یافت نشد' })
+ }
+ if (req.body.amount > user.walletBalance) {
+ return res.status(400).json({ msg: 'موجودی شما کافی نیست' })
+ }
if (user.walletBalance >= 50000) {
const data = {
card: req.body.card,
diff --git a/server/kojaWebService.js b/server/kojaWebService.js
index d7f52e4..af13a9f 100644
--- a/server/kojaWebService.js
+++ b/server/kojaWebService.js
@@ -1,29 +1,27 @@
const axios = require('axios')
const { kojaBaseUrl, kojaAccount } = require('./_env')
-export async function isDeviceRegisteredOnKoja(imei) {
+export async function findDeviceByImeiOnKoja(imei) {
try {
const result = await axios.get(`/devices/imei/${imei}`, {
baseURL: kojaBaseUrl,
auth: kojaAccount
})
- console.log('device registration check result from koja.ir', result)
- if (result.status === 200) {
- return true
- }
- return result
+
+ console.log('result.data from koja.ir******************', result.data.result)
+ return result.data.result
} catch (error) {
if (error.response) {
const { status } = error.response
if (status === 401) {
throw new Error('خطا در اتصال به سامانه ردیاب')
}
- if (status === 404) {
- return false
- }
- if (status === 403) {
- return true
- }
+ // if (status === 404) {
+ // return false
+ // }
+ // if (status === 403) {
+ // return true
+ // }
throw error
} else {
throw error
diff --git a/server/models/GPS.Fee.js b/server/models/GPS.Fee.js
new file mode 100644
index 0000000..cab6f05
--- /dev/null
+++ b/server/models/GPS.Fee.js
@@ -0,0 +1,10 @@
+const mongoose = require('mongoose')
+
+
+const FeeSchema = mongoose.Schema({
+ title: String,
+ amount: Number,
+ createdAt: { type: Date, default: Date.now },
+})
+
+module.exports = mongoose.model('Fee', FeeSchema)
diff --git a/server/models/GPS.InstalledDevice.js b/server/models/GPS.InstalledDevice.js
index 9e0e70d..e77e0b4 100644
--- a/server/models/GPS.InstalledDevice.js
+++ b/server/models/GPS.InstalledDevice.js
@@ -6,6 +6,7 @@ const InstalledDeviceSchema = mongoose.Schema({
ref: "Device"
},
IMEI:String,
+ deviceType:String,
status: {
type: Number,
enum: [
diff --git a/server/routes/admin.js b/server/routes/admin.js
index 00e69dd..6abaea7 100644
--- a/server/routes/admin.js
+++ b/server/routes/admin.js
@@ -33,7 +33,7 @@ const award = require('../controllers/GPS.Award')
const awardRequest = require('../controllers/GPS.AwardRequest')
const userGPS = require('../controllers/GPS.User')
const renewal = require('../controllers/GPS.Renewal')
-
+const fee = require('../controllers/GPS.Fee')
/// //////////////////////////////////////////////////////// routes
/// ///////////////////////////// GPS
@@ -81,6 +81,9 @@ router.get('/gps/device/imei/:imei', hasPermission('gps'), device.getOneByIMEI)
router.get('/gps/device/id/:id', hasPermission('gps'), device.getOne)
router.put('/gps/device/:id', hasPermission('gps'), device.updateDevice)
+/// ////////////// Fee
+router.post('/gps/install-fee', hasPermission('gps'), fee.setFee)
+router.get('/gps/install-fee', hasPermission('gps'), fee.getFee)
/// /////////////////////////////////////////////////////////
/// ///////////// survey
router.get('/surveys', hasPermission('surveys'), surveyController.getAllForAdmin)