fix(Estimate): estimate status.

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>

src/containers/Sales/Estimates/EstimatesLanding/EstimatesList.js

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

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>

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": "منتهية الصلاحية"
 }
 

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"
 }