@kipicore/dbcore 1.1.367 → 1.1.369

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (87) hide show
  1. package/dist/db/psql/migrations/20260401061046-update_pdc.d.ts +2 -0
  2. package/dist/db/psql/migrations/20260401061046-update_pdc.js +35 -0
  3. package/dist/db/psql/migrations/20260401063714-update_pdc_histroy.d.ts +2 -0
  4. package/dist/db/psql/migrations/20260401063714-update_pdc_histroy.js +45 -0
  5. package/dist/interfaces/feeReminderTypeInterface.d.ts +2 -2
  6. package/dist/interfaces/index.d.ts +0 -11
  7. package/dist/interfaces/index.js +0 -11
  8. package/dist/interfaces/pdcChequeInterface.d.ts +1 -3
  9. package/dist/interfaces/pdcHistoryInterface.d.ts +4 -4
  10. package/dist/models/mongodb/feeReminderTypeModel.js +1 -2
  11. package/dist/models/mongodb/index.d.ts +0 -1
  12. package/dist/models/mongodb/index.js +2 -4
  13. package/dist/models/psql/index.d.ts +0 -10
  14. package/dist/models/psql/index.js +3 -23
  15. package/dist/models/psql/pdcChequeModel.d.ts +1 -3
  16. package/dist/models/psql/pdcChequeModel.js +17 -31
  17. package/dist/models/psql/pdcHistoryModel.d.ts +3 -3
  18. package/dist/models/psql/pdcHistoryModel.js +30 -14
  19. package/dist/types/index.d.ts +0 -11
  20. package/dist/types/index.js +0 -11
  21. package/package.json +1 -1
  22. package/dist/interfaces/feeHistoryDetailsInterface.d.ts +0 -17
  23. package/dist/interfaces/feeHistoryDetailsInterface.js +0 -2
  24. package/dist/interfaces/feeHistoryInterface.d.ts +0 -22
  25. package/dist/interfaces/feeHistoryInterface.js +0 -2
  26. package/dist/interfaces/feeTypeHasTermsInterface.d.ts +0 -12
  27. package/dist/interfaces/feeTypeHasTermsInterface.js +0 -2
  28. package/dist/interfaces/feeTypeInterface.d.ts +0 -14
  29. package/dist/interfaces/feeTypeInterface.js +0 -4
  30. package/dist/interfaces/feesCollectionInterface.d.ts +0 -19
  31. package/dist/interfaces/feesCollectionInterface.js +0 -2
  32. package/dist/interfaces/paymentTermsInterface.d.ts +0 -16
  33. package/dist/interfaces/paymentTermsInterface.js +0 -2
  34. package/dist/interfaces/schoolFeeCollectionInterface.d.ts +0 -13
  35. package/dist/interfaces/schoolFeeCollectionInterface.js +0 -2
  36. package/dist/interfaces/schoolFeeInterface.d.ts +0 -22
  37. package/dist/interfaces/schoolFeeInterface.js +0 -2
  38. package/dist/interfaces/userFeeTypeByAccountInterface.d.ts +0 -19
  39. package/dist/interfaces/userFeeTypeByAccountInterface.js +0 -2
  40. package/dist/interfaces/userFeeTypeInterface.d.ts +0 -17
  41. package/dist/interfaces/userFeeTypeInterface.js +0 -2
  42. package/dist/interfaces/userHasFeeTermsInterface.d.ts +0 -37
  43. package/dist/interfaces/userHasFeeTermsInterface.js +0 -2
  44. package/dist/models/mongodb/schoolFeeModel.d.ts +0 -4
  45. package/dist/models/mongodb/schoolFeeModel.js +0 -182
  46. package/dist/models/psql/feeHistoryDetailsModel.d.ts +0 -27
  47. package/dist/models/psql/feeHistoryDetailsModel.js +0 -145
  48. package/dist/models/psql/feeHistoryModel.d.ts +0 -33
  49. package/dist/models/psql/feeHistoryModel.js +0 -189
  50. package/dist/models/psql/feeTypeHasTermsModel.d.ts +0 -22
  51. package/dist/models/psql/feeTypeHasTermsModel.js +0 -99
  52. package/dist/models/psql/feeTypeModel.d.ts +0 -24
  53. package/dist/models/psql/feeTypeModel.js +0 -110
  54. package/dist/models/psql/feesCollectionModel.d.ts +0 -30
  55. package/dist/models/psql/feesCollectionModel.js +0 -200
  56. package/dist/models/psql/paymentTermsModel.d.ts +0 -19
  57. package/dist/models/psql/paymentTermsModel.js +0 -125
  58. package/dist/models/psql/schoolFeeCollectionModel.d.ts +0 -23
  59. package/dist/models/psql/schoolFeeCollectionModel.js +0 -109
  60. package/dist/models/psql/userFeeTypeByAccountModel.d.ts +0 -23
  61. package/dist/models/psql/userFeeTypeByAccountModel.js +0 -179
  62. package/dist/models/psql/userFeeTypeModel.d.ts +0 -26
  63. package/dist/models/psql/userFeeTypeModel.js +0 -180
  64. package/dist/models/psql/userHasFeeTermsModel.d.ts +0 -28
  65. package/dist/models/psql/userHasFeeTermsModel.js +0 -136
  66. package/dist/types/feeHistoryDetailsType.d.ts +0 -6
  67. package/dist/types/feeHistoryDetailsType.js +0 -2
  68. package/dist/types/feeHistoryType.d.ts +0 -18
  69. package/dist/types/feeHistoryType.js +0 -2
  70. package/dist/types/feeTypeHasTermsType.d.ts +0 -3
  71. package/dist/types/feeTypeHasTermsType.js +0 -2
  72. package/dist/types/feeTypeType.d.ts +0 -3
  73. package/dist/types/feeTypeType.js +0 -2
  74. package/dist/types/feesCollectionType.d.ts +0 -3
  75. package/dist/types/feesCollectionType.js +0 -2
  76. package/dist/types/paymentTermsType.d.ts +0 -3
  77. package/dist/types/paymentTermsType.js +0 -3
  78. package/dist/types/schoolFeeCollectionType.d.ts +0 -3
  79. package/dist/types/schoolFeeCollectionType.js +0 -2
  80. package/dist/types/schoolFeeType.d.ts +0 -3
  81. package/dist/types/schoolFeeType.js +0 -2
  82. package/dist/types/userFeeTypeByAccountType.d.ts +0 -3
  83. package/dist/types/userFeeTypeByAccountType.js +0 -2
  84. package/dist/types/userFeeTypeType.d.ts +0 -6
  85. package/dist/types/userFeeTypeType.js +0 -2
  86. package/dist/types/userHasFeeTermsType.d.ts +0 -3
  87. package/dist/types/userHasFeeTermsType.js +0 -2
@@ -0,0 +1,2 @@
1
+ export function up(queryInterface: any, Sequelize: any): Promise<void>;
2
+ export function down(queryInterface: any, Sequelize: any): Promise<void>;
@@ -0,0 +1,35 @@
1
+ 'use strict';
2
+ module.exports = {
3
+ async up(queryInterface, Sequelize) {
4
+ await queryInterface.sequelize.transaction(async (transaction) => {
5
+ // 🔴 Remove columns
6
+ await queryInterface.removeColumn('pdcCheques', 'user_fee_type_by_account_id', { transaction });
7
+ await queryInterface.removeColumn('pdcCheques', 'standard_id', { transaction });
8
+ await queryInterface.removeColumn('pdcCheques', 'gr_no', { transaction });
9
+ // 🟢 Add new column
10
+ await queryInterface.addColumn('pdcCheques', 'student_fee_collection_id', {
11
+ type: Sequelize.UUID,
12
+ allowNull: true,
13
+ }, { transaction });
14
+ });
15
+ },
16
+ async down(queryInterface, Sequelize) {
17
+ await queryInterface.sequelize.transaction(async (transaction) => {
18
+ // 🔁 Revert: Add removed columns back
19
+ await queryInterface.addColumn('pdcCheques', 'user_fee_type_by_account_id', {
20
+ type: Sequelize.UUID,
21
+ allowNull: true,
22
+ }, { transaction });
23
+ await queryInterface.addColumn('pdcCheques', 'standard_id', {
24
+ type: Sequelize.UUID,
25
+ allowNull: true,
26
+ }, { transaction });
27
+ await queryInterface.addColumn('pdcCheques', 'gr_no', {
28
+ type: Sequelize.STRING,
29
+ allowNull: true,
30
+ }, { transaction });
31
+ // 🔁 Remove newly added column
32
+ await queryInterface.removeColumn('pdcCheques', 'student_fee_collection_id', { transaction });
33
+ });
34
+ }
35
+ };
@@ -0,0 +1,2 @@
1
+ export function up(queryInterface: any, Sequelize: any): Promise<void>;
2
+ export function down(queryInterface: any, Sequelize: any): Promise<void>;
@@ -0,0 +1,45 @@
1
+ 'use strict';
2
+ module.exports = {
3
+ async up(queryInterface, Sequelize) {
4
+ await queryInterface.sequelize.transaction(async (transaction) => {
5
+ // 🔴 Remove old columns
6
+ await queryInterface.removeColumn('pdc_history', 'user_fee_type_by_account_id', { transaction });
7
+ await queryInterface.removeColumn('pdc_history', 'standard_id', { transaction });
8
+ await queryInterface.removeColumn('pdc_history', 'gr_no', { transaction });
9
+ // 🟢 Add new columns
10
+ await queryInterface.addColumn('pdc_history', 'student_fee_collection_id', {
11
+ type: Sequelize.UUID,
12
+ allowNull: true,
13
+ }, { transaction });
14
+ await queryInterface.addColumn('pdc_history', 'fee_type_collection_id', {
15
+ type: Sequelize.UUID,
16
+ allowNull: true,
17
+ }, { transaction });
18
+ await queryInterface.addColumn('pdc_history', 'fee_type_paid_amount', {
19
+ type: Sequelize.INTEGER,
20
+ allowNull: true,
21
+ }, { transaction });
22
+ });
23
+ },
24
+ async down(queryInterface, Sequelize) {
25
+ await queryInterface.sequelize.transaction(async (transaction) => {
26
+ // 🔁 Add removed columns back
27
+ await queryInterface.addColumn('pdc_history', 'user_fee_type_by_account_id', {
28
+ type: Sequelize.UUID,
29
+ allowNull: true,
30
+ }, { transaction });
31
+ await queryInterface.addColumn('pdc_history', 'standard_id', {
32
+ type: Sequelize.UUID,
33
+ allowNull: true,
34
+ }, { transaction });
35
+ await queryInterface.addColumn('pdc_history', 'gr_no', {
36
+ type: Sequelize.STRING,
37
+ allowNull: true,
38
+ }, { transaction });
39
+ // 🔁 Remove new columns
40
+ await queryInterface.removeColumn('pdc_history', 'student_fee_collection_id', { transaction });
41
+ await queryInterface.removeColumn('pdc_history', 'fee_type_collection_id', { transaction });
42
+ await queryInterface.removeColumn('pdc_history', 'fee_type_paid_amount', { transaction });
43
+ });
44
+ }
45
+ };
@@ -1,11 +1,11 @@
1
1
  import { Document } from 'mongoose';
2
- import { FEE_REMINDER_SETTING_FREQUENCY, FEE_REMINDER_SETTING_TYPE } from '../constants/app';
2
+ import { FEE_REMINDER_SETTING_TYPE } from '../constants/app';
3
3
  import { IDefaultAttributes } from './commonInterface';
4
4
  export interface IFeeReminderTypeModelAttributes extends IDefaultAttributes, Document {
5
5
  id: string;
6
6
  type: FEE_REMINDER_SETTING_TYPE;
7
7
  day: number;
8
- frequency: FEE_REMINDER_SETTING_FREQUENCY;
8
+ frequency: number[];
9
9
  instituteId: string;
10
10
  academicCalendarId?: string;
11
11
  oldId?: string;
@@ -35,15 +35,10 @@ export * from './examHasAnswerSheetInterface';
35
35
  export * from './examInterface';
36
36
  export * from './facilityInterface';
37
37
  export * from './featureActionInterface';
38
- export * from './feeHistoryDetailsInterface';
39
- export * from './feeHistoryInterface';
40
38
  export * from './feeReminderInterface';
41
39
  export * from './feeReminderSettingInterface';
42
40
  export * from './feeReminderTypeInterface';
43
- export * from './feeTypeHasTermsInterface';
44
- export * from './feeTypeInterface';
45
41
  export * from './feedBackInterface';
46
- export * from './feesCollectionInterface';
47
42
  export * from './fileStorageInterface';
48
43
  export * from './floorManagementInterface';
49
44
  export * from './generateIdCardInterface';
@@ -66,7 +61,6 @@ export * from './masterLeaveInterface';
66
61
  export * from './moduleFeatureInterface';
67
62
  export * from './moduleInterface';
68
63
  export * from './offersInterface';
69
- export * from './paymentTermsInterface';
70
64
  export * from './pdcChequeInterface';
71
65
  export * from './pdcHistoryInterface';
72
66
  export * from './photosGalleryInterface';
@@ -77,8 +71,6 @@ export * from './projectAssessmentOptionInterface';
77
71
  export * from './replaceTeacherInterface';
78
72
  export * from './roleInterface';
79
73
  export * from './rulesRegulationInterface';
80
- export * from './schoolFeeCollectionInterface';
81
- export * from './schoolFeeInterface';
82
74
  export * from './schoolOfferInterface';
83
75
  export * from './sendNotificationInerface';
84
76
  export * from './slotInterface';
@@ -98,13 +90,10 @@ export * from './typeManagementInterface';
98
90
  export * from './uniqueNumberCounterInterface';
99
91
  export * from './userBookAssessmentInterface';
100
92
  export * from './userDetailsInterface';
101
- export * from './userFeeTypeByAccountInterface';
102
- export * from './userFeeTypeInterface';
103
93
  export * from './userHasAnnouncementInterface';
104
94
  export * from './userHasBatchInterface';
105
95
  export * from './userHasCourseInterface';
106
96
  export * from './userHasDeviceInterface';
107
- export * from './userHasFeeTermsInterface';
108
97
  export * from './userHasFileInterface';
109
98
  export * from './userHasHomeWorkInterface';
110
99
  export * from './userHasInventoryHistoryInterface';
@@ -51,15 +51,10 @@ __exportStar(require("./examHasAnswerSheetInterface"), exports);
51
51
  __exportStar(require("./examInterface"), exports);
52
52
  __exportStar(require("./facilityInterface"), exports);
53
53
  __exportStar(require("./featureActionInterface"), exports);
54
- __exportStar(require("./feeHistoryDetailsInterface"), exports);
55
- __exportStar(require("./feeHistoryInterface"), exports);
56
54
  __exportStar(require("./feeReminderInterface"), exports);
57
55
  __exportStar(require("./feeReminderSettingInterface"), exports);
58
56
  __exportStar(require("./feeReminderTypeInterface"), exports);
59
- __exportStar(require("./feeTypeHasTermsInterface"), exports);
60
- __exportStar(require("./feeTypeInterface"), exports);
61
57
  __exportStar(require("./feedBackInterface"), exports);
62
- __exportStar(require("./feesCollectionInterface"), exports);
63
58
  __exportStar(require("./fileStorageInterface"), exports);
64
59
  __exportStar(require("./floorManagementInterface"), exports);
65
60
  __exportStar(require("./generateIdCardInterface"), exports);
@@ -82,7 +77,6 @@ __exportStar(require("./masterLeaveInterface"), exports);
82
77
  __exportStar(require("./moduleFeatureInterface"), exports);
83
78
  __exportStar(require("./moduleInterface"), exports);
84
79
  __exportStar(require("./offersInterface"), exports);
85
- __exportStar(require("./paymentTermsInterface"), exports);
86
80
  __exportStar(require("./pdcChequeInterface"), exports);
87
81
  __exportStar(require("./pdcHistoryInterface"), exports);
88
82
  __exportStar(require("./photosGalleryInterface"), exports);
@@ -93,8 +87,6 @@ __exportStar(require("./projectAssessmentOptionInterface"), exports);
93
87
  __exportStar(require("./replaceTeacherInterface"), exports);
94
88
  __exportStar(require("./roleInterface"), exports);
95
89
  __exportStar(require("./rulesRegulationInterface"), exports);
96
- __exportStar(require("./schoolFeeCollectionInterface"), exports);
97
- __exportStar(require("./schoolFeeInterface"), exports);
98
90
  __exportStar(require("./schoolOfferInterface"), exports);
99
91
  __exportStar(require("./sendNotificationInerface"), exports);
100
92
  __exportStar(require("./slotInterface"), exports);
@@ -114,13 +106,10 @@ __exportStar(require("./typeManagementInterface"), exports);
114
106
  __exportStar(require("./uniqueNumberCounterInterface"), exports);
115
107
  __exportStar(require("./userBookAssessmentInterface"), exports);
116
108
  __exportStar(require("./userDetailsInterface"), exports);
117
- __exportStar(require("./userFeeTypeByAccountInterface"), exports);
118
- __exportStar(require("./userFeeTypeInterface"), exports);
119
109
  __exportStar(require("./userHasAnnouncementInterface"), exports);
120
110
  __exportStar(require("./userHasBatchInterface"), exports);
121
111
  __exportStar(require("./userHasCourseInterface"), exports);
122
112
  __exportStar(require("./userHasDeviceInterface"), exports);
123
- __exportStar(require("./userHasFeeTermsInterface"), exports);
124
113
  __exportStar(require("./userHasFileInterface"), exports);
125
114
  __exportStar(require("./userHasHomeWorkInterface"), exports);
126
115
  __exportStar(require("./userHasInventoryHistoryInterface"), exports);
@@ -7,11 +7,9 @@ export interface IPdcChequeModelAttributes extends IDefaultAttributes {
7
7
  depositDate: Date;
8
8
  chequeNo: string;
9
9
  amount: number;
10
- grNo: string;
11
- userFeeTypeByAccountId: string;
12
10
  status: PDF_CHEQUE_STATUS;
13
11
  bankName: string;
14
12
  frequency: PDF_CHEQUE_FREQUENCY;
15
- standardId: string;
16
13
  academicCalendarId?: string;
14
+ studentFeeCollectionId: string;
17
15
  }
@@ -7,12 +7,12 @@ export interface IPdcHistoryModelAttributes extends IDefaultAttributes {
7
7
  userId: string;
8
8
  depositDate: Date;
9
9
  chequeNo: string;
10
- amount: number;
11
- grNo: string;
12
- userFeeTypeByAccountId: string;
13
10
  status: PDF_CHEQUE_STATUS;
14
11
  bankName: string;
15
12
  frequency: PDF_CHEQUE_FREQUENCY;
16
- standardId: string;
17
13
  academicCalendarId?: string;
14
+ studentFeeCollectionId: string;
15
+ feeTypeCollectionId: string;
16
+ feeTypePaidAmount: number;
17
+ amount: number;
18
18
  }
@@ -46,8 +46,7 @@ const feeReminderTypeModelSchema = new mongoose_1.Schema({
46
46
  required: true,
47
47
  },
48
48
  frequency: {
49
- type: String,
50
- enum: Object.values(app_1.FEE_REMINDER_SETTING_FREQUENCY),
49
+ type: [Number],
51
50
  },
52
51
  instituteId: {
53
52
  type: String,
@@ -23,7 +23,6 @@ export { default as JobApplyModel } from './jobApplyModel';
23
23
  export { default as PhotosGalleryModel } from './photosGalleryModel';
24
24
  export { default as PlannerModel } from './plannerModel';
25
25
  export { default as ReplaceTeacherModel } from './replaceTeacherModel';
26
- export { default as SchoolFeeModel } from './schoolFeeModel';
27
26
  export { default as SubjectIndexModel } from './subjectIndexModel';
28
27
  export { default as SubscriptionPlanModel } from './subscriptionPlanModel';
29
28
  export { default as TaskManagementModel } from './taskManagementModel';
@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.CreatePollModel = exports.SheetFieldMappingModel = exports.FileUploadUserDetails = exports.CompetitionUsersModel = exports.CompetitionGroupModel = exports.CompetitionModel = exports.CampusCarnivalModel = exports.AppointmentHistoryModel = exports.AppointmentModel = exports.SeatingArrangementModel = exports.AssignFileModel = exports.ThemeModel = exports.BDayWishModel = exports.AdditionalDetailModel = exports.CanteenModel = exports.WalletTransactionModel = exports.VideoAnalystModel = exports.UserSchoolMetaModel = exports.UserInstituteMetaModel = exports.UserDetailsModel = exports.UniqueNumberCounterModel = exports.TaskManagementModel = exports.SubscriptionPlanModel = exports.SubjectIndexModel = exports.SchoolFeeModel = exports.ReplaceTeacherModel = exports.PlannerModel = exports.PhotosGalleryModel = exports.JobApplyModel = exports.InvoiceModel = exports.InquiryModel = exports.InformationSupportModel = exports.HolidayModel = exports.GenerateIdCardModel = exports.FeedBackModel = exports.FeeReminderTypeModel = exports.ExamModel = exports.ExamHasAnswerSheetModel = exports.ExamGroupModel = exports.EventModel = exports.DashboardManagementModel = exports.DailyBookModel = exports.ColumnModel = exports.CertificatesManagementModel = exports.CertificatesHistoryModel = exports.CareerModel = exports.BlogModel = exports.AttendanceModel = exports.ApprovalRequestModel = exports.connectMongoDb = void 0;
7
- exports.FinalMarkSheetModel = exports.MarkSheetConfigurationModel = exports.AppAnalyticsEventModel = exports.GrantAndDonationModel = exports.TicketRaiseModel = exports.EducationOfficerModel = exports.InstituteFeeModel = exports.SchoolFee1Model = exports.FeeConfigModel = exports.EventTemplatesModel = exports.PollSelectionModel = void 0;
6
+ exports.PollSelectionModel = exports.CreatePollModel = exports.SheetFieldMappingModel = exports.FileUploadUserDetails = exports.CompetitionUsersModel = exports.CompetitionGroupModel = exports.CompetitionModel = exports.CampusCarnivalModel = exports.AppointmentHistoryModel = exports.AppointmentModel = exports.SeatingArrangementModel = exports.AssignFileModel = exports.ThemeModel = exports.BDayWishModel = exports.AdditionalDetailModel = exports.CanteenModel = exports.WalletTransactionModel = exports.VideoAnalystModel = exports.UserSchoolMetaModel = exports.UserInstituteMetaModel = exports.UserDetailsModel = exports.UniqueNumberCounterModel = exports.TaskManagementModel = exports.SubscriptionPlanModel = exports.SubjectIndexModel = exports.ReplaceTeacherModel = exports.PlannerModel = exports.PhotosGalleryModel = exports.JobApplyModel = exports.InvoiceModel = exports.InquiryModel = exports.InformationSupportModel = exports.HolidayModel = exports.GenerateIdCardModel = exports.FeedBackModel = exports.FeeReminderTypeModel = exports.ExamModel = exports.ExamHasAnswerSheetModel = exports.ExamGroupModel = exports.EventModel = exports.DashboardManagementModel = exports.DailyBookModel = exports.ColumnModel = exports.CertificatesManagementModel = exports.CertificatesHistoryModel = exports.CareerModel = exports.BlogModel = exports.AttendanceModel = exports.ApprovalRequestModel = exports.connectMongoDb = void 0;
7
+ exports.FinalMarkSheetModel = exports.MarkSheetConfigurationModel = exports.AppAnalyticsEventModel = exports.GrantAndDonationModel = exports.TicketRaiseModel = exports.EducationOfficerModel = exports.InstituteFeeModel = exports.SchoolFee1Model = exports.FeeConfigModel = exports.EventTemplatesModel = void 0;
8
8
  const mongoose_1 = __importDefault(require("mongoose"));
9
9
  const env_1 = require("../../configs/env");
10
10
  const transformIdInQueryPlugin_1 = __importDefault(require("./plugin/transformIdInQueryPlugin"));
@@ -73,8 +73,6 @@ var plannerModel_1 = require("./plannerModel");
73
73
  Object.defineProperty(exports, "PlannerModel", { enumerable: true, get: function () { return __importDefault(plannerModel_1).default; } });
74
74
  var replaceTeacherModel_1 = require("./replaceTeacherModel");
75
75
  Object.defineProperty(exports, "ReplaceTeacherModel", { enumerable: true, get: function () { return __importDefault(replaceTeacherModel_1).default; } });
76
- var schoolFeeModel_1 = require("./schoolFeeModel");
77
- Object.defineProperty(exports, "SchoolFeeModel", { enumerable: true, get: function () { return __importDefault(schoolFeeModel_1).default; } });
78
76
  var subjectIndexModel_1 = require("./subjectIndexModel");
79
77
  Object.defineProperty(exports, "SubjectIndexModel", { enumerable: true, get: function () { return __importDefault(subjectIndexModel_1).default; } });
80
78
  var subscriptionPlanModel_1 = require("./subscriptionPlanModel");
@@ -27,13 +27,8 @@ export { default as DriverModel } from './driverModel';
27
27
  export { default as EntityGroupModel } from './entityGroupModel';
28
28
  export { default as FacilityModel } from './facilityModel';
29
29
  export { default as FeatureActionModel } from './featureActionModel';
30
- export { default as FeeHistoryDetailsModel } from './feeHistoryDetailsModel';
31
- export { default as FeeHistoryModel } from './feeHistoryModel';
32
30
  export { default as FeeReminderModel } from './feeReminderModel';
33
31
  export { default as FeeReminderSettingModel } from './feeReminderSettingModel';
34
- export { default as FeeTypeHasTermsModel } from './feeTypeHasTermsModel';
35
- export { default as FeeTypeModel } from './feeTypeModel';
36
- export { default as FeesCollectionModel } from './feesCollectionModel';
37
32
  export { default as FileStorageModel } from './fileStorageModel';
38
33
  export { default as FloorManagementModel } from './floorManagementModel';
39
34
  export { default as GreetingsModel } from './greetingsModel';
@@ -50,7 +45,6 @@ export { default as MasterLeaveModel } from './masterLeaveModel';
50
45
  export { default as ModuleFeatureModel } from './moduleFeatureModel';
51
46
  export { default as ModuleModel } from './moduleModel';
52
47
  export { default as OfferModel } from './offerModel';
53
- export { default as PaymentTermsModel } from './paymentTermsModel';
54
48
  export { default as PdcChequeModel } from './pdcChequeModel';
55
49
  export { default as PdcHistoryModel } from './pdcHistoryModel';
56
50
  export { default as PincodeModel } from './pincodeModel';
@@ -58,7 +52,6 @@ export { default as ProductModel } from './productModel';
58
52
  export { default as ProjectAssessmentOptionModel } from './projectAssessmentOptionModel';
59
53
  export { default as RoleModel } from './roleModel';
60
54
  export { default as RulesRegulationModel } from './rulesRegulationModel';
61
- export { default as SchoolFeeCollectionModel } from './schoolFeeCollectionModel';
62
55
  export { default as SchoolOfferModel } from './schoolOfferModel';
63
56
  export { default as SendNotificationModel } from './sendNotificationModel';
64
57
  export { default as SlotModel } from './slotModel';
@@ -72,13 +65,10 @@ export { default as TokenModel } from './tokenModel';
72
65
  export { default as TripModel } from './tripModel';
73
66
  export { default as TypeManagementModel } from './typeManagementModel';
74
67
  export { default as UserBookAssessmentModel } from './userBookAssessmentModel';
75
- export { default as UserFeeTypeByAccountModel } from './userFeeTypeByAccountModel';
76
- export { default as UserFeeTypeModel } from './userFeeTypeModel';
77
68
  export { default as UserHasAnnouncementModel } from './userHasAnnouncementModel';
78
69
  export { default as UserHasBatchModel } from './userHasBatchModel';
79
70
  export { default as UserHasCourseModel } from './userHasCourseModel';
80
71
  export { default as UserHasDeviceModel } from './userHasDeviceModel';
81
- export { default as UserHasFeeTermsModel } from './userHasFeeTermsModel';
82
72
  export { default as UserHasFileModel } from './userHasFileModel';
83
73
  export { default as UserHasHomeWorkModel } from './userHasHomeWorkModel';
84
74
  export { default as UserHasInventoryHistoryModel } from './userHasInventoryHistoryModel';
@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.OfferModel = exports.ModuleModel = exports.ModuleFeatureModel = exports.MasterLeaveModel = exports.LectureModel = exports.LectureHistoryModel = exports.InventoryModel = exports.InventoryHistoryModel = exports.InstituteSubscriptionPlanModel = exports.InstituteModel = exports.InstituteEntityTypeModel = exports.InstituteEntityModel = exports.HomeWorkModel = exports.GreetingsModel = exports.FloorManagementModel = exports.FileStorageModel = exports.FeesCollectionModel = exports.FeeTypeModel = exports.FeeTypeHasTermsModel = exports.FeeReminderSettingModel = exports.FeeReminderModel = exports.FeeHistoryModel = exports.FeeHistoryDetailsModel = exports.FeatureActionModel = exports.FacilityModel = exports.EntityGroupModel = exports.DriverModel = exports.CourseModel = exports.CourseHasVisitorsModel = exports.CountryModel = exports.ContactFeedBackModel = exports.CoinPurchaseOfferModel = exports.CloudStorageModel = exports.ClassRoomModel = exports.CityModel = exports.CategoriesModel = exports.BookAssessmentDateModel = exports.BatchSubjectProjectAssessmentModel = exports.BatchSubjectBookAssessmentModel = exports.BatchModel = exports.BannerModel = exports.BankAccountDetailsModel = exports.AreaModel = exports.AnnouncementModel = exports.AccountHasReceiptDetailsModel = exports.AcademicCalendarModel = exports.SubCategoriesModel = exports.Sequelize = exports.db = exports.sequelize = void 0;
7
- exports.VendorManagementModel = exports.VehicleModel = exports.UserRequiredStepsModel = exports.UserProjectAssessmentOptionModel = exports.UserPayoutModel = exports.UserPayoutHistoryModel = exports.UserPayoutDetailsModel = exports.UserModel = exports.UserLeaveRequestModel = exports.UserHasSubjectFeeModel = exports.UserHasStorageModel = exports.UserHasRollNumberModel = exports.UserHasRoleModel = exports.UserHasParentModel = exports.UserHasOfferModel = exports.UserHasLeaveModel = exports.UserHasLeaveHistoryModel = exports.UserHasInventoryModel = exports.UserHasInventoryHistoryModel = exports.UserHasHomeWorkModel = exports.UserHasFileModel = exports.UserHasFeeTermsModel = exports.UserHasDeviceModel = exports.UserHasCourseModel = exports.UserHasBatchModel = exports.UserHasAnnouncementModel = exports.UserFeeTypeModel = exports.UserFeeTypeByAccountModel = exports.UserBookAssessmentModel = exports.TypeManagementModel = exports.TripModel = exports.TokenModel = exports.ToDoModel = exports.TestimonialModel = exports.SyllabusModel = exports.SubjectHasPayFeeHistoryModel = exports.SubjectHasFeeModel = exports.StateModel = exports.SlotModel = exports.SendNotificationModel = exports.SchoolOfferModel = exports.SchoolFeeCollectionModel = exports.RulesRegulationModel = exports.RoleModel = exports.ProjectAssessmentOptionModel = exports.ProductModel = exports.PincodeModel = exports.PdcHistoryModel = exports.PdcChequeModel = exports.PaymentTermsModel = void 0;
8
- exports.SubjectInternalMarkModel = exports.InternalMarkModel = exports.TermsAndConditionModel = exports.FeeType1Model = exports.StudentFeeTermsModel = exports.UserHasPenaltyModel = exports.PenaltyModel = exports.ClassRoomCollectionModel = exports.ClassRoomEventModel = exports.StudentFeeTypeCollectionModel = exports.SchoolFeeTermsModel = exports.StudentFeeHistoryModel = exports.StudentFeeCollectionModel = exports.UserDirectoryModel = exports.StudentLeaveRequestModel = exports.CloneListModel = exports.IncomeExpenseModel = exports.MaintenanceModel = exports.AdvertisementModel = exports.WorkOffDaysModel = exports.EntityWiseCalendarModel = exports.CampusModel = exports.LostFoundItemModel = exports.WorkingShiftModel = exports.WorkingDayModel = exports.WalletModel = exports.WalletHistoryModel = void 0;
6
+ exports.ProjectAssessmentOptionModel = exports.ProductModel = exports.PincodeModel = exports.PdcHistoryModel = exports.PdcChequeModel = exports.OfferModel = exports.ModuleModel = exports.ModuleFeatureModel = exports.MasterLeaveModel = exports.LectureModel = exports.LectureHistoryModel = exports.InventoryModel = exports.InventoryHistoryModel = exports.InstituteSubscriptionPlanModel = exports.InstituteModel = exports.InstituteEntityTypeModel = exports.InstituteEntityModel = exports.HomeWorkModel = exports.GreetingsModel = exports.FloorManagementModel = exports.FileStorageModel = exports.FeeReminderSettingModel = exports.FeeReminderModel = exports.FeatureActionModel = exports.FacilityModel = exports.EntityGroupModel = exports.DriverModel = exports.CourseModel = exports.CourseHasVisitorsModel = exports.CountryModel = exports.ContactFeedBackModel = exports.CoinPurchaseOfferModel = exports.CloudStorageModel = exports.ClassRoomModel = exports.CityModel = exports.CategoriesModel = exports.BookAssessmentDateModel = exports.BatchSubjectProjectAssessmentModel = exports.BatchSubjectBookAssessmentModel = exports.BatchModel = exports.BannerModel = exports.BankAccountDetailsModel = exports.AreaModel = exports.AnnouncementModel = exports.AccountHasReceiptDetailsModel = exports.AcademicCalendarModel = exports.SubCategoriesModel = exports.Sequelize = exports.db = exports.sequelize = void 0;
7
+ exports.MaintenanceModel = exports.AdvertisementModel = exports.WorkOffDaysModel = exports.EntityWiseCalendarModel = exports.CampusModel = exports.LostFoundItemModel = exports.WorkingShiftModel = exports.WorkingDayModel = exports.WalletModel = exports.WalletHistoryModel = exports.VendorManagementModel = exports.VehicleModel = exports.UserRequiredStepsModel = exports.UserProjectAssessmentOptionModel = exports.UserPayoutModel = exports.UserPayoutHistoryModel = exports.UserPayoutDetailsModel = exports.UserModel = exports.UserLeaveRequestModel = exports.UserHasSubjectFeeModel = exports.UserHasStorageModel = exports.UserHasRollNumberModel = exports.UserHasRoleModel = exports.UserHasParentModel = exports.UserHasOfferModel = exports.UserHasLeaveModel = exports.UserHasLeaveHistoryModel = exports.UserHasInventoryModel = exports.UserHasInventoryHistoryModel = exports.UserHasHomeWorkModel = exports.UserHasFileModel = exports.UserHasDeviceModel = exports.UserHasCourseModel = exports.UserHasBatchModel = exports.UserHasAnnouncementModel = exports.UserBookAssessmentModel = exports.TypeManagementModel = exports.TripModel = exports.TokenModel = exports.ToDoModel = exports.TestimonialModel = exports.SyllabusModel = exports.SubjectHasPayFeeHistoryModel = exports.SubjectHasFeeModel = exports.StateModel = exports.SlotModel = exports.SendNotificationModel = exports.SchoolOfferModel = exports.RulesRegulationModel = exports.RoleModel = void 0;
8
+ exports.SubjectInternalMarkModel = exports.InternalMarkModel = exports.TermsAndConditionModel = exports.FeeType1Model = exports.StudentFeeTermsModel = exports.UserHasPenaltyModel = exports.PenaltyModel = exports.ClassRoomCollectionModel = exports.ClassRoomEventModel = exports.StudentFeeTypeCollectionModel = exports.SchoolFeeTermsModel = exports.StudentFeeHistoryModel = exports.StudentFeeCollectionModel = exports.UserDirectoryModel = exports.StudentLeaveRequestModel = exports.CloneListModel = exports.IncomeExpenseModel = void 0;
9
9
  const sequelize_1 = require("sequelize");
10
10
  Object.defineProperty(exports, "Sequelize", { enumerable: true, get: function () { return sequelize_1.Sequelize; } });
11
11
  const postgresConfig = require('../../configs/postgresConfig');
@@ -148,20 +148,10 @@ var facilityModel_1 = require("./facilityModel");
148
148
  Object.defineProperty(exports, "FacilityModel", { enumerable: true, get: function () { return __importDefault(facilityModel_1).default; } });
149
149
  var featureActionModel_1 = require("./featureActionModel");
150
150
  Object.defineProperty(exports, "FeatureActionModel", { enumerable: true, get: function () { return __importDefault(featureActionModel_1).default; } });
151
- var feeHistoryDetailsModel_1 = require("./feeHistoryDetailsModel");
152
- Object.defineProperty(exports, "FeeHistoryDetailsModel", { enumerable: true, get: function () { return __importDefault(feeHistoryDetailsModel_1).default; } });
153
- var feeHistoryModel_1 = require("./feeHistoryModel");
154
- Object.defineProperty(exports, "FeeHistoryModel", { enumerable: true, get: function () { return __importDefault(feeHistoryModel_1).default; } });
155
151
  var feeReminderModel_1 = require("./feeReminderModel");
156
152
  Object.defineProperty(exports, "FeeReminderModel", { enumerable: true, get: function () { return __importDefault(feeReminderModel_1).default; } });
157
153
  var feeReminderSettingModel_1 = require("./feeReminderSettingModel");
158
154
  Object.defineProperty(exports, "FeeReminderSettingModel", { enumerable: true, get: function () { return __importDefault(feeReminderSettingModel_1).default; } });
159
- var feeTypeHasTermsModel_1 = require("./feeTypeHasTermsModel");
160
- Object.defineProperty(exports, "FeeTypeHasTermsModel", { enumerable: true, get: function () { return __importDefault(feeTypeHasTermsModel_1).default; } });
161
- var feeTypeModel_1 = require("./feeTypeModel");
162
- Object.defineProperty(exports, "FeeTypeModel", { enumerable: true, get: function () { return __importDefault(feeTypeModel_1).default; } });
163
- var feesCollectionModel_1 = require("./feesCollectionModel");
164
- Object.defineProperty(exports, "FeesCollectionModel", { enumerable: true, get: function () { return __importDefault(feesCollectionModel_1).default; } });
165
155
  var fileStorageModel_1 = require("./fileStorageModel");
166
156
  Object.defineProperty(exports, "FileStorageModel", { enumerable: true, get: function () { return __importDefault(fileStorageModel_1).default; } });
167
157
  var floorManagementModel_1 = require("./floorManagementModel");
@@ -194,8 +184,6 @@ var moduleModel_1 = require("./moduleModel");
194
184
  Object.defineProperty(exports, "ModuleModel", { enumerable: true, get: function () { return __importDefault(moduleModel_1).default; } });
195
185
  var offerModel_1 = require("./offerModel");
196
186
  Object.defineProperty(exports, "OfferModel", { enumerable: true, get: function () { return __importDefault(offerModel_1).default; } });
197
- var paymentTermsModel_1 = require("./paymentTermsModel");
198
- Object.defineProperty(exports, "PaymentTermsModel", { enumerable: true, get: function () { return __importDefault(paymentTermsModel_1).default; } });
199
187
  var pdcChequeModel_1 = require("./pdcChequeModel");
200
188
  Object.defineProperty(exports, "PdcChequeModel", { enumerable: true, get: function () { return __importDefault(pdcChequeModel_1).default; } });
201
189
  var pdcHistoryModel_1 = require("./pdcHistoryModel");
@@ -210,8 +198,6 @@ var roleModel_1 = require("./roleModel");
210
198
  Object.defineProperty(exports, "RoleModel", { enumerable: true, get: function () { return __importDefault(roleModel_1).default; } });
211
199
  var rulesRegulationModel_1 = require("./rulesRegulationModel");
212
200
  Object.defineProperty(exports, "RulesRegulationModel", { enumerable: true, get: function () { return __importDefault(rulesRegulationModel_1).default; } });
213
- var schoolFeeCollectionModel_1 = require("./schoolFeeCollectionModel");
214
- Object.defineProperty(exports, "SchoolFeeCollectionModel", { enumerable: true, get: function () { return __importDefault(schoolFeeCollectionModel_1).default; } });
215
201
  var schoolOfferModel_1 = require("./schoolOfferModel");
216
202
  Object.defineProperty(exports, "SchoolOfferModel", { enumerable: true, get: function () { return __importDefault(schoolOfferModel_1).default; } });
217
203
  var sendNotificationModel_1 = require("./sendNotificationModel");
@@ -238,10 +224,6 @@ var typeManagementModel_1 = require("./typeManagementModel");
238
224
  Object.defineProperty(exports, "TypeManagementModel", { enumerable: true, get: function () { return __importDefault(typeManagementModel_1).default; } });
239
225
  var userBookAssessmentModel_1 = require("./userBookAssessmentModel");
240
226
  Object.defineProperty(exports, "UserBookAssessmentModel", { enumerable: true, get: function () { return __importDefault(userBookAssessmentModel_1).default; } });
241
- var userFeeTypeByAccountModel_1 = require("./userFeeTypeByAccountModel");
242
- Object.defineProperty(exports, "UserFeeTypeByAccountModel", { enumerable: true, get: function () { return __importDefault(userFeeTypeByAccountModel_1).default; } });
243
- var userFeeTypeModel_1 = require("./userFeeTypeModel");
244
- Object.defineProperty(exports, "UserFeeTypeModel", { enumerable: true, get: function () { return __importDefault(userFeeTypeModel_1).default; } });
245
227
  var userHasAnnouncementModel_1 = require("./userHasAnnouncementModel");
246
228
  Object.defineProperty(exports, "UserHasAnnouncementModel", { enumerable: true, get: function () { return __importDefault(userHasAnnouncementModel_1).default; } });
247
229
  var userHasBatchModel_1 = require("./userHasBatchModel");
@@ -250,8 +232,6 @@ var userHasCourseModel_1 = require("./userHasCourseModel");
250
232
  Object.defineProperty(exports, "UserHasCourseModel", { enumerable: true, get: function () { return __importDefault(userHasCourseModel_1).default; } });
251
233
  var userHasDeviceModel_1 = require("./userHasDeviceModel");
252
234
  Object.defineProperty(exports, "UserHasDeviceModel", { enumerable: true, get: function () { return __importDefault(userHasDeviceModel_1).default; } });
253
- var userHasFeeTermsModel_1 = require("./userHasFeeTermsModel");
254
- Object.defineProperty(exports, "UserHasFeeTermsModel", { enumerable: true, get: function () { return __importDefault(userHasFeeTermsModel_1).default; } });
255
235
  var userHasFileModel_1 = require("./userHasFileModel");
256
236
  Object.defineProperty(exports, "UserHasFileModel", { enumerable: true, get: function () { return __importDefault(userHasFileModel_1).default; } });
257
237
  var userHasHomeWorkModel_1 = require("./userHasHomeWorkModel");
@@ -9,13 +9,11 @@ declare class PdcChequeModel extends Model<IPdcChequeModelAttributes, TPdcCheque
9
9
  depositDate: Date;
10
10
  chequeNo: string;
11
11
  amount: number;
12
- grNo: string;
13
- userFeeTypeByAccountId: string;
14
12
  status: PDF_CHEQUE_STATUS;
15
13
  bankName: string;
16
14
  frequency: PDF_CHEQUE_FREQUENCY;
17
- standardId: string;
18
15
  academicCalendarId?: string;
16
+ studentFeeCollectionId: string;
19
17
  createdBy: string;
20
18
  updatedBy: string;
21
19
  deletedBy: string;
@@ -5,7 +5,7 @@ const index_1 = require("./index");
5
5
  const app_1 = require("../../constants/app");
6
6
  class PdcChequeModel extends sequelize_1.Model {
7
7
  static associate(models) {
8
- const { UserModel, InstituteModel, UserFeeTypeByAccountModel, InstituteEntityModel, AcademicCalendarModel } = models;
8
+ const { UserModel, InstituteModel, AcademicCalendarModel, StudentFeeCollectionModel } = models;
9
9
  PdcChequeModel.belongsTo(UserModel, {
10
10
  foreignKey: {
11
11
  name: 'createdBy',
@@ -46,22 +46,6 @@ class PdcChequeModel extends sequelize_1.Model {
46
46
  foreignKey: 'userId',
47
47
  as: 'userHasPdcCheques',
48
48
  });
49
- PdcChequeModel.belongsTo(UserFeeTypeByAccountModel, {
50
- foreignKey: 'userFeeTypeByAccountId',
51
- as: 'pdcChequeUserFeeType',
52
- });
53
- UserFeeTypeByAccountModel.hasMany(PdcChequeModel, {
54
- foreignKey: 'userFeeTypeByAccountId',
55
- as: 'userFeeTypePdcCheques',
56
- });
57
- PdcChequeModel.belongsTo(InstituteEntityModel, {
58
- foreignKey: 'standardId',
59
- as: 'pdcChequeStandard',
60
- });
61
- InstituteEntityModel.hasMany(PdcChequeModel, {
62
- foreignKey: 'standardId',
63
- as: 'StandardPdcCheques',
64
- });
65
49
  PdcChequeModel.belongsTo(AcademicCalendarModel, {
66
50
  foreignKey: {
67
51
  name: 'academicCalendarId',
@@ -69,7 +53,19 @@ class PdcChequeModel extends sequelize_1.Model {
69
53
  },
70
54
  as: 'pdcChequeAcaCal',
71
55
  });
72
- AcademicCalendarModel.hasMany(PdcChequeModel, { foreignKey: 'academicCalendarId', field: 'academic_calendar_id', as: 'acaCalPdcCheque' });
56
+ AcademicCalendarModel.hasMany(PdcChequeModel, {
57
+ foreignKey: 'academicCalendarId',
58
+ field: 'academic_calendar_id',
59
+ as: 'acaCalPdcCheque',
60
+ });
61
+ PdcChequeModel.belongsTo(StudentFeeCollectionModel, {
62
+ foreignKey: 'studentFeeCollectionId',
63
+ as: 'pdcChequeCollection',
64
+ });
65
+ StudentFeeCollectionModel.hasMany(PdcChequeModel, {
66
+ foreignKey: 'studentFeeCollectionId',
67
+ as: 'collectionHasPdcCheques',
68
+ });
73
69
  }
74
70
  }
75
71
  PdcChequeModel.init({
@@ -89,9 +85,9 @@ PdcChequeModel.init({
89
85
  field: 'user_id',
90
86
  allowNull: true,
91
87
  },
92
- userFeeTypeByAccountId: {
88
+ studentFeeCollectionId: {
93
89
  type: sequelize_1.DataTypes.UUID,
94
- field: 'user_fee_type_by_account_id',
90
+ field: 'student_fee_collection_id',
95
91
  allowNull: true,
96
92
  },
97
93
  depositDate: {
@@ -104,20 +100,10 @@ PdcChequeModel.init({
104
100
  field: 'cheque_no',
105
101
  allowNull: true,
106
102
  },
107
- standardId: {
108
- type: sequelize_1.DataTypes.UUID,
109
- field: 'standard_id',
110
- allowNull: true,
111
- },
112
103
  amount: {
113
104
  type: sequelize_1.DataTypes.INTEGER,
114
105
  allowNull: true,
115
106
  },
116
- grNo: {
117
- type: sequelize_1.DataTypes.STRING,
118
- field: 'gr_no',
119
- allowNull: true,
120
- },
121
107
  bankName: {
122
108
  type: sequelize_1.DataTypes.STRING,
123
109
  field: 'bank_name',
@@ -136,7 +122,7 @@ PdcChequeModel.init({
136
122
  type: sequelize_1.DataTypes.UUID,
137
123
  field: 'academic_calendar_id',
138
124
  allowNull: true,
139
- }
125
+ },
140
126
  }, {
141
127
  modelName: 'PdcChequeModel',
142
128
  tableName: 'pdcCheques',
@@ -10,13 +10,13 @@ declare class PdcHistoryModel extends Model<IPdcHistoryModelAttributes, TPdcHist
10
10
  depositDate: Date;
11
11
  chequeNo: string;
12
12
  amount: number;
13
- grNo: string;
14
- userFeeTypeByAccountId: string;
15
13
  status: PDF_CHEQUE_STATUS;
16
14
  bankName: string;
17
15
  frequency: PDF_CHEQUE_FREQUENCY;
18
- standardId: string;
19
16
  academicCalendarId?: string;
17
+ studentFeeCollectionId: string;
18
+ feeTypeCollectionId: string;
19
+ feeTypePaidAmount: number;
20
20
  createdBy: string;
21
21
  updatedBy: string;
22
22
  deletedBy: string;
@@ -5,7 +5,7 @@ const index_1 = require("./index");
5
5
  const app_1 = require("../../constants/app");
6
6
  class PdcHistoryModel extends sequelize_1.Model {
7
7
  static associate(models) {
8
- const { UserModel, InstituteModel, UserFeeTypeByAccountModel, InstituteEntityModel, PdcChequeModel, AcademicCalendarModel } = models;
8
+ const { UserModel, InstituteModel, UserFeeTypeByAccountModel, InstituteEntityModel, StudentFeeCollectionModel, PdcChequeModel, AcademicCalendarModel, StudentFeeTypeCollectionModel, } = models;
9
9
  PdcHistoryModel.belongsTo(UserModel, {
10
10
  foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
11
11
  as: 'createdByUser',
@@ -66,6 +66,22 @@ class PdcHistoryModel extends sequelize_1.Model {
66
66
  as: 'pdcChequeHAcaCal',
67
67
  });
68
68
  AcademicCalendarModel.hasMany(PdcHistoryModel, { foreignKey: 'academicCalendarId', field: 'academic_calendar_id', as: 'acaCalPdcChequeH' });
69
+ PdcHistoryModel.belongsTo(StudentFeeCollectionModel, {
70
+ foreignKey: 'studentFeeCollectionId',
71
+ as: 'pdcChequeHistoryCollection',
72
+ });
73
+ StudentFeeCollectionModel.hasMany(PdcHistoryModel, {
74
+ foreignKey: 'studentFeeCollectionId',
75
+ as: 'collectionHasPdcChequeHistory',
76
+ });
77
+ PdcHistoryModel.belongsTo(StudentFeeTypeCollectionModel, {
78
+ foreignKey: 'feeTypeCollectionId',
79
+ as: 'pdcHistoryTypeCollection',
80
+ });
81
+ StudentFeeTypeCollectionModel.hasMany(PdcHistoryModel, {
82
+ foreignKey: 'feeTypeCollectionId',
83
+ as: 'typCollectionHasPdcHistory',
84
+ });
69
85
  }
70
86
  }
71
87
  PdcHistoryModel.init({
@@ -85,9 +101,19 @@ PdcHistoryModel.init({
85
101
  field: 'user_id',
86
102
  allowNull: true,
87
103
  },
88
- userFeeTypeByAccountId: {
104
+ studentFeeCollectionId: {
89
105
  type: sequelize_1.DataTypes.UUID,
90
- field: 'user_fee_type_by_account_id',
106
+ field: 'student_fee_collection_id',
107
+ allowNull: true,
108
+ },
109
+ feeTypeCollectionId: {
110
+ type: sequelize_1.DataTypes.UUID,
111
+ field: 'fee_type_collection_id',
112
+ allowNull: true,
113
+ },
114
+ feeTypePaidAmount: {
115
+ type: sequelize_1.DataTypes.INTEGER,
116
+ field: 'fee_type_paid_amount',
91
117
  allowNull: true,
92
118
  },
93
119
  pdcChequeId: {
@@ -105,20 +131,10 @@ PdcHistoryModel.init({
105
131
  field: 'cheque_no',
106
132
  allowNull: true,
107
133
  },
108
- standardId: {
109
- type: sequelize_1.DataTypes.UUID,
110
- field: 'standard_id',
111
- allowNull: true,
112
- },
113
134
  amount: {
114
135
  type: sequelize_1.DataTypes.INTEGER,
115
136
  allowNull: true,
116
137
  },
117
- grNo: {
118
- type: sequelize_1.DataTypes.STRING,
119
- field: 'gr_no',
120
- allowNull: true,
121
- },
122
138
  bankName: {
123
139
  type: sequelize_1.DataTypes.STRING,
124
140
  field: 'bank_name',
@@ -137,7 +153,7 @@ PdcHistoryModel.init({
137
153
  type: sequelize_1.DataTypes.UUID,
138
154
  field: 'academic_calendar_id',
139
155
  allowNull: true,
140
- }
156
+ },
141
157
  }, {
142
158
  modelName: 'PdcHistoryModel',
143
159
  tableName: 'pdc_history',