From fe4e3720340bc0b966f1736825a1441608c90e9b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 6 Jul 2023 13:53:24 +1000
Subject: [PATCH] Updates for releases

---
 VERSION.txt                          |  2 +-
 app/Export/CSV/InvoiceItemExport.php | 25 ++++++++++++++------
 app/Models/Invoice.php               | 34 ++++++++++++++++++++++++++++
 config/ninja.php                     |  4 ++--
 phpstan.neon                         |  4 ++--
 5 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 3b739526c7..accefefe0c 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.6.9
\ No newline at end of file
+5.6.10
\ No newline at end of file
diff --git a/app/Export/CSV/InvoiceItemExport.php b/app/Export/CSV/InvoiceItemExport.php
index 83181268c1..be3b9e7376 100644
--- a/app/Export/CSV/InvoiceItemExport.php
+++ b/app/Export/CSV/InvoiceItemExport.php
@@ -145,13 +145,18 @@ class InvoiceItemExport extends BaseExport
         $transformed_items = [];
 
         foreach ($invoice->line_items as $item) {
-            $item_array = [];
-
+            $item_array = [];            
             foreach (array_values($this->input['report_keys']) as $key) { //items iterator produces item array
+                
                 if (str_contains($key, "item.")) {
+
                     $key = str_replace("item.", "", $key);
 
-                    $keyval = str_replace("custom_value", "invoice", $key);
+                    if($key == 'type_id')
+                        $keyval = 'type';
+
+                    if($key == 'tax_id')
+                        $keyval = 'tax_category';
 
                     if (property_exists($item, $key)) {
                         $item_array[$keyval] = $item->{$key};
@@ -160,8 +165,6 @@ class InvoiceItemExport extends BaseExport
                     }
                 }
             }
-            nlog("item array");
-            nlog($item_array);
 
             $entity = [];
 
@@ -174,8 +177,8 @@ class InvoiceItemExport extends BaseExport
                     $entity[$keyval] = "";
                 }
             }
-            nlog("entity");
-            nlog($entity);
+            // nlog("entity");
+            // nlog($entity);
 
             $transformed_items = array_merge($transformed_invoice, $item_array);
             $entity = $this->decorateAdvancedFields($invoice, $transformed_items);
@@ -220,6 +223,14 @@ class InvoiceItemExport extends BaseExport
             $entity['currency'] = $invoice->client->currency() ? $invoice->client->currency()->code : $invoice->company->currency()->code;
         }
 
+        if(array_key_exists('type', $entity)) {
+            $entity['type'] = $invoice->typeIdString($entity['type']);
+        }
+
+        if(array_key_exists('tax_category', $entity)) {
+            $entity['tax_category'] = $invoice->taxTypeString($entity['tax_category']);
+        }
+
         if($this->force_keys) {
             $entity['client'] = $invoice->client->present()->name();
             $entity['client_id_number'] = $invoice->client->id_number;
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index f390f21fc5..4c0a19f086 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -889,4 +889,38 @@ class Invoice extends BaseModel
     {
         return ctrans('texts.invoice');
     }
+
+    public function taxTypeString($id)
+    {
+        match(intval($id)){
+            Product::PRODUCT_TYPE_PHYSICAL => $tax_type = ctrans('texts.physical_goods'),
+            Product::PRODUCT_TYPE_SERVICE => $tax_type = ctrans('texts.services'),
+            Product::PRODUCT_TYPE_DIGITAL => $tax_type = ctrans('texts.digital_products'),
+            Product::PRODUCT_TYPE_SHIPPING => $tax_type = ctrans('texts.shipping'),
+            Product::PRODUCT_TYPE_EXEMPT => $tax_type = ctrans('texts.tax_exempt'),
+            Product::PRODUCT_TYPE_REDUCED_TAX => $tax_type = ctrans('texts.reduced_tax'),
+            Product::PRODUCT_TYPE_OVERRIDE_TAX => $tax_type = ctrans('texts.override_tax'),
+            Product::PRODUCT_TYPE_ZERO_RATED => $tax_type = ctrans('texts.zero_rated'),
+            Product::PRODUCT_TYPE_REVERSE_TAX => $tax_type = ctrans('texts.reverse_tax'),
+            default => $tax_type = ctrans('texts.physical_goods'),
+        };
+
+        return $tax_type;
+    }
+
+    public function typeIdString($id)
+    {
+        match($id) {
+            '1' => $type = ctrans('texts.product'),
+            '2' => $type = ctrans('texts.service'),
+            '3' => $type = ctrans('texts.gateway_fees'),
+            '4' => $type = ctrans('texts.gateway_fees'),
+            '5' => $type = ctrans('texts.late_fees'),
+            '6' => $type = ctrans('texts.expense'),
+            default => $type = ctrans('texts.product'),
+        };
+
+        return $type;
+
+    }
 }
diff --git a/config/ninja.php b/config/ninja.php
index 13b6b5cdfe..8ba93f8f8f 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.9',
-    'app_tag' => '5.6.9',
+    'app_version' => '5.6.10',
+    'app_tag' => '5.6.10',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),
diff --git a/phpstan.neon b/phpstan.neon
index b3411ce79b..cebc91d327 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,11 +1,11 @@
 includes:
     - ./vendor/nunomaduro/larastan/extension.neon
-
+    - phpstan-baseline.neon
 parameters:
     treatPhpDocTypesAsCertain: false
     parallel:
         jobSize: 5
-        maximumNumberOfProcesses: 8
+        maximumNumberOfProcesses: 16
         processTimeout: 600.0
     ignoreErrors:
         - '#Call to an undefined method .*badMethod\(\)#'