From 9474a4fcd1ee36a5328b9f7a789b49c27988269d Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Thu, 30 Dec 2021 11:56:58 +0200
Subject: [PATCH 1/4] BIG-197 Bill landed amount text right align.

---
 src/containers/Dialogs/AllocateLandedCostDialog/utils.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/containers/Dialogs/AllocateLandedCostDialog/utils.js b/src/containers/Dialogs/AllocateLandedCostDialog/utils.js
index e3fb5ac3b..0cf420992 100644
--- a/src/containers/Dialogs/AllocateLandedCostDialog/utils.js
+++ b/src/containers/Dialogs/AllocateLandedCostDialog/utils.js
@@ -89,11 +89,14 @@ export const useAllocateLandedCostEntriesTableColumns = () => {
         accessor: 'rate',
         disableSortBy: true,
         width: '100',
+        align: 'right',
+
       },
       {
         Header: intl.get('amount'),
         accessor: 'amount',
         disableSortBy: true,
+        align: 'right',
         width: '100',
       },
       {

From fa23aa67d3f6c3b59f1ed3b0f06dc29568d03901 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Thu, 30 Dec 2021 12:15:23 +0200
Subject: [PATCH 2/4] BIG-202 Remove the allocate actions bar.

---
 .../BillDrawer/BillDetailActionsBar.js        |  6 ++++++
 .../BillDrawer/LocatedLandedCostTable.js      | 20 ++-----------------
 src/containers/Drawers/BillDrawer/utils.js    |  8 +++++++-
 src/lang/ar/index.json                        |  1 +
 src/lang/en/index.json                        |  1 +
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js b/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js
index 0db244234..7f78410b5 100644
--- a/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js
+++ b/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js
@@ -69,6 +69,11 @@ function BillDetailActionsBar({
     openDialog('quick-payment-made', { billId });
   };
 
+  // Handle allocate landed cost button click.
+  const handleAllocateCostClick = () => {
+    openDialog('allocate-landed-cost', { billId });
+  };
+
   return (
     <DrawerActionsBar>
       <NavbarGroup>
@@ -106,6 +111,7 @@ function BillDetailActionsBar({
           <BillMenuItem
             payload={{
               onConvert: handleConvertToVendorCredit,
+              onAllocateLandedCost: handleAllocateCostClick,
             }}
           />
         </Can>
diff --git a/src/containers/Drawers/BillDrawer/LocatedLandedCostTable.js b/src/containers/Drawers/BillDrawer/LocatedLandedCostTable.js
index fa536fa92..300928a4d 100644
--- a/src/containers/Drawers/BillDrawer/LocatedLandedCostTable.js
+++ b/src/containers/Drawers/BillDrawer/LocatedLandedCostTable.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { DataTable, Card, FormattedMessage as T } from 'components';
-import { Button, Classes, NavbarGroup } from '@blueprintjs/core';
 
 import { useLocatedLandedCostColumns, ActionsMenu } from './components';
 import { useBillDrawerContext } from './BillDrawerProvider';
@@ -13,8 +12,7 @@ import { TableStyle } from '../../../common';
 import TableSkeletonRows from 'components/Datatable/TableSkeletonRows';
 
 import { compose } from 'utils';
-import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
-import Icon from 'components/Icon';
+
 
 /**
  * Located landed cost table.
@@ -32,10 +30,7 @@ function LocatedLandedCostTable({
   const columns = useLocatedLandedCostColumns();
   const { transactions, billId } = useBillDrawerContext();
 
-  // Handle allocate landed cost button click.
-  const handleAllocateCostClick = () => {
-    openDialog('allocate-landed-cost', { billId });
-  };
+
 
   // Handle the transaction delete action.
   const handleDeleteTransaction = ({ id }) => {
@@ -60,17 +55,6 @@ function LocatedLandedCostTable({
 
   return (
     <div>
-      <DashboardActionsBar>
-        <NavbarGroup>
-          <Button
-            className={Classes.MINIMAL}
-            icon={<Icon icon="receipt-24" />}
-            text={<T id={'allocate_landed_coast'} />}
-            onClick={handleAllocateCostClick}
-          />
-        </NavbarGroup>
-      </DashboardActionsBar>
-
       <Card>
         <DataTable
           columns={columns}
diff --git a/src/containers/Drawers/BillDrawer/utils.js b/src/containers/Drawers/BillDrawer/utils.js
index 55d1a958c..2b5871332 100644
--- a/src/containers/Drawers/BillDrawer/utils.js
+++ b/src/containers/Drawers/BillDrawer/utils.js
@@ -101,7 +101,9 @@ export function BillDetailsStatus({ bill }) {
   );
 }
 
-export const BillMenuItem = ({ payload: { onConvert } }) => {
+export const BillMenuItem = ({
+  payload: { onConvert, onAllocateLandedCost },
+}) => {
   return (
     <Popover
       minimal={true}
@@ -112,6 +114,10 @@ export const BillMenuItem = ({ payload: { onConvert } }) => {
       }}
       content={
         <Menu>
+          <MenuItem
+            onClick={onAllocateLandedCost}
+            text={<T id={'bill.allocate_landed_coast'} />}
+          />
           <MenuItem
             onClick={onConvert}
             text={<T id={'bill.convert_to_credit_note'} />}
diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json
index 20134c86f..fdec423dc 100644
--- a/src/lang/ar/index.json
+++ b/src/lang/ar/index.json
@@ -1682,6 +1682,7 @@
   "inventory_adjustment.column.product":"المنتج",
   "invoice.convert_to_credit_note":"تحويل إلى إشعار دائن",
   "bill.convert_to_credit_note":"تحويل إلى إشعار مدين",
+  "bill.allocate_landed_coast":"تحميل تكلفة اضافية",
   "overdue":"متأخرّة",
   "invite_user.label.role_name":"دور المستخدم",
   "permissions.column.view": "عرض",
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index 1cd3fd0ea..7456ead45 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1670,6 +1670,7 @@
   "inventory_adjustment.column.product":"Product",
   "invoice.convert_to_credit_note":"Convert to Credit Note",
   "bill.convert_to_credit_note":"Convert to Vendor Credit",
+  "bill.allocate_landed_coast":"Allocate Landed Cost",
   "overdue":"Overdue",
   "permissions.column.view": "View",
   "permissions.column.full_access": "Full Access",

From 6b98e1f1c285d3af01760b230a1661007ddb8701 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Thu, 30 Dec 2021 12:28:42 +0200
Subject: [PATCH 3/4] BIG-204 payment transactions context menu actions.

---
 .../BillPaymentTransactionTable.js                     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.js b/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.js
index 8ef93e23b..f19c23bd4 100644
--- a/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.js
+++ b/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.js
@@ -40,15 +40,15 @@ function BillPaymentTransactionTable({
   });
 
   // Handles delete bill payment transactions.
-  const handleDeleteBillPaymentTransactons = ({ bill_id }) => {
-    openAlert('bill-delete', {
-      billId: bill_id,
+  const handleDeleteBillPaymentTransactons = ({ bill_payment_id }) => {
+    openAlert('payment-made-delete', {
+      paymentMadeId: bill_payment_id,
     });
   };
 
   // Handles edit  bill payment transactions.
-  const handleEditBillPaymentTransactions = ({ bill_id }) => {
-    history.push(`/bills/${bill_id}/edit`);
+  const handleEditBillPaymentTransactions = ({ bill_payment_id }) => {
+    history.push(`/payment-mades/${bill_payment_id}/edit`);
     closeDrawer('bill-drawer');
   };
 

From 75b1cce380b2273ccc2d14490fd5bd0ec279aeca Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Thu, 30 Dec 2021 12:35:28 +0200
Subject: [PATCH 4/4] BIG-211 Invalidate reconciliation credit & vendor
 transaction.

---
 src/hooks/query/creditNote.js   | 4 ++++
 src/hooks/query/vendorCredit.js | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/hooks/query/creditNote.js b/src/hooks/query/creditNote.js
index 9b05391c9..8bed87936 100644
--- a/src/hooks/query/creditNote.js
+++ b/src/hooks/query/creditNote.js
@@ -31,6 +31,10 @@ const commonInvalidateQueries = (queryClient) => {
   queryClient.invalidateQueries(t.RECONCILE_CREDIT_NOTE);
   queryClient.invalidateQueries(t.RECONCILE_CREDIT_NOTES);
 
+  // Invalidate invoices.
+  queryClient.invalidateQueries(t.SALE_INVOICES);
+  queryClient.invalidateQueries(t.SALE_INVOICE);
+
   // Invalidate financial reports.
   queryClient.invalidateQueries(t.FINANCIAL_REPORT);
 };
diff --git a/src/hooks/query/vendorCredit.js b/src/hooks/query/vendorCredit.js
index 45fddee27..8e6af88aa 100644
--- a/src/hooks/query/vendorCredit.js
+++ b/src/hooks/query/vendorCredit.js
@@ -31,6 +31,10 @@ const commonInvalidateQueries = (queryClient) => {
   queryClient.invalidateQueries(t.RECONCILE_VENDOR_CREDIT);
   queryClient.invalidateQueries(t.RECONCILE_VENDOR_CREDITS);
 
+  // Invalidate bills.
+  queryClient.invalidateQueries(t.BILL);
+  queryClient.invalidateQueries(t.BILLS);
+
   // Invalidate financial reports.
   queryClient.invalidateQueries(t.FINANCIAL_REPORT);
 };