Commit Graph

Select branches

Hide Pull Requests

Activity_Hierarchy

Approve_Task

Ashutosh_ActivityMaster_managenment

Ashutosh_AddServerHeade_False

Ashutosh_AllowCredentials

Ashutosh_Bug#108_Attendance_log

Ashutosh_Bug#114_Email_Template_Not_Found

Ashutosh_Bug#119_Remove_CheckList_Item

Ashutosh_Bug#125_Unable_To_Add_Checklist_Item

Ashutosh_Bug#18_Project_Duplicate

Ashutosh_Bug#1_Cors_Configuration

Ashutosh_Bug#37_Attendance_Issues

Ashutosh_Bug_#74_Attendance_Regularization_Date

Ashutosh_Bug_#75_Employee_duplicatation

Ashutosh_CreateNewTenant

Ashutosh_Dashboard

Ashutosh_Employee_Update_Validation

Ashutosh_Enhancement_#104_Store_Images_In_AmazonS3

Ashutosh_Enhancement_#123_Possible_Null_Reference

Ashutosh_Enhancement_#214_Report_Task_At_Zero

Ashutosh_Forum_APIs

Ashutosh_JWT_Token

Ashutosh_Null_Refrenance_Warning_Fixed

Ashutosh_SCRUM-58_Time_Discrepancies_Attendance

Ashutosh_SCRUM-62_Decodeing_Token_Reset_password

Ashutosh_Task#106_Upload_Whitelist_Only

Ashutosh_Task#14_TenantProfile

Ashutosh_Task#1609

Ashutosh_Task#16_UpdateTenant

Ashutosh_Task_#67_Request_Demo

Ashutosh_Task_#79_Get_Industries_API

Ashutosh_User_Validations

Brevo_Mailling

Change_MPIN_Digits

Dynamic_Filter

Feature_Image_Gallary

Feature_Task_management

Finance_Dashboards

Inventory_Management

Issues_April_4W

Issuses

OnFieldWork_V1

Payment_Gatway_Management_OFW

Project_Report_Datewise

Purchase_Invoice_Management

Response_Encryption

Service_Project_Management

SideMenu_Management

TeanantManagement

TenantManagementV1

Update_Email_Template

Upgrade_Expense

Upgrade_Expense_Main

UserRights

Vaibhav_Resolved_Issues

Weidget_Dashboard_Jobs

contact_import

main

pramod_Refactoring#12_UniqueApplicationRole

pramod_Task#448

vikas_38_featurepermission_issue

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#16

#17

#18

#19

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• 5387e009cb sorted the service , activity group and activity by names Purchase_Invoice_Management ashutosh.nehete 2025-12-09 19:13:08 +05:30
• 4853613efd Checking the if employee is actively assigned to the project when getting list of emplyees when assigning task ashutosh.nehete 2025-12-09 18:59:07 +05:30
• 7459876a20 Added an Helper Function to get list all project Ids ashutosh.nehete 2025-12-09 17:17:59 +05:30
• c820b973a8 Optimize the get list of basic project for both infra and service ashutosh.nehete 2025-12-09 16:31:11 +05:30
• 5459a24a58 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.api into Response_Encryption Response_Encryption ashutosh.nehete 2025-12-09 16:14:26 +05:30
• 0395b46610 Updated the expense details API ashutosh.nehete 2025-12-09 14:44:39 +05:30
• 6a300db97c Optimized the expense list and expense details APIs ashutosh.nehete 2025-12-09 13:12:14 +05:30
• dac1e13685 Update the advance filter in collection controller ashutosh.nehete 2025-12-08 17:25:20 +05:30
• d00ddb8e8b Sloved the project not found in expense deatils ashutosh.nehete 2025-12-08 15:02:50 +05:30
• 93c4803634 Valided the organization by it name ashutosh.nehete 2025-12-08 12:24:14 +05:30
• cce84d901a Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.api into Response_Encryption ashutosh.nehete 2025-12-08 11:27:46 +05:30
• f7e707557a Optimized the get employee list API ashutosh.nehete 2025-12-08 11:26:51 +05:30
• 6c35bd3bf8 Merge pull request 'Weidget_Dashboard_Jobs' (#157) from Weidget_Dashboard_Jobs into Purchase_Invoice_Management ashutosh.nehete 2025-12-08 05:00:34 +00:00
• e7e96c3bb2 solved the mearged confilct Weidget_Dashboard_Jobs ashutosh.nehete 2025-12-08 10:29:02 +05:30
• 82c9f249ef Added an new API to filter expense by advance filter ashutosh.nehete 2025-12-08 10:02:59 +05:30
• 4f427a58c4 Changed the encription key for response ashutosh.nehete 2025-12-06 16:39:15 +05:30
• 9fbaf03ce4 Updated the encription fuction ashutosh.nehete 2025-12-06 16:08:43 +05:30
• a0a65fc08c Saving the mail logs in mongodb rather than my sql ashutosh.nehete 2025-12-06 15:55:08 +05:30
• 9b8bb5d0cb Merge pull request 'SideMenu_Management' (#156) from SideMenu_Management into Purchase_Invoice_Management ashutosh.nehete 2025-12-06 10:02:20 +00:00
• 20df833c48 Added API to get side menu for mobile SideMenu_Management ashutosh.nehete 2025-12-06 15:14:57 +05:30
• 8470223f98 Merge branch 'Finance_Dashboards' of https://git.marcoaiot.com/admin/marco.pms.api into SideMenu_Management ashutosh.nehete 2025-12-06 14:13:53 +05:30
• c5949606aa Changed the text to name ashutosh.nehete 2025-12-06 12:49:46 +05:30
• 4c284f9904 Modified side menu APIs ashutosh.nehete 2025-12-06 12:06:41 +05:30
• 852ddc7e02 Optimized the side menu APIs ashutosh.nehete 2025-12-05 19:06:21 +05:30
• 6bcc67bb63 Added an API to get purchase invoice overview Finance_Dashboards ashutosh.nehete 2025-12-05 15:40:26 +05:30
• fdb08fae89 Solved the migration from purchase invoice branch ashutosh.nehete 2025-12-05 14:49:12 +05:30
• 94e2e4f18b Added an API to get collection overview ashutosh.nehete 2025-12-05 14:42:15 +05:30
• 0960702f0c Added the new entites in invoice attachment type table ashutosh.nehete 2025-12-04 14:32:50 +05:30
• 26ac59fa52 changed msg if invoice-payment exceed to tax profoma amount pramod.mahajan 2025-12-04 13:03:16 +05:30
• aa604f4d9e Added the job progression API ashutosh.nehete 2025-12-04 12:12:20 +05:30
• 1a3c030495 Added proform amount check in add payment API ashutosh.nehete 2025-12-04 10:02:01 +05:30
• 447e915505 Added proforma related information in purchase inovice list VM ashutosh.nehete 2025-12-03 15:43:14 +05:30
• 3caf944c50 Added globle search in purchase invoices (title, UID) ashutosh.nehete 2025-12-03 14:59:42 +05:30
• 5d8a5e0cc8 Added an API to get todays attendance record for current logged-in-employee ashutosh.nehete 2025-12-03 11:13:41 +05:30
• 4282a6e1f7 Solved the authorize not found error ashutosh.nehete 2025-12-01 16:58:00 +05:30
• e1ca7e6152 Added response filter in all controllers ashutosh.nehete 2025-12-01 16:53:24 +05:30
• 638d9faf1f Added encryption filter in collection controller ashutosh.nehete 2025-12-01 16:46:39 +05:30
• a4714d5440 Added an API to deactivate or activate the purchase invoice ashutosh.nehete 2025-12-01 12:37:35 +05:30
• 4b981b6c74 Added the purchase invoice related permissions ashutosh.nehete 2025-12-01 12:07:16 +05:30
• e92976049e Added an APIs get payment history list and add payment to purchase invoices ashutosh.nehete 2025-12-01 11:01:20 +05:30
• 28deae6416 Added size and upload at in mapping for purchase invoice attachments ashutosh.nehete 2025-12-01 10:26:26 +05:30
• 1746cf0300 Changed the condition to check the new attachments ashutosh.nehete 2025-12-01 10:00:41 +05:30
• 9e7651f345 Corrected the logic of updating images and add file size in details View model ashutosh.nehete 2025-12-01 09:49:41 +05:30
• 49da601092 Added filter by id as well in both project list API and basic Organization list API ashutosh.nehete 2025-11-27 15:13:26 +05:30
• 0fe59223e2 Added an API to get list of delivery challan by purchase invoice ID ashutosh.nehete 2025-11-27 14:42:38 +05:30
• 41feb58d45 Added An API to add delivery challan to purchase invoice ashutosh.nehete 2025-11-27 12:28:21 +05:30
• 34c5ac9c25 Added an API to update purchase invoice ashutosh.nehete 2025-11-26 19:30:22 +05:30
• 3dce559de2 Added an API to get details of the purchase invoice ashutosh.nehete 2025-11-26 18:02:28 +05:30
• 886a32b3e3 Added an API to get list of purchase invoices wth filter ashutosh.nehete 2025-11-26 15:00:44 +05:30
• b6baff7d00 Added an API to get basic list of organizations ashutosh.nehete 2025-11-26 12:47:50 +05:30
• bbe36ed535 Added an API create the Purchase invoice ashutosh.nehete 2025-11-26 12:07:11 +05:30
• fa1c534ba8 Added Status In Purchase Invoice Details Table ashutosh.nehete 2025-11-25 20:04:59 +05:30
• d1f5240f8f Corrected the invoice attachment type APIs endpoint ashutosh.nehete 2025-11-25 19:21:35 +05:30
• c4653b557c Added an API to get a list of Invoice attachment types ashutosh.nehete 2025-11-25 19:12:29 +05:30
• 8aace3e1d9 Added an API to get Purchase invoice status list API ashutosh.nehete 2025-11-25 18:58:46 +05:30
• a6177adb43 Added PurchaseInvoice Related Tables ashutosh.nehete 2025-11-25 18:38:13 +05:30
• 6b8ba85a31 added commented job progreaasion API ashutosh.nehete 2025-11-25 15:06:56 +05:30
• a3ffe1d3d6 Corrected the spelling mistake JobTicketId in job attendance main ashutosh.nehete 2025-11-25 12:55:50 +05:30
• 55c2ca73de Merge pull request 'Project_Branch_Management' (#155) from Project_Branch_Management into main ashutosh.nehete 2025-11-25 06:49:18 +00:00
• bcba454b6e Added a function to check if have service project permission ashutosh.nehete 2025-11-25 12:17:23 +05:30
• 84fbf88347 revert 4320f92964bc6bcc07aaaffd0e3454c739e7f8ab Dynamic_Filter ashutosh.nehete 2025-11-25 04:45:25 +00:00
• 4320f92964 Added encryption middleware for all APIs ashutosh.nehete 2025-11-24 17:56:59 +05:30
• bd4bd90e7b Added the dynamic filter in collection and expense controller ashutosh.nehete 2025-11-24 12:49:54 +05:30
• e73413c849 Added the date in project report API in market controller ashutosh.nehete 2025-11-24 12:01:56 +05:30
• 457e3b411e Updated the dynamic sorting in collection controller ashutosh.nehete 2025-11-24 11:04:53 +05:30
• 8f5a49deed Added dynamic sortting, grouping, cloumn searching in collection controller ashutosh.nehete 2025-11-22 00:31:47 +05:30
• f1f5fc263f Update firebase helper function for record attendance ashutosh.nehete 2025-11-21 13:07:55 +05:30
• 64aab7d712 Removed Project ForignKey From ProjectContactMapping Table ashutosh.nehete 2025-11-21 12:04:35 +05:30
• c7a73e78fb Removed Project ForignKey From PaymentRequest Table ashutosh.nehete 2025-11-21 11:33:57 +05:30
• 1b94592026 Removed the project forign key and able to create payment request for both infra and service project ashutosh.nehete 2025-11-20 17:59:59 +05:30
• 9c95b12a8f Removed the project forign key and able to create expense for both infra and service project ashutosh.nehete 2025-11-20 16:47:25 +05:30
• df0e9f7b46 Added the update at in job details update log histeroy vm ashutosh.nehete 2025-11-20 15:39:53 +05:30
• 24e45037da Added an API to get list of branch types ashutosh.nehete 2025-11-20 14:35:02 +05:30
• a31266ee4a Update the Id check in branch update API ashutosh.nehete 2025-11-20 12:25:58 +05:30
• bd2f9d953f Added IsArchive field in ob ticket table ashutosh.nehete 2025-11-20 11:58:45 +05:30
• d5a7ad0716 Added An APi to get Projects Completion Status ashutosh.nehete 2025-11-19 18:30:16 +05:30
• 4108915b92 Added the project branch in job ticket table ashutosh.nehete 2025-11-19 18:11:54 +05:30
• dad135571d Added the project branch CRUD oprations ashutosh.nehete 2025-11-19 15:36:45 +05:30
• 5a402925b1 Added the Project branch related tables ashutosh.nehete 2025-11-19 15:10:40 +05:30
• 0277303c54 Added the search string in get infra project list API Service_Project_Management ashutosh.nehete 2025-11-19 12:07:48 +05:30
• eed97d31c6 Searching project through short name as well ashutosh.nehete 2025-11-19 10:52:16 +05:30
• a7a9fb4012 Updated the API to get employee list with current advance payment balance ashutosh.nehete 2025-11-19 10:31:21 +05:30
• 03ee834505 Corrected the logic for next status in expense ashutosh.nehete 2025-11-18 18:01:17 +05:30
• 0349229bac added the logic only employee who created expense or payment requset able to submit it for review ashutosh.nehete 2025-11-18 17:45:31 +05:30
• f4e6fab3d6 Added API to get list of combined projects and add current in get status list API ashutosh.nehete 2025-11-18 16:57:55 +05:30
• 6dfbf655ef Added on hold count in service project list VM ashutosh.nehete 2025-11-18 16:19:07 +05:30
• 230267bdb9 Added on hold job count in service project list API ashutosh.nehete 2025-11-18 14:47:24 +05:30
• f171b0add6 Added the Addition project related information in service project list API ashutosh.nehete 2025-11-18 13:06:45 +05:30
• 5522551e67 Optimizied all collection related APIs ashutosh.nehete 2025-11-18 12:06:24 +05:30
• b74ae2d75c Checking the job id while getting employee mapping in updae job API ashutosh.nehete 2025-11-18 11:10:19 +05:30
• 0cdabf61ad Added UpdatedAt in job update log VM ashutosh.nehete 2025-11-18 11:03:38 +05:30
• 76e77eb50f Added the billedTo in collection module and removed the project forign key and update so able to accept both infra project and service project ashutosh.nehete 2025-11-18 10:43:34 +05:30
• b247ed36ed Changed the name of of expense category in master menu ashutosh.nehete 2025-11-18 10:37:36 +05:30
• 88de8b218b Changed the time out interval for signalR ashutosh.nehete 2025-11-17 18:13:29 +05:30
• bb328ad980 Removed the primary employee creation form create organization API and added interval time for signalR ashutosh.nehete 2025-11-17 17:59:30 +05:30
• 92a234ff7e Added attendanceId job details VM ashutosh.nehete 2025-11-17 17:43:51 +05:30
• 64cb2e0671 Added the action and next action in get job details API for current employee ashutosh.nehete 2025-11-17 16:28:11 +05:30
• 863f0ce8e2 Added the UID in job ticket table and view model ashutosh.nehete 2025-11-17 14:34:21 +05:30
• bd14424062 Added an API to get logs of certain attendance ashutosh.nehete 2025-11-17 13:06:24 +05:30
• 897537a60c Added the API to get latest tagging entitry for current employee ashutosh.nehete 2025-11-17 12:03:06 +05:30