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

Fixes for releases

Browse Source
This commit is contained in:
David Bomba 2023-07-06 13:11:35 +10:00
parent 7dab130ecd
commit 7526f347a9
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@ -48,7 +48,7 @@ jobs:
npm run build npm run build
cp -r dist/react/* ../public/react cp -r dist/react/* ../public/react
mkdir -p public/tinymce_6.4.2/tinymce/js/ mkdir -p public/tinymce_6.4.2/tinymce/js/
cp -r node_modules/tinymce ../public/tinymce_6.4.2/tinymce/js/ cp -r node_modules/tinymce public/tinymce_6.4.2/tinymce/js/
cd .. cd ..
rm -rf ui rm -rf ui
php artisan ninja:react php artisan ninja:react

18
app/Export/CSV/InvoiceItemExport.php
View File

@ -69,9 +69,9 @@ class InvoiceItemExport extends BaseExport
'total_taxes' => 'total_taxes', 'total_taxes' => 'total_taxes',
'currency' => 'currency_id', 'currency' => 'currency_id',
'quantity' => 'item.quantity', 'quantity' => 'item.quantity',
'unit_cost' => 'item.cost', 'cost' => 'item.cost',
'product_key' => 'item.product_key', 'product_key' => 'item.product_key',
'cost' => 'item.product_cost', 'buy_price' => 'item.product_cost',
'notes' => 'item.notes', 'notes' => 'item.notes',
'discount' => 'item.discount', 'discount' => 'item.discount',
'is_amount_discount' => 'item.is_amount_discount', 'is_amount_discount' => 'item.is_amount_discount',
@ -87,6 +87,8 @@ class InvoiceItemExport extends BaseExport
'invoice2' => 'item.custom_value2', 'invoice2' => 'item.custom_value2',
'invoice3' => 'item.custom_value3', 'invoice3' => 'item.custom_value3',
'invoice4' => 'item.custom_value4', 'invoice4' => 'item.custom_value4',
'tax_category' => 'item.tax_id',
'type' => 'item.type_id',
]; ];
private array $decorate_keys = [ private array $decorate_keys = [
@ -149,14 +151,18 @@ class InvoiceItemExport extends BaseExport
if (str_contains($key, "item.")) { if (str_contains($key, "item.")) {
$key = str_replace("item.", "", $key); $key = str_replace("item.", "", $key);
$keyval = str_replace("custom_value", "invoice", $key);
if (property_exists($item, $key)) { if (property_exists($item, $key)) {
$item_array[$key] = $item->{$key}; $item_array[$keyval] = $item->{$key};
} else { } else {
$item_array[$key] = ''; $item_array[$keyval] = '';
} }
} }
} }
nlog("item array");
nlog($item_array);
$entity = []; $entity = [];
foreach (array_values($this->input['report_keys']) as $key) { //create an array of report keys only foreach (array_values($this->input['report_keys']) as $key) { //create an array of report keys only
@ -168,6 +174,8 @@ class InvoiceItemExport extends BaseExport
$entity[$keyval] = ""; $entity[$keyval] = "";
} }
} }
nlog("entity");
nlog($entity);
$transformed_items = array_merge($transformed_invoice, $item_array); $transformed_items = array_merge($transformed_invoice, $item_array);
$entity = $this->decorateAdvancedFields($invoice, $transformed_items); $entity = $this->decorateAdvancedFields($invoice, $transformed_items);

2
lang/en/texts.php
View File

@ -5113,7 +5113,7 @@ $LANG = array(
'item_tax_rate1' => 'Item Tax Rate 1', 'item_tax_rate1' => 'Item Tax Rate 1',
'item_tax_rate2' => 'Item Tax Rate 2', 'item_tax_rate2' => 'Item Tax Rate 2',
'item_tax_rate3' => 'Item Tax Rate 3', 'item_tax_rate3' => 'Item Tax Rate 3',
'buy_price' => 'Buy Price',
); );

6
phpstan.neon
View File

@ -4,9 +4,9 @@ includes:
parameters: parameters:
treatPhpDocTypesAsCertain: false treatPhpDocTypesAsCertain: false
parallel: parallel:
jobSize: 20 jobSize: 5
maximumNumberOfProcesses: 2 maximumNumberOfProcesses: 8
processTimeout: 300.0 processTimeout: 600.0
ignoreErrors: ignoreErrors:
- '#Call to an undefined method .*badMethod\(\)#' - '#Call to an undefined method .*badMethod\(\)#'
- '#Call to an undefined method Illuminate\Database\Eloquent\Builder::exclude#' - '#Call to an undefined method Illuminate\Database\Eloquent\Builder::exclude#'