184 Commits

Author SHA1 Message Date
92bcfb73c6 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-14 16:47:40 +05:30
dab3c5fe52 fixed attachement error 2025-11-14 14:58:50 +05:30
297e0712bc integrated job details api and optimized form 2025-11-14 02:51:29 +05:30
844a6f59d1 added fetch api of jobs 2025-11-13 19:50:19 +05:30
651779adea Merge branch 'Organization_Hierarchy' into Service_Project_Managment 2025-11-13 10:20:48 +05:30
a40f96fe72 removed unneeded border and replace toggle for activtive - inactie 2025-11-13 10:07:40 +05:30
d7f00898a0 added delete service project 2025-11-12 19:38:04 +05:30
fa944f5abe Removing unwanted placeholder. 2025-11-12 12:14:09 +05:30
94413b9beb Implementing ManageReporting at Employee. 2025-11-11 18:00:34 +05:30
8900ed6fc4 Merge branch 'landing-page-consmatic-changes-migration' into migrate_main 2025-11-11 17:34:50 +05:30
04a3141f65 remove swiper from login main and added bootstrap corausal 2025-11-11 17:34:25 +05:30
ec9bcd1ea5 added validation for Tax , base amount, and added signal for PR and Recurring 2025-11-10 16:10:18 +05:30
6531eb7576 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 11:50:00 +05:30
c52cbb1435 Adding End Date in Recurring Expense Popup and adding i icon on it. 2025-11-10 11:49:56 +05:30
449de6edba added new attribute - disabled 2025-11-10 10:15:13 +05:30
5a7c6a29ba added recurring payment 2025-11-08 15:20:53 +05:30
587fb420fd migrated PR from upgrade_Expense 2025-11-08 12:53:24 +05:30
6a97dcf5f6 added initially expense 2025-11-07 18:15:45 +05:30
dcbb4a3997 fixed DatePicker size issue 2025-11-07 16:47:51 +05:30
86f931929a Adding Spinner in Dashbard. 2025-10-31 10:57:56 +05:30
c438b51ef1 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main 2025-10-24 13:04:39 +05:30
9e5555ff9d added properly permissions 2025-10-24 06:41:58 +00:00
ecd726bbb1 integrated comment api added comment and payments history inside view collection 2025-10-24 06:41:58 +00:00
dec15278fa Changes in Emp Attendance and DateRange picker. 2025-10-15 11:00:18 +05:30
9288ac1fbc successfuuly fetch data and create collection 2025-10-14 10:24:45 +05:30
13d3572cf6 fixed datepicke ui 2025-10-10 16:45:43 +05:30
f8095ac9bf upgraded progress 2025-10-10 10:55:51 +05:30
8bcfcc5718 fixed attendance - check In -out and persisted date range from Redux store for attendance logs 2025-10-07 07:12:49 +00:00
638c033705 fixed employee name show whenever update expense - for paid by 2025-10-05 00:14:39 +05:30
72424eee53 added updation for fllter 2025-09-29 11:52:11 +05:30
482f8a9bcb added organization api in repo. and removed unuse files 2025-09-27 23:54:44 +05:30
1e7b4ba21e Date field not cleared in Tenant filter after clicking Clear button 2025-09-27 09:40:05 +00:00
7ac3268514 Add an info (ℹ️) icon to the Daily Progress Report’s Total Pending Task 2025-09-27 09:37:36 +00:00
57edd92dce fixed blocking of dailyprogress by using pagination 2025-09-25 12:36:55 +05:30
a380a7ab29 Changes in Choose Organization1 popup increase the space. 2025-09-22 16:25:02 +05:30
c609387924 Changes in Organization popup 2025-09-22 16:00:24 +05:30
Pramod
e610cc08c1 changed Uii for org. or project assigned 2025-09-20 18:47:09 +05:30
731d2dbed7 Changes in Infrastructure. 2025-09-20 11:51:32 +05:30
2e65007f26 fixed Modal provider component and setup organization creation 2025-09-18 15:23:48 +05:30
3c4c25b449 refactore SelectMult Tag for label display is required or optional 2025-09-18 15:23:23 +05:30
979293ad90 setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 2025-09-18 15:21:23 +05:30
99eaf92e3f initially setup 2025-09-18 15:18:51 +05:30
a48fc1d989 fixed Modal provider component and setup organization creation 2025-09-18 15:18:04 +05:30
8eb8e27f89 refactore SelectMult Tag for label display is required or optional 2025-09-18 15:18:04 +05:30
012a89b3ea setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 2025-09-18 15:18:04 +05:30
701d1adc0b initially setup 2025-09-18 15:18:03 +05:30
42086d7f3a Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Sep_1W_V2 2025-09-16 10:40:27 +05:30
70110192f4 Remove Required Indicator from Tags Field in Document Upload 2025-09-13 10:13:18 +00:00
2f2ddb0576 Standardize All Buttons in Expenses Module to Match Website-Wide Button Style 2025-09-13 10:06:14 +00:00
0484de498c Changes in UI of Directory Notes Tabs and all the popups. 2025-09-12 16:11:31 +05:30