diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeFields.module.scss b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeFields.module.scss index 7222b3187..fbcbbbb5e 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeFields.module.scss +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeFields.module.scss @@ -1,5 +1,6 @@ .root { flex: 1; + background: #fff; } .mainFields{ @@ -16,4 +17,8 @@ padding: 10px 16px; border-top: 1px solid #d9d9d9; flex-flow: row-reverse; +} + +.showCompanyLogoField:global(.bp4-large){ + font-size: 14px; } \ No newline at end of file diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeGeneralFields.module.scss b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeGeneralFields.module.scss new file mode 100644 index 000000000..e11e108a5 --- /dev/null +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeGeneralFields.module.scss @@ -0,0 +1,3 @@ +.showCompanyLogoField{ + font-size: 14px; +} \ No newline at end of file diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeGeneralFields.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeGeneralFields.tsx index cd3e3039c..7972e40a9 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeGeneralFields.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeGeneralFields.tsx @@ -1,4 +1,5 @@ -import { Box, FFormGroup, FSwitch, Stack } from '@/components'; +// @ts-nocheck +import { FFormGroup, FSwitch, Stack } from '@/components'; import { FColorInput } from './FColorField'; import styles from './InvoiceCustomizeFields.module.scss'; import { Classes } from '@blueprintjs/core'; @@ -6,39 +7,48 @@ import { Classes } from '@blueprintjs/core'; export function InvoiceCustomizeGeneralField() { return ( - -

General Branding

+ +

General Branding

Set your invoice details to be automatically applied every time
you create a new invoice.

- - - + + + + - - - + + + - - - + + + +
); } diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeHeader.module.scss b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeHeader.module.scss index afca06e9b..72c7764a1 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeHeader.module.scss +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeHeader.module.scss @@ -5,7 +5,7 @@ box-shadow: 0 1px 0 rgba(17, 20, 24, .15); display: flex; flex: 0 0 auto; - min-height: 40px; + min-height: 55px; padding: 5px 5px 5px 20px; position: relative; background-color: #fff; @@ -14,6 +14,6 @@ .title{ margin: 0; - font-size: 19px; + font-size: 20px; font-weight: 500; } \ No newline at end of file diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizePreviewContent.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizePreviewContent.tsx index 0e526ccee..fd504f2c5 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizePreviewContent.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizePreviewContent.tsx @@ -3,7 +3,7 @@ import { PaperTemplate } from './PaperTemplate'; export function InvoiceCustomizePreviewContent() { return ( - + ); diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.module.scss b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.module.scss index 4989f86f2..ae98db880 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.module.scss +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.module.scss @@ -2,16 +2,19 @@ .root { border-radius: 5px; background-color: #fff; - box-shadow: inset 0 4px 0px 0 #002762, 0 10px 15px rgba(0, 0, 0, 0.15); - padding: 22px; + color: #000; + box-shadow: inset 0 4px 0px 0 #002762, 0 10px 15px rgba(0, 0, 0, 0.05); + padding: 22px 30px; position: relative; } .bigTitle{ font-size: 60px; margin: 0; - LINE-HEIGHT: 1; - MARGIN-BOTTOM: 20px; + line-height: 1; + margin-bottom: 20px; + font-weight: 500; + color: #333; } .details { @@ -22,11 +25,12 @@ } .detail { display: flex; - flex-direction: row; - gap: 10px; + flex-direction: row; + gap: 12px; } .detailLabel { min-width: 120px; + color: #333; } .addressRoot{ @@ -42,7 +46,7 @@ flex: 1; } -.table :global { +.table { margin-top: 40px; width: 100%; border-collapse: collapse; @@ -51,6 +55,18 @@ thead th{ font-weight: 400; border-bottom: 1px solid #000; + padding: 5px 10px; + + &.rate, + &.total{ + text-align: right; + } + &:first-of-type{ + padding-left: 0; + } + &:last-of-type{ + padding-right: 0; + } } tbody{ @@ -59,8 +75,20 @@ } td{ - border: 1px solid #F6F6F6; - padding: 10px 0; + border-bottom: 1px solid #F6F6F6; + padding: 12px 10px; + + &:first-of-type{ + padding-left: 0; + } + &:last-of-type{ + padding-right: 0; + } + + &.rate, + &.total{ + text-align: right; + } } } } @@ -78,6 +106,13 @@ .totalsItemLabel{ min-width: 160px; } +.totalsItemAmount{ + flex: 1 1 auto; + text-align: right; +} +.totalBottomBordered { + border-bottom: 1px solid #000; +} .logoWrap{ height: 120px; @@ -85,21 +120,24 @@ position: absolute; right: 20px; top: 20px; + border-radius: 5px; + overflow: hidden; img{ max-width: 100%; } } - .footer{ } .paragraph{ margin-bottom: 20px; + font-size: 12px; } .paragraphLabel{ - color: #333333; + margin-bottom: 2px; + color: #666; } \ No newline at end of file diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.tsx index eac6baec6..ca542c98c 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.tsx @@ -1,3 +1,4 @@ +import clsx from 'classnames'; import styles from './PaperTemplate.module.scss'; export function PaperTemplate() { @@ -7,7 +8,10 @@ export function PaperTemplate() {

Invoice

- +
@@ -30,7 +34,7 @@ export function PaperTemplate() {
- Bigcapital Technology, Inc.
+ Bigcapital Technology, Inc.
131 Continental Dr Suite 305 Newark,
Delaware 19713 @@ -43,7 +47,7 @@ export function PaperTemplate() {
- Billed To
+ Billed To
Bigcapital Technology, Inc.
131 Continental Dr Suite 305 Newark,
@@ -62,17 +66,17 @@ export function PaperTemplate() { Item Description - Rate - Total + Rate + Total - + Simply dummy text Simply dummy text of the printing and typesetting - 1 X $100,00 - $100,00 + 1 X $100,00 + $100,00 @@ -81,37 +85,37 @@ export function PaperTemplate() {
Sub Total
-
630.00
+
630.00
Discount
-
0.00
+
0.00
Sample Tax1 (4.70%)
-
11.75
+
11.75
Sample Tax2 (7.00%)
-
21.00
+
21.00
-
+
Total
-
$662.75
+
$662.75
Payment Made
-
100.00
+
100.00
-
+
Balance Due
-
$562.75
+
$562.75