Merge branch 'develop' into fix-spelling-a-char

2026-02-17 13:20:31 +00:00 · 2023-08-22 22:49:39 +02:00
parent 1411f64cf6 f898acdb8b
commit 34efd58f34
301 changed files with 9345 additions and 7022 deletions
--- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormTopBar.tsx
+++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormTopBar.tsx
@@ -1,11 +1,10 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
+
 import {
  Alignment,
  NavbarGroup,
  NavbarDivider,
-  Button,
  Classes,
 } from '@blueprintjs/core';
 import {
@@ -15,12 +14,13 @@ import {
 import { Features } from '@/constants';
 import { useFeatureCan } from '@/hooks/state';
 import {
-  Icon,
  BranchSelect,
  FeatureCan,
  WarehouseSelect,
  FormTopbar,
  DetailsBarSkeletonBase,
+  FormWarehouseSelectButton,
+  FormBranchSelectButton,
 } from '@/components';
 import { useCreditNoteFormContext } from './CreditNoteFormProvider';

@@ -70,8 +70,9 @@ function CreditNoteFormSelectBranch() {
    <BranchSelect
      name={'branch_id'}
      branches={branches}
-      input={CreditNoteBranchSelectButton}
+      input={FormBranchSelectButton}
      popoverProps={{ minimal: true }}
+      fill={false}
    />
  );
 }
@@ -86,30 +87,9 @@ function CreditFormSelectWarehouse() {
    <WarehouseSelect
      name={'warehouse_id'}
      warehouses={warehouses}
-      input={CreditNoteWarehouseSelectButton}
+      input={FormWarehouseSelectButton}
      popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function CreditNoteWarehouseSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('credit_note.warehouse_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
-    />
-  );
-}
-
-function CreditNoteBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('credit_note.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
    />
  );
 }
--- a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimtaeFormTopBar.tsx
+++ b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimtaeFormTopBar.tsx
@@ -1,11 +1,9 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
 import {
  Alignment,
  NavbarGroup,
  NavbarDivider,
-  Button,
  Classes,
 } from '@blueprintjs/core';
 import {
@@ -15,12 +13,13 @@ import {
 import { Features } from '@/constants';
 import { useFeatureCan } from '@/hooks/state';
 import {
-  Icon,
  BranchSelect,
  FeatureCan,
  WarehouseSelect,
  FormTopbar,
  DetailsBarSkeletonBase,
+  FormWarehouseSelectButton,
+  FormBranchSelectButton,
 } from '@/components';
 import { useEstimateFormContext } from './EstimateFormProvider';

@@ -70,8 +69,9 @@ function EstimateFormSelectBranch() {
    <BranchSelect
      name={'branch_id'}
      branches={branches}
-      input={EstimateBranchSelectButton}
+      input={FormBranchSelectButton}
      popoverProps={{ minimal: true }}
+      fill={false}
    />
  );
 }
@@ -86,30 +86,9 @@ function EstimateFormSelectWarehouse() {
    <WarehouseSelect
      name={'warehouse_id'}
      warehouses={warehouses}
-      input={EstimateWarehouseSelectButton}
+      input={FormWarehouseSelectButton}
      popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function EstimateWarehouseSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('estimate.warehouse_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
-    />
-  );
-}
-
-function EstimateBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('estimate.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
    />
  );
 }
--- a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.tsx
+++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.tsx
@@ -1,12 +1,10 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
 import styled from 'styled-components';
 import {
  Alignment,
  NavbarGroup,
  NavbarDivider,
-  Button,
  Classes,
 } from '@blueprintjs/core';
 import {
@@ -18,11 +16,12 @@ import { Features } from '@/constants';
 import { useInvoiceFormContext } from './InvoiceFormProvider';
 import { useFeatureCan } from '@/hooks/state';
 import {
-  Icon,
  BranchSelect,
  FeatureCan,
  WarehouseSelect,
  FormTopbar,
+  FormWarehouseSelectButton,
+  FormBranchSelectButton,
 } from '@/components';

 /**
@@ -70,8 +69,9 @@ function InvoiceFormSelectBranch() {
    <BranchSelect
      name={'branch_id'}
      branches={branches}
-      input={InvoiceBranchSelectButton}
+      input={FormBranchSelectButton}
      popoverProps={{ minimal: true }}
+      fill={false}
    />
  );
 }
@@ -86,30 +86,9 @@ function InvoiceFormSelectWarehouse() {
    <WarehouseSelect
      name={'warehouse_id'}
      warehouses={warehouses}
-      input={InvoiceWarehouseSelectButton}
+      input={FormWarehouseSelectButton}
      popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function InvoiceWarehouseSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('invoice.warehouse_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
-    />
-  );
-}
-
-function InvoiceBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('invoice.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
    />
  );
 }
--- a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.tsx
+++ b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.tsx
@@ -7,25 +7,18 @@ import { FFormGroup, FEditableText, FormattedMessage as T } from '@/components';
 export function PaymentReceiveFormFootetLeft() {
  return (
    <React.Fragment>
-      {/* --------- Statement--------- */}
-      <PaymentMsgFormGroup
-        name={'message'}
-        label={<T id={'payment_receive_form.message.label'} />}
-      >
-        <FEditableText
-          name={'message'}
-          placeholder={intl.get('payment_receive_form.message.placeholder')}
-        />
-      </PaymentMsgFormGroup>
-
      {/* --------- Internal Note--------- */}
      <TermsConditsFormGroup
-        name={'internal_note'}
+        name={'statement'}
        label={<T id={'payment_receive_form.label.note'} />}
+        fastField={true}
      >
        <FEditableText
-          name={'internal_note'}
-          placeholder={intl.get('payment_receive_form.internal_note.placeholder')}
+          name={'statement'}
+          placeholder={intl.get(
+            'payment_receive_form.internal_note.placeholder',
+          )}
+          fastField={true}
        />
      </TermsConditsFormGroup>
    </React.Fragment>
@@ -43,17 +36,3 @@ const TermsConditsFormGroup = styled(FFormGroup)`
    }
  }
 `;
-
-const PaymentMsgFormGroup = styled(FFormGroup)`
-  &.bp3-form-group {
-    margin-bottom: 40px;
-
-    .bp3-label {
-      font-size: 12px;
-      margin-bottom: 12px;
-    }
-    .bp3-form-content {
-      margin-left: 10px;
-    }
-  }
-`;
--- a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormTopBar.tsx
+++ b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormTopBar.tsx
@@ -1,22 +1,21 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
-import { Alignment, NavbarGroup, Button, Classes } from '@blueprintjs/core';
+import { Alignment, NavbarGroup, Classes } from '@blueprintjs/core';
 import { useSetPrimaryBranchToForm } from './utils';
 import { useFeatureCan } from '@/hooks/state';
 import {
-  Icon,
  BranchSelect,
  FeatureCan,
  FormTopbar,
  DetailsBarSkeletonBase,
+  FormBranchSelectButton,
 } from '@/components';
 import { usePaymentReceiveFormContext } from './PaymentReceiveFormProvider';
 import { Features } from '@/constants';

 /**
 * Payment receive from top bar.
- * @returns
+ * @returns {JSX.Element}
 */
 export default function PaymentReceiveFormTopBar() {
  // Features guard.
@@ -29,7 +28,6 @@ export default function PaymentReceiveFormTopBar() {
  if (!featureCan(Features.Branches)) {
    return null;
  }
-
  return (
    <FormTopbar>
      <NavbarGroup align={Alignment.LEFT}>
@@ -41,6 +39,10 @@ export default function PaymentReceiveFormTopBar() {
  );
 }

+/**
+ * Branch select of payment receive form.
+ * @returns {JSX.Element}
+ */
 function PaymentReceiveFormSelectBranch() {
  // payment receive form context.
  const { branches, isBranchesLoading } = usePaymentReceiveFormContext();
@@ -51,19 +53,9 @@ function PaymentReceiveFormSelectBranch() {
    <BranchSelect
      name={'branch_id'}
      branches={branches}
-      input={PaymentReceiveBranchSelectButton}
+      input={FormBranchSelectButton}
      popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function PaymentReceiveBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('payment_receive.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
    />
  );
 }
--- a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormTopbar.tsx
+++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormTopbar.tsx
@@ -1,12 +1,9 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
-import styled from 'styled-components';
 import {
  Alignment,
  NavbarGroup,
  NavbarDivider,
-  Button,
  Classes,
 } from '@blueprintjs/core';
 import {
@@ -18,12 +15,13 @@ import { Features } from '@/constants';
 import { useFeatureCan } from '@/hooks/state';
 import { useReceiptFormContext } from './ReceiptFormProvider';
 import {
-  Icon,
  BranchSelect,
  FeatureCan,
  WarehouseSelect,
  FormTopbar,
  DetailsBarSkeletonBase,
+  FormBranchSelectButton,
+  FormWarehouseSelectButton,
 } from '@/components';

 /**
@@ -76,8 +74,9 @@ function ReceiptFormSelectBranch() {
    <BranchSelect
      name={'branch_id'}
      branches={branches}
-      input={ReceiptBranchSelectButton}
+      input={FormBranchSelectButton}
      popoverProps={{ minimal: true }}
+      fill={false}
    />
  );
 }
@@ -96,30 +95,9 @@ function ReceiptFormSelectWarehouse() {
    <WarehouseSelect
      name={'warehouse_id'}
      warehouses={warehouses}
-      input={ReceiptWarehouseSelectButton}
+      input={FormWarehouseSelectButton}
      popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function ReceiptBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('receipt.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
-    />
-  );
-}
-
-function ReceiptWarehouseSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('receipt.warehouse_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
+      fill={false}
    />
  );
 }