80 Commits

Author SHA1 Message Date
b8d3e58428 added challan 2025-11-27 21:25:23 +05:30
82c1dc4b8e created purchase form 2025-11-26 12:29:40 +05:30
5d773b0680 Merge branch 'SideBarCollapsed' into Purchase_Invoice_Management 2025-11-25 15:24:19 +05:30
c6af020c85 changed fs-6 and body-font-size 2025-11-25 15:09:25 +05:30
f13005a031 fixed side issue collapsing 2025-11-24 19:48:03 +05:30
25003d912e add green color class for onfieldwork.com 2025-11-19 12:35:13 +05:30
dd41600045 modify Job view Ui 2025-11-18 11:58:57 +05:30
849567f999 UI changes in View Jobs. 2025-11-17 18:25:42 +05:30
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
86819dde03 added comment, attchment 2025-11-14 13:04:15 +05:30
297e0712bc integrated job details api and optimized form 2025-11-14 02:51:29 +05:30
c0378e1d7d revert body background color change. It was turned white after making changes for Landing Page. Ideallly it had to be gray 2025-11-13 12:31:43 +05:30
bc6a935e95 modify view of PR 2025-11-10 12:40:29 +05:30
30615e4bba login page swaper added 2025-11-10 11:28:51 +05:30
5a7c6a29ba added recurring payment 2025-11-08 15:20:53 +05:30
3259a1ba81 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Payment_Getway_Management 2025-11-07 14:56:27 +05:30
e95a78e1a3 added payment getway using raz razorpay 2025-10-29 10:58:28 +05:30
a070d23304 added skeleton for dashboard card figures cards 2025-10-25 10:26:41 +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
6649cab6a2 Added cursor-not-allowed when user can delete the organization. 2025-10-13 14:16:11 +05:30
136bc94c5b removed dbugger and add new classes 2025-10-11 13:12:23 +05:30
482f8a9bcb added organization api in repo. and removed unuse files 2025-09-27 23:54:44 +05:30
ca8a41bb63 added style classes for footer 2025-09-27 09:29:59 +00:00
2ef1fcfd1d successfullly assigned employe to project 2025-09-27 09:29:59 +00:00
Pramod
e610cc08c1 changed Uii for org. or project assigned 2025-09-20 18:47:09 +05:30
9a3488c92b convert inline style css class into class name 2025-09-18 15:23:48 +05:30
6d86362e9e Merge branch 'Landing_pages' into Document_Manag
# Conflicts:
#	src/pages/authentication/LoginPage.jsx
#	src/pages/employee/EmployeeList.jsx
#	src/router/AppRoutes.jsx
2025-09-08 12:34:18 +05:30
83c2f7fb0c set legal-info page css 2025-08-26 11:41:07 +05:30
585199a2a1 fixed layout properly of login , reset, forgot, login-with-otp and forgot -pages 2025-08-25 20:15:51 +05:30
a537da6eff Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag 2025-08-16 10:12:47 +05:30
c350574171 - Add project list on emplyee profile
- Add image as per gender
2025-08-12 16:24:59 +05:30
1c0a6d8a89 Created new layout for employee profile page 2025-08-12 16:24:59 +05:30
2d7adbac14 initial setup for tenant profile 2025-08-09 17:36:14 +05:30
fb3b55c694 added spinkit loader and integrated inside projectDeatils and InfraPlanning 2025-08-08 14:11:22 +05:30
6a3f9e57d9 added proper date 2025-08-07 17:57:22 +05:30
952dfefddc resolved taking incorrect date range 2025-08-07 17:57:22 +05:30
1a77c26d6b added proper date 2025-08-07 17:47:44 +05:30
597baede57 resolved taking incorrect date range 2025-08-07 17:47:44 +05:30
da12099ba1 added proper date 2025-08-07 17:18:15 +05:30
7d7549e902 resolved taking incorrect date range 2025-08-07 17:18:15 +05:30
3d7a8a1c94 attachement display horizontically 2025-08-06 10:22:47 +05:30
0c8c954b9c created skeleton css file 2025-08-06 00:17:13 +05:30
4d32d1de16 copy expense feature from Refactore_Expense 2025-08-06 00:04:26 +05:30
d3f21f33b6 added background color property for table row - 'tr-group'- that grouping entities 2025-07-25 18:17:18 +05:30
6e5e206bc8 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2 2025-07-17 17:30:16 +05:30
d2f761bd48 Changes in EmployeePage. 2025-07-16 13:08:25 +00:00
c1fb50c667 Creating a new weidget Attendance Overview and accroding to project selection data will seen. 2025-07-16 13:08:25 +00:00
d6d98c7515 configure perfect scroll bar 2025-07-16 09:50:37 +05:30
6a7eb0ee91 fixed card width in core.css 2025-07-15 07:32:29 +00:00