flykup_model_production 1.0.11 → 1.0.13

package/models/notification.model.js

@@ -20,7 +20,8 @@ const notificationSchema = new mongoose.Schema(
         'admin_broadcast',
         'seller_broadcast',
         'live_stream_start',
-        'seller_order_update'
+        'seller_order_update',
+        'new_show_scheduled'
       ],
       required: true,
     },

package/models/order.modal.js

@@ -17,6 +17,10 @@ const orderSchema = new mongoose.Schema(
       required: true,
       index: true
     },
+    notificationSent: {
+  orderPlaced: { type: Boolean, default: false },
+  orderConfirmed: { type: Boolean, default: false }
+},
     products: [{
       productId: {
         type: mongoose.Schema.Types.ObjectId,

package/models/orderPayment.model.js

@@ -61,16 +61,30 @@ const paymentSchema = new mongoose.Schema({
   },
   paymentMethod: String,
   transactionTime: Date,
-  sellerPayments: [{
+ sellerPayments: [{
     sellerId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: 'users',
       required: true
     },
-    amount: Number,
+    payableAmount: { // Amount for products only
+      type: Number,
+      required: true,
+      default: 0
+    },
+    deliveryCharge: { // Delivery fee for this seller's shipment
+      type: Number,
+      required: true,
+      default: 0
+    },
+    totalAmount: { // The sum of payableAmount + deliveryCharge
+      type: Number,
+      required: true,
+      default: 0
+    },
     settlementStatus: {
       type: String,
-      enum: ['PENDING', 'SETTLED','FAILED'],
+      enum: ['PENDING', 'SETTLED', 'FAILED'],
       default: 'PENDING'
     }
   }]
@@ -80,7 +94,7 @@ const paymentSchema = new mongoose.Schema({
 
 // Create indexes for better performance
 paymentSchema.index({ razorpayOrderId: 1 });
-paymentSchema.index({ cfOrderId: 1 });
+// paymentSchema.index({ cfOrderId: 1 });
 paymentSchema.index({ orderId: 1 });
 
 // ❌ The pre-save middleware is no longer needed and should be removed.

package/models/shoppableVideo.model.js

@@ -191,7 +191,38 @@ isEligibleToPlay: {
   type: Boolean,
   default: false, // Default to true, can be set to false if video is not eligible for playback
   index: true // Index for quick lookups
-}
+},
+// Admin Approval Fields
+approvalStatus: {
+  type: String,
+  enum: ['pending', 'approved', 'rejected'],
+  default: 'pending',
+  index: true
+},
+approvedBy: {
+  type: Schema.Types.ObjectId,
+  ref: 'Admin',
+  default: null
+},
+approvedAt: {
+  type: Date,
+  default: null
+},
+rejectionReason: {
+  type: String,
+  default: null,
+  trim: true
+},
+rejectedBy: {
+  type: Schema.Types.ObjectId,
+  ref: 'Admin',
+  default: null
+},
+rejectedAt: {
+  type: Date,
+  default: null
+},
+
   },
   { timestamps: true }
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flykup_model_production",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "main": "index.js",
   "type": "module",
   "private": false,