QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-19 22:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Estimate): estimate status.

Browse Source
This commit is contained in:
a.bouhuolia
2021-12-28 17:01:35 +02:00
parent 1688f49bc1
commit 1e472d278a
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/containers/Drawers/EstimateDetailDrawer/components.js
View File

@@ -10,23 +10,22 @@ import { T, Choose } from 'components';
export function EstimateDetailsStatus({ estimate }) { export function EstimateDetailsStatus({ estimate }) {
return ( return (
<Choose> <Choose>
<Choose.When condition={estimate.is_delivered && estimate.is_approved}> <Choose.When condition={estimate.is_approved}>
<Tag intent={Intent.SUCCESS} round={true}> <Tag intent={Intent.SUCCESS} round={true}>
<T id={'approved'} /> <T id={'approved'} />
</Tag> </Tag>
</Choose.When> </Choose.When>
<Choose.When condition={estimate.is_delivered && estimate.is_rejected}> <Choose.When condition={estimate.is_rejected}>
<Tag intent={Intent.DANGER} round={true}> <Tag intent={Intent.DANGER} round={true}>
<T id={'rejected'} /> <T id={'rejected'} />
</Tag> </Tag>
</Choose.When> </Choose.When>
<Choose.When <Choose.When condition={estimate.is_expired}>
condition={ <Tag intent={Intent.WARNING} round={true}>
estimate.is_delivered && <T id={'estimate.status.expired'} />
!estimate.is_rejected && </Tag>
!estimate.is_approved </Choose.When>
} <Choose.When condition={estimate.is_delivered}>
>
<Tag intent={Intent.SUCCESS} round={true}> <Tag intent={Intent.SUCCESS} round={true}>
<T id={'delivered'} /> <T id={'delivered'} />
</Tag> </Tag>

1
src/containers/Sales/Estimates/EstimatesLanding/EstimatesList.js
View File

@@ -43,7 +43,6 @@ function EstimatesList({
<EstimatesViewTabs /> <EstimatesViewTabs />
<EstimatesDataTable /> <EstimatesDataTable />
</DashboardPageContent> </DashboardPageContent>
</EstimatesListProvider> </EstimatesListProvider>
); );
} }

13
src/containers/Sales/Estimates/EstimatesLanding/components.js
View File

@@ -24,19 +24,22 @@ import { safeCallback } from 'utils';
*/ */
export const statusAccessor = (row) => ( export const statusAccessor = (row) => (
<Choose> <Choose>
<Choose.When condition={row.is_delivered && row.is_approved}> <Choose.When condition={row.is_approved}>
<Tag minimal={true} intent={Intent.SUCCESS} round={true}> <Tag minimal={true} intent={Intent.SUCCESS} round={true}>
<T id={'approved'} /> <T id={'approved'} />
</Tag> </Tag>
</Choose.When> </Choose.When>
<Choose.When condition={row.is_delivered && row.is_rejected}> <Choose.When condition={row.is_rejected}>
<Tag minimal={true} intent={Intent.DANGER} round={true}> <Tag minimal={true} intent={Intent.DANGER} round={true}>
<T id={'rejected'} /> <T id={'rejected'} />
</Tag> </Tag>
</Choose.When> </Choose.When>
<Choose.When <Choose.When condition={row.is_expired}>
condition={row.is_delivered && !row.is_rejected && !row.is_approved} <Tag minimal={true} intent={Intent.WARNING} round={true}>
> <T id={'estimate.status.expired'} />
</Tag>
</Choose.When>
<Choose.When condition={row.is_delivered}>
<Tag minimal={true} intent={Intent.SUCCESS} round={true}> <Tag minimal={true} intent={Intent.SUCCESS} round={true}>
<T id={'delivered'} /> <T id={'delivered'} />
</Tag> </Tag>

3
src/lang/ar/index.json
View File

@@ -1732,7 +1732,8 @@
"permissions.inventory_valuation_summary":"ملخص تقييم المخزون ", "permissions.inventory_valuation_summary":"ملخص تقييم المخزون ",
"permissions.inventory_items_details":"تفاصيل منتج المخزون", "permissions.inventory_items_details":"تفاصيل منتج المخزون",
"permissions.cashflow_account_transactions":"معاملات حسابات التدفقات النقدية", "permissions.cashflow_account_transactions":"معاملات حسابات التدفقات النقدية",
"permissions.more_permissions":"عرض المزيد " "permissions.more_permissions":"عرض المزيد ",
"estimate.status.expired": "منتهية الصلاحية"
} }

4
src/lang/en/index.json
View File

@@ -1719,6 +1719,8 @@
"permissions.inventory_valuation_summary":"Inventory valuation summary", "permissions.inventory_valuation_summary":"Inventory valuation summary",
"permissions.inventory_items_details":"Inventory valuation summary", "permissions.inventory_items_details":"Inventory valuation summary",
"permissions.cashflow_account_transactions":"Cashflow account transactions", "permissions.cashflow_account_transactions":"Cashflow account transactions",
"permissions.more_permissions":"More Permissions" "permissions.more_permissions":"More Permissions",
"estimate.status.expired": "Expired"
} }