Merge branch 'develop' of https://github.com/BigcapitalTech/bigcapital-client into develop

.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
@@ -43,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

src/components/Card.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
-
+ 
 export default function Card({ className, children }) {
   return <div className={classNames('card', className)}>{children}</div>;
 }

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);

src/containers/Drawers/InventoryAdjustmentDetailDrawer/index.js

@@ -19,12 +19,7 @@ function InventoryAdjustmentDetailDrawer({
   payload: { inventoryId },
 }) {
   return (
-    <Drawer
+    <Drawer isOpen={isOpen} name={name} size={'750px'}>
-      isOpen={isOpen}
-      name={name}
-      style={{ minWidth: '700px', maxWidth: '900px' }}
-      size={'65%'}
-    >
       <DrawerSuspense>
         <InventoryAdjustmentDrawerContent inventoryId={inventoryId} />
       </DrawerSuspense>

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 },
   );

src/style/components/DataTable/DataTable.scss

@@ -17,8 +17,9 @@
     display: block;
 
     .thead {
-      overflow-y: auto;
+      overflow: hidden;
-      overflow-x: 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{
+      .skeleton {
-        animation: skeleton-fade-in .3s linear forwards,
+        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{
+    .th {
-      .skeleton{
+      .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;
     }
   }
-}
+}

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,