Merge pull request #7395 from turbo124/v5-develop

Payable invoice filters

app/Filters/InvoiceFilters.php

@@ -138,6 +138,18 @@ class InvoiceFilters extends QueryFilters
         });
     }
 
+    public function payable(string $client_id)
+    {
+        if (strlen($client_id) == 0) {
+            return $this->builder;
+        }
+
+        return $this->builder->whereIn('status_id', [Invoice::STATUS_DRAFT, Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
+                             ->where('balance', '>', 0)
+                             ->where('is_deleted', 0)
+                             ->where('client_id', $this->decodePrimaryKey($client_id));
+    }
+
     /**
      * Sorts the list based on $sort.
      *

app/Http/Requests/Client/UpdateClientRequest.php

@@ -158,7 +158,11 @@ class UpdateClientRequest extends Request
                 unset($settings->{$key});
             }
 
-            if($key == 'default_task_rate'){
+            //26-04-2022 - In case settings are returned as array instead of object
+            if($key == 'default_task_rate' && is_array($settings)){
+                $settings['default_task_rate'] = floatval($value);
+            }
+            elseif($key == 'default_task_rate' && is_object($settings)) {
                 $settings->default_task_rate = floatval($value);
             }
         }

app/Import/Providers/BaseImport.php

@@ -181,6 +181,65 @@ class BaseImport
 
 			} catch (\Exception $ex) {
 
+				if(\DB::connection(config('database.default'))->transactionLevel() > 0)
+					\DB::connection(config('database.default'))->rollBack();
+
+				if ($ex instanceof ImportException) {
+					$message = $ex->getMessage();
+				} else {
+					report($ex);
+					$message = 'Unknown error';
+				}
+
+				$this->error_array[$entity_type][] = [
+					$entity_type => $record,
+					'error' => $message,
+				];
+			}
+
+		}
+
+		return $count;
+	}
+
+	public function ingestProducts($data, $entity_type)
+	{
+		$count = 0;
+
+		foreach ($data as $key => $record) {
+
+			try {
+
+				$entity = $this->transformer->transform($record);
+				$validator = $this->request_name::runFormRequest($entity);
+
+				if ($validator->fails()) {
+					$this->error_array[$entity_type][] = [
+						$entity_type => $record,
+						'error' => $validator->errors()->all(),
+					];
+				} else {
+
+					if($this->transformer->hasProduct($entity['product_key'])) 
+						$product = $this->transformer->getProduct($entity['product_key']);
+					else
+						$product = $this->factory_name::create($this->company->id,$this->getUserIDForRecord($entity));
+
+					$entity = $this->repository->save(
+						array_diff_key($entity, ['user_id' => false]),
+						$product
+					);
+
+					$entity->saveQuietly();
+					$count++;
+
+				}
+
+			} catch (\Exception $ex) {
+
+				if(\DB::connection(config('database.default'))->transactionLevel() > 0)
+					\DB::connection(config('database.default'))->rollBack();
+				
 				if ($ex instanceof ImportException) {
 					$message = $ex->getMessage();
 				} else {
@@ -309,6 +368,10 @@ class BaseImport
 					);
 				}
 			} catch (\Exception $ex) {
+				
+				if(\DB::connection(config('database.default'))->transactionLevel() > 0)
+					\DB::connection(config('database.default'))->rollBack();
+
 				if ($ex instanceof ImportException) {
 					$message = $ex->getMessage();
 				} else {
@@ -506,6 +569,8 @@ class BaseImport
 			'company' => $this->company,
 		];
 
+nlog($this->company->company_users);
+
 		$nmo = new NinjaMailerObject;
 		$nmo->mailable = new ImportCompleted($this->company, $data);
 		$nmo->company = $this->company;

app/Import/Providers/Csv.php

@@ -116,7 +116,7 @@ class Csv extends BaseImport implements ImportInterface
 
         $this->transformer = new ProductTransformer($this->company);
 
-        $product_count = $this->ingest($data, $entity_type);
+        $product_count = $this->ingestProducts($data, $entity_type);
 
         $this->entity_count['products'] = $product_count;
     }

app/Import/Transformer/BaseTransformer.php

@@ -199,20 +199,16 @@ class BaseTransformer
      *
      * @return string
      */
-    public function getProduct($data, $key, $field, $default = false)
+    public function getProduct($key)
     {
         $product = $this->company
             ->products()
             ->whereRaw("LOWER(REPLACE(`product_key`, ' ' ,''))  = ?", [
-                strtolower(str_replace(' ', '', $data->{$key})),
+                strtolower(str_replace(' ', '', $key)),
             ])
             ->first();
 
-        if ($product) {
+        return $product;
-            return $product->{$field} ?: $default;
-        }
-
-        return $default;
     }
 
     /**

app/Jobs/Util/Import.php

@@ -241,7 +241,6 @@ class Import implements ShouldQueue
             $this->company->account->companies()->update(['is_large' => true]);
         }
 
-
         $this->company->client_registration_fields = \App\DataMapper\ClientRegistrationFields::generate();
         $this->company->save();
 
@@ -948,6 +947,11 @@ class Import implements ShouldQueue
                 RecurringInvoiceFactory::create($this->company->id, $modified['user_id'])
             );
 
+            if($invoice->status_id == 4 && $invoice->remaining_cycles == -1){
+                $invoice->status_id =2;
+                $invoice->save();
+            }
+
             $key = "recurring_invoices_{$resource['id']}";
 
             $this->ids['recurring_invoices'][$key] = [

app/Mail/Company/CompanyDeleted.php

@@ -50,7 +50,10 @@ class CompanyDeleted extends Mailable
     public function build()
     {
         App::forgetInstance('translator');
-        App::setLocale($this->account->default_company->getLocale());
+
+        if($this->company)
+            App::setLocale($this->company->getLocale());
+            
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($this->settings));
 

app/Models/Company.php

@@ -479,7 +479,6 @@ class Company extends BaseModel
     public function owner()
     {
         return $this->company_users()->withTrashed()->where('is_owner', true)->first()->user;
-        //return $this->company_users->where('is_owner', true)->first()->user;
     }
 
     public function resolveRouteBinding($value, $field = null)

app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php

@@ -176,7 +176,7 @@ class AuthorizePaymentMethod
                 $billto->setCountry($this->authorize->client->country->name);
             }
 
-            $billto->setPhoneNumber($this->authorize->client->phone);
+            $billto->setPhoneNumber(substr($this->authorize->client->phone,0,20));
         }
 
         // Create a new Customer Payment Profile object

app/PaymentDrivers/StripePaymentDriver.php

@@ -445,7 +445,7 @@ class StripePaymentDriver extends BaseDriver
 
         if(count($searchResults) == 1){
             $customer = $searchResults->data[0];
-            $this->updateStripeCustomer($customer);
+           // $this->updateStripeCustomer($customer);
             return $customer; 
         }
 

app/Services/Invoice/MarkPaid.php

@@ -105,7 +105,7 @@ class MarkPaid extends AbstractService
         /* Get the last record for the client and set the current balance*/
             $client = Client::where('id', $this->invoice->client_id)->lockForUpdate()->first();
             $client->paid_to_date += $payment->amount;
-            $client->balance += $payment->amount * -1;
+            $client->balance -= $payment->amount;
             $client->save();
 
         }, 1);

app/Services/Quote/TriggeredActions.php

@@ -51,7 +51,7 @@ class TriggeredActions extends AbstractService
         }        
 
         if ($this->request->has('approve') && $this->request->input('approve') == 'true' && in_array($this->quote->status_id, [Quote::STATUS_SENT, Quote::STATUS_DRAFT])) {
-            $this->quote = $this->quote->service()->convert()->save();
+            $this->quote = $this->quote->service()->approveWithNoCoversion()->save();
         }        
 
         

app/Utils/HtmlEngine.php

@@ -213,9 +213,9 @@ class HtmlEngine
         $data['$gross_subtotal'] = ['value' => Number::formatMoney($this->entity_calc->getGrossSubTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.subtotal')];
 
         if($this->entity->uses_inclusive_taxes)
-            $data['$net_subtotal'] = ['value' => Number::formatMoney(($this->entity_calc->getSubTotal() - $this->entity->total_taxes), $this->client) ?: ' ', 'label' => ctrans('texts.net_subtotal')];
+            $data['$net_subtotal'] = ['value' => Number::formatMoney(($this->entity_calc->getSubTotal() - $this->entity->total_taxes - $this->entity_calc->getTotalDiscount()), $this->client) ?: ' ', 'label' => ctrans('texts.net_subtotal')];
         else
-            $data['$net_subtotal'] = ['value' => Number::formatMoney($this->entity_calc->getSubTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.net_subtotal')];
+            $data['$net_subtotal'] = ['value' => Number::formatMoney($this->entity_calc->getSubTotal() - $this->entity_calc->getTotalDiscount(), $this->client) ?: ' ', 'label' => ctrans('texts.net_subtotal')];
 
         $data['$invoice.subtotal'] = &$data['$subtotal'];
 

app/Utils/SystemHealth.php

@@ -81,9 +81,31 @@ class SystemHealth
             'pdf_engine' => (string) self::getPdfEngine(),
             'queue' => (string) config('queue.default'),
             'trailing_slash' => (bool) self::checkUrlState(),
+            'file_permissions' => (string) self::checkFileSystem()
         ];
     }
 
+    public static function checkFileSystem()
+    {
+
+        $directoryIterator = new \RecursiveDirectoryIterator(base_path(), \RecursiveDirectoryIterator::SKIP_DOTS);
+
+        foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
+
+            if(strpos($file->getPathname(), '.git') !== false)
+                continue;
+
+            //nlog($file->getPathname());
+
+            if ($file->isFile() && ! $file->isWritable()) {
+                return "{$file->getFileName()} is not writable";
+            }
+        }
+
+        return 'Ok';
+
+    }
+
     public static function checkUrlState()
     {
         if (env('APP_URL') && substr(env('APP_URL'), -1) == '/')

app/Utils/Traits/MakesInvoiceValues.php

@@ -301,17 +301,29 @@ trait MakesInvoiceValues
             $data[$key][$table_type . ".{$_table_type}2"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}2", $item->custom_value2, $this->client);
             $data[$key][$table_type . ".{$_table_type}3"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}3", $item->custom_value3, $this->client);
             $data[$key][$table_type . ".{$_table_type}4"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}4", $item->custom_value4, $this->client);
-
-            // 08-02-2022 - fix for regression below
-            // $data[$key][$table_type.'.quantity'] = Number::formatValue($item->quantity, $this->client->currency());
             
-            $data[$key][$table_type.'.quantity'] = ($item->quantity == 0) ? '' : Number::formatValueNoTrailingZeroes($item->quantity, $this->client->currency());
+            if($item->quantity > 0 || $item->cost > 0){
-            
-            $data[$key][$table_type.'.unit_cost'] = ($item->cost == 0) ? '' : Number::formatMoneyNoRounding($item->cost, $this->client);
 
-            $data[$key][$table_type.'.cost'] = ($item->cost == 0) ? '' : Number::formatMoney($item->cost, $this->client);
+                $data[$key][$table_type.'.quantity'] = Number::formatValueNoTrailingZeroes($item->quantity, $this->client->currency());
+                
+                $data[$key][$table_type.'.unit_cost'] = Number::formatMoneyNoRounding($item->cost, $this->client);
 
-            $data[$key][$table_type.'.line_total'] =  ($item->line_total == 0) ? '' :Number::formatMoney($item->line_total, $this->client);
+                $data[$key][$table_type.'.cost'] = Number::formatMoney($item->cost, $this->client);
+
+                $data[$key][$table_type.'.line_total'] =  Number::formatMoney($item->line_total, $this->client);
+
+            }
+            else {
+
+                $data[$key][$table_type.'.quantity'] = '';
+                
+                $data[$key][$table_type.'.unit_cost'] = '';
+
+                $data[$key][$table_type.'.cost'] = '';
+
+                $data[$key][$table_type.'.line_total'] =  '';
+                
+            }
 
             if(property_exists($item, 'gross_line_total'))
                 $data[$key][$table_type.'.gross_line_total'] =  ($item->gross_line_total == 0) ? '' :Number::formatMoney($item->gross_line_total, $this->client);

database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php

@@ -0,0 +1,191 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ConvertCustomFieldsColumnFromVarcharToText extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        set_time_limit(0);
+
+        Schema::table('credits', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('client_contacts', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('clients', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('clients', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('documents', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('expenses', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('invoices', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('payments', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('products', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('projects', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('quotes', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('recurring_invoices', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('recurring_quotes', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('recurring_expenses', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('tasks', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('users', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('vendors', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+        Schema::table('vendor_contacts', function (Blueprint $table) {
+
+            $table->text('custom_value1')->change();
+            $table->text('custom_value2')->change();
+            $table->text('custom_value3')->change();
+            $table->text('custom_value3')->change();
+
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        
+    }
+}

tests/Feature/Import/Zoho/ZohoTest.php

@@ -22,6 +22,7 @@ use App\Utils\Traits\MakesHash;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Str;
 use Tests\MockAccountData;
 use Tests\TestCase;
@@ -34,12 +35,14 @@ class ZohoTest extends TestCase
 {
     use MakesHash;
     use MockAccountData;
-    use DatabaseTransactions;
+    // use DatabaseTransactions;
 
     public function setUp(): void
     {
         parent::setUp();
 
+        Session::start();
+
         $this->withoutMiddleware(ThrottleRequests::class);
 
         config(['database.default' => config('ninja.db.default')]);
@@ -120,7 +123,7 @@ class ZohoTest extends TestCase
         Cache::put($hash . '-client', base64_encode($csv), 360);
 
         $csv_importer = new Zoho($data, $this->company);
-
+        
         $count = $csv_importer->import('client');
 
         $base_transformer = new BaseTransformer($this->company);