2859 Commits

Author SHA1 Message Date
7105a3640f Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Advance_Payment_List 2025-11-20 12:36:40 +05:30
268bd2875f Changing the position of Status in Collection list view. 2025-11-19 14:26:12 +05:30
7773b7a43b Adding Status and UI implementation in Collection. 2025-11-19 12:59:57 +05:30
25003d912e add green color class for onfieldwork.com 2025-11-19 12:35:13 +05:30
a3be63b74f Implementing api for Advance payment all data. 2025-11-19 12:22:38 +05:30
54420c70d9 change landing page logo to marco from ON 2025-11-19 12:15:08 +05:30
4b5f8756b3 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Advance_Payment_List 2025-11-19 11:27:51 +05:30
10e54637d5 Adding list view in Advance payment list. 2025-11-19 10:47:11 +05:30
3fe533c8e3 addd serach poject field both projects 2025-11-19 10:42:12 +05:30
5b91c13b85 adding list view in advance payment list. 2025-11-19 09:46:41 +05:30
ed87e3f11b removed conole error 2025-11-18 18:28:38 +05:30
e276836653 added prevent to take action after close ticket 2025-11-18 18:13:49 +05:30
523d6baea6 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-18 17:56:21 +05:30
9e47f10440 updated padding of multi- select tag 2025-11-18 17:56:17 +05:30
54d89e1429 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Advance_Payment_List 2025-11-18 17:38:30 +05:30
018f132501 Adding Navigate functionality in ServiceprjectTeams. 2025-11-18 17:31:51 +05:30
f3eed11540 Merge pull request 'Service_Management_CardView :- Creating a card for Services project.' (#512) from Service_Management_CardView into Service_Project_Managment
Reviewed-on: #512
merged
2025-11-18 11:56:35 +00:00
836b34c237 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Management_CardView 2025-11-18 17:24:04 +05:30
bf92ffcb3e added job status during update job 2025-11-18 17:22:52 +05:30
dd380f6820 Edit button add in About project for Services. 2025-11-18 17:20:53 +05:30
f997c2f2cc Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Management_CardView 2025-11-18 17:01:22 +05:30
1c5d62f5ed Correction in HoverPopup when it we select single the all will be open. 2025-11-18 16:57:48 +05:30
37dbbf53f3 fixed table align 2025-11-18 16:56:11 +05:30
2cb9b41f98 Increasing the size of datepicker at TaskReport filter panel. 2025-11-18 16:38:57 +05:30
e6e27beb6f Creating Card for ServiceProject. 2025-11-18 16:35:05 +05:30
9822ae91ec Adding AdvancePayment a list view. 2025-11-18 15:56:16 +05:30
3753d01f7d prevent to change status once job status is done 2025-11-18 14:25:13 +05:30
c8a599fc8f Adding Extra fields in Service Project Card. 2025-11-18 12:47:39 +05:30
1c2674d435 Filteration using status in Services and Infra. 2025-11-18 12:24:41 +05:30
31d340c645 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Management_CardView 2025-11-18 12:15:25 +05:30
61e210c305 Filtering according to Dropdown filter. 2025-11-18 12:14:35 +05:30
dd41600045 modify Job view Ui 2025-11-18 11:58:57 +05:30
72052a4708 Creating a ServiceCard view. 2025-11-18 11:50:29 +05:30
4dfc0fa7ca Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-18 11:08:44 +05:30
3cfac9a2bb fixed - useProject (infra) params 2025-11-18 11:08:33 +05:30
b14353dd4f Adding Organization form at Create Service. 2025-11-18 10:10:44 +05:30
8de1230f79 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 20:26:33 +05:30
9b65e0a320 added update job 2025-11-17 20:26:28 +05:30
70ed617b9b Adding Payment_processed at the place of payment_Processed. 2025-11-17 19:21:40 +05:30
d4bb7373f2 Adding Plus icon in Create Services. 2025-11-17 19:12:34 +05:30
f4f14127b7 Merge pull request 'We are creating filter chips in the Payment Request filter panel.' (#508) from Katik_Task#1746 into Service_Project_Managment
Reviewed-on: #508
2025-11-17 13:12:58 +00:00
c8bbf6b8a8 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Katik_Task#1746 2025-11-17 18:40:18 +05:30
36be17daa7 Merge pull request 'Hide “Advance Payment” Mode When Creating Expense After Payment Processed (Mobile & Web)' (#509) from Kartik_Bug#1735 into Service_Project_Managment
Reviewed-on: #509
2025-11-17 13:06:01 +00:00
d6b2ed9f84 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 18:35:49 +05:30
088e5e0368 UI Implementation at Job List 2025-11-17 18:35:42 +05:30
977e5c77a7 Merge pull request 'Invoice list should display according to the selected date range in Collection module.' (#510) from Kartik_Bug#1505 into Service_Project_Managment
Reviewed-on: #510
2025-11-17 13:03:50 +00:00
2b1d3e5890 Merge branch 'Service_Project_Managment' into Kartik_Bug#1505 2025-11-17 13:03:42 +00:00
a61e621ce2 Merge pull request 'Kartik_Bug#1737 :- UI Implementation in Expense Weidget.' (#507) from Kartik_Bug#1737 into Service_Project_Managment
Reviewed-on: #507
2025-11-17 13:01:33 +00:00
0bd1cea703 1) Handle blank space in menu bar
2) Breadcrum  "Home" link to "Dashboard" on pages where it was missing
2025-11-17 18:30:13 +05:30
d6ef713370 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 18:28:20 +05:30