Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

VERSION.txt

@@ -1 +1 @@
-5.3.8
+5.3.9

app/Import/Transformers/Zoho/InvoiceTransformer.php

@@ -67,7 +67,7 @@ class InvoiceTransformer extends BaseTransformer {
 
 		if ( $transformed['balance'] < $transformed['amount'] ) {
 			$transformed['payments'] = [[
-				'date'   => date( 'Y-m-d' ),
+				'date'   => isset( $invoice_data['Last Payment Date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Invoice Date'] ) ) : date( 'Y-m-d' ),
 				'amount' => $transformed['amount'] - $transformed['balance'],
 			]];
 		}
@@ -75,3 +75,4 @@ class InvoiceTransformer extends BaseTransformer {
 		return $transformed;
 	}
 }
+

app/Models/ClientContact.php

@@ -92,7 +92,7 @@ class ClientContact extends Authenticatable implements HasLocalePreference
         'custom_value4',
         'email',
         'is_primary',
-        'client_id',
+        // 'client_id',
     ];
 
     /**

app/Repositories/ClientContactRepository.php

@@ -56,8 +56,10 @@ class ClientContactRepository extends BaseRepository
 
             if (! $update_contact) {
                 $update_contact = ClientContactFactory::create($client->company_id, $client->user_id);
-                $update_contact->client_id = $client->id;
             }
+            
+            //10-09-2021 - enforce the client->id and remove client_id from fillables
+            $update_contact->client_id = $client->id;
 
             /* We need to set NULL email addresses to blank strings to pass authentication*/
             if(array_key_exists('email', $contact) && is_null($contact['email']))

config/ninja.php

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

public/flutter_service_worker.js

@@ -3,12 +3,12 @@ const MANIFEST = 'flutter-app-manifest';
 const TEMP = 'flutter-temp-cache';
 const CACHE_NAME = 'flutter-app-cache';
 const RESOURCES = {
-  "main.dart.js": "a4ce90340b3e610ee073d2f40c0377c1",
-"version.json": "46d4015fc9abcefe5371cafcf2084173",
+  "main.dart.js": "0124649b1dd42c7fd93b9489eaf99b1e",
+"version.json": "9ec5e3813adc4bfd8713556c5059e97d",
 "manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40",
 "icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
 "icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
-"/": "7fb4e233bcd97d5af44e8e4ed2d9784b",
+"/": "debe3f3301b29dcbdc324fb3f330965a",
 "assets/NOTICES": "9eb7e2eb2888ea5bae5f536720db37cd",
 "assets/fonts/MaterialIcons-Regular.otf": "4e6447691c9509f7acdbf8a931a85ca1",
 "assets/AssetManifest.json": "38d9aea341601f3a5c6fa7b5a1216ea5",

public/version.json

@@ -1 +1 @@
-{"app_name":"invoiceninja_flutter","version":"5.0.58","build_number":"58"}
+{"app_name":"invoiceninja_flutter","version":"5.0.59","build_number":"59"}