flykup_model_development 2.0.9 → 3.0.1

package/index.js

@@ -32,7 +32,7 @@ import ShoppableVideoInteraction from './models/ShoppableInteraction.model.js';
 import SellerDraft from './models/sellerDraft.model.js';
 import AadhaarVerification from './models/AadhaarVerification.js';
 import BankVerification from './models/BankVerification.js';
-import GSTVerification from './models/GSTVerification.js'
+import GSTVerification from './models/GSTVerification.js';
 let initialized = false;
 
 export async function initializeSharedModels({ token, dbUri }) {
@@ -134,6 +134,4 @@ export {
   AadhaarVerificationModel as AadhaarVerification,
   BankVerificationModel as BankVerification,
   GSTVerificationModel as GSTVerification
-
-
 };

package/models/order.modal.js

@@ -1,5 +1,5 @@
 // order.modal.js
-import mongoose, { Schema, model } from 'mongoose';
+import mongoose from 'mongoose';
 import { nanoid } from 'nanoid';
 
 const orderSchema = new mongoose.Schema(
@@ -48,17 +48,6 @@ const orderSchema = new mongoose.Schema(
         type: String,
         enum: ['CGST+SGST', 'IGST',"NON-GST"],
         required: true
-      },
-        isFlashSale: {
-        type: Boolean,
-        default: false
-      },
-      flashSaleId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'FlashSale'
-      },
-      flashPrice: {
-        type: Number
       }
     }],
     totalBaseAmount: {
@@ -147,7 +136,7 @@ const orderSchema = new mongoose.Schema(
     }],
     paymentMethod: {
       type: String,
-      enum: ['CARD', 'UPI', 'NETBANKING', 'WALLET', 'COD', "PENDING_PAYMENT", "CASHFREE", "Online"],
+      enum: ['CARD', 'UPI', 'NETBANKING', 'WALLET', 'COD', "PENDING_PAYMENT", "CASHFREE","RAZORPAY", "Online"],
       required: true
     },
     paymentStatus: {
@@ -177,9 +166,9 @@ const orderSchema = new mongoose.Schema(
       // default: 'ORDERED', // Default should be the initial state
       required: true
     },
-     sourceType: {
+    sourceType: {
       type: String,
-      enum: ['static', 'shoppable_video', 'livestream', 'auction', 'flash_sale'], // Add flash_sale
+      enum: ['static', 'shoppable_video', 'livestream', 'auction'],
       required: true
     },
     sourceRefId: String,
@@ -288,6 +277,9 @@ payment: {
 );
 
 
-
-const Order = mongoose.models.Order || mongoose.model('Order', orderSchema);
+const Order = mongoose.model('Order', orderSchema);
 export default Order;
+
+
+// const Order = mongoose.models.Order || mongoose.model('Order', orderSchema);
+// export default Order;

package/models/orderPayment.model.js

@@ -0,0 +1,66 @@
+import mongoose from 'mongoose';
+
+const paymentSchema = new mongoose.Schema({
+  orderId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Order',
+    required: true
+  },
+  cfOrderId: {
+    type: String,
+    required: false,
+    default: null
+  },
+  cfPaymentSessionId: {
+    type: String,
+    required: false,
+    default: null
+  },
+  // Razorpay fields
+  razorpayOrderId: {
+    type: String,
+    required: false,
+    default: null
+  },
+  razorpayPaymentId: {
+    type: String,
+    required: false,
+    default: null
+  },
+  userId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'users',
+    required: true
+  },
+  amount: {
+    type: Number,
+    required: true
+  },
+  currency: {
+    type: String,
+    default: 'INR'
+  },
+  status: {
+    type: String,
+    enum: ['PENDING', 'SUCCESS', 'FAILED',"REFUNDED"],
+    default: 'PENDING'
+  },
+  paymentMethod: String,
+  transactionId: String,
+  transactionTime: Date,
+  sellerPayments: [{
+    sellerId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'users',
+      required: true
+    },
+    amount: Number,
+    settlementStatus: {
+      type: String,
+      enum: ['PENDING', 'SETTLED'],
+      default: 'PENDING'
+    }
+  }]
+}, { timestamps: true });
+const OrderPayment = mongoose.model('orderPayment', paymentSchema);
+export default OrderPayment;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flykup_model_development",
-  "version": "2.0.9",
+  "version": "3.0.1",
   "main": "index.js",
   "type": "module",
   "private": false,
@@ -11,6 +11,7 @@
     "bcrypt": "^5.1.0",
     "crypto": "^1.0.1",
     "dotenv": "^16.4.5",
+    "flykup_model_development": "^2.0.9",
     "jsonwebtoken": "^9.0.0",
     "mongoose": "^8.0.0",
     "nanoid": "^5.1.5"