2735 Commits

Author SHA1 Message Date
59c46f7f3b Calling API for Get payment Request. 2025-11-03 14:46:20 +05:30
e80223beba Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-03 12:52:17 +05:30
de2d23ec83 added padding for table header 2025-11-03 12:52:10 +05:30
f3cfb3cf24 adding api for get list for payment request. 2025-11-03 12:50:06 +05:30
0e3c78df11 added advance rpayment list component 2025-11-03 12:11:30 +05:30
e0c0a14777 Adding List view for Payment Request. 2025-11-03 10:06:09 +05:30
17a08304e3 Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-01 18:11:13 +05:30
c13e0acd3d added advance list inside Advance payments 2025-11-01 18:10:48 +05:30
b0a58740a5 Remove mandatory field from bill attachment. 2025-11-01 17:39:54 +05:30
c123373892 Adding Create API for Payment Request. 2025-11-01 17:10:47 +05:30
9c03303547 added employee search box inside advance payment 2025-11-01 16:55:32 +05:30
d8712c0d04 Merge pull request 'issues_Oct_4W' (#498) from issues_Oct_4W into OnFieldWork_V1
Reviewed-on: #498
Merged
2025-11-01 11:21:09 +00:00
5f0972ee32 addedfixed height for employee list insidemanage bucket 2025-11-01 11:21:09 +00:00
0d1d51d56b fixed check ehcke issue 2025-11-01 11:21:09 +00:00
166b0a1caf Remove fw-bold in View popup at attendance logs. 2025-11-01 11:21:09 +00:00
196069b39a Creating APi for Create Payemnt Request. 2025-11-01 16:00:00 +05:30
10c2e9dfee Added Submit and Cancel button on Payment Request. 2025-11-01 15:08:43 +05:30
494b1b2b77 Added view for Payment Request. 2025-11-01 14:57:47 +05:30
465b67e25c initially added pages for AdvancePayment and Payment Request 2025-11-01 14:43:09 +05:30
ec04426e52 added get icon for file by use uploaded 2025-10-30 15:17:38 +05:30
dc75121d31 fixed date formating inside attenace logs and expense list 2025-10-30 11:29:02 +05:30
d3acf13c0a fixed card size for dashboard cards 2025-10-30 10:50:45 +05:30
cc4cea0f27 fixed date range picker width 2025-10-29 11:46:46 +05:30
02777a8f47 cosmatic and logo changes 2025-10-27 11:46:53 +05:30
7c5dca1665 updated confirm modal, added success option 2025-10-24 11:36:00 +05:30
0d0b7f2cbc changes to green theme 2025-10-23 12:41:58 +05:30
394d28f80d integrated collection mang. completely 2025-10-17 15:17:48 +05:30
95c6e71be8 Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into OnFieldWork_V1 2025-10-17 13:50:16 +05:30
0091b1064e intergrated collection managment 2025-10-17 13:49:44 +05:30
cde6794697 Changes in Index.jtml for hidding some unnessary fields. 2025-10-17 12:51:48 +05:30
78b721dad7 Changes in Expensfilter panel at on apply and clear fitler is closed. 2025-10-17 10:24:35 +05:30
a8ae0fac70 Merge branch 'landing_page_with_new_theme' into OnFieldWork_V1 2025-10-15 16:56:04 +05:30
b318d469f6 Changes in OnField Work. 2025-10-15 16:52:27 +05:30
73534226e3 Changes in Filter panel when on close 2025-10-15 14:38:17 +05:30
9bbe479153 Removing unnessary gap in Documents.jsx file. 2025-10-15 12:45:38 +05:30
ce976a6d5c Changes Directory Notes and Contact filter panel at time of chips remover. 2025-10-15 12:25:33 +05:30
d1af4f402d Changes when we select a Expense Status in ExpenseFilter Panel. 2025-10-15 12:18:27 +05:30
105beb6062 more cosmmatic changes 2025-10-15 11:54:49 +05:30
f61c7a4a35 Removing Unessary gaps. 2025-10-15 11:50:26 +05:30
dacd72f945 handle reposnsive height 2025-10-15 10:52:07 +05:30
a2177dc2af UI changes in attendance, listview Directory, ExpenseList, Project Page at mobile view. 2025-10-14 15:53:37 +05:30
a9d1ba08dd UI updation in Attendance Toady's and Regularization tab. 2025-10-14 15:44:36 +05:30
9526cb0e5e add more cosmatic changes and include contact us section 2025-10-14 10:29:46 +05:30
432cf2122e new design added 2025-10-13 16:12:46 +05:30
765b4356a6 Merge pull request 'Adding Chips in Directory Contact and Notes Page.' (#473) from Kartik_Task#1465 into OnFieldWork_V1
Reviewed-on: #473
Merged
2025-10-11 08:41:19 +00:00
6125130cff Adding Chips in Directory Contact and Notes Page. 2025-10-11 08:41:19 +00:00
006ca21e1d imported PreviwDocument compoent that was missing 2025-10-11 10:52:02 +05:30
bb2d7b8923 added pading in check-in check-out form 2025-10-10 19:54:20 +05:30
c921dbff09 fixed u 2025-10-10 17:49:14 +05:30
e84da2dcb0 Merge pull request 'Kartik_Task_1459 :- Adding Export Excel and PDF in Directory.' (#469) from Kartik_Task_1459 into OnFieldWork_V1
Reviewed-on: #469
Merged
2025-10-10 11:24:30 +00:00