flykup_model_development 3.1.28 → 3.1.30

package/models/order.modal.js

@@ -248,7 +248,7 @@ const orderSchema = new mongoose.Schema(
     },
     sourceType: {
       type: String,
-      enum: ['static', 'shoppable_video', 'livestream', 'auction','flash_sale'],
+      enum: ['static', 'shoppable_video', 'livestream', 'auction', 'flash_sale', 'giveaway'],
       required: true
     },
     sourceRefId: String,

package/models/productListing.model.js

@@ -54,7 +54,22 @@ const ProductListingSchema = new Schema(
       min: 0,
       default: null,
     },
-
+     logisticsType: {
+      type: String,
+      enum: ["flykupLogistics", "selfShipment"],
+      default: null,
+    },
+    deliveryCharge: {
+      type: Number,
+      min: 0,
+      default: null,
+    },
+    estimatedDeliveryDate: {
+      type: Number, // Change from Date to Number
+      min: 0,
+      default: null,
+    },
+  
     // --- ADDED/UPDATED FIELDS FROM FRONTEND ---
     brand: { type: String, default: null }, // ADDED
     manufacturer: String,
@@ -156,3 +171,172 @@ export default ProductListing;
 
 
 
+
+
+// // backend/models/ProductListing.js (or similar path)
+// import mongoose from "mongoose";
+// const { Schema } = mongoose;
+
+// const ProductListingSchema = new Schema(
+//   {
+//     sellerId: { type: Schema.Types.ObjectId, ref: "sellers" },
+//     stockId: { type: Schema.Types.ObjectId, ref: "stocks" },
+//     title: String,
+//     description: String,
+//       flashSale: {
+//     isActive: { type: Boolean, default: false },
+//     flashSaleId: { type: mongoose.Schema.Types.ObjectId, ref: 'FlashSale' },
+//     flashPrice: { type: Number, default: 0 },
+//     flashStock: { type: Number, default: 0 },
+//     originalPrice: { type: Number, default: 0 },
+//     endsAt: { type: Date, default: null },
+//     startsAt: { type: Date, default: null }
+//   },
+  
+// //new fields added 
+
+// returnPolicy: {
+//       hasReturn: { type: Boolean, default: false },
+//       returnType: { 
+//         type: [String], 
+//         enum: ['refund', 'replacement'],
+//         default: []
+//       },
+//       returnDays: { type: Number, min: 0, default: null },
+//       terms: [String] // Keep existing terms for backward compatibility
+//     },
+//     sku: {
+//       type: String,
+//       required: true,
+//       match: [/^[A-Za-z0-9-]{6,}$/, 'SKU must be at least 6 alphanumeric characters']
+//     },
+// // ----------end of new fields added
+//     images: [
+//       {
+//         key: { type: String, maxLength: 255, default: null },
+//       }
+//     ],
+//     category: String,
+//     subcategory: String,
+//     hsnNo: String,
+//     MRP: {
+//       type: Number,
+//       min: 0,
+//       default: null,
+//     },
+//     productPrice: {
+//       type: Number,
+//       min: 0,
+//       default: null,
+//     },
+//     startingPrice: {
+//       type: Number,
+//       min: 0,
+//       default: null,
+//     },
+//     reservedPrice: {
+//       type: Number,
+//       min: 0,
+//       default: null,
+//     },
+
+//     // --- ADDED/UPDATED FIELDS FROM FRONTEND ---
+//     brand: { type: String, default: null }, // ADDED
+//     manufacturer: String,
+//     manufacturerAddress: String, // ADDED in frontend, already exists here
+//     countryOfOrigin: String,
+//     netQuantity: { type: String, default: null }, // ADDED (String to accommodate units like '500g')
+//     packagingType: { type: String, default: null }, // ADDED
+//     weight: { // For shipping calculations
+//       value: { type: Number, default: null },
+//       unit: { type: String, default: null },
+//     },
+//     dimensions: { // For shipping calculations
+//       length: { type: Number, default: null },
+//       width: { type: Number, default: null },
+//       height: { type: Number, default: null },
+//     },
+//     expiryDate: { type: Date, default: null }, // ADDED in frontend, already exists here (changed to allow null)
+//     shelfLife: { type: String, default: null }, // ADDED in frontend, already exists here (changed to allow null)
+//     batchNumber: { type: String, default: null }, // ADDED in frontend, already exists here (changed to allow null)
+//     gstRate: { type: Number, default: null }, // Changed to allow null if needed
+//     sellerName: String,
+//     sellerContact: { type: String, default: null }, // ADDED
+//     sellerGSTIN: { type: String, default: null }, // ADDED
+//     returnPolicy: [String],
+//     warranty: {
+//       hasWarranty: { type: Boolean, default: false }, // Default added
+//       duration: { type: String, default: null }, // Default added
+//     },
+//     fssaiLicenseNo: { type: String, default: null }, // ADDED in frontend, already exists here (changed to allow null)
+//     bisCertification: { type: String, default: null }, // ADDED in frontend, already exists here (changed to allow null)
+//     importerName: { type: String, default: null }, // Default added
+//     importerAddress: { type: String, default: null }, // Default added
+//     importerGSTIN: { type: String, default: null }, // Default added
+//     eWasteCompliance: { type: Boolean, default: false }, // Default added
+//     recyclablePackaging: { type: Boolean, default: false }, // Default added
+//     hazardousMaterials: { type: String, default: null }, // Default added
+//     allowDropshipping: {
+//       type: Boolean,
+//       default: false,
+//       index: true,
+//     },
+//     commissionRate: {
+//       type: Number,
+//       min: [0, 'Commission rate cannot be negative.'],
+//       // max: [100, 'Commission rate cannot exceed 100%.'], // Max was 25, changed to 100 based on frontend
+//       max: [100, 'Commission rate cannot exceed 100%.'],
+//       default: null,
+//       // Removed Mongoose-level required validation dependent on allowDropshipping
+//       // Let application logic handle this if needed, or adjust validator
+//       // required: [
+//       //   function () { return this.allowDropshipping === true; },
+//       //   'Commission rate is required when allowing dropshipping.'
+//       // ],
+//       // validate: { ... } // Keep or remove validation as needed
+//     },
+//     hasReturn: {
+//   type: Boolean,
+//   default: false
+// },
+// returnDays: {
+//   type: Number,
+//   min: 0,
+//   default: null
+// },
+// size: {
+//   type: String,
+//   default: null
+// },
+//     isActive: {
+//       type: Boolean,
+//       default: true,
+//     },ratingSummary: {
+//     averageRating: { type: Number, default: 0 },
+//     totalRatings: { type: Number, default: 0 },
+//     ratingDistribution: {
+//         1: { type: Number, default: 0 },
+//         2: { type: Number, default: 0 },
+//         3: { type: Number, default: 0 },
+//         4: { type: Number, default: 0 },
+//         5: { type: Number, default: 0 }
+//     }
+// },
+// totalReviews: { type: Number, default: 0 }
+//   },
+
+
+  
+//   { timestamps: true }
+// );
+// ProductListingSchema.index({ title: 'text', description: 'text', category: 'text' });
+// ProductListingSchema.index({ sellerId: 1, sku: 1 }, { unique: true });
+
+// // Safe export to prevent OverwriteModelError
+// const ProductListing = mongoose.models.productlistings || mongoose.model("productlistings", ProductListingSchema);
+// export default ProductListing;
+
+
+
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flykup_model_development",
-  "version": "3.1.28",
+  "version": "3.1.30",
   "main": "index.js",
   "type": "module",
   "private": false,