flykup_model_development 3.1.76 → 3.1.77

package/models/orderPayment.model.js

@@ -13,14 +13,13 @@ const paymentSchema = new mongoose.Schema({
   },
   paymentGateway: {
     type: String,
-    enum: ['RAZORPAY', 'CASHFREE'],
+    enum: ['RAZORPAY', 'CASHFREE','WALLET'],
     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';
     }
@@ -33,14 +32,12 @@ const paymentSchema = new mongoose.Schema({
   // 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';
     }
@@ -62,24 +59,24 @@ const paymentSchema = new mongoose.Schema({
   paymentMethod: String,
   transactionTime: Date,
   
-  // ✅ SELLER PAYMENTS FIELD - Now matching package model
+  // ✅ SELLER PAYMENTS - Only 4 new fields added
   sellerPayments: [{
     sellerId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: 'users',
       required: true
     },
-    payableAmount: { // Amount for products only
+    payableAmount: {
       type: Number,
       required: true,
       default: 0
     },
-    deliveryCharge: { // Delivery fee for this seller's shipment
+    deliveryCharge: {
       type: Number,
       required: true,
       default: 0
     },
-    totalAmount: { // The sum of payableAmount + deliveryCharge
+    totalAmount: {
       type: Number,
       required: true,
       default: 0
@@ -88,6 +85,24 @@ const paymentSchema = new mongoose.Schema({
       type: String,
       enum: ['PENDING', 'SETTLED', 'FAILED'],
       default: 'PENDING'
+    },
+    // ✅ NEW FIELDS (All optional with defaults - production safe)
+    settledAt: {
+      type: Date,
+      default: null
+    },
+    settledBy: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'Admin',
+      default: null
+    },
+    transactionReference: {
+      type: String,
+      default: null
+    },
+    failureReason: {
+      type: String,
+      default: null
     }
   }]
 }, {
@@ -97,6 +112,8 @@ const paymentSchema = new mongoose.Schema({
 // Create indexes for better performance
 paymentSchema.index({ razorpayOrderId: 1 });
 paymentSchema.index({ orderId: 1 });
+paymentSchema.index({ 'sellerPayments.sellerId': 1 });
+paymentSchema.index({ 'sellerPayments.settlementStatus': 1 });
 
 const OrderPayment =
   mongoose.models.OrderPayment || mongoose.model('orderPayment', paymentSchema);
@@ -111,7 +128,6 @@ export default OrderPayment;
 
 
 
-
 // import mongoose from 'mongoose';
 
 // const paymentSchema = new mongoose.Schema({

package/package.json

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

package/.github/workflows/main.yml

@@ -1,30 +0,0 @@
-name: Publish to npm
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set node
-        uses: actions/setup-node@v3
-        with:
-          node-version: "18"
-          registry-url: "https://registry.npmjs.org/"
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Build project
-        run: npm run build || echo "No build step"
-
-      - name: Publish to npm
-        run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}

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

@@ -1,4 +0,0 @@
-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

@@ -1,4 +0,0 @@
-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","","",""