mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-10-31 15:57:33 -04:00 
			
		
		
		
	Update rest of the designs with new $pdf_variables key
This commit is contained in:
		
							parent
							
								
									23577a5f0f
								
							
						
					
					
						commit
						169eb4a766
					
				| @ -20,12 +20,6 @@ class Bold extends BaseDesign | ||||
| { | ||||
|     use MakesInvoiceValues, DesignHelpers; | ||||
| 
 | ||||
|     /** Global list of table elements, @var array */ | ||||
|     public $elements; | ||||
| 
 | ||||
|     /** @var App\Models\Client */ | ||||
|     public $client; | ||||
| 
 | ||||
|     /** @var App\Models\Invoice || @var App\Models\Quote */ | ||||
|     public $entity; | ||||
| 
 | ||||
| @ -82,7 +76,7 @@ class Bold extends BaseDesign | ||||
| 
 | ||||
|     public function companyDetails() | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_details; | ||||
|         $variables = $this->context['pdf_variables']['company_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -95,7 +89,7 @@ class Bold extends BaseDesign | ||||
| 
 | ||||
|     public function companyAddress(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_address; | ||||
|         $variables = $this->context['pdf_variables']['company_address']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -108,7 +102,7 @@ class Bold extends BaseDesign | ||||
| 
 | ||||
|     public function clientDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->client_details; | ||||
|         $variables = $this->context['pdf_variables']['client_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -121,10 +115,10 @@ class Bold extends BaseDesign | ||||
| 
 | ||||
|     public function entityDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->invoice_details; | ||||
|         $variables = $this->context['pdf_variables']['invoice_details']; | ||||
| 
 | ||||
|         if ($this->entity instanceof \App\Models\Quote) { | ||||
|             $variables = $this->entity->company->settings->pdf_variables->quote_details; | ||||
|             $variables = $this->context['pdf_variables']['quote_details']; | ||||
|         } | ||||
| 
 | ||||
|         $elements = []; | ||||
| @ -174,7 +168,7 @@ class Bold extends BaseDesign | ||||
|         foreach ($items as $row) { | ||||
|             $element = ['element' => 'tr', 'content' => '', 'elements' => []]; | ||||
| 
 | ||||
|             foreach ($this->context['product-table-columns'] as $key => $cell) { | ||||
|             foreach ($this->context['pdf_variables']['product_columns'] as $key => $cell) { | ||||
|                 $element['elements'][] = ['element' => 'td', 'content' => $row[$cell], 'properties' => ['class' => 'px-4 py-4']]; | ||||
|             } | ||||
| 
 | ||||
|  | ||||
| @ -82,7 +82,7 @@ class Business extends BaseDesign | ||||
| 
 | ||||
|     public function companyDetails() | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_details; | ||||
|         $variables = $this->context['pdf_variables']['company_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -95,7 +95,7 @@ class Business extends BaseDesign | ||||
| 
 | ||||
|     public function companyAddress(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_address; | ||||
|         $variables = $this->context['pdf_variables']['company_address']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -108,7 +108,7 @@ class Business extends BaseDesign | ||||
| 
 | ||||
|     public function clientDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->client_details; | ||||
|         $variables = $this->context['pdf_variables']['client_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -121,10 +121,10 @@ class Business extends BaseDesign | ||||
| 
 | ||||
|     public function entityDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->invoice_details; | ||||
|         $variables = $this->context['pdf_variables']['invoice_details']; | ||||
| 
 | ||||
|         if ($this->entity instanceof \App\Models\Quote) { | ||||
|             $variables = $this->entity->company->settings->pdf_variables->quote_details; | ||||
|             $variables = $this->context['pdf_variables']['quote_details']; | ||||
|         } | ||||
| 
 | ||||
|         $elements = []; | ||||
| @ -154,7 +154,7 @@ class Business extends BaseDesign | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
|         foreach ($this->context['product-table-columns'] as $column) { | ||||
|         foreach ($this->context['pdf_variables']['product_columns'] as $column) { | ||||
|             $elements[] = ['element' => 'th', 'content' => $column . '_label', 'properties' => ['class' => 'font-semibold text-white px-4 bg-blue-900 py-5']]; | ||||
|         } | ||||
| 
 | ||||
| @ -174,7 +174,7 @@ class Business extends BaseDesign | ||||
|         foreach ($items as $row) { | ||||
|             $element = ['element' => 'tr', 'content' => '', 'elements' => []]; | ||||
| 
 | ||||
|             foreach ($this->context['product-table-columns'] as $key => $cell) { | ||||
|             foreach ($this->context['pdf_variables']['product_columns'] as $key => $cell) { | ||||
|                 $element['elements'][] = ['element' => 'td', 'content' => $row[$cell], 'properties' => ['class' => 'border-4 border-white px-4 py-4 bg-gray-200']]; | ||||
|             } | ||||
| 
 | ||||
|  | ||||
| @ -82,7 +82,7 @@ class Clean extends BaseDesign | ||||
| 
 | ||||
|     public function companyDetails() | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_details; | ||||
|         $variables = $this->context['pdf_variables']['company_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -95,7 +95,7 @@ class Clean extends BaseDesign | ||||
| 
 | ||||
|     public function companyAddress(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_address; | ||||
|         $variables = $this->context['pdf_variables']['company_address']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -108,10 +108,10 @@ class Clean extends BaseDesign | ||||
| 
 | ||||
|     public function entityDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->invoice_details; | ||||
|         $variables = $this->context['pdf_variables']['invoice_details']; | ||||
| 
 | ||||
|         if ($this->entity instanceof \App\Models\Quote) { | ||||
|             $variables = $this->entity->company->settings->pdf_variables->quote_details; | ||||
|             $variables = $this->context['pdf_variables']['quote_details']; | ||||
|         } | ||||
| 
 | ||||
|         $elements = []; | ||||
| @ -128,7 +128,7 @@ class Clean extends BaseDesign | ||||
| 
 | ||||
|     public function clientDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->client_details; | ||||
|         $variables = $this->context['pdf_variables']['client_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -154,7 +154,7 @@ class Clean extends BaseDesign | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
|         foreach ($this->context['product-table-columns'] as $column) { | ||||
|         foreach ($this->context['pdf_variables']['product_columns'] as $column) { | ||||
|             $elements[] = ['element' => 'th', 'content' => $column . '_label', 'properties' => ['class' => 'font-semibold px-4 py-5']]; | ||||
|         } | ||||
| 
 | ||||
| @ -174,7 +174,7 @@ class Clean extends BaseDesign | ||||
|         foreach ($items as $row) { | ||||
|             $element = ['element' => 'tr', 'content' => '', 'elements' => []]; | ||||
| 
 | ||||
|             foreach ($this->context['product-table-columns'] as $key => $cell) { | ||||
|             foreach ($this->context['pdf_variables']['product_columns'] as $key => $cell) { | ||||
|                 $element['elements'][] = ['element' => 'td', 'content' => $row[$cell], 'properties' => ['class' => 'border-t border-b px-4 py-4']]; | ||||
|             } | ||||
| 
 | ||||
|  | ||||
| @ -82,7 +82,7 @@ class Creative extends BaseDesign | ||||
| 
 | ||||
|     public function companyDetails() | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_details; | ||||
|         $variables = $this->context['pdf_variables']['company_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -95,7 +95,7 @@ class Creative extends BaseDesign | ||||
| 
 | ||||
|     public function companyAddress(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_address; | ||||
|         $variables = $this->context['pdf_variables']['company_address']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -108,7 +108,7 @@ class Creative extends BaseDesign | ||||
| 
 | ||||
|     public function clientDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->client_details; | ||||
|         $variables = $this->context['pdf_variables']['client_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -121,10 +121,10 @@ class Creative extends BaseDesign | ||||
| 
 | ||||
|     public function entityDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->invoice_details; | ||||
|         $variables = $this->context['pdf_variables']['invoice_details']; | ||||
| 
 | ||||
|         if ($this->entity instanceof \App\Models\Quote) { | ||||
|             $variables = $this->entity->company->settings->pdf_variables->quote_details; | ||||
|             $variables = $this->context['pdf_variables']['quote_details']; | ||||
|         } | ||||
| 
 | ||||
|         $elements = []; | ||||
| @ -154,7 +154,7 @@ class Creative extends BaseDesign | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
|         foreach ($this->context['product-table-columns'] as $column) { | ||||
|         foreach ($this->context['pdf_variables']['product_columns'] as $column) { | ||||
|             $elements[] = ['element' => 'th', 'content' => $column . '_label', 'properties' => ['class' => 'font-medium uppercase text-pink-700 text-xl px-4 py-5']]; | ||||
|         } | ||||
| 
 | ||||
| @ -174,7 +174,7 @@ class Creative extends BaseDesign | ||||
|         foreach ($items as $row) { | ||||
|             $element = ['element' => 'tr', 'content' => '', 'elements' => []]; | ||||
| 
 | ||||
|             foreach ($this->context['product-table-columns'] as $key => $cell) { | ||||
|             foreach ($this->context['pdf_variables']['product_columns'] as $key => $cell) { | ||||
|                 $element['elements'][] = ['element' => 'td', 'content' => $row[$cell], 'properties' => ['class' => 'px-4 py-4']]; | ||||
|             } | ||||
| 
 | ||||
|  | ||||
| @ -82,10 +82,10 @@ class Elegant extends BaseDesign | ||||
| 
 | ||||
|     public function entityDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->invoice_details; | ||||
|         $variables = $this->context['pdf_variables']['invoice_details']; | ||||
| 
 | ||||
|         if ($this->entity instanceof \App\Models\Quote) { | ||||
|             $variables = $this->entity->company->settings->pdf_variables->quote_details; | ||||
|             $variables = $this->context['pdf_variables']['quote_details']; | ||||
|         } | ||||
| 
 | ||||
|         $elements = []; | ||||
| @ -103,7 +103,7 @@ class Elegant extends BaseDesign | ||||
| 
 | ||||
|     public function companyDetails() | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_details; | ||||
|         $variables = $this->context['pdf_variables']['company_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -116,7 +116,7 @@ class Elegant extends BaseDesign | ||||
| 
 | ||||
|     public function companyAddress(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_address; | ||||
|         $variables = $this->context['pdf_variables']['company_address']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -129,7 +129,7 @@ class Elegant extends BaseDesign | ||||
| 
 | ||||
|     public function clientDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->client_details; | ||||
|         $variables = $this->context['pdf_variables']['client_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -155,7 +155,7 @@ class Elegant extends BaseDesign | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
|         foreach ($this->context['product-table-columns'] as $column) { | ||||
|         foreach ($this->context['pdf_variables']['product_columns'] as $column) { | ||||
|             $elements[] = ['element' => 'th', 'content' => $column . '_label', 'properties' => ['class' => 'font-normal text-green-700 px-4 py-2']]; | ||||
|         } | ||||
| 
 | ||||
| @ -175,7 +175,7 @@ class Elegant extends BaseDesign | ||||
|         foreach ($items as $row) { | ||||
|             $element = ['element' => 'tr', 'properties' => ['class' => 'border-dashed border-b border-black'], 'content' => '', 'elements' => []]; | ||||
| 
 | ||||
|             foreach ($this->context['product-table-columns'] as $key => $cell) { | ||||
|             foreach ($this->context['pdf_variables']['product_columns'] as $key => $cell) { | ||||
|                 $element['elements'][] = ['element' => 'td', 'content' => $row[$cell], 'properties' => ['class' => 'px-4 py-3']]; | ||||
|             } | ||||
| 
 | ||||
|  | ||||
| @ -82,7 +82,7 @@ class Hipster extends BaseDesign | ||||
| 
 | ||||
|     public function companyDetails() | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_details; | ||||
|         $variables = $this->context['pdf_variables']['company_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -95,7 +95,7 @@ class Hipster extends BaseDesign | ||||
| 
 | ||||
|     public function companyAddress(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_address; | ||||
|         $variables = $this->context['pdf_variables']['company_address']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -108,7 +108,7 @@ class Hipster extends BaseDesign | ||||
| 
 | ||||
|     public function clientDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->client_details; | ||||
|         $variables = $this->context['pdf_variables']['client_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -121,10 +121,10 @@ class Hipster extends BaseDesign | ||||
| 
 | ||||
|     public function entityDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->invoice_details; | ||||
|         $variables = $this->context['pdf_variables']['invoice_details']; | ||||
| 
 | ||||
|         if ($this->entity instanceof \App\Models\Quote) { | ||||
|             $variables = $this->entity->company->settings->pdf_variables->quote_details; | ||||
|             $variables = $this->context['pdf_variables']['quote_details']; | ||||
|         } | ||||
| 
 | ||||
|         $elements = []; | ||||
| @ -154,7 +154,7 @@ class Hipster extends BaseDesign | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
|         foreach ($this->context['product-table-columns'] as $column) { | ||||
|         foreach ($this->context['pdf_variables']['product_columns'] as $column) { | ||||
|             $elements[] = ['element' => 'th', 'content' => $column . '_label', 'properties' => ['class' => 'border-l-2 border-black px-4 py-2 uppercase']]; | ||||
|         } | ||||
| 
 | ||||
| @ -174,7 +174,7 @@ class Hipster extends BaseDesign | ||||
|         foreach ($items as $row) { | ||||
|             $element = ['element' => 'tr', 'content' => '', 'elements' => []]; | ||||
| 
 | ||||
|             foreach ($this->context['product-table-columns'] as $key => $cell) { | ||||
|             foreach ($this->context['pdf_variables']['product_columns'] as $key => $cell) { | ||||
|                 $element['elements'][] = ['element' => 'td', 'content' => $row[$cell], 'properties' => ['class' => 'border-l-2 border-black px-4 py-4']]; | ||||
|             } | ||||
| 
 | ||||
|  | ||||
| @ -82,10 +82,10 @@ class Modern extends BaseDesign | ||||
| 
 | ||||
|     public function entityDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->invoice_details; | ||||
|         $variables = $this->context['pdf_variables']['invoice_details']; | ||||
| 
 | ||||
|         if ($this->entity instanceof \App\Models\Quote) { | ||||
|             $variables = $this->entity->company->settings->pdf_variables->quote_details; | ||||
|             $variables = $this->context['pdf_variables']['quote_details']; | ||||
|         } | ||||
| 
 | ||||
|         $elements = []; | ||||
| @ -102,7 +102,7 @@ class Modern extends BaseDesign | ||||
| 
 | ||||
|     public function clientDetails(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->client_details; | ||||
|         $variables = $this->context['pdf_variables']['client_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -128,7 +128,7 @@ class Modern extends BaseDesign | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
|         foreach ($this->context['product-table-columns'] as $column) { | ||||
|         foreach ($this->context['pdf_variables']['product_columns'] as $column) { | ||||
|             $elements[] = ['element' => 'th', 'content' => $column . '_label', 'properties' => ['class' => 'px-4 py-2']]; | ||||
|         } | ||||
| 
 | ||||
| @ -148,7 +148,7 @@ class Modern extends BaseDesign | ||||
|         foreach ($items as $row) { | ||||
|             $element = ['element' => 'tr', 'properties' => ['class' => 'border-t border-b border-gray-900'], 'content' => '', 'elements' => []]; | ||||
| 
 | ||||
|             foreach ($this->context['product-table-columns'] as $key => $cell) { | ||||
|             foreach ($this->context['pdf_variables']['product_columns'] as $key => $cell) { | ||||
|                 $element['elements'][] = ['element' => 'td', 'content' => $row[$cell], 'properties' => ['class' => 'px-4 py-4']]; | ||||
|             } | ||||
| 
 | ||||
| @ -187,7 +187,7 @@ class Modern extends BaseDesign | ||||
| 
 | ||||
|     public function companyDetails() | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_details; | ||||
|         $variables = $this->context['pdf_variables']['company_details']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
| @ -200,7 +200,7 @@ class Modern extends BaseDesign | ||||
| 
 | ||||
|     public function companyAddress(): array | ||||
|     { | ||||
|         $variables = $this->entity->company->settings->pdf_variables->company_address; | ||||
|         $variables = $this->context['pdf_variables']['company_address']; | ||||
| 
 | ||||
|         $elements = []; | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user