diff --git a/app/Designs/Bold.php b/app/Designs/Bold.php index aaed1d075ddf..e7eb132dbce9 100644 --- a/app/Designs/Bold.php +++ b/app/Designs/Bold.php @@ -58,7 +58,7 @@ class Bold extends AbstractDesign return '
-

$your_invoice

$client_details +

$your_invoice_label

$client_details
@@ -99,7 +99,7 @@ class Bold extends AbstractDesign
- $invoice.public_notes + $entity.public_notes
diff --git a/app/Designs/Business.php b/app/Designs/Business.php index 1d81e8d76170..5cc311e5cbbb 100644 --- a/app/Designs/Business.php +++ b/app/Designs/Business.php @@ -28,11 +28,20 @@ class Business extends AbstractDesign + body{font-size:90%} + /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}h1{font-size:2em;margin:.67em 0}a{background-color:transparent}img{border-style:none}[type=button],[type=reset],[type=submit]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring{outline:1px dotted ButtonText}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}[hidden],template{display:none}html{box-sizing:border-box;font-family:sans-serif}*,:after,:before{box-sizing:inherit}h1,h2,h4,p{margin:0}html{font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;line-height:1.5}*,:after,:before{border:0 solid #e2e8f0}img{border-style:solid}[role=button]{cursor:pointer}table{border-collapse:collapse}h1,h2,h4{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}img{display:block;vertical-align:middle;max-width:100%;height:auto}.bg-white{background-color:#fff}.bg-gray-100{background-color:#f7fafc}.bg-gray-200{background-color:#edf2f7}.bg-gray-300{background-color:#e2e8f0}.bg-gray-800{background-color:#2d3748}.bg-gray-900{background-color:#1a202c}.bg-orange-600{background-color:#dd6b20}.bg-orange-700{background-color:#c05621}.bg-teal-600{background-color:#319795}.bg-blue-900{background-color:#2a4365}.border-black{border-color:#000}.border-white{border-color:#fff}.border-gray-300{border-color:#e2e8f0}.border-gray-400{border-color:#cbd5e0}.border-gray-900{border-color:#1a202c}.border-teal-600{border-color:#319795}.border-pink-700{border-color:#b83280}.rounded{border-radius:.25rem}.rounded-lg{border-radius:.5rem}.rounded-t-lg{border-top-left-radius:.5rem}.rounded-r-lg,.rounded-t-lg{border-top-right-radius:.5rem}.rounded-r-lg{border-bottom-right-radius:.5rem}.rounded-l-lg{border-top-left-radius:.5rem;border-bottom-left-radius:.5rem}.border-dashed{border-style:dashed}.border-4{border-width:4px}.border{border-width:1px}.border-t-2{border-top-width:2px}.border-l-2{border-left-width:2px}.border-t-4{border-top-width:4px}.border-b-4{border-bottom-width:4px}.border-t{border-top-width:1px}.border-b{border-bottom-width:1px}.border-l{border-left-width:1px}.inline-block{display:inline-block}.flex{display:-webkit-box;display:flex}.table{display:table}.flex-col{-webkit-box-orient:vertical;-webkit-box-direction:normal;flex-direction:column}.flex-wrap{flex-wrap:wrap}.items-end{-webkit-box-align:end;align-items:flex-end}.items-center{-webkit-box-align:center;align-items:center}.justify-end{-webkit-box-pack:end;justify-content:flex-end}.justify-center{-webkit-box-pack:center;justify-content:center}.justify-between{-webkit-box-pack:justify;justify-content:space-between}.content-center{align-content:center}.font-normal{font-weight:400}.font-medium{font-weight:500}.font-semibold{font-weight:600}.font-bold{font-weight:700}.h-24{height:6rem}.h-auto{height:auto}.m-3{margin:.75rem}.my-1{margin-top:.25rem;margin-bottom:.25rem}.mx-6{margin-left:1.5rem;margin-right:1.5rem}.my-10{margin-top:2.5rem;margin-bottom:2.5rem}.my-12{margin-top:3rem;margin-bottom:3rem}.my-16{margin-top:4rem;margin-bottom:4rem}.mx-16{margin-left:4rem;margin-right:4rem}.my-20{margin-top:5rem;margin-bottom:5rem}.mx-24{margin-left:6rem;margin-right:6rem}.mt-1{margin-top:.25rem}.mt-2{margin-top:.5rem}.mr-2{margin-right:.5rem}.ml-2{margin-left:.5rem}.mr-3{margin-right:.75rem}.mt-4{margin-top:1rem}.mr-4{margin-right:1rem}.mb-4{margin-bottom:1rem}.ml-4{margin-left:1rem}.mt-5{margin-top:1.25rem}.mr-5{margin-right:1.25rem}.ml-5{margin-left:1.25rem}.mt-6{margin-top:1.5rem}.ml-6{margin-left:1.5rem}.mt-8{margin-top:2rem}.mr-8{margin-right:2rem}.ml-8{margin-left:2rem}.mt-10{margin-top:2.5rem}.mr-10{margin-right:2.5rem}.ml-10{margin-left:2.5rem}.mt-12{margin-top:3rem}.mt-16{margin-top:4rem}.ml-16{margin-left:4rem}.mt-20{margin-top:5rem}.mt-24{margin-top:6rem}.ml-24{margin-left:6rem}.mt-32{margin-top:8rem}.mr-40{margin-right:10rem}.ml-40{margin-left:10rem}.p-1{padding:.25rem}.p-5{padding:1.25rem}.p-12{padding:3rem}.p-16{padding:4rem}.p-px{padding:1px}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.py-3{padding-top:.75rem;padding-bottom:.75rem}.px-3{padding-left:.75rem;padding-right:.75rem}.py-4{padding-top:1rem;padding-bottom:1rem}.px-4{padding-left:1rem;padding-right:1rem}.py-5{padding-top:1.25rem;padding-bottom:1.25rem}.px-5{padding-left:1.25rem;padding-right:1.25rem}.py-8{padding-top:2rem;padding-bottom:2rem}.py-10{padding-top:2.5rem;padding-bottom:2.5rem}.px-10{padding-left:2.5rem;padding-right:2.5rem}.py-12{padding-top:3rem;padding-bottom:3rem}.px-12{padding-left:3rem;padding-right:3rem}.py-16{padding-top:4rem;padding-bottom:4rem}.px-16{padding-left:4rem;padding-right:4rem}.pt-4{padding-top:1rem}.pl-4{padding-left:1rem}.pt-5{padding-top:1.25rem}.pb-6{padding-bottom:1.5rem}.pt-10{padding-top:2.5rem}.pt-12{padding-top:3rem}.pl-12{padding-left:3rem}.pb-16{padding-bottom:4rem}.pb-20{padding-bottom:5rem}.static{position:static}.absolute{position:absolute}.relative{position:relative}.bottom-0{bottom:0}.table-auto{table-layout:auto}.text-left{text-align:left}.text-right{text-align:right}.text-white{color:#fff}.text-gray-600{color:#718096}.text-red-700{color:#c53030}.text-red-800{color:#9b2c2c}.text-orange-600{color:#dd6b20}.text-orange-700{color:#c05621}.text-orange-800{color:#9c4221}.text-yellow-600{color:#d69e2e}.text-green-700{color:#2f855a}.text-teal-600{color:#319795}.text-blue-500{color:#4299e1}.text-blue-600{color:#3182ce}.text-pink-700{color:#b83280}.text-xl{font-size:1.25rem}.text-2xl{font-size:1.5rem}.text-5xl{font-size:3rem}.text-6xl{font-size:4rem}.uppercase{text-transform:uppercase}.tracking-tight{letter-spacing:-.025em}.align-middle{vertical-align:middle}.w-24{width:6rem}.w-32{width:8rem}.w-40{width:10rem}.w-48{width:12rem}.w-56{width:14rem}.w-64{width:16rem}.w-auto{width:auto}.w-1\/2{width:50%}.w-1\/3{width:33.333333%}.w-2\/3{width:66.666667%}.w-1\/4{width:25%}.w-full{width:100%} + - + + +
@@ -62,27 +71,13 @@ class Business extends AbstractDesign $client_details
-
-
-
- $invoice_number_label - $invoice_number +
+
+
+ $entity_labels
-
- $po_number_label - $po_number -
-
- $date_label - $date -
-
- $due_date - $due_date_label -
-
- $balance_due_label - $balance_due +
+ $entity_details
@@ -93,8 +88,8 @@ class Business extends AbstractDesign public function table_styles() { return [ - 'table_header_thead_class' => "text-left bg-blue-900 rounded-lg", - 'table_header_td_class' => "font-semibold text-white px-4 py-5", + 'table_header_thead_class' => "text-left bg-blue-900", + 'table_header_td_class' => "font-semibold text-white px-4 bg-blue-900 py-5", 'table_body_td_class' => "border-4 border-white text-orange-700 px-4 py-4", ]; } @@ -103,20 +98,20 @@ class Business extends AbstractDesign return ' - + $table_header $table_body - - - + + - @@ -129,10 +124,10 @@ class Business extends AbstractDesign - - diff --git a/app/Designs/Clean.php b/app/Designs/Clean.php index 8fede5c9d024..a404b5818967 100644 --- a/app/Designs/Clean.php +++ b/app/Designs/Clean.php @@ -28,22 +28,22 @@ class Clean extends AbstractDesign -
+
- $company_logo +
$company_logo
$company_details
-
+
$company_address
@@ -57,7 +57,7 @@ class Clean extends AbstractDesign return '

- $invoice_label + $entity_label

@@ -105,7 +105,7 @@ class Clean extends AbstractDesign
- $invoice.public_notes + $entity.public_notes
diff --git a/app/Designs/Creative.php b/app/Designs/Creative.php index 0d1f43520ff6..f657d5dc034e 100644 --- a/app/Designs/Creative.php +++ b/app/Designs/Creative.php @@ -28,18 +28,29 @@ class Creative extends AbstractDesign -
-
- $company_logo +
+
+
+
+ $client_details +
+
+ $company_details +
+
+ $company_address +
+
+
+ $company_logo +
- -
'; } @@ -47,53 +58,30 @@ class Creative extends AbstractDesign public function body() { return ' -
-
-

$balance_due_label

-
-
- $client_details -
-
-
- $company_details -
-
- $company_address -
-
-
-
-
-

$details_label:

-
-
- $invoice_number_label - $invoice_number -
-
- $date_label - $date -
-
- $due_date_label - $due_date -
-
- $balance_due_label - $balance_due -
-
+
+
+

$entity_label

+ #$entity_number +
+
+
+
+ $entity_labels +
+
+ $entity_details +
+
'; } public function table_styles() { return [ - 'table_header_thead_class' => "text-left border-dashed border-b border-black", - 'table_header_td_class' => "font-normal text-green-700 px-4 py-2", + 'table_header_thead_class' => "text-left rounded-lg", + 'table_header_td_class' => "font-medium uppercase text-pink-700 text-xl px-4 py-5", 'table_body_td_class' => "px-4 py-4", ]; } @@ -101,8 +89,8 @@ class Creative extends AbstractDesign public function table() { return ' -
$invoice.public_notes +
$entity.public_notes $total_tax_labels $line_tax_labels + $total_tax_values $line_tax_values
+ $balance_due_label + $balance_due
- +
+ $table_header @@ -110,7 +98,7 @@ class Creative extends AbstractDesign $table_body - + - - - - - -
$invoice.public_notes$entity.public_notes $total_tax_labels $line_tax_labels @@ -121,20 +109,11 @@ class Creative extends AbstractDesign
+

$terms_label

$terms
- $balance_due_label - - $balance_due -
'; } @@ -142,10 +121,10 @@ class Creative extends AbstractDesign public function footer() { return ' -
-

Thanks

+
+

$balance_due_label

+

$balance_due

-
diff --git a/app/Designs/CreativeRed.php b/app/Designs/Elegant.php similarity index 76% rename from app/Designs/CreativeRed.php rename to app/Designs/Elegant.php index 96584078c777..6b323c1ea704 100644 --- a/app/Designs/CreativeRed.php +++ b/app/Designs/Elegant.php @@ -11,7 +11,7 @@ namespace App\Designs; -class CreativeRed extends AbstractDesign +class Elegant extends AbstractDesign { public function __construct() { @@ -28,29 +28,18 @@ class CreativeRed extends AbstractDesign -
-
-
-
- $client_details -
-
- $company_details -
-
- $company_address -
-
-
- $company_logo -
+
+
+ $company_logo
+ +
'; } @@ -58,44 +47,43 @@ class CreativeRed extends AbstractDesign public function body() { return ' -
-
-

$invoice_label

- #$invoice_number -
-
-
-
- $invoice_number_label - $invoice_number -
-
- $po_number_label - $po_number -
-
- $date_label - $date -
-
- $due_date_label - $due_date -
-
- $balance_due_label - $balance_due -
+
+
+

$balance_due_label

+
+
+ $client_details +
+
+
+ $company_details +
+
+ $company_address +
+
+
+
+
+

$details_label:

+
+
+ $entity_labels +
+
+ $entity_details +
+
-
'; } public function table_styles() { return [ - 'table_header_thead_class' => "text-left rounded-lg", - 'table_header_td_class' => "font-medium uppercase text-pink-700 text-xl px-4 py-5", + 'table_header_thead_class' => "text-left border-dashed border-b border-black", + 'table_header_td_class' => "font-normal text-green-700 px-4 py-2", 'table_body_td_class' => "px-4 py-4", ]; } @@ -103,8 +91,8 @@ class CreativeRed extends AbstractDesign public function table() { return ' - - +
+ $table_header @@ -112,7 +100,7 @@ class CreativeRed extends AbstractDesign $table_body - + - + + + + +
$invoice.public_notes$entity.public_notes $total_tax_labels $line_tax_labels @@ -123,11 +111,20 @@ class CreativeRed extends AbstractDesign
+

$terms_label

$terms
+ $balance_due_label + + $balance_due +
'; } @@ -135,10 +132,10 @@ class CreativeRed extends AbstractDesign public function footer() { return ' -
-

$balance_due_label

-

$balance_due

+
+

Thanks

+
diff --git a/app/Designs/Hipster.php b/app/Designs/Hipster.php index 12dd215ba7b2..fbef0432831e 100644 --- a/app/Designs/Hipster.php +++ b/app/Designs/Hipster.php @@ -28,7 +28,7 @@ class Hipster extends AbstractDesign @@ -63,9 +63,9 @@ class Hipster extends AbstractDesign return '
-

$invoice_label

+

$entity_label

- $invoice_number + $entity_number
$date_label $date @@ -105,7 +105,7 @@ class Hipster extends AbstractDesign $table_body - $invoice.public_notes + $entity.public_notes $total_tax_labels diff --git a/app/Designs/Modern.php b/app/Designs/Modern.php index d9b62b978175..d72a4ac7e6df 100644 --- a/app/Designs/Modern.php +++ b/app/Designs/Modern.php @@ -28,7 +28,7 @@ class Modern extends AbstractDesign @@ -96,7 +96,7 @@ class Modern extends AbstractDesign
- $invoice.public_notes + $entity.public_notes
diff --git a/app/Designs/Photo.php b/app/Designs/Photo.php index dd7282a5deec..1d3759c853e4 100644 --- a/app/Designs/Photo.php +++ b/app/Designs/Photo.php @@ -28,7 +28,7 @@ class Photo extends AbstractDesign diff --git a/app/Designs/Plain.php b/app/Designs/Plain.php index 6b8dba9cb13c..822108ca30c2 100644 --- a/app/Designs/Plain.php +++ b/app/Designs/Plain.php @@ -38,7 +38,7 @@ class Plain extends AbstractDesign
- $invoice_label + $entity_label
$company_details @@ -98,7 +98,7 @@ class Plain extends AbstractDesign
-

$invoice.public_notes

+

$entity.public_notes

$terms_label

$terms

diff --git a/app/Designs/Playful.php b/app/Designs/Playful.php new file mode 100644 index 000000000000..b5e02a8a1361 --- /dev/null +++ b/app/Designs/Playful.php @@ -0,0 +1,147 @@ + + + + $number + + + + + + +
+ +
+
+
+ $company_logo +
+
+
+
+
+ $entity_labels +
+
+ $entity_details +
+
+
+
+
+ '; + + } + + public function body() { + + return ' +
+
+
+

$entity_to_label

+
+
+ $client_details +
+
+
+
+
+
+

$from_label:

+
+
+ $company_details +
+
+
+
+
+ '; + + } + + public function table_styles() { + return [ + 'table_header_thead_class' => "text-left bg-teal-600 rounded-lg", + 'table_header_td_class' => "font-semibold text-white px-4 py-3", + 'table_body_td_class' => "border-b-4 border-teal-600 text-red-800 px-4 py-4", + ]; + } + + public function table() { + + return ' + + + + $table_header + + + + $table_body + + + + + + + + + + + + + + +
$entity.public_notes + $total_tax_labels + $line_tax_labels + + $total_tax_values + $line_tax_values +
+

$terms_label

+

$terms

+
+ $balance_due_label + + $balance_due +
'; + } + + public function footer() { + + return ' +
+ + '; + + } + +} \ No newline at end of file