flykup_model_development 3.1.16 → 3.1.18

package/models/order.modal.js

@@ -1,14 +1,14 @@
-// order.modal.js
+// order.model.js - CORRECTED SCHEMA STRUCTURE
 import mongoose from 'mongoose';
 import { nanoid } from 'nanoid';
 
 const orderSchema = new mongoose.Schema(
   {
-     orderId: {
+    orderId: {
       type: String,
       required: true,
       unique: true,
-      default: () => `ORD-${nanoid(8)}`
+      default: () => `FLY-ORD-${nanoid(8)}`
     },
     userId: {
       type: mongoose.Schema.Types.ObjectId,
@@ -48,15 +48,7 @@ const orderSchema = new mongoose.Schema(
         type: String,
         enum: ['CGST+SGST', 'IGST',"NON-GST"],
         required: true
-      },
-      isFlashSale: {
-      type: Boolean,
-      default: false
-    },
-    flashPrice: {
-      type: Number,
-      default: null // Store the specific flash price used for this item
-    }
+      }
     }],
     totalBaseAmount: {
       type: Number,
@@ -84,30 +76,75 @@ const orderSchema = new mongoose.Schema(
         amount: Number
       }
     },
-       deliveryAddress: {
-     name: { type: String, maxLength: 50, trim: true, required: true },
-     mobile: { type: String, trim: true, maxLength: 15, required: true },
-     alternateMobile: { type: String, trim: true, maxLength: 15, default: null },
-     line1: { type: String, trim: true, maxLength: 100, required: true },
-     line2: { type: String, trim: true, maxLength: 100, default: "" },
-     city: { type: String, trim: true, maxLength: 50, required: true },
-     state: { type: String, trim: true, maxLength: 50, required: true },
-     pincode: { type: String, maxLength: 6, trim: true, required: true },
-     addressType: {
-       type: String,
-       enum: ['home', 'work', 'other'],
-       default: 'home'
-     },
-     // --- ADD THESE FIELDS INSIDE deliveryAddress ---
-     addressModified: {
+    deliveryAddress: {
+      name: { type: String, maxLength: 50, trim: true, required: true },
+      mobile: { type: String, trim: true, maxLength: 15, required: true },
+      alternateMobile: { type: String, trim: true, maxLength: 15, default: null },
+      line1: { type: String, trim: true, maxLength: 100, required: true },
+      line2: { type: String, trim: true, maxLength: 100, default: "" },
+      city: { type: String, trim: true, maxLength: 50, required: true },
+      state: { type: String, trim: true, maxLength: 50, required: true },
+      pincode: { type: String, maxLength: 6, trim: true, required: true },
+      addressType: {
+        type: String,
+        enum: ['home', 'work', 'other'],
+        default: 'home'
+      },
+      addressModified: {
         type: Boolean,
         default: false
-     },
-     addressModifiedAt: {
+      },
+      addressModifiedAt: {
         type: Date,
         default: null
-     }
-   },
+      }
+    },
+    // CORRECT PLACEMENT - TOP LEVEL FIELDS
+    logisticsDetails: {
+      shipmentMethod: {
+        type: String,
+        enum: ['self_shipment', 'flykup_logistics'],
+        default: 'flykup_logistics'
+      },
+      awbNumber: String,
+      carrier: String,
+      carrierId: String,
+      trackingNumber: String,
+      trackingUrl: String,
+      expectedDeliveryDate: Date,
+      shipmentBookedAt: Date,
+      logisticsResponse: mongoose.Schema.Types.Mixed,
+      shipmentBookingStatus: {
+        type: String,
+        enum: ['pending', 'booked', 'failed'],
+        default: 'pending'
+      },
+      shipmentBookingError: String,
+      multipleSellers: {
+        type: Boolean,
+        default: false
+      },
+      selectedCourier: {
+        courierId: String,
+        courierName: String,
+        deliveryCharges: Number,
+        estimatedDays: Number,
+        deliveryDate: String
+      }
+    },
+    packageDetails: {
+      totalWeight: Number,
+      weightUnit: {
+        type: String,
+        default: 'grams'
+      },
+      dimensions: {
+        length: Number,
+        width: Number,
+        height: Number
+      },
+      volumetricWeight: Number
+    },
     pickupAddresses: [{
       sellerUserId: {
         type: mongoose.Schema.Types.ObjectId,
@@ -144,7 +181,7 @@ const orderSchema = new mongoose.Schema(
     }],
     paymentMethod: {
       type: String,
-      enum: ['CARD', 'UPI', 'NETBANKING', 'WALLET', 'COD', "PENDING_PAYMENT", "CASHFREE","RAZORPAY", "Online"],
+       enum: ['CARD', 'UPI', 'NETBANKING', 'WALLET', 'COD', "PENDING_PAYMENT", "CASHFREE","RAZORPAY", "Online"],
       required: true
     },
     paymentStatus: {
@@ -176,7 +213,7 @@ const orderSchema = new mongoose.Schema(
     },
     sourceType: {
       type: String,
-      enum: ['static', 'shoppable_video', 'livestream', 'auction','flash_sale'],
+      enum: ['static', 'shoppable_video', 'livestream', 'auction'],
       required: true
     },
     sourceRefId: String,
@@ -262,19 +299,6 @@ cancelSource: {
   enum: ['user', 'seller', 'system'],
   default: 'user'
 },
-  flashSaleItems: [{
-    productId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'productlistings'
-    },
-    flashSaleId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'FlashSale'
-    },
-    quantity: Number,
-    flashPrice: Number,
-    originalPrice: Number
-  }],
 payment: {
   type: mongoose.Schema.Types.ObjectId,
   ref: 'orderPayment'
@@ -293,13 +317,331 @@ payment: {
     default: 0
   },
   invoiceError: String
+
+
+
+
+
+  
   },
- 
+  
   { timestamps: true }
 );
 
 
+const Order = mongoose.model('Order', orderSchema);
+export default Order;
 
 
-const Order = mongoose.models.Order || mongoose.model('Order', orderSchema);
-export default Order;
+// const Order = mongoose.models.Order || mongoose.model('Order', orderSchema);
+// export default Order;
+
+
+
+
+
+// // order.modal.js
+// import mongoose from 'mongoose';
+// import { nanoid } from 'nanoid';
+
+// const orderSchema = new mongoose.Schema(
+//   {
+//      orderId: {
+//       type: String,
+//       required: true,
+//       unique: true,
+//       default: () => `ORD-${nanoid(8)}`
+//     },
+//     userId: {
+//       type: mongoose.Schema.Types.ObjectId,
+//       ref: 'users',
+//       required: true,
+//       index: true
+//     },
+//     products: [{
+//       productId: {
+//         type: mongoose.Schema.Types.ObjectId,
+//         ref: 'productlistings',
+//         required: true
+//       },
+//       sellerUserId: {
+//         type: mongoose.Schema.Types.ObjectId,
+//         ref: 'users',
+//         required: true
+//       },
+//       quantity: {
+//         type: Number,
+//         required: true,
+//         min: 1
+//       },
+//       basePrice: {
+//         type: Number,
+//         required: true
+//       },
+//       gstRate: {
+//         type: Number,
+//         required: true
+//       },
+//       gstAmount: {
+//         type: Number,
+//         required: true
+//       },
+//       gstType: {
+//         type: String,
+//         enum: ['CGST+SGST', 'IGST',"NON-GST"],
+//         required: true
+//       },
+//       isFlashSale: {
+//       type: Boolean,
+//       default: false
+//     },
+//     flashPrice: {
+//       type: Number,
+//       default: null // Store the specific flash price used for this item
+//     }
+//     }],
+//     totalBaseAmount: {
+//       type: Number,
+//       required: true
+//     },
+//     totalGstAmount: {
+//       type: Number,
+//       required: true
+//     },
+//     totalAmount: {
+//       type: Number,
+//       required: true
+//     },
+//     gstSplit: {
+//       cgst: {
+//         rate: Number,
+//         amount: Number
+//       },
+//       sgst: {
+//         rate: Number,
+//         amount: Number
+//       },
+//       igst: {
+//         rate: Number,
+//         amount: Number
+//       }
+//     },
+//        deliveryAddress: {
+//      name: { type: String, maxLength: 50, trim: true, required: true },
+//      mobile: { type: String, trim: true, maxLength: 15, required: true },
+//      alternateMobile: { type: String, trim: true, maxLength: 15, default: null },
+//      line1: { type: String, trim: true, maxLength: 100, required: true },
+//      line2: { type: String, trim: true, maxLength: 100, default: "" },
+//      city: { type: String, trim: true, maxLength: 50, required: true },
+//      state: { type: String, trim: true, maxLength: 50, required: true },
+//      pincode: { type: String, maxLength: 6, trim: true, required: true },
+//      addressType: {
+//        type: String,
+//        enum: ['home', 'work', 'other'],
+//        default: 'home'
+//      },
+//      // --- ADD THESE FIELDS INSIDE deliveryAddress ---
+//      addressModified: {
+//         type: Boolean,
+//         default: false
+//      },
+//      addressModifiedAt: {
+//         type: Date,
+//         default: null
+//      }
+//    },
+//     pickupAddresses: [{
+//       sellerUserId: {
+//         type: mongoose.Schema.Types.ObjectId,
+//         ref: 'users',
+//         required: true
+//       },
+//       name: String,
+//       mobile: String,
+//       addressLine1: {
+//         type: String,
+//         trim: true,
+//         maxLength: 150,
+//       },
+//       addressLine2: {
+//         type: String,
+//         trim: true,
+//         maxLength: 150,
+//       },
+//       city: {
+//         type: String,
+//         trim: true,
+//         maxLength: 50,
+//       },
+//       state: {
+//         type: String,
+//         trim: true,
+//         maxLength: 50,
+//       },
+//       pincode: {
+//         type: String,
+//         trim: true,
+//         maxLength: 6,
+//       },
+//     }],
+//     paymentMethod: {
+//       type: String,
+//       enum: ['CARD', 'UPI', 'NETBANKING', 'WALLET', 'COD', "PENDING_PAYMENT", "CASHFREE","RAZORPAY", "Online"],
+//       required: true
+//     },
+//     paymentStatus: {
+//       type: String,
+//       enum: ['PENDING', 'PAID', 'FAILED', 'REFUNDED'],
+//       default: 'PENDING',
+//       required: true
+//     },
+//     orderStatus: {
+//       type: String,
+//       enum: [
+//         'PENDING_PAYMENT',
+//         'ORDERED',
+//         'PACKED',
+//         'SHIPPED',
+//         'OUT_FOR_DELIVERY',
+//         'DELIVERED',
+//         'CANCELLED',
+//         'RETURN_REQUESTED',
+//         'RETURN_APPROVED',
+//         'RETURN_SHIPPED',
+//         'RETURN_RECEIVED',
+//         'REFUNDED',
+//         'REPLACEMENT_SHIPPED',
+//         'REPLACEMENT_DELIVERED'
+//       ],
+//       // default: 'ORDERED', // Default should be the initial state
+//       required: true
+//     },
+//     sourceType: {
+//       type: String,
+//       enum: ['static', 'shoppable_video', 'livestream', 'auction','flash_sale'],
+//       required: true
+//     },
+//     sourceRefId: String,
+//     deliveryCharge: {
+//       type: Number,
+//       default: 40
+//     },
+//     statusTimeline: {
+//       ordered: Date,
+//       paid: Date,
+//       packed: Date,
+//       shipped: Date,
+//       outForDelivery: Date,
+//       delivered: Date,
+//       cancelled: Date,
+//       returnRequested: Date,
+//       returnApproved: Date,
+//       returnShipped: Date,
+//       returnReceived: Date,
+//       refunded: Date,
+//       replacementShipped: Date,
+//       replacementDelivered: Date
+//     },
+//     courierDetails: { 
+//       carrier: String,
+//       trackingNumber: String,
+//       estimatedDelivery: Date
+//     },
+//     returnDetails: {
+//       reason: String,
+//       type: {
+//         type: String,
+//         enum: ['REFUND', 'REPLACE']
+//       },
+//       items: [{
+//         productId: mongoose.Schema.Types.ObjectId,
+//         quantity: Number
+//       }]
+//     },
+//     refundDetails: {
+//       amount: Number,
+//       method: String,
+//       transactionId: String
+//     },
+//     replacementDetails: {
+//       trackingNumber: String,
+//       replacementOrderId: mongoose.Schema.Types.ObjectId
+//     },
+//     returnRequests: [{
+//   _id: { type: mongoose.Schema.Types.ObjectId, auto: true },
+//   orderItemId: {  // Reference to the specific item in the order
+//     type: mongoose.Schema.Types.ObjectId,
+//     required: true
+//   },
+//   reason: String,
+//   additionalNotes: String,
+//   images: [String],
+//   status: {
+//     type: String,
+//     enum: ['PENDING', 
+//             'APPROVED', 
+//             'REJECTED', 
+//             'RETURN_SHIPPED', 
+//             'RETURN_RECEIVED', 
+//             'REFUNDED'],
+//     default: 'PENDING'
+//   },
+//    shipmentDetails: {
+//     carrier: String,
+//     trackingNumber: String,
+//     receiptImage: String, // S3 key for uploaded image
+//     shippedAt: Date
+//     },
+//     receivedAt: Date,
+//     refundProcessedAt: Date,
+//   sellerResponse: String,
+//   requestedAt: Date,
+//   processedAt: Date
+// }],
+// cancelReason: String,
+// cancelSource: {
+//   type: String,
+//   enum: ['user', 'seller', 'system'],
+//   default: 'user'
+// },
+//   flashSaleItems: [{
+//     productId: {
+//       type: mongoose.Schema.Types.ObjectId,
+//       ref: 'productlistings'
+//     },
+//     flashSaleId: {
+//       type: mongoose.Schema.Types.ObjectId,
+//       ref: 'FlashSale'
+//     },
+//     quantity: Number,
+//     flashPrice: Number,
+//     originalPrice: Number
+//   }],
+// payment: {
+//   type: mongoose.Schema.Types.ObjectId,
+//   ref: 'orderPayment'
+// },  
+//  invoiceKey: {
+//       type: String,
+//       default: null
+//     },
+//      invoiceStatus: {
+//     type: String,
+//     enum: ['pending', 'processing', 'completed', 'failed'],
+//     default: 'pending'
+//   },
+//   invoiceRetries: {
+//     type: Number,
+//     default: 0
+//   },
+//   invoiceError: String
+//   },
+ 
+//   { timestamps: true }
+// );
+
+
+
+
+// const Order = mongoose.models.Order || mongoose.model('Order', orderSchema);
+// export default Order;

package/package.json

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