flykup_model_production 1.0.15 → 1.0.16

package/models/order.modal.js

@@ -252,7 +252,7 @@ const orderSchema = new mongoose.Schema(
     },
     sourceType: {
       type: String,
-      enum: ['static', 'shoppable_video', 'livestream', 'auction', 'flash_sale', 'giveaway'],
+      enum: ['static', 'shoppable_video', 'livestream', 'auction', 'flash_sale', 'giveaway','bundle_sale','bundle_flash_sale'],
       required: true
     },
     sourceRefId: String,
@@ -351,6 +351,10 @@ cancelSource: {
     flashPrice: Number,
     originalPrice: Number
   }],
+  labelPrinted: {
+    type: Boolean,
+    default: false
+  },
 payment: {
   type: mongoose.Schema.Types.ObjectId,
   ref: 'orderPayment'

package/models/orderPayment.model.js

@@ -61,7 +61,9 @@ const paymentSchema = new mongoose.Schema({
   },
   paymentMethod: String,
   transactionTime: Date,
- sellerPayments: [{
+  
+  // ✅ SELLER PAYMENTS FIELD - Now matching package model
+  sellerPayments: [{
     sellerId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: 'users',
@@ -94,12 +96,124 @@ const paymentSchema = new mongoose.Schema({
 
 // Create indexes for better performance
 paymentSchema.index({ razorpayOrderId: 1 });
-// paymentSchema.index({ cfOrderId: 1 });
 paymentSchema.index({ orderId: 1 });
 
-// ❌ The pre-save middleware is no longer needed and should be removed.
-
 const OrderPayment =
   mongoose.models.OrderPayment || mongoose.model('orderPayment', paymentSchema);
 
-export default OrderPayment;
+export default OrderPayment;
+
+
+
+
+
+
+
+
+
+
+// import mongoose from 'mongoose';
+
+// const paymentSchema = new mongoose.Schema({
+//   orderId: {
+//     type: mongoose.Schema.Types.ObjectId,
+//     ref: 'Order',
+//     required: true
+//   },
+//   userId: {
+//     type: mongoose.Schema.Types.ObjectId,
+//     ref: 'users',
+//     required: true
+//   },
+//   paymentGateway: {
+//     type: String,
+//     enum: ['RAZORPAY', 'CASHFREE'],
+//     required: true
+//   },
+
+//   // Razorpay-specific fields
+//   razorpayOrderId: {
+//     type: String,
+//     // ✅ This field is now required only if the gateway is RAZORPAY
+//     required: function() {
+//       return this.paymentGateway === 'RAZORPAY';
+//     }
+//   },
+//   razorpayPaymentId: {
+//     type: String,
+//     default: null
+//   },
+
+//   // Cashfree-specific fields
+//   cfPaymentSessionId: {
+//     type: String,
+//     // ✅ This field is now required only if the gateway is CASHFREE
+//     required: function() {
+//       return this.paymentGateway === 'CASHFREE';
+//     }
+//   },
+//   cfOrderId: {
+//     type: String,
+//     // ✅ This field is now required only if the gateway is CASHFREE
+//     required: function() {
+//       return this.paymentGateway === 'CASHFREE';
+//     }
+//   },
+
+//   amount: {
+//     type: Number,
+//     required: true
+//   },
+//   currency: {
+//     type: String,
+//     default: 'INR'
+//   },
+//   status: {
+//     type: String,
+//     enum: ['PENDING', 'SUCCESS', 'FAILED', 'REFUNDED'],
+//     default: 'PENDING'
+//   },
+//   paymentMethod: String,
+//   transactionTime: Date,
+//  sellerPayments: [{
+//     sellerId: {
+//       type: mongoose.Schema.Types.ObjectId,
+//       ref: 'users',
+//       required: true
+//     },
+//     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'],
+//       default: 'PENDING'
+//     }
+//   }]
+// }, {
+//   timestamps: true
+// });
+
+// // Create indexes for better performance
+// paymentSchema.index({ razorpayOrderId: 1 });
+// // paymentSchema.index({ cfOrderId: 1 });
+// paymentSchema.index({ orderId: 1 });
+
+// // ❌ The pre-save middleware is no longer needed and should be removed.
+
+// const OrderPayment =
+//   mongoose.models.OrderPayment || mongoose.model('orderPayment', paymentSchema);
+
+// export default OrderPayment;

package/models/productListing.model.js

@@ -131,6 +131,10 @@ const ProductListingSchema = new Schema(
       type: Boolean,
       default: true,
     },
+    shopifySynced: {
+  type: Boolean,
+  default: false,
+},
     ratingSummary: {
       averageRating: { type: Number, default: 0 },
       totalRatings: { type: Number, default: 0 },

package/models/seller_settlements_2025-11-18 (1).csv

@@ -0,0 +1,4 @@
+Seller Name,Owner Name,Email,Mobile,Total Amount,Total Orders,Total Products,Account Number,IFSC Code,Bank Name
+"HARISH A","HARISH A","thebrandspot@gmail.com","THEBRANDSPOT","1270","38","38","","",""
+"Shanthi","Shanthi","shanthiaravindan81@gmail.com","+919500060775","450","1","1","","",""
+"Gokul Krishnan","Gokul Krishnan","gkgokul1817@gmail.com","gokul_krishnan","55","1","1","","",""

package/models/seller_settlements_2025-11-18.csv

@@ -0,0 +1,4 @@
+Seller Name,Owner Name,Email,Mobile,Total Amount,Total Orders,Total Products,Account Number,IFSC Code,Bank Name
+"HARISH A","HARISH A","thebrandspot@gmail.com","THEBRANDSPOT","1270","38","38","","",""
+"Shanthi","Shanthi","shanthiaravindan81@gmail.com","+919500060775","450","1","1","","",""
+"Gokul Krishnan","Gokul Krishnan","gkgokul1817@gmail.com","gokul_krishnan","55","1","1","","",""

package/models/shows.model.js

@@ -72,6 +72,29 @@ const liveFlashSaleSchema = new Schema({
     default: Date.now
   }
 });
+const bundleSaleSchema = new Schema({
+  _id: false,
+  bundleSaleId: { 
+    type: Schema.Types.ObjectId, 
+    ref: "bundlesales",
+    required: true 
+  },
+  bundleOwnerSellerId: { 
+    type: Schema.Types.ObjectId, 
+    ref: 'sellers',
+    required: function() {
+      return this.bundleSaleId != null;
+    }
+  },
+  bundleTitle: { type: String }, // Quick reference title
+  bundleMRP: { type: Number, min: 0, default: null }, // Original MRP
+  sellingPrice: { type: Number, min: 0, default: null }, // Actual selling price
+  bundleImage: { // Bundle thumbnail image
+    key: { type: String, default: null },
+    url: { type: String, default: null }
+  },
+  createdAt: { type: Date, default: Date.now }
+});
 
 // Show Schema with FIXED validation
 const showSchema = new Schema(
@@ -154,6 +177,12 @@ const showSchema = new Schema(
       enum: ['created', 'live', 'cancelled', 'ended'],
       default: 'created'
     },
+    viewerCount: {
+  type: Number,
+  default: 0,
+  min: 0
+},
+
     likes: {
       type: Number,
       default: 0,
@@ -192,6 +221,10 @@ const showSchema = new Schema(
         message: 'productOwnerSellerId is required when productId is provided'
       }
     },
+     bundleSales: {
+      type: [bundleSaleSchema],
+      default: []
+    },
     
     auctionProducts: {
       type: [
@@ -306,7 +339,7 @@ showSchema.pre('validate', function(next) {
   next();
 });
 
-const Show = mongoose.model("shows", showSchema);
+const Show = mongoose.models.shows || mongoose.model("shows", showSchema);
 export default Show;
 
 

package/models/user.model.js

@@ -44,6 +44,7 @@ const UserSchema = new mongoose.Schema(
       maxLength: 60,
       index: true,
     },
+    isMandate: { type: Boolean, default: false },
     password: {
       type: String,
       required: function () {
@@ -60,6 +61,12 @@ const UserSchema = new mongoose.Schema(
       },
       default: null,
     },
+    gender: {
+  type: String,
+  enum: ["male", "female", "other", "prefer-not-to-say"],
+  lowercase: true,
+  default: null
+},
     accessAllowed: { type: Boolean, default: true },
     oAuth: {
       type: String,

package/package.json

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