@@ -72,31 +62,14 @@
Issued to:
- | S.No. |
- Item Details |
- Type |
- Net Amount |
- Tax Rate |
- Tax Type |
- Tax Amount |
- Total Amount |
+ {{tableHeader}}
{{tableRows}}
{{totalRow}}
{{amountInWordsRow}}
-
- |
-
- |
-
- For EVENTORY TECH SOLUTIONS PVT LIMITED:
- 
- Authorized Signatory
- |
-
+ {{signatureRow}}
diff --git a/invoicing-service/templates/style.css b/invoicing-service/templates/style.css
index 232ccac3..39494d08 100644
--- a/invoicing-service/templates/style.css
+++ b/invoicing-service/templates/style.css
@@ -6,13 +6,11 @@ body {
}
.invoice-container {
- max-width: 800px;
- margin: 20px auto;
+ width: 100%;
+ margin: 0;
background: #fff;
padding: 30px;
- border: 1px solid #ddd;
- border-radius: 5px;
- box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.1);
+ box-sizing: border-box;
}
header {
diff --git a/models/anonCustomerOrder.js b/models/anonCustomerOrder.js
index 660831c5..3469c461 100644
--- a/models/anonCustomerOrder.js
+++ b/models/anonCustomerOrder.js
@@ -10,7 +10,7 @@ const anonOrderItemSchema = new mongoose.Schema({
required: true
},
service_asset: [{
- type: String
+ type: String
}],
quantity: {
type: Number,
@@ -27,7 +27,7 @@ const anonOrderItemSchema = new mongoose.Schema({
},
tax_rate: {
type: Number,
- default: 0
+ default: 0
},
tax_type: {
type: String,
@@ -43,6 +43,31 @@ const anonOrderItemSchema = new mongoose.Schema({
}
}, { _id: false });
+const anonPaymentBreakdownsSchema = new mongoose.Schema({
+ name: {
+ type: String,
+ required: true
+ },
+ amount: {
+ type: Number,
+ required: true
+ },
+ date: {
+ type: Date,
+ required: true
+ },
+ status: {
+ type: String,
+ enum: ["Unpaid", "Paid", "Failed"],
+ default: "Unpaid"
+ },
+ custom_items: [{
+ name_of_service: String,
+ price: Number,
+ description: String
+ }]
+}, { _id: false });
+
const anonPaymentDetailsSchema = new mongoose.Schema({
paymentStatus: {
type: String,
@@ -74,139 +99,144 @@ const anonCustomerOrderSchema = new mongoose.Schema({
unique: true,
default: () => `ANON_ODR_${Date.now()}`
},
-
+
chat_id: {
type: String,
required: true,
},
-
+
anon_user_id: {
type: String,
required: false,
index: true
},
-
+
em_id: {
type: String,
required: true,
default: 'EM_SYSTEM'
},
-
+
service_id: {
type: String,
default: null
},
-
+
vendor_id: {
type: String,
default: null
},
-
+
vendor_name: {
type: String,
default: null
},
-
+
customer_name: {
type: String,
default: "Anonymous Customer"
},
-
+
customer_contact_number: {
type: String,
default: null
},
-
+
customer_contact_email: {
type: String,
default: null
},
-
+
event_type: {
type: String,
- default: null
+ default: null
},
-
+
event_start: {
type: Date,
default: null
},
-
+
event_end: {
type: Date,
default: null
},
-
+
event_time: {
type: String,
default: null
},
-
+
event_location: {
type: String,
default: null
},
-
+
location_type: {
type: String,
enum: ['indoor', 'outdoor', null],
default: null
},
-
+
guest_count: {
type: Number,
default: null
},
-
+
budget: {
type: Number,
default: null
},
-
+
final_order_items: [anonOrderItemSchema],
-
+
final_amount: {
type: Number,
default: 0
},
-
+
advance_amount_requested: {
type: Number,
default: 0
},
-
+
paymentDetails: {
type: anonPaymentDetailsSchema,
default: () => ({})
},
-
+
+ paymentBreakdowns: {
+ type: [anonPaymentBreakdownsSchema],
+ default: []
+ },
+
specificTerms: {
type: [String],
default: []
},
-
+
order_status: {
type: String,
enum: ['draft', 'pending', 'sent_to_customer', 'approved', 'rejected', 'converted', 'cancelled'],
default: 'draft'
},
-
+
priority: {
type: String,
enum: ['low', 'medium', 'high', 'urgent'],
default: 'medium'
},
-
+
em_notes: {
type: String,
default: ''
},
-
+
customer_requirements: {
type: String,
default: ''
},
-
+
source_info: {
utm_source: String,
utm_medium: String,
@@ -215,22 +245,22 @@ const anonCustomerOrderSchema = new mongoose.Schema({
landing_page: String,
device_info: String
},
-
+
converted_to_order_id: {
type: String,
default: null
},
-
+
converted_at: {
type: Date,
default: null
},
-
+
created_at: {
type: Date,
default: Date.now
},
-
+
updated_at: {
type: Date,
default: Date.now
diff --git a/models/events.js b/models/events.js
index 2f31d915..7e632612 100644
--- a/models/events.js
+++ b/models/events.js
@@ -42,6 +42,32 @@ const cartItemSchema = new mongoose.Schema({
}
}, { _id: false });
+// Payment Breakdowns Schema (embedded in Events)
+const paymentBreakdownsSchema = new mongoose.Schema({
+ name: {
+ type: String,
+ required: true
+ },
+ amount: {
+ type: Number,
+ required: true
+ },
+ date: {
+ type: Date,
+ required: true
+ },
+ status: {
+ type: String,
+ enum: ["Unpaid", "Paid", "Failed"],
+ default: "Unpaid"
+ },
+ custom_items: [{
+ name_of_service: String,
+ price: Number,
+ description: String
+ }]
+}, { _id: false });
+
// Events Schema
const eventsSchema = new mongoose.Schema({
event_id: {
@@ -209,12 +235,6 @@ const eventsSchema = new mongoose.Schema({
default: 0,
min: 0
},
- advance_amount_paid: {
- type: Number,
- required: true,
- default: 0,
- min: 0
- },
payment_status: {
type: String,
required: true,
@@ -242,6 +262,10 @@ const eventsSchema = new mongoose.Schema({
taxOnCommission: { type: Number, default: 0 }
}
},
+ payment_breakdowns: {
+ type: [paymentBreakdownsSchema],
+ default: []
+ },
payment_method_details: [
{
payment_method: {
@@ -345,10 +369,6 @@ eventsSchema.pre('save', function (next) {
return next(new Error('Already paid amount cannot exceed final amount'));
}
- if (this.advance_amount_paid > this.final_amount) {
- return next(new Error('Advance amount cannot exceed final amount'));
- }
-
next();
});
diff --git a/models/invoices.js b/models/invoices.js
index 57d72b3b..c227be04 100644
--- a/models/invoices.js
+++ b/models/invoices.js
@@ -42,6 +42,14 @@ const invoicesSchema = new mongoose.Schema({
required: true,
enum: ['registration', 'advance_booking', 'booking', 'payment']
},
+ invoice_for: {
+ type: String,
+ required: true,
+ enum: ['customer', 'vendor']
+ },
+ payment_label: {
+ type: String // e.g. "token", "advance1", "finalpay", "lastpay"
+ },
vendor_id: {
type: String,
required: true
diff --git a/models/orders.js b/models/orders.js
index 320d9310..856f5c62 100644
--- a/models/orders.js
+++ b/models/orders.js
@@ -56,6 +56,32 @@ const lastApprovalSchema = new Schema({
}
}, { _id: false });
+// Payment Breakdowns Schema (embedded in Orders)
+const paymentBreakdownsSchema = new Schema({
+ name: {
+ type: String,
+ required: true
+ },
+ amount: {
+ type: Number,
+ required: true
+ },
+ date: {
+ type: Date,
+ required: true
+ },
+ status: {
+ type: String,
+ enum: ["Unpaid", "Paid", "Failed"],
+ default: "Unpaid"
+ },
+ custom_items: [{
+ name_of_service: String,
+ price: Number,
+ description: String
+ }]
+}, { _id: false });
+
// Payment Details Schema (embedded in Orders)
const paymentDetailsSchema = new Schema({
paymentStatus: {
@@ -252,6 +278,10 @@ const ordersSchema = new Schema({
paymentDetails: {
type: paymentDetailsSchema
},
+ paymentBreakdowns: {
+ type: [paymentBreakdownsSchema],
+ default: []
+ },
specificTerms: {
type: [String],
default: []
diff --git a/routes/bookingRoutes.js b/routes/bookingRoutes.js
index 6a1ddc0a..9f040e18 100644
--- a/routes/bookingRoutes.js
+++ b/routes/bookingRoutes.js
@@ -15,7 +15,8 @@ import {
getAllVendorServiceSchedules,
addBookingInvoice,
updateEventPaymentDetails,
- cancelBooking
+ cancelBooking,
+ getTransactionsByEventId
} from "../controllers/bookingController.js";
const router = express.Router();
@@ -344,4 +345,6 @@ router.put("/:event_id/payment-details", updateEventPaymentDetails);
*/
router.put("/:event_id/cancel", cancelBooking);
+router.get("/transactions/:event_id", getTransactionsByEventId);
+
export default router;