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

Fixes for tinymce build

Browse Source
This commit is contained in:
David Bomba 2023-07-06 12:00:23 +10:00
parent 91d2ec13d8
commit 2b24c2fd88
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,8 @@ jobs:
npm i npm i
npm run build npm run build
cp -r dist/react/* ../public/react cp -r dist/react/* ../public/react
cp -r node_modules/tinymce ../public/ mkdir 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

2
VERSION.txt
View File

@ -1 +1 @@
5.6.8 5.6.9

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

@ -142,7 +142,7 @@ class InvoiceItemExport extends BaseExport
foreach ($invoice->line_items as $item) { foreach ($invoice->line_items as $item) {
$item_array = []; $item_array = [];
foreach (array_values($this->input['report_keys']) as $key) { foreach (array_values($this->input['report_keys']) as $key) { //items iterator produces item array
if (str_contains($key, "item.")) { if (str_contains($key, "item.")) {
$key = str_replace("item.", "", $key); $key = str_replace("item.", "", $key);
@ -153,11 +153,13 @@ class InvoiceItemExport extends BaseExport
} }
} }
} }
nlog("item array");
nlog($item_array);
$entity = []; $entity = [];
foreach (array_values($this->input['report_keys']) as $key) { foreach (array_values($this->input['report_keys']) as $key) {
$keyval = array_search($key, $this->entity_keys); $keyval = array_search($key, $this->entity_keys);
if (array_key_exists($key, $transformed_items)) { if (array_key_exists($key, $transformed_items)) {
$entity[$keyval] = $transformed_items[$key]; $entity[$keyval] = $transformed_items[$key];
@ -166,6 +168,9 @@ class InvoiceItemExport extends BaseExport
} }
} }
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);

4
config/ninja.php
View File

@ -15,8 +15,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.6.8', 'app_version' => '5.6.9',
'app_tag' => '5.6.8', 'app_tag' => '5.6.9',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),