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

app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php

@@ -33,9 +33,9 @@ class MatchBankTransactionRequest extends Request
             'transactions' => 'bail|array',
             'transactions.*.id' => 'bail|required',
             'transactions.*.invoice_ids' => 'nullable|string|sometimes',
-            'transactions.*.ninja_category_id' => 'nullable|string|sometimes'
         ];
 
+        $rules['transactions.*.ninja_category_id'] = 'bail|nullable|sometimes|exists:expense_categories,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
         $rules['transactions.*.vendor_id'] = 'bail|sometimes|exists:vendors,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
 
         return $rules;

app/Http/ValidationRules/User/HasValidPhoneNumber.php

@@ -47,11 +47,11 @@ class HasValidPhoneNumber implements Rule
 		if(!$sid)
 			return true; 
 
-		$twilio = new Twilio\Rest\Client($sid, $token);
+		$twilio = new \Twilio\Rest\Client($sid, $token);
 
 		$country = auth()->user()->account?->companies()?->first()?->country();
 
-		if(!$country || strlen($user->phone) < 2)
+		if(!$country || strlen(auth()->user()->phone) < 2)
 		  return true;
 
 		$countryCode = $country->iso_3166_2;
@@ -62,7 +62,9 @@ class HasValidPhoneNumber implements Rule
 		                                        ->fetch(["countryCode" => $countryCode]);
 
             $user = auth()->user();
-        	$user->phone = $phone_number->phoneNumber;
+
+            request()->merge(['validated_phone' => $phone_number->phoneNumber ]);
+
 			$user->verified_phone_number = true;
             $user->save();
             

app/Import/Providers/Csv.php

@@ -46,11 +46,14 @@ use App\Repositories\PaymentRepository;
 use App\Repositories\ProductRepository;
 use App\Repositories\QuoteRepository;
 use App\Repositories\VendorRepository;
+use App\Utils\Traits\MakesHash;
 use Illuminate\Support\Facades\Validator;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 class Csv extends BaseImport implements ImportInterface
 {
+    use MakesHash;
+
     public array $entity_count = [];
 
     public function import(string $entity)
@@ -77,24 +80,20 @@ class Csv extends BaseImport implements ImportInterface
 
         $data = $this->getCsvData($entity_type);
 
-        if (is_array($data)) {
+        if (is_array($data)) 
+        {
+
             $data = $this->preTransformCsv($data, $entity_type);
 
-
+            foreach($data as $key => $value)
-            if(array_key_exists('bank_integration_id', $this->request)){
+            {
-
+                $data[$key]['bank.bank_integration_id'] = $this->decodePrimaryKey($this->request['bank_integration_id']);
-                foreach($data as $key => $value)
-                {
-                    $data['bank_integration_id'][$key] = $this->request['bank_integration_id'];
-                }
-
             }
 
         }
 
         if (empty($data)) {
             $this->entity_count['bank_transactions'] = 0;
-
             return;
         }
 
@@ -102,6 +101,8 @@ class Csv extends BaseImport implements ImportInterface
         $this->repository_name = BankTransactionRepository::class;
         $this->factory_name = BankTransactionFactory::class;
 
+        $this->repository = app()->make($this->repository_name);
+
         $this->transformer = new BankTransformer($this->company);
         $bank_transaction_count = $this->ingest($data, $entity_type);
         $this->entity_count['bank_transactions'] = $bank_transaction_count;

app/Import/Transformer/BaseTransformer.php

@@ -68,6 +68,11 @@ class BaseTransformer
 
     }
 
+    public function getNumber($data, $field)
+    {
+        return (isset($data->$field) && $data->$field) ? (int)$data->$field : 0;
+    }
+
     public function getString($data, $field)
     {
         return isset($data[$field]) && $data[$field] ? trim($data[$field]) : '';

app/Import/Transformers/Bank/BankTransformer.php

@@ -12,7 +12,7 @@
 namespace App\Import\Transformers\Bank;
 
 use App\Import\ImportException;
-use App\Import\Transformers\BaseTransformer;
+use App\Import\Transformer\BaseTransformer;
 use App\Models\BankTransaction;
 use App\Utils\Number;
 
@@ -31,17 +31,17 @@ class BankTransformer extends BaseTransformer
     	$now = now();
 
     	$transformed = [
-            // 'bank_integration_id' => $this->bank_integration->id,
+            'bank_integration_id' => $transaction['bank.bank_integration_id'],
             'transaction_id' => $this->getNumber($transaction,'bank.transaction_id'),
             'amount' => abs($this->getFloat($transaction, 'bank.amount')),
             'currency_id' => $this->getCurrencyByCode($transaction, 'bank.currency'),
             'account_type' => strlen($this->getString($transaction, 'bank.account_type')) > 1 ? $this->getString($transaction, 'bank.account_type') : 'bank',
             'category_id' => $this->getNumber($transaction, 'bank.category_id') > 0 ? $this->getNumber($transaction, 'bank.category_id') : null,
-            'category_type' => $this->getString($transaction, 'category_type'),
+            'category_type' => $this->getString($transaction, 'bank.category_type'),
-            'date' => array_key_exists('date', $transaction) ? date('Y-m-d', strtotime(str_replace("/","-",$transaction['date'])))
+            'date' => array_key_exists('bank.date', $transaction) ? $this->parseDate($transaction['bank.date'])
                 : now()->format('Y-m-d'),
-            'bank_account_id' => array_key_exists('bank_account_id', $transaction) ? $transaction['bank_account_id'] : 0,
+            'bank_account_id' => array_key_exists('bank.bank_account_id', $transaction) ? $transaction['bank.bank_account_id'] : 0,
-            'description' => array_key_exists('description', $transaction)? $transaction['description'] : '',
+            'description' => array_key_exists('bank.description', $transaction) ? $transaction['bank.description'] : '',
             'base_type' => $this->calculateType($transaction),
             'created_at' => $now,
             'updated_at' => $now,
@@ -56,22 +56,22 @@ class BankTransformer extends BaseTransformer
     private function calculateType($transaction)
     {
 
-    	if(array_key_exists('base_type', $transaction) && $transaction['base_type'] == 'CREDIT')
+    	if(array_key_exists('bank.base_type', $transaction) && $transaction['bank.base_type'] == 'CREDIT')
     		return 'CREDIT';
 
-    	if(array_key_exists('base_type', $transaction) && $transaction['base_type'] == 'DEBIT')
+    	if(array_key_exists('bank.base_type', $transaction) && $transaction['bank.base_type'] == 'DEBIT')
     		return 'DEBIT';
 
-    	if(array_key_exists('category_id',$transaction))
+    	if(array_key_exists('bank.category_id', $transaction))
     		return 'DEBIT';
 
-    	if(array_key_exists('category_type', $transaction) && $transaction['category_type'] == 'Income')
+    	if(array_key_exists('bank.category_type', $transaction) && $transaction['bank.category_type'] == 'Income')
     		return 'CREDIT';
 
-    	if(array_key_exists('category_type', $transaction))
+    	if(array_key_exists('bank.category_type', $transaction))
     		return 'DEBIT';
 
-    	if(array_key_exists('amount', $transaction) && is_numeric($transaction['amount']) && $transaction['amount'] > 0)
+    	if(array_key_exists('bank.amount', $transaction) && is_numeric($transaction['bank.amount']) && $transaction['bank.amount'] > 0)
     		return 'CREDIT';
 
     	return 'DEBIT';

app/Jobs/User/VerifyPhone.php

@@ -53,7 +53,7 @@ class VerifyPhone implements ShouldQueue
 		if(!$sid)
 			return; // no twilio api credentials provided, bail.
 
-		$twilio = new Twilio\Rest\Client($sid, $token);
+		$twilio = new \Twilio\Rest\Client($sid, $token);
 
 		$country = $this->user->account?->companies()?->first()?->country();
 

app/Observers/UserObserver.php

@@ -38,9 +38,9 @@ class UserObserver
      */
     public function updated(User $user)
     {
-        if (Ninja::isHosted() && $user->isDirty('phone')) {
+        // if (Ninja::isHosted() && $user->isDirty('phone')) {
-            VerifyPhone::dispatch($user);
+        //     VerifyPhone::dispatch($user);
-        }
+        // }
     }
 
     /**

app/Repositories/UserRepository.php

@@ -56,15 +56,12 @@ class UserRepository extends BaseRepository
         $company = auth()->user()->company();
         $account = $company->account;
 
-        /* If hosted and Enterprise we need to increment the num_users field on the accounts table*/
-        // 05-08-2022 This is an error, the num_users should _never_ increment
-        // if (! $user->id && $account->isEnterpriseClient()) {
-        //     $account->num_users++;
-        //     $account->save();
-        // }
         if(array_key_exists('oauth_provider_id', $details))
             unset($details['oauth_provider_id']);
         
+        if (request()->has('validated_phone'))
+            $details['phone'] = request()->input('validated_phone');
+
         $user->fill($details);
 
         //allow users to change only their passwords - not others!
@@ -140,7 +137,7 @@ class UserRepository extends BaseRepository
             $cu->forceDelete();
         }
 
-        event(new UserWasDeleted($user, $company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
+        event(new UserWasDeleted($user, auth()->user(), $company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         $user->delete();