From 79772a93b5ddd50e1b3dd5365d023db24f8c3be4 Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Wed, 15 Sep 2021 15:44:00 +0200
Subject: [PATCH] BIG-63: fix universal search of payment mades.

---
 client/src/components/Details/index.js        |  3 ++-
 .../ItemDetailDrawer/ItemDetailHeader.js      |  2 ++
 .../PaymentMadeUniversalSearch.js             | 24 +++++++++++--------
 .../Sales/Invoices/InvoiceUniversalSearch.js  |  4 ++--
 .../src/style/components/UniversalSearch.scss |  4 +---
 server/src/models/BillPayment.Settings.ts     |  2 +-
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/client/src/components/Details/index.js b/client/src/components/Details/index.js
index 58362042f..ef1690f3c 100644
--- a/client/src/components/Details/index.js
+++ b/client/src/components/Details/index.js
@@ -41,7 +41,7 @@ export function DetailsMenu({
 /**
  * Detail item.
  */
-export function DetailItem({ label, children, name, className }) {
+export function DetailItem({ label, children, name, align, className }) {
   const { minLabelSize } = useDetailsMenuContext();
 
   return (
@@ -50,6 +50,7 @@ export function DetailItem({ label, children, name, className }) {
         'detail-item',
         {
           [`detail-item--${name}`]: name,
+          [`align-${align}`]: align,
         },
         className,
       )}
diff --git a/client/src/containers/Drawers/ItemDetailDrawer/ItemDetailHeader.js b/client/src/containers/Drawers/ItemDetailDrawer/ItemDetailHeader.js
index 72fca7758..a6d925b4d 100644
--- a/client/src/containers/Drawers/ItemDetailDrawer/ItemDetailHeader.js
+++ b/client/src/containers/Drawers/ItemDetailDrawer/ItemDetailHeader.js
@@ -23,10 +23,12 @@ export default function ItemDetailHeader() {
         <DetailItem
           label={intl.get('sell_price')}
           children={item.sell_price_formatted}
+          align={'right'}
         />
         <DetailItem
           label={intl.get('cost_price')}
           children={item.cost_price_formatted}
+          align={'right'}
         />
       </DetailsMenu>
 
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.js b/client/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.js
index 26d64ef80..bd423d01b 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.js
@@ -1,8 +1,9 @@
 import React from 'react';
 import { MenuItem } from '@blueprintjs/core';
 import intl from 'react-intl-universal';
+import { isEmpty } from 'lodash';
 
-import { Icon } from 'components';
+import { Icon, If } from 'components';
 
 import { RESOURCES_TYPES } from 'common/resourcesTypes';
 import withDrawerActions from '../../Drawer/withDrawerActions';
@@ -33,8 +34,8 @@ export const PaymentMadeUniversalSearchSelect = withDrawerActions(
 /**
  * Payment made universal search item.
  */
- export function PaymentMadeUniversalSearchItem(
-  item,
+export function PaymentMadeUniversalSearchItem(
+  { text, label, reference },
   { handleClick, modifiers, query },
 ) {
   return (
@@ -42,16 +43,20 @@ export const PaymentMadeUniversalSearchSelect = withDrawerActions(
       active={modifiers.active}
       text={
         <div>
-          <div>{highlightText(item.text, query)}</div>
+          <div>{highlightText(text, query)}</div>
 
           <span class="bp3-text-muted">
-            {highlightText(item.reference.payment_number, query)}{' '}
-            <Icon icon={'caret-right-16'} iconSize={16} />
-            {highlightText(item.reference.formatted_payment_date, query)}
+            {reference.payment_number && (
+              <>
+                {highlightText(reference.payment_number, query)}
+                <Icon icon={'caret-right-16'} iconSize={16} />
+              </>
+            )}
+            {highlightText(reference.formatted_payment_date, query)}
           </span>
         </div>
       }
-      label={<div class="amount">{item.reference.formatted_amount}</div>}
+      label={<div class="amount">{label}</div>}
       onClick={handleClick}
       className={'universal-search__item--payment-made'}
     />
@@ -64,7 +69,6 @@ export const PaymentMadeUniversalSearchSelect = withDrawerActions(
 const paymentMadeToSearch = (payment) => ({
   id: payment.id,
   text: payment.vendor.display_name,
-  subText: payment.formatted_payment_date,
   label: payment.formatted_amount,
   reference: payment,
 });
@@ -72,7 +76,7 @@ const paymentMadeToSearch = (payment) => ({
 /**
  * Binds universal search payment made configure.
  */
- export const universalSearchPaymentMadeBind = () => ({
+export const universalSearchPaymentMadeBind = () => ({
   resourceType: RESOURCES_TYPES.PAYMENT_MADE,
   optionItemLabel: intl.get('payment_mades'),
   selectItemAction: PaymentMadeUniversalSearchSelect,
diff --git a/client/src/containers/Sales/Invoices/InvoiceUniversalSearch.js b/client/src/containers/Sales/Invoices/InvoiceUniversalSearch.js
index 59b4a3fe5..1f67a1057 100644
--- a/client/src/containers/Sales/Invoices/InvoiceUniversalSearch.js
+++ b/client/src/containers/Sales/Invoices/InvoiceUniversalSearch.js
@@ -81,7 +81,7 @@ export function InvoiceUniversalSearchItem(
           <span class="bp3-text-muted">
             {highlightText(item.reference.invoice_no, query)}{' '}
             <Icon icon={'caret-right-16'} iconSize={16} />
-            {highlightText(item.reference.formatted_invoice_date, query)}
+            {item.reference.formatted_invoice_date}
           </span>
         </div>
       }
@@ -102,7 +102,7 @@ export function InvoiceUniversalSearchItem(
  * @param {*} invoice
  * @returns
  */
- const transformInvoicesToSearch = (invoice) => ({
+const transformInvoicesToSearch = (invoice) => ({
   id: invoice.id,
   text: invoice.customer.display_name,
   label: invoice.formatted_balance,
diff --git a/client/src/style/components/UniversalSearch.scss b/client/src/style/components/UniversalSearch.scss
index 402bc5312..2ee0a989d 100644
--- a/client/src/style/components/UniversalSearch.scss
+++ b/client/src/style/components/UniversalSearch.scss
@@ -110,14 +110,12 @@
               color: #5c7080;
             }
           }
-
         }
 
         &-label {
           flex-direction: row;
+          text-align: right;
         }
-
-
       }
     }
 
diff --git a/server/src/models/BillPayment.Settings.ts b/server/src/models/BillPayment.Settings.ts
index 586d525d5..8ca4113b2 100644
--- a/server/src/models/BillPayment.Settings.ts
+++ b/server/src/models/BillPayment.Settings.ts
@@ -40,7 +40,7 @@ export default {
     payment_number: {
       name: 'bill_payment.field.payment_number',
       column: 'payment_number',
-      fieldType: 'number',
+      fieldType: 'text',
     },
     payment_date: {
       name: 'bill_payment.field.payment_date',