diff --git a/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx b/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx index cf4254220..5e3b6bb6c 100644 --- a/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx +++ b/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx @@ -40,6 +40,9 @@ function ProjectDetailActionsBar({ // Handle new transaction button click. const handleNewTransactionBtnClick = ({ path }) => { switch (path) { + case 'project_task': + openDialog('project-task-form', { projectId }); + break; case 'invoincing': openDialog('project-invoicing-form'); break; diff --git a/src/containers/Projects/containers/ProjectDetails/ProjectTasks/components.tsx b/src/containers/Projects/containers/ProjectDetails/ProjectTasks/components.tsx index 9e74e0e31..801f06526 100644 --- a/src/containers/Projects/containers/ProjectDetails/ProjectTasks/components.tsx +++ b/src/containers/Projects/containers/ProjectDetails/ProjectTasks/components.tsx @@ -36,11 +36,11 @@ export function TaskAccessor(row) { {row.name} - {row.charge_type === 'hourly_rate' + {row.charge_type === 'TIME' ? intl.get('project_task.rate', { rate: row.rate, }) - : intl.get(row.charge_type)} + : row.charge_type} {row.estimate_minutes && intl.get('project_task.estimate_minutes', { diff --git a/src/containers/Projects/containers/ProjectDetails/common.ts b/src/containers/Projects/containers/ProjectDetails/common.ts index 432d142fe..f27c61189 100644 --- a/src/containers/Projects/containers/ProjectDetails/common.ts +++ b/src/containers/Projects/containers/ProjectDetails/common.ts @@ -1,6 +1,7 @@ import intl from 'react-intl-universal'; export const projectTranslations = [ + { name: intl.get('project_details.new_task'), path: 'project_task' }, { name: intl.get('project_details.new_invoicing'), path: 'invoincing' }, { name: intl.get('project_details.new_expense'), path: 'expense' }, { diff --git a/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx b/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx index 0093c5b4c..4e6f24876 100644 --- a/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx +++ b/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx @@ -12,7 +12,7 @@ import withDialogActions from '@/containers/Dialog/withDialogActions'; const defaultInitialValues = { name: '', - charge_type: 'fixed_price', + charge_type: 'fixed', estimate_minutes: '', cost_estimate: 0, rate: '0.00', diff --git a/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx b/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx index 8abc41ef0..9fe8fece3 100644 --- a/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx +++ b/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx @@ -60,7 +60,7 @@ function ProjectTaskFormFields({ /> diff --git a/src/containers/Projects/containers/common/modalChargeOptions.ts b/src/containers/Projects/containers/common/modalChargeOptions.ts index 025175ba3..124da1570 100644 --- a/src/containers/Projects/containers/common/modalChargeOptions.ts +++ b/src/containers/Projects/containers/common/modalChargeOptions.ts @@ -1,9 +1,9 @@ import intl from 'react-intl-universal'; export const taskChargeOptions = [ - { name: intl.get('project_task.dialog.hourly_rate'), value: 'hourly_rate' }, - { name: intl.get('project_task.dialog.fixed_price'), value: 'fixed_price' }, - { name: intl.get('project_task.dialog.non_chargeable'), value: 'non_chargeable' }, + { name: intl.get('project_task.dialog.hourly_rate'), value: 'time' }, + { name: intl.get('project_task.dialog.fixed_price'), value: 'fixed' }, + { name: intl.get('project_task.dialog.non_chargeable'), value: 'non_chargable' }, ]; export const expenseChargeOption = [ diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 73205b5c3..64b3b0c71 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -2108,6 +2108,7 @@ "project_details.label.purchases": "Purchases", "project_details.label.sales": "Sales", "project_details.label.journals": "Journals", + "project_details.new_task": "New Task", "project_details.new_invoicing": "New Invoicing", "project_details.new_expense": "New Expense", "project_details.new_estimated_expense": "New Estimated Expense", @@ -2208,5 +2209,8 @@ "project_invoicing.dialog.all_time_entries": "All time entries", "project_invoicing.dialog.all_unbilled_expenses": "All unbilled expenses", "project_invoicing.dialog.all_bills": "All bills", - "project_invoicing.dialog.bill_to": "Bill To" + "project_invoicing.dialog.bill_to": "Bill To", + "project_billable_entries.dialog.label": "Add Project Entries", + "project_billable_entries.dialog.filter_by_date": "Filter by Date", + "project_billable_entries.dialog.filter_by_type":"Filter by Type" } \ No newline at end of file