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

#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

• a04ef7ca9b Added the edit payment request API ashutosh.nehete 2025-11-01 18:00:23 +05:30
• b6295ebef4 Added the get currencies API ashutosh.nehete 2025-11-01 16:57:50 +05:30
• bdeeb673c7 resolver conflict and merged- AdvancePaymentTranaction pramod.mahajan 2025-11-01 16:43:24 +05:30
• e8a2191bc2 added get advance payment transaction api pramod.mahajan 2025-11-01 16:37:53 +05:30
• d456bd6a1e Merge pull request 'Ashutosh_Task#1609' (#147) from Ashutosh_Task#1609 into Upgrade_Expense ashutosh.nehete 2025-11-01 10:38:18 +00:00
• eccb87ebb4 Completed the Create payment request API Ashutosh_Task#1609 ashutosh.nehete 2025-11-01 16:07:47 +05:30
• e1d6434fc6 Change the ExpenseTypeMaster to ExpenseCategoryMaster in create Payment Request API ashutosh.nehete 2025-11-01 15:59:29 +05:30
• faa47c40b2 Change the table ExpenseTypeMaster to ExpenseCategoryMaster ashutosh.nehete 2025-11-01 15:58:22 +05:30
• e7edc2f45c Added the payment request attachment in create payment request API ashutosh.nehete 2025-11-01 15:48:36 +05:30
• e821724e83 created the shell API to create payment request ashutosh.nehete 2025-11-01 15:09:54 +05:30
• e3b418560b Added CurrentBalance in Adevance payment table ashutosh.nehete 2025-11-01 12:36:16 +05:30
• 18cd1efafa Added the expense related migrations ashutosh.nehete 2025-11-01 12:05:41 +05:30
• b4677aacf3 Added Payment Request, Recurring Payment and Advance Payment Related Tables ashutosh.nehete 2025-11-01 10:38:05 +05:30
• ffb9e6508f Added the API to Map Purchase Order Status with child Inventory_Management ashutosh.nehete 2025-10-31 14:44:38 +05:30
• 8a36ffe652 Added the API to Map Requisition Status with child ashutosh.nehete 2025-10-31 13:21:13 +05:30
• 08e893dcc8 Change the check permssion check for tenant details API ashutosh.nehete 2025-10-31 11:26:57 +05:30
• 68aec35028 Change the check permssion check for tenant details API Payment_Gatway_Management_OFW ashutosh.nehete 2025-10-31 11:26:45 +05:30
• a684556cff Chnaged the permission check for tenant details API ashutosh.nehete 2025-10-31 11:21:49 +05:30
• 28d64c71bd Made Requisition Status Mapping Nullable ashutosh.nehete 2025-10-31 10:22:37 +05:30
• a05f1ba5c3 Added the Compeny type master and data ashutosh.nehete 2025-10-31 10:11:09 +05:30
• 25896d3093 Added the data for company types and units and Added the get APIs for this masters ashutosh.nehete 2025-10-30 11:58:16 +05:30
• ee48d7372a Added the renew Subscription API ashutosh.nehete 2025-10-29 17:25:32 +05:30
• 83e8e8c7de Added the renew Subscription API ashutosh.nehete 2025-10-29 17:25:20 +05:30
• c3b93022fd Added the payment related APIs ashutosh.nehete 2025-10-29 16:29:39 +05:30
• 3b0c958342 Added the self subscription API ashutosh.nehete 2025-10-29 16:28:55 +05:30
• 4916a95eb4 Corrected adding the subscription after payment ashutosh.nehete 2025-10-29 14:44:54 +05:30
• 7e90e4a703 Changed the check to check id model id and id from query is same ashutosh.nehete 2025-10-29 11:37:09 +05:30
• d1af0df27b Changed the check to check if current tenant is super tenant ashutosh.nehete 2025-10-29 11:10:57 +05:30
• 511ad38c94 Added the Product Category master APIs ashutosh.nehete 2025-10-29 10:58:06 +05:30
• ad273ed58e Changed Item To Product And Country Master Table And Data ashutosh.nehete 2025-10-28 18:15:40 +05:30
• 86b37549eb Featching the industry while create tenant enquire ashutosh.nehete 2025-10-28 15:39:34 +05:30
• 5253ed9a39 Corrected the migration errors in subscription plan table ashutosh.nehete 2025-10-28 10:57:42 +05:30
• 4e171e8ca3 revert 1a360447cd54ae92c981323e5895602f8e24f17f ashutosh.nehete 2025-10-28 05:23:22 +00:00
• bd839b12f9 revert 7273f49b3ffd96f11fc8220e5d3e4ef663179541 ashutosh.nehete 2025-10-28 05:23:06 +00:00
• 08b2cfe844 revert eed4e4cf314730579cbb0cd117acf581759a5295 ashutosh.nehete 2025-10-28 05:22:56 +00:00
• eed4e4cf31 changed the response for self Registration ashutosh.nehete 2025-10-28 10:47:04 +05:30
• 7273f49b3f Make the payment details nullable ashutosh.nehete 2025-10-28 10:41:52 +05:30
• 1a360447cd Added the Payment details in tenant subscription table ashutosh.nehete 2025-10-27 18:29:26 +05:30
• 78575337ec Saving the tenant if payment is successfully ashutosh.nehete 2025-10-27 17:56:51 +05:30
• ca07dea389 Removed the AsNoTraking in PurchaseOrderStatus edit API ashutosh.nehete 2025-10-27 16:27:14 +05:30
• ac4da0c930 Saving the tenant enquire in before payment ashutosh.nehete 2025-10-27 16:12:19 +05:30
• 6377cee718 Changed the API methods ashutosh.nehete 2025-10-27 15:59:33 +05:30
• 0e698a8a0d Added the default to isActive parameter in delete status APIs ashutosh.nehete 2025-10-27 15:56:44 +05:30
• 3d37050dff Corrected the check for sattus ids in edit APIs ashutosh.nehete 2025-10-27 15:36:11 +05:30
• df999ed2c5 Added the mapping for status in inventroy ashutosh.nehete 2025-10-27 14:54:26 +05:30
• 468f50f2da Added the Requisition Status and Purchase Order Status in master list ashutosh.nehete 2025-10-27 14:48:35 +05:30
• fba12f577d Added the Inventory relasted Tables and master APIs of Purchase Order Status and Requisition Status ashutosh.nehete 2025-10-27 14:37:02 +05:30
• d29b061799 saving the payment details in database ashutosh.nehete 2025-10-27 09:49:23 +05:30
• 04f1917332 Added the payment details in verify payment API ashutosh.nehete 2025-10-25 15:57:16 +05:30
• 1d54af7c00 Added create order and verify payment API for razor pay ashutosh.nehete 2025-10-24 17:01:22 +05:30
• c6744f0556 Merge pull request 'Collection_Management' (#146) from Collection_Management into main ashutosh.nehete 2025-10-24 06:21:29 +00:00
• 7e634e3a47 Added the payement adjustment heads in master dropdown OnFieldWork_V1 ashutosh.nehete 2025-10-17 14:31:21 +05:30
• e94210a341 Added the organization name in attendance records ashutosh.nehete 2025-10-17 14:23:57 +05:30
• 918f856632 Added the Collection in OFW ashutosh.nehete 2025-10-17 12:56:33 +05:30
• 031c34cb7c Added mark as complete check in get invoice list API ashutosh.nehete 2025-10-17 11:28:26 +05:30
• b3595ad6b6 Merge branch 'Collection_Management' of https://git.marcoaiot.com/admin/marco.pms.api into Collection_Management ashutosh.nehete 2025-10-17 11:11:34 +05:30
• 34bd84ad73 Added audit while mark as complete ininvoice ashutosh.nehete 2025-10-17 11:10:38 +05:30
• c8d69e7c5b Merge branch 'Collection_Management' of https://git.marcoaiot.com/admin/marco.pms.api into Collection_Management ashutosh.nehete 2025-10-17 10:56:46 +05:30
• 94f57e2852 Reactiving the employee without checking any condditions of attendance ashutosh.nehete 2025-10-17 10:56:31 +05:30
• 843dc8edfc Addd the collection related permission in context and APIs ashutosh.nehete 2025-10-16 13:04:49 +05:30
• 70aa5121fa Added the Finance in mobile menu ashutosh.nehete 2025-10-15 17:43:58 +05:30
• 2e299c6152 Added the expense related dashboards ashutosh.nehete 2025-10-15 13:00:17 +05:30
• c13dec9052 Added the payement adjustment heads in master dropdown ashutosh.nehete 2025-10-15 11:26:36 +05:30
• 8c305872a0 Added the CRUD API for Payment Adjustment heads ashutosh.nehete 2025-10-15 11:24:48 +05:30
• 302185808e Added the Payment Adjustment Head table also new API of get Payment Adjustment Head lists as well added the forgin key in received payment table and API ashutosh.nehete 2025-10-14 17:57:37 +05:30
• 4dc37cb0ac Added the projectID filter in get invoice list API ashutosh.nehete 2025-10-14 16:55:46 +05:30
• e80728805b Added the comment in Received Invoice Payment and added provide all project flag in get basic project ashutosh.nehete 2025-10-14 15:34:38 +05:30
• 4434ea971f Added file name and content type in invoice attachment view models ashutosh.nehete 2025-10-14 14:29:57 +05:30
• 5a9b06cca6 Added the update invoice API ashutosh.nehete 2025-10-14 14:24:59 +05:30
• 47bb49fac6 Merge pull request 'Added the organization name in record response object' (#145) from Ashutosh_Bug#1498 into Collection_Management ashutosh.nehete 2025-10-14 06:07:09 +00:00
• 5ce95f7e23 Added the organization name in record response object ashutosh.nehete 2025-10-14 11:36:32 +05:30
• 636dd48ad6 Change response for invoice number check ashutosh.nehete 2025-10-14 11:29:04 +05:30
• 62688d508f Added the add comment API and get Details API ashutosh.nehete 2025-10-14 11:24:35 +05:30
• c92e71b292 Added the new API to markAsCompletedthe invoice ashutosh.nehete 2025-10-13 21:08:11 +05:30
• 2b19890b53 Added the create payment received invoice API ashutosh.nehete 2025-10-13 20:44:38 +05:30
• 5ff87cd870 Added the get list of invoices API ashutosh.nehete 2025-10-13 19:59:18 +05:30
• b30369baa5 Added the new API to create invoice ashutosh.nehete 2025-10-13 18:35:57 +05:30
• 4684b438f6 Added the invoice related tables ashutosh.nehete 2025-10-13 18:35:26 +05:30
• 7e20807325 corrected the distinct by error ashutosh.nehete 2025-10-11 15:57:53 +05:30
• 186486d934 Added the new API to get organizations for dropdown ashutosh.nehete 2025-10-11 15:36:52 +05:30
• d07f0311ae Optmized the work status master APIs ashutosh.nehete 2025-10-11 13:52:20 +05:30
• 2f6031e62c revert e02636b6b66287a22fcfb34c150aece1b136cc68 ashutosh.nehete 2025-10-11 08:19:59 +00:00
• e02636b6b6 Optmized the work status master APIs ashutosh.nehete 2025-10-11 13:48:36 +05:30
• bad784e147 Optimized the contact related msater APIs ashutosh.nehete 2025-10-11 12:59:31 +05:30
• 886d0bb3b1 Clearing the employee profile cache when selecting the tenant ashutosh.nehete 2025-10-10 18:32:01 +05:30
• 2a25bbae82 Added .WithExposedHeaders("Authorization") in project.cs Ashutosh_AllowCredentials ashutosh.nehete 2025-10-10 18:14:23 +05:30
• 2041f99ac5 Added the AllowCredentials in cros in project.cs file ashutosh.nehete 2025-10-10 17:55:59 +05:30
• 74dd9eeb8d organization Tenant Mapping is already existed then return error message ashutosh.nehete 2025-10-10 17:53:23 +05:30
• 1939a63d9a Assigning the appilcation role to root employee of the any organization ashutosh.nehete 2025-10-10 17:05:43 +05:30
• c07db9f94d removed employee project cache when adding the subscription ashutosh.nehete 2025-10-10 15:59:42 +05:30
• 53da15416a Removing all employees profile from cache for certain tenant ashutosh.nehete 2025-10-10 15:46:56 +05:30
• a809bdd469 Merge pull request 'Sloved issues of permissions not been assigned when updating the subscription' (#144) from Ashutosh_Bug#1461 into main ashutosh.nehete 2025-10-10 08:49:19 +00:00
• bb2c098cb9 Sloved issues of permissions not been assigned when updating the subscription ashutosh.nehete 2025-10-10 14:17:32 +05:30
• bd3b70f4ea Merge pull request 'Added the RequestedAt and RequestedBy in attendance' (#143) from Ashutosh_Enhancement#1452 into main ashutosh.nehete 2025-10-10 07:06:25 +00:00
• 000cef3bb7 enhanced the get team based on project ashutosh.nehete 2025-10-10 12:36:11 +05:30
• 522deae8f7 Added the RequestedAt and RequestedBy in attendance ashutosh.nehete 2025-10-10 12:08:53 +05:30
• 663d94093c Enhanced the employe log API ashutosh.nehete 2025-10-10 10:01:21 +05:30
• dc83aa72a6 Added the API to get filter task allocation ashutosh.nehete 2025-10-09 16:57:04 +05:30
• 9a8aa4f5ce Changed the index of reject button in expense controller ashutosh.nehete 2025-10-09 16:52:34 +05:30
• af92ab977b Added the get filter API ashutosh.nehete 2025-10-09 16:47:06 +05:30