Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Task 'Amount' not correctly converted from client currency to home currency #241

This commit is contained in:
Hillel Coren 2021-04-11 11:36:20 +03:00
parent 68117f886f
commit 512f5d8fe8
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ui/project/project_presenter.dart
View File

@ -50,7 +50,8 @@ class ProjectPresenter extends EntityPresenter {
case ProjectFields.clientNumber: case ProjectFields.clientNumber:
return Text(client.number); return Text(client.number);
case ProjectFields.taskRate: case ProjectFields.taskRate:
return Text(formatNumber(project.taskRate, context)); return Text(formatNumber(project.taskRate, context,
clientId: project.clientId));
case ProjectFields.dueDate: case ProjectFields.dueDate:
return Text(formatDate(project.dueDate, context)); return Text(formatDate(project.dueDate, context));
case ProjectFields.publicNotes: case ProjectFields.publicNotes:

2
lib/ui/project/view/project_view_overview.dart
View File

@ -58,7 +58,7 @@ class _ProjectOverviewState extends State<ProjectOverview> {
final Map<String, String> fields = { final Map<String, String> fields = {
ProjectFields.dueDate: formatDate(project.dueDate, context), ProjectFields.dueDate: formatDate(project.dueDate, context),
ProjectFields.taskRate: formatNumber(project.taskRate, context, ProjectFields.taskRate: formatNumber(project.taskRate, context,
formatNumberType: FormatNumberType.money), formatNumberType: FormatNumberType.money, clientId: project.clientId),
}; };
if (project.customValue1.isNotEmpty) { if (project.customValue1.isNotEmpty) {

4
lib/ui/task/task_presenter.dart
View File

@ -52,7 +52,7 @@ class TaskPresenter extends EntityPresenter {
case TaskFields.client: case TaskFields.client:
return Text(state.clientState.map[task.clientId]?.displayName ?? ''); return Text(state.clientState.map[task.clientId]?.displayName ?? '');
case TaskFields.rate: case TaskFields.rate:
return Text(formatNumber(task.rate, context)); return Text(formatNumber(task.rate, context, clientId: task.clientId));
case TaskFields.calculatedRate: case TaskFields.calculatedRate:
final client = state.clientState.get(task.clientId); final client = state.clientState.get(task.clientId);
final rate = taskRateSelector( final rate = taskRateSelector(
@ -62,7 +62,7 @@ class TaskPresenter extends EntityPresenter {
project: state.projectState.get(task.projectId), project: state.projectState.get(task.projectId),
group: state.groupState.get(client.groupId), group: state.groupState.get(client.groupId),
); );
return Text(formatNumber(rate, context)); return Text(formatNumber(rate, context, clientId: task.clientId));
case TaskFields.project: case TaskFields.project:
return Text(state.projectState.map[task.projectId]?.name ?? ''); return Text(state.projectState.map[task.projectId]?.name ?? '');
case TaskFields.description: case TaskFields.description:

4
lib/ui/task/view/task_view_overview.dart
View File

@ -60,7 +60,8 @@ class _TaskOverviewState extends State<TaskOverview> {
final group = state.groupState.get(client?.groupId); final group = state.groupState.get(client?.groupId);
final Map<String, String> fields = { final Map<String, String> fields = {
TaskFields.rate: formatNumber(task.rate, context, zeroIsNull: true), TaskFields.rate: formatNumber(task.rate, context,
zeroIsNull: true, clientId: client.id),
}; };
if ((task.statusId ?? '').isNotEmpty) { if ((task.statusId ?? '').isNotEmpty) {
@ -107,6 +108,7 @@ class _TaskOverviewState extends State<TaskOverview> {
), ),
), ),
context, context,
clientId: client.id,
), ),
), ),
ListDivider(), ListDivider(),