Joao Ramos
|
d03d790327
|
Merge branch 'develop' into feature-payment-corporate-id
CSV Improvements after merge issues
|
2023-12-27 19:21:02 +00:00 |
|
João Ramos
|
cc2d0bf1b0
|
Merged in feature-paymentFilters (pull request #8)
Added payment and date filter
Approved-by: Tiago Ribeiro
|
2023-12-27 14:54:08 +00:00 |
|
João Ramos
|
03a199983b
|
Merged develop into feature-paymentFilters
|
2023-12-27 14:52:53 +00:00 |
|
Joao Ramos
|
fe5833b061
|
Fixed Date range picker label
|
2023-12-27 14:50:10 +00:00 |
|
Joao Ramos
|
0c2200f49f
|
Removed debugger
|
2023-12-27 14:48:55 +00:00 |
|
João Ramos
|
9dbe876d65
|
Merged in feature-payment-block-corporate-update (pull request #9)
Blocked Corporate user update through payment records screen
Approved-by: Tiago Ribeiro
|
2023-12-26 20:25:46 +00:00 |
|
Tiago Ribeiro
|
fd402bbd32
|
Merged develop into feature-payment-block-corporate-update
|
2023-12-26 20:24:39 +00:00 |
|
João Ramos
|
f2aa377cfe
|
Merged in feature-country-manager-flag (pull request #11)
Feature country manager flag
Approved-by: Tiago Ribeiro
|
2023-12-26 20:23:56 +00:00 |
|
Tiago Ribeiro
|
0f0223725e
|
Merged develop into feature-paymentFilters
|
2023-12-26 20:23:40 +00:00 |
|
Tiago Ribeiro
|
3ef29e43f5
|
Merged develop into feature-country-manager-flag
|
2023-12-26 20:22:06 +00:00 |
|
João Ramos
|
60a7835040
|
Merged in feature-payment-export-csv (pull request #12)
Feature payment export csv
Approved-by: Tiago Ribeiro
|
2023-12-26 20:21:13 +00:00 |
|
Tiago Ribeiro
|
1c645fcba2
|
Added an ID to every payment record column
|
2023-12-23 20:44:04 +00:00 |
|
Joao Ramos
|
938a5e9c7c
|
Removed debugger
|
2023-12-23 14:52:56 +00:00 |
|
Joao Ramos
|
cc655fed6c
|
Added flag display for agents
|
2023-12-23 14:51:28 +00:00 |
|
Joao Ramos
|
7f9692a3d9
|
Replaced display of payment id with corporate's id
|
2023-12-23 14:38:18 +00:00 |
|
Joao Ramos
|
cf90cae4eb
|
Blocked Corporate user update through payment records screen
|
2023-12-23 14:29:24 +00:00 |
|
Joao Ramos
|
fea8e0672e
|
Added Export CSV
|
2023-12-23 00:01:24 +00:00 |
|
Joao Ramos
|
359748841f
|
Added payment and date filter
|
2023-12-22 23:22:25 +00:00 |
|
Tiago Ribeiro
|
c37bb2691b
|
Added the ability to view the stats in a specific time interval
|
2023-12-18 17:57:27 +00:00 |
|
João Ramos
|
6c49409de8
|
Merged in bug-fixing-140223 (pull request #7)
Bug fixing 140223
|
2023-12-15 15:52:07 +00:00 |
|
Tiago Ribeiro
|
2a335026de
|
Used a already set constant instead of creating a new function
|
2023-12-15 10:53:25 +00:00 |
|
Tiago Ribeiro
|
7712e5c71d
|
Made it so it also reloads the users
|
2023-12-15 10:51:31 +00:00 |
|
Tiago Ribeiro
|
861d97222a
|
Updated from companyName to name
|
2023-12-15 10:40:32 +00:00 |
|
Tiago Ribeiro
|
de862f635c
|
Merge branch 'develop' into bug-fixing-140223
|
2023-12-15 10:37:38 +00:00 |
|
João Ramos
|
ae058422aa
|
Merged in feature-paymentAssetManagement (pull request #5)
Added file storage handling for Corporate and Commission transfer
Approved-by: Tiago Ribeiro
|
2023-12-15 10:09:02 +00:00 |
|
Joao Ramos
|
44454d1e05
|
Changed corporate from user.name to user.companyName
Company name is now updateable
|
2023-12-14 17:57:39 +00:00 |
|
Joao Ramos
|
a2b9ba17a7
|
Replaced 'Agent' with 'Country Manager' on role display
|
2023-12-14 17:38:24 +00:00 |
|
Joao Ramos
|
6f61fe1564
|
Comission is now hidden from everyone apart from admins
|
2023-12-14 17:34:52 +00:00 |
|
Joao Ramos
|
73d7ddc4af
|
Profile screen was crashing
|
2023-12-14 17:34:12 +00:00 |
|
João Ramos
|
263f4afa82
|
Merged develop into feature-paymentAssetManagement
|
2023-12-14 17:21:24 +00:00 |
|
Joao Ramos
|
45cf2dc279
|
Added a number asset to limit to a specific number of decimal cases if needed
|
2023-12-14 17:20:36 +00:00 |
|
João Ramos
|
786a425d85
|
Merged in feature-displayRole (pull request #6)
Show User type in the navbar
Approved-by: Tiago Ribeiro
|
2023-12-14 09:58:06 +00:00 |
|
Tiago Ribeiro
|
d57223bd01
|
Added a Fixed decimal point for the payment records
|
2023-12-14 09:52:47 +00:00 |
|
Joao Ramos
|
fbc2cff3f1
|
Minor identation changes
|
2023-12-13 23:58:48 +00:00 |
|
Joao Ramos
|
9ad4f077d1
|
Added user type to navbar
|
2023-12-13 23:57:32 +00:00 |
|
Joao Ramos
|
e2b6061310
|
Merge branch 'develop' into feature-paymentAssetManagement
|
2023-12-13 23:43:52 +00:00 |
|
Joao Ramos
|
b77e97a9d2
|
Changed icon used for replacing files
|
2023-12-13 23:39:22 +00:00 |
|
João Ramos
|
67925c8a9e
|
Merged in feature-newPaymentOnUserUpdate (pull request #3)
Feature newPaymentOnUserUpdate
Approved-by: Tiago Ribeiro
|
2023-12-13 23:33:30 +00:00 |
|
Joao Ramos
|
020ecff29c
|
Implemented file storage handling for Corporate Transfer and Comission Transfer
|
2023-12-13 23:29:14 +00:00 |
|
Tiago Ribeiro
|
964660ed5d
|
Merged develop into feature-newPaymentOnUserUpdate
|
2023-12-13 22:01:43 +00:00 |
|
João Ramos
|
1390af62ab
|
Merged in feature-levelScoringTiers (pull request #4)
Changed approach to display level for Level Testing
Approved-by: Tiago Ribeiro
|
2023-12-13 22:01:07 +00:00 |
|
Joao Ramos
|
15947f942c
|
Fixed issue with payment records on update
|
2023-12-13 17:08:26 +00:00 |
|
Joao Ramos
|
7b3c3d15db
|
Changed approach to display level for Level Testing
|
2023-12-13 00:14:34 +00:00 |
|
Joao Ramos
|
1cff6fe242
|
Temporary fix on date/data payment
|
2023-12-12 22:48:38 +00:00 |
|
Joao Ramos
|
4cbd045502
|
Added comission to user card and updated user update to insert a new payment entry
|
2023-12-12 22:44:33 +00:00 |
|
Joao Ramos
|
21b612eaa4
|
Removed references to Referred corporated
|
2023-12-11 22:34:42 +00:00 |
|
Tiago Ribeiro
|
ef18e304a1
|
- Created a package list for student packages;
- Updated the group creation wizard to work as a modal;
|
2023-12-11 13:43:23 +00:00 |
|
Tiago Ribeiro
|
8e4223a9e7
|
Slight tweak on the sidebar logout
|
2023-12-09 15:44:02 +00:00 |
|
Tiago Ribeiro
|
7d696735ba
|
Improved a bit of the UI for the admin dashboard
|
2023-12-09 15:35:56 +00:00 |
|
Tiago Ribeiro
|
e0ecc5be05
|
Merge branch 'develop' into improvement-37/writing-evaluation-perfect-answer
|
2023-12-09 14:47:06 +00:00 |
|