From 1e472d278ac564cef5a1d154cd07d82f144dd00e Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Tue, 28 Dec 2021 17:01:35 +0200
Subject: [PATCH] fix(Estimate): estimate status.

---
 .../Drawers/EstimateDetailDrawer/components.js  | 17 ++++++++---------
 .../Estimates/EstimatesLanding/EstimatesList.js |  1 -
 .../Estimates/EstimatesLanding/components.js    | 13 ++++++++-----
 src/lang/ar/index.json                          |  3 ++-
 src/lang/en/index.json                          |  4 +++-
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/containers/Drawers/EstimateDetailDrawer/components.js b/src/containers/Drawers/EstimateDetailDrawer/components.js
index d9f470627..a3f6ea63a 100644
--- a/src/containers/Drawers/EstimateDetailDrawer/components.js
+++ b/src/containers/Drawers/EstimateDetailDrawer/components.js
@@ -10,23 +10,22 @@ import { T, Choose } from 'components';
 export function EstimateDetailsStatus({ estimate }) {
   return (
     <Choose>
-      <Choose.When condition={estimate.is_delivered && estimate.is_approved}>
+      <Choose.When condition={estimate.is_approved}>
         <Tag intent={Intent.SUCCESS} round={true}>
           <T id={'approved'} />
         </Tag>
       </Choose.When>
-      <Choose.When condition={estimate.is_delivered && estimate.is_rejected}>
+      <Choose.When condition={estimate.is_rejected}>
         <Tag intent={Intent.DANGER} round={true}>
           <T id={'rejected'} />
         </Tag>
       </Choose.When>
-      <Choose.When
-        condition={
-          estimate.is_delivered &&
-          !estimate.is_rejected &&
-          !estimate.is_approved
-        }
-      >
+      <Choose.When condition={estimate.is_expired}>
+        <Tag intent={Intent.WARNING} round={true}>
+          <T id={'estimate.status.expired'} />
+        </Tag>
+      </Choose.When>
+      <Choose.When condition={estimate.is_delivered}>
         <Tag intent={Intent.SUCCESS} round={true}>
           <T id={'delivered'} />
         </Tag>
diff --git a/src/containers/Sales/Estimates/EstimatesLanding/EstimatesList.js b/src/containers/Sales/Estimates/EstimatesLanding/EstimatesList.js
index ac6561444..b32f1b318 100644
--- a/src/containers/Sales/Estimates/EstimatesLanding/EstimatesList.js
+++ b/src/containers/Sales/Estimates/EstimatesLanding/EstimatesList.js
@@ -43,7 +43,6 @@ function EstimatesList({
         <EstimatesViewTabs />
         <EstimatesDataTable />
       </DashboardPageContent>
-
     </EstimatesListProvider>
   );
 }
diff --git a/src/containers/Sales/Estimates/EstimatesLanding/components.js b/src/containers/Sales/Estimates/EstimatesLanding/components.js
index 1db40660f..37a237845 100644
--- a/src/containers/Sales/Estimates/EstimatesLanding/components.js
+++ b/src/containers/Sales/Estimates/EstimatesLanding/components.js
@@ -24,19 +24,22 @@ import { safeCallback } from 'utils';
  */
 export const statusAccessor = (row) => (
   <Choose>
-    <Choose.When condition={row.is_delivered && row.is_approved}>
+    <Choose.When condition={row.is_approved}>
       <Tag minimal={true} intent={Intent.SUCCESS} round={true}>
         <T id={'approved'} />
       </Tag>
     </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}>
         <T id={'rejected'} />
       </Tag>
     </Choose.When>
-    <Choose.When
-      condition={row.is_delivered && !row.is_rejected && !row.is_approved}
-    >
+    <Choose.When condition={row.is_expired}>
+      <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}>
         <T id={'delivered'} />
       </Tag>
diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json
index f5fd703be..0c0e6d053 100644
--- a/src/lang/ar/index.json
+++ b/src/lang/ar/index.json
@@ -1732,7 +1732,8 @@
   "permissions.inventory_valuation_summary":"ملخص تقييم المخزون ",
   "permissions.inventory_items_details":"تفاصيل منتج المخزون",
   "permissions.cashflow_account_transactions":"معاملات حسابات التدفقات النقدية",
-  "permissions.more_permissions":"عرض المزيد "
+  "permissions.more_permissions":"عرض المزيد ",
 
+  "estimate.status.expired": "منتهية الصلاحية"
 }
 
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index f55a7c95b..1cd3fd0ea 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1719,6 +1719,8 @@
   "permissions.inventory_valuation_summary":"Inventory valuation summary",
   "permissions.inventory_items_details":"Inventory valuation summary",
   "permissions.cashflow_account_transactions":"Cashflow account transactions",
-  "permissions.more_permissions":"More Permissions"
+  "permissions.more_permissions":"More Permissions",
+
+  "estimate.status.expired": "Expired"
 }