From 0fc1a7815ad2755383cb5df9f81e1de2ab5f1e3e Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 21 Sep 2021 21:10:57 +0200 Subject: [PATCH 1/7] feat: message error landed cost. --- src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js b/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js index 826e9c925..45b78e093 100644 --- a/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js +++ b/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js @@ -35,7 +35,7 @@ function BillTransactionDeleteAlert({ deleteLandedCostMutate(BillId) .then(() => { AppToaster.show({ - message: intl.get('the_landed_cost_has_been_deleted_successfully'), + message: intl.get('bill.action.delete_successfully.landed_cost'), intent: Intent.SUCCESS, }); closeAlert(name); From 12606d1857377962ade837ef1fa75fe3dd583d25 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Tue, 21 Sep 2021 21:23:56 +0200 Subject: [PATCH 2/7] chore: remove job branches filter. --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e0afaba4..52753d496 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,9 +7,6 @@ jobs: working_directory: ~/app docker: - image: docker:17.05.0-ce-git - branches: - only: - - master steps: - checkout: path: ~/app From ecf56f3b990fc1d2080959fe4cfdd34cd828bb48 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 21 Sep 2021 22:09:41 +0200 Subject: [PATCH 3/7] fix: table header overflow. --- src/style/components/DataTable/DataTable.scss | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/src/style/components/DataTable/DataTable.scss b/src/style/components/DataTable/DataTable.scss index 36bd7f5a9..62bbdc146 100644 --- a/src/style/components/DataTable/DataTable.scss +++ b/src/style/components/DataTable/DataTable.scss @@ -17,8 +17,9 @@ display: block; .thead { - overflow-y: auto; - overflow-x: hidden; + overflow: hidden; + // overflow-y: auto; + // overflow-x: hidden; .th { padding: 0.7rem 0.5rem; @@ -28,7 +29,7 @@ font-weight: 600; border-bottom: 1px solid rgb(224, 224, 224); - > div{ + > div { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -65,16 +66,16 @@ } } - .bp3-context-menu-popover-target{ + .bp3-context-menu-popover-target { z-index: 100; } - .tr-context{ + .tr-context { display: flex; flex: 1 0 auto; } - &:hover .td.clickable{ + &:hover .td.clickable { cursor: pointer; } } @@ -89,7 +90,7 @@ margin: 0; padding: 0.5rem; - .cell-inner{ + .cell-inner { flex: 1 0 0; } @@ -115,7 +116,7 @@ .inner-resizer { height: 100%; width: 1px; - border-left: 1px solid #E6E6E6; + border-left: 1px solid #e6e6e6; margin: 0 auto; } @@ -141,11 +142,11 @@ } } - .skeleton{ - animation: skeleton-fade-in .3s linear forwards, + .skeleton { + animation: skeleton-fade-in 0.3s linear forwards, skeleton-glow 1s linear infinite alternate; - animation-delay: 0s,.3s; + animation-delay: 0s, 0.3s; height: 8px; opacity: 1; width: 65%; @@ -153,8 +154,8 @@ } } - .th{ - .skeleton{ + .th { + .skeleton { margin: 5px 0; } } @@ -177,7 +178,7 @@ .placeholder { color: #a0a0a0; } - .text-overview{ + .text-overview { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -188,7 +189,7 @@ } &.is-text-overview { - .expend-padding{ + .expend-padding { display: flex; width: 100%; } @@ -219,7 +220,6 @@ } } .tr.no-results { - .td { flex-direction: column; padding: 18px 20px; @@ -228,7 +228,7 @@ font-size: 14px; border-bottom: 0; - &:hover{ + &:hover { background: transparent; } } @@ -269,7 +269,7 @@ } } - .tr-inner{ + .tr-inner { display: flex; width: 100%; } @@ -332,14 +332,11 @@ } } - - .ReactVirtualized__Grid{ + .ReactVirtualized__Grid { will-change: auto !important; } } - - .table-constrant { .table { .thead .th { @@ -360,4 +357,4 @@ border-bottom: 1px solid #d2dce2; } } -} \ No newline at end of file +} From 14012c4d7e028b3f18df7e1a4b7a6718746b75fd Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Tue, 21 Sep 2021 22:25:24 +0200 Subject: [PATCH 4/7] test circleci --- src/components/Card.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Card.js b/src/components/Card.js index 4e8c3e256..65dd41eed 100644 --- a/src/components/Card.js +++ b/src/components/Card.js @@ -1,6 +1,6 @@ import React from 'react'; import classNames from 'classnames'; - + export default function Card({ className, children }) { return
{children}
; } From 7b85dfee5daf9ac4b58c7383c2c24b9148b50c14 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Tue, 21 Sep 2021 22:32:14 +0200 Subject: [PATCH 5/7] chore: add circleci build and publish workflow. --- .circleci/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 52753d496..82db60c76 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,3 +40,11 @@ jobs: command: | docker login -u abouhuolia -p 1532015325_ASdfqwer docker push abouhuolia/bigcapital-client:latest + +workflows: + build_and_publish: # name of your workflow + jobs: + - build: + filters: + branches: + only: master From 5fc4897663f453dfd4ec35dbc0bf033880d512e2 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 22 Sep 2021 13:56:43 +0200 Subject: [PATCH 6/7] BIG-116: payment made transcation. --- .../PaymentMadeDetailDrawer/PaymentMadeDetailProvider.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailProvider.js b/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailProvider.js index b51368ba5..35f039283 100644 --- a/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailProvider.js +++ b/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailProvider.js @@ -34,7 +34,7 @@ function PaymentMadeDetailProvider({ paymentMadeId, ...props }) { } = useTransactionsByReference( { reference_id: paymentMadeId, - reference_type: 'paymentMade', + reference_type: 'BillPayment', }, { enabled: !!paymentMadeId }, ); From fd07306102fdb545dbc2f24fb60ba777d0a68482 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 22 Sep 2021 15:25:30 +0200 Subject: [PATCH 7/7] fix: inventory adjustment style. --- .../Drawers/InventoryAdjustmentDetailDrawer/index.js | 7 +------ .../Drawers/InventoryAdjustmentDrawer.module.scss | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/containers/Drawers/InventoryAdjustmentDetailDrawer/index.js b/src/containers/Drawers/InventoryAdjustmentDetailDrawer/index.js index f614bc782..fd9b0a12d 100644 --- a/src/containers/Drawers/InventoryAdjustmentDetailDrawer/index.js +++ b/src/containers/Drawers/InventoryAdjustmentDetailDrawer/index.js @@ -19,12 +19,7 @@ function InventoryAdjustmentDetailDrawer({ payload: { inventoryId }, }) { return ( - + diff --git a/src/style/components/Drawers/InventoryAdjustmentDrawer.module.scss b/src/style/components/Drawers/InventoryAdjustmentDrawer.module.scss index 52706bbfb..211c2f9ba 100644 --- a/src/style/components/Drawers/InventoryAdjustmentDrawer.module.scss +++ b/src/style/components/Drawers/InventoryAdjustmentDrawer.module.scss @@ -1,6 +1,7 @@ .detail_panel { :global .card { padding: 22px 15px; + margin: 15px; } &_header { @@ -9,6 +10,7 @@ &_table { :global .bigcapital-datatable { + margin-top: 30px; .thead, .tbody { .quantity,