From b6ffd492fadb9a299e238e33ad5479e308feb125 Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Sun, 7 Mar 2021 21:08:28 +0200 Subject: [PATCH 1/6] fix(paymentmade): fix payment date & cancel and clear button. --- .../PaymentForm/PaymentMadeFloatingActions.js | 14 ++++++++--- .../PaymentMadeFormHeaderFields.js | 24 ++++++++++++------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFloatingActions.js b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFloatingActions.js index 06943211f..768267760 100644 --- a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFloatingActions.js +++ b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFloatingActions.js @@ -10,6 +10,7 @@ import { MenuItem, } from '@blueprintjs/core'; import { FormattedMessage as T } from 'react-intl'; +import { useHistory } from 'react-router-dom'; import classNames from 'classnames'; import { useFormikContext } from 'formik'; import { usePaymentMadeFormContext } from './PaymentMadeFormProvider'; @@ -21,8 +22,11 @@ import { Icon } from 'components'; * Payment made floating actions bar. */ export default function PaymentMadeFloatingActions() { + // History context. + const history = useHistory(); + // Formik context. - const { isSubmitting } = useFormikContext(); + const { isSubmitting, resetForm } = useFormikContext(); // Payment made form context. const { setSubmitPayload, paymentMadeId } = usePaymentMadeFormContext(); @@ -33,10 +37,14 @@ export default function PaymentMadeFloatingActions() { }; // Handle clear button click. - const handleClearBtnClick = (event) => {}; + const handleClearBtnClick = (event) => { + resetForm(); + }; // Handle cancel button click. - const handleCancelBtnClick = (event) => {}; + const handleCancelBtnClick = (event) => { + history.goBack(); + }; // Handle submit & new button click. const handleSubmitAndNewClick = (event) => { diff --git a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js index 886912dae..adb12da66 100644 --- a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js +++ b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js @@ -5,7 +5,7 @@ import { Position, Classes, ControlGroup, - Button + Button, } from '@blueprintjs/core'; import { DateInput } from '@blueprintjs/datetime'; import { FastField, Field, useFormikContext, ErrorMessage } from 'formik'; @@ -21,13 +21,14 @@ import { Money, Hint, Icon, - MoneyInputGroup + MoneyInputGroup, } from 'components'; import withSettings from 'containers/Settings/withSettings'; import { usePaymentMadeFormContext } from './PaymentMadeFormProvider'; import { momentFormatter, tansformDateValue, + handleDateChange, inputIntent, compose, safeSumBy, @@ -40,7 +41,10 @@ import { */ function PaymentMadeFormHeaderFields({ baseCurrency }) { // Formik form context. - const { values: { entries }, setFieldValue } = useFormikContext(); + const { + values: { entries }, + setFieldValue, + } = useFormikContext(); // Payment made form context. const { @@ -49,10 +53,12 @@ function PaymentMadeFormHeaderFields({ baseCurrency }) { isNewMode, setPaymentVendorId, } = usePaymentMadeFormContext(); - + // Sumation of payable full-amount. - const payableFullAmount = useMemo(() => safeSumBy(entries, 'due_amount'), [entries]); - + const payableFullAmount = useMemo(() => safeSumBy(entries, 'due_amount'), [ + entries, + ]); + // Handle receive full-amount click. const handleReceiveFullAmountClick = () => { const newEntries = fullAmountPaymentEntries(entries); @@ -97,7 +103,7 @@ function PaymentMadeFormHeaderFields({ baseCurrency }) { {/* ------------ Payment date ------------ */} - + {({ form, field: { value }, meta: { error, touched } }) => ( } @@ -110,7 +116,9 @@ function PaymentMadeFormHeaderFields({ baseCurrency }) { { + form.setFieldValue('payment_date', formattedDate); + })} popoverProps={{ position: Position.BOTTOM, minimal: true }} inputProps={{ leftIcon: , From e551a89c7b91d55da008e9aee583a027e47ab51e Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Sun, 7 Mar 2021 21:14:07 +0200 Subject: [PATCH 2/6] fix(paymentmade): fix cancel and clear button. --- .../PaymentReceiveForm/PaymentReceiveFloatingActions.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFloatingActions.js b/client/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFloatingActions.js index 6cc28a56b..bc71e8d9e 100644 --- a/client/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFloatingActions.js +++ b/client/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFloatingActions.js @@ -26,7 +26,7 @@ export default function PaymentReceiveFormFloatingActions() { const { setSubmitPayload, isNewMode } = usePaymentReceiveFormContext(); // Formik form context. - const { isSubmitting, submitForm } = useFormikContext(); + const { isSubmitting, submitForm, resetForm } = useFormikContext(); // History context. const history = useHistory(); @@ -38,7 +38,9 @@ export default function PaymentReceiveFormFloatingActions() { }; // Handle clear button click. - const handleClearBtnClick = (event) => {}; + const handleClearBtnClick = (event) => { + resetForm(); + }; // Handle cancel button click. const handleCancelBtnClick = (event) => { From fc884a3014c7bf30b33c3aff2b5873a5fe87fe9b Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Sun, 7 Mar 2021 21:16:31 +0200 Subject: [PATCH 3/6] fix(expense): Expense table. --- client/src/containers/Expenses/ExpensesLanding/components.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/containers/Expenses/ExpensesLanding/components.js b/client/src/containers/Expenses/ExpensesLanding/components.js index 2b4d1c89d..e60f9f70f 100644 --- a/client/src/containers/Expenses/ExpensesLanding/components.js +++ b/client/src/containers/Expenses/ExpensesLanding/components.js @@ -158,6 +158,7 @@ export function useExpensesTableColumns() { accessor: ExpenseAccountAccessor, width: 160, className: 'expense_account', + disableSortBy: true, }, { id: 'published', @@ -170,9 +171,9 @@ export function useExpensesTableColumns() { id: 'description', Header: formatMessage({ id: 'description' }), accessor: DescriptionAccessor, - disableSorting: true, width: 150, className: 'description', + disableSortBy: true, }, { id: 'actions', From e1dd6ffec9922fc285942f27298dce45db2932ef Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Sun, 7 Mar 2021 21:17:25 +0200 Subject: [PATCH 4/6] fix(SaleEstimate): estimate table. --- .../containers/Sales/Estimates/EstimatesLanding/components.js | 4 ++-- server/src/models/SaleEstimate.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/containers/Sales/Estimates/EstimatesLanding/components.js b/client/src/containers/Sales/Estimates/EstimatesLanding/components.js index 21e770c51..e37175482 100644 --- a/client/src/containers/Sales/Estimates/EstimatesLanding/components.js +++ b/client/src/containers/Sales/Estimates/EstimatesLanding/components.js @@ -200,9 +200,9 @@ export function useEstiamtesTableColumns() { { id: 'reference_no', Header: formatMessage({ id: 'reference_no' }), - accessor: 'reference_no', + accessor: 'reference', width: 90, - className: 'reference_no', + className: 'reference', }, { id: 'actions', diff --git a/server/src/models/SaleEstimate.js b/server/src/models/SaleEstimate.js index 0d3ac9f0c..fc732da79 100644 --- a/server/src/models/SaleEstimate.js +++ b/server/src/models/SaleEstimate.js @@ -209,7 +209,7 @@ export default class SaleEstimate extends TenantModel { }, reference_no: { label: "Reference No.", - column: "reference_no", + column: "reference", columnType: "number", fieldType: "number", }, From 5c4d6aee5fd805605d9980b325eb5e3eba8fa859 Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Sun, 7 Mar 2021 21:18:30 +0200 Subject: [PATCH 5/6] refactoring(drawer): drawer template. --- client/src/components/Drawer/Drawer.js | 2 +- .../src/style/components/Drawer/DrawerTemplate.scss | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/client/src/components/Drawer/Drawer.js b/client/src/components/Drawer/Drawer.js index e0c46b331..4d5f35214 100644 --- a/client/src/components/Drawer/Drawer.js +++ b/client/src/components/Drawer/Drawer.js @@ -10,7 +10,7 @@ export default function ({ children, isOpen, isClose, drawerProps }) { position={Position.RIGHT} canOutsideClickClose={true} canEscapeKeyClose={true} - size={'65%'} + size={'700px'} onClose={isClose} {...drawerProps} > diff --git a/client/src/style/components/Drawer/DrawerTemplate.scss b/client/src/style/components/Drawer/DrawerTemplate.scss index 7860a45f3..22a6d58c1 100644 --- a/client/src/style/components/Drawer/DrawerTemplate.scss +++ b/client/src/style/components/Drawer/DrawerTemplate.scss @@ -1,22 +1,21 @@ #page-size { margin: 0 auto; background-color: transparent; - width: 21cm; - // width: 680px; + width: 680px; + // width: 21cm; // height: 29.7cm; padding-bottom: 20px; } .template { background-color: transparent; - margin: 20px; + margin: 25px 20px; &__header { display: flex; align-items: center; justify-content: space-between; - // margin: 0px 40px 16px 0px; - margin: 0px 5px 15px 5px; + margin: 0px 35px 20px 5px; &--title h1 { font-weight: 600; color: #1c4587; @@ -31,11 +30,9 @@ display: flex; flex-wrap: wrap; border-bottom: 2px solid #1155cc; - padding-bottom: 35px; - + padding: 2px 2px 30px; &__info { flex: 0 1 24%; - // flex: 0 1 25%; padding-left: 5px; color: #999999; font-size: 16px; From a054419c8f723fb679463b04c9660fc797d937f6 Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Sun, 7 Mar 2021 21:53:13 +0200 Subject: [PATCH 6/6] fix(itemCategory): sorting itemCategory. --- client/src/containers/ItemsCategories/ItemCategoriesTable.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/containers/ItemsCategories/ItemCategoriesTable.js b/client/src/containers/ItemsCategories/ItemCategoriesTable.js index 7d2190683..c2e515f87 100644 --- a/client/src/containers/ItemsCategories/ItemCategoriesTable.js +++ b/client/src/containers/ItemsCategories/ItemCategoriesTable.js @@ -52,7 +52,6 @@ function ItemsCategoryTable({ loading={isCategoriesLoading} headerLoading={isCategoriesLoading} progressBarLoading={isCategoriesFetching} - manualSortBy={true} expandable={true} sticky={true} selectionColumn={true}