Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop

src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditFloatingActions.js

@@ -35,8 +35,9 @@ function RefundVendorCreditFloatingActions({
           loading={isSubmitting}
           style={{ minWidth: '85px' }}
           type="submit"
-          text="Refund"
-        />
+        >
+          <T id={'refund'} />
+        </Button>
       </div>
     </div>
   );

src/containers/Drawers/BillDrawer/BillDrawerProvider.js

@@ -33,7 +33,7 @@ function BillDrawerProvider({ billId, ...props }) {
     <DrawerLoading loading={loading}>
       <DrawerHeaderContent
         name="bill-drawer"
-        title={intl.get('bill_details')}
+        title={intl.get('bill.details.drawer.title')}
       />
       <BillDrawerContext.Provider value={provider} {...props} />
     </DrawerLoading>

src/containers/Drawers/BillDrawer/utils.js

@@ -87,7 +87,7 @@ export function BillDetailsStatus({ bill }) {
           </Choose.When>
           <Choose.Otherwise>
             <StatusTag intent={Intent.PRIMARY} round={true}>
-              Due
+              <T id={'due'} />
             </StatusTag>
           </Choose.Otherwise>
         </Choose>
@@ -114,7 +114,7 @@ export const BillMenuItem = ({ payload: { onConvert } }) => {
         <Menu>
           <MenuItem
             onClick={onConvert}
-            text={<T id={'convert_to_vendor_credit'} />}
+            text={<T id={'bill.convert_to_credit_note'} />}
           />
         </Menu>
       }

src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailHeader.js

@@ -55,7 +55,7 @@ export default function InvoiceDetailHeader() {
               </ButtonLink>
             </DetailItem>
 
-            <DetailItem label={intl.get('invoice_no')}>
+            <DetailItem label={intl.get('invoice.details.invoice_no')}>
               {invoice.invoice_no}
             </DetailItem>
           </DetailsMenu>
@@ -71,7 +71,7 @@ export default function InvoiceDetailHeader() {
               <strong>{invoice.formatted_due_amount}</strong>
             </DetailItem>
 
-            <DetailItem label={intl.get('payment_amount')}>
+            <DetailItem label={intl.get('invoice.details.payment_amount')}>
               <strong>{invoice.formatted_payment_amount}</strong>
             </DetailItem>
 

src/containers/Drawers/InvoiceDetailDrawer/utils.js

@@ -107,7 +107,7 @@ export const BadDebtMenuItem = ({
           <Can I={SaleInvoiceAction.Edit} a={AbilitySubject.Invoice}>
             <MenuItem
               onClick={onConvert}
-              text={<T id={'convert_to_credit_note'} />}
+              text={<T id={'invoice.convert_to_credit_note'} />}
             />
           </Can>
           <Can I={SaleInvoiceAction.NotifyBySms} a={AbilitySubject.Invoice}>

src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactions/components.js

@@ -79,7 +79,7 @@ export const useInvoicePaymentTransactionsColumns = () => {
       },
       {
         id: 'rate',
-        Header: 'Rate',
+        Header: intl.get('rate'),
         accessor: 'formatted_rate',
         align: 'right',
         width: 100,

src/containers/Purchases/Bills/BillsLanding/components.js

@@ -56,7 +56,7 @@ export function ActionsMenu({
         />
         <MenuItem
           icon={<Icon icon="convert_to" />}
-          text={intl.get('convert_to_vendor_credit')}
+          text={intl.get('bill.convert_to_credit_note')}
           onClick={safeCallback(onConvert, original)}
         />
 

src/containers/Purchases/CreditNotes/CreditNotesLanding/components.js

@@ -63,7 +63,7 @@ export function ActionsMenu({
           }
         >
           <MenuItem
-            // icon={<Icon icon="quick-payment-16" />}
+            icon={<Icon icon="quick-payment-16" />}
             text={intl.get('vendor_credits.action.reconcile_with_bills')}
             onClick={safeCallback(onReconcile, original)}
           />

src/containers/Sales/Invoices/InvoicesLanding/components.js

@@ -147,7 +147,7 @@ export function ActionsMenu({
         />
         <MenuItem
           icon={<Icon icon="convert_to" />}
-          text={intl.get('convert_to_credit_note')}
+          text={intl.get('invoice.convert_to_credit_note')}
           onClick={safeCallback(onConvert, original)}
         />