Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 02:04:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Custom values for invoice templates

Browse Source
This commit is contained in:
David Bomba 2019-09-03 16:01:40 +10:00
parent 28a214a9bc
commit f9a5bd3444
4 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Factory/InvoiceItemFactory.php
View File

@ -11,12 +11,14 @@
namespace App\Factory; namespace App\Factory;
use Illuminate\Support\Carbon;
class InvoiceItemFactory class InvoiceItemFactory
{ {
public static function create() :\stdClass public static function create() :\stdClass
{ {
$item = new \stdClass; $item = new \stdClass;
$item->qty = 0; $item->quantity = 0;
$item->cost = 0; $item->cost = 0;
$item->product_key = ''; $item->product_key = '';
$item->notes = ''; $item->notes = '';
@ -28,9 +30,13 @@ class InvoiceItemFactory
$item->tax_rate2 = 0; $item->tax_rate2 = 0;
$item->sort_id = 0; $item->sort_id = 0;
$item->line_total = 0; $item->line_total = 0;
$item->invoice_item_type_id = 0; $item->date = Carbon::now();
$item->custom_value1 = NULL;
$item->custom_value2 = NULL;
$item->custom_value3 = NULL;
$item->custom_value4 = NULL;
return $item; return $item;
} }
} }

46
app/Utils/Traits/MakesInvoiceValues.php
View File

@ -226,7 +226,6 @@ trait MakesInvoiceValues
*/ */
public function table(array $columns) :string public function table(array $columns) :string
{ {
//need to transform taxes and custom labels between the header column and value columns
$data = '<table class="table table-hover table-striped">'; $data = '<table class="table table-hover table-striped">';
@ -237,17 +236,11 @@ trait MakesInvoiceValues
$data .= '</tr></thead>'; $data .= '</tr></thead>';
$columns = str_replace(['custom_invoice_label1', $columns = $this->transformColumns($columns);
'custom_invoice_label2',
'custom_invoice_label3',
'custom_invoice_label4'],
['custom_invoice_value1',
'custom_invoice_value2',
'custom_invoice_value3',
'custom_invoice_value4'],
$columns);
foreach($this->line_items as $item) $items = $this->transformLineItems($this->line_items);
foreach($items as $item)
{ {
$data .= '<tr class="item">'; $data .= '<tr class="item">';
@ -262,4 +255,35 @@ trait MakesInvoiceValues
$data .= '</table>'; $data .= '</table>';
} }
/**
* Transform the column headers into invoice variables
* @param array $columns The column header values
* @return array The invoice variables
*/
private function transformColumns(array $columns) :array
{
return str_replace(['custom_invoice_label1',
'custom_invoice_label2',
'custom_invoice_label3',
'custom_invoice_label4',
'tax_name1',
'tax_name2'],
['custom_invoice_value1',
'custom_invoice_value2',
'custom_invoice_value3',
'custom_invoice_value4',
'tax_rate1',
'tax_rate2'],
$columns);
}
/**
* Formats the line items for display
* @param array $items The array of invoice items
* @return array The formatted array of invoice items
*/
private function transformLineItems(array $items) :array
{
}
} }

3
resources/views/pdf/design1.blade.php
View File

@ -171,7 +171,8 @@
notes notes
cost cost
quantity quantity
taxes (tax_name1, tax_name2, tax_rate1, tax_rate2) tax_name1
tax_name2
line_total line_total
custom_label1 ( will show as the following parameter as its value -> custom_invoice_value1 ) custom_label1 ( will show as the following parameter as its value -> custom_invoice_value1 )
custom_label2 ( will show as the following parameter as its value -> custom_invoice_value2 ) custom_label2 ( will show as the following parameter as its value -> custom_invoice_value2 )

2
tests/Unit/MakesInvoiceValuesTest.php
View File

@ -28,7 +28,7 @@ class MakesInvoiceValuesTest extends TestCase
$this->assertTrue(in_array("custom_invoice_value3", $columns)); $this->assertTrue(in_array("custom_invoice_value3", $columns));
$this->assertFalse(in_array("custom_invoice_value1", $columns));
} }