diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cacb0cf11c43..727e9f442ed1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,8 @@ jobs: npm i npm run build 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 .. rm -rf ui php artisan ninja:react diff --git a/VERSION.txt b/VERSION.txt index 51d29ed91e3f..3b739526c772 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.6.8 \ No newline at end of file +5.6.9 \ No newline at end of file diff --git a/app/Export/CSV/InvoiceItemExport.php b/app/Export/CSV/InvoiceItemExport.php index 10841508ab62..fe2533d79edf 100644 --- a/app/Export/CSV/InvoiceItemExport.php +++ b/app/Export/CSV/InvoiceItemExport.php @@ -142,7 +142,7 @@ class InvoiceItemExport extends BaseExport foreach ($invoice->line_items as $item) { $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.")) { $key = str_replace("item.", "", $key); @@ -153,11 +153,13 @@ class InvoiceItemExport extends BaseExport } } } +nlog("item array"); +nlog($item_array); $entity = []; 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)) { $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); $entity = $this->decorateAdvancedFields($invoice, $transformed_items); diff --git a/config/ninja.php b/config/ninja.php index ec107aa75405..13b6b5cdfe37 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.6.8', - 'app_tag' => '5.6.8', + 'app_version' => '5.6.9', + 'app_tag' => '5.6.9', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),