Merge pull request #5008 from turbo124/v5-stable

v5.1.12
2024-11-11 05:32:39 +01:00 · 2021-03-01 22:00:53 +11:00 · 2021-03-01 22:00:53 +11:00 · 52bf4afd64
commit 52bf4afd64
parent 96e847be7d 2ab76e9098
20 changed files with 167 additions and 26 deletions
--- a/VERSION.txt
+++ b/VERSION.txt
@ -1 +1 @@
-5.1.11
+5.1.12
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@ -286,11 +286,25 @@ class LoginController extends BaseController
        }

        if ($user) {
+
            $client = new Google_Client();
            $client->setClientId(config('ninja.auth.google.client_id'));
            $client->setClientSecret(config('ninja.auth.google.client_secret'));
            $client->setRedirectUri(config('ninja.app_url'));
-            $token = $client->authenticate(request()->input('server_auth_code'));
+
+            $token = false;
+
+            try{
+                $token = $client->authenticate(request()->input('server_auth_code'));
+            }
+            catch(\Exception $e) {
+
+                return response()
+                ->json(['message' => ctrans('texts.invalid_credentials')], 401)
+                ->header('X-App-Version', config('ninja.app_version'))
+                ->header('X-Api-Version', config('ninja.minimum_client_version'));
+
+            }

            $refresh_token = '';

--- a/app/Http/Middleware/SetEmailDb.php
+++ b/app/Http/Middleware/SetEmailDb.php
@ -33,10 +33,12 @@ class SetEmailDb
        ];

        if ($request->input('email') && config('ninja.db.multi_db_enabled')) {
-            nlog("trying to find db");
-            if (! MultiDB::userFindAndSetDb($request->input('email'))) {
+            
+
+            if (! MultiDB::userFindAndSetDb($request->input('email'))) 
                return response()->json($error, 400);
-            }
+            
+            
        }
        // else {
        //     return response()->json($error, 403);
--- a/app/Http/Middleware/UserVerified.php
+++ b/app/Http/Middleware/UserVerified.php
@ -13,6 +13,7 @@ namespace App\Http\Middleware;

 use App\Libraries\MultiDB;
 use App\Models\User;
+use App\Utils\Ninja;
 use Closure;
 use Hashids\Hashids;
 use Illuminate\Http\Request;
@ -26,7 +27,7 @@ class UserVerified

    public function __construct(?User $user)
    {
-        $this->user = $user ?: auth()->user();
+        $this->user = property_exists($user, 'id') ? $user : auth()->user();
    }

    /**
@ -38,6 +39,8 @@ class UserVerified
     */
    public function handle($request, Closure $next)
    {
+        if(Ninja::isSelfHost())
+            return $next($request);

        $error = [
            'message' => 'Email confirmation required.',
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@ -92,6 +92,8 @@ class CreateEntityPdf implements ShouldQueue
        App::forgetInstance('translator');
        Lang::replace(Ninja::transformTranslations($this->entity->client->getMergedSettings()));

+        $this->entity->service()->deletePdf();
+
        if (config('ninja.phantomjs_pdf_generation')) {
            return (new Phantom)->generate($this->invitation);
        }
--- a/app/Jobs/Util/UnlinkFile.php
+++ b/app/Jobs/Util/UnlinkFile.php
@ -39,6 +39,8 @@ class UnlinkFile implements ShouldQueue
     */
    public function handle()
    {
+        // nlog("deleting");
+        // nlog($this->file_path);
        Storage::disk($this->disk)->delete($this->file_path);
    }
 }
--- a/app/Libraries/MultiDB.php
+++ b/app/Libraries/MultiDB.php
@ -187,9 +187,10 @@ class MultiDB

        //multi-db active
        foreach (self::$dbs as $db) {
-            if (User::on($db)->where(['email' => $email])->get()->count() >= 1) { // if user already exists, validation will fail
+            
+            if (User::on($db)->where(['email' => $email])->count() >= 1) 
                return true;
-            }
+            
        }

        return false;
--- a/app/Mail/Engine/CreditEmailEngine.php
+++ b/app/Mail/Engine/CreditEmailEngine.php
@ -89,7 +89,9 @@ class CreditEmailEngine extends BaseEmailEngine
            ->setInvitation($this->invitation);

        if ($this->client->getSetting('pdf_email_attachment') !== false) {
-            $this->setAttachments(['path' => $this->credit->pdf_file_path(), 'name' => basename($this->credit->pdf_file_path())]);
+            $this->setAttachments([$this->credit->pdf_file_path()]);
+
+            // $this->setAttachments(['path' => $this->credit->pdf_file_path(), 'name' => basename($this->credit->pdf_file_path())]);
        }

        //attach third party documents
--- a/app/Mail/Engine/QuoteEmailEngine.php
+++ b/app/Mail/Engine/QuoteEmailEngine.php
@ -90,8 +90,8 @@ class QuoteEmailEngine extends BaseEmailEngine


        if ($this->client->getSetting('pdf_email_attachment') !== false) {
-            // $this->setAttachments([$this->quote->pdf_file_path()]);
-            $this->setAttachments(['path' => $this->quote->pdf_file_path(), 'name' => basename($this->quote->pdf_file_path())]);
+            $this->setAttachments([$this->quote->pdf_file_path()]);
+            //$this->setAttachments(['path' => $this->quote->pdf_file_path(), 'name' => basename($this->quote->pdf_file_path())]);

        }

--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@ -85,6 +85,7 @@ class Company extends BaseModel
        'expense_inclusive_taxes',
        'session_timeout',
        'oauth_password_required',
+        'invoice_task_datelog',
    ];

    protected $hidden = [
--- a/app/Models/Presenters/CompanyPresenter.php
+++ b/app/Models/Presenters/CompanyPresenter.php
@ -36,7 +36,11 @@ class CompanyPresenter extends EntityPresenter
            $settings = $this->entity->settings;
        }

-        return (strlen($settings->company_logo) > 0) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
+        if(strlen($settings->company_logo))
+            return asset($settings->company_logo);
+        else
+            return 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
+
    }

    public function address($settings = null)
@ -91,13 +95,13 @@ class CompanyPresenter extends EntityPresenter
        }
    }

-    public function getSpcQrCode($client_currency, $invoice_number, $balance)
+    public function getSpcQrCode($client_currency, $invoice_number, $balance_due_raw)
    {
        $settings = $this->entity->settings;

        return 

-        "SPC\n0200\n1\nCH860021421411198240K\nK\n{$this->name}\n{$settings->address1}\n{$settings->postal_code} {$settings->city}\n\n\nCH\n\n\n\n\n\n\n\n{$balance}\n{$client_currency}\n\n\n\n\n\n\n\nNON\n\n{$invoice_number}\nEPD\n";
+        "SPC\n0200\n1\nCH860021421411198240K\nK\n{$this->name}\n{$settings->address1}\n{$settings->postal_code} {$settings->city}\n\n\nCH\n\n\n\n\n\n\n\n{$balance_due_raw}\n{$client_currency}\n\n\n\n\n\n\n\nNON\n\n{$invoice_number}\nEPD\n";
    }

 }
--- a/app/Models/Quote.php
+++ b/app/Models/Quote.php
@ -200,25 +200,27 @@ class Quote extends BaseModel
        return new QuoteService($this);
    }

+
    public function pdf_file_path($invitation = null, string $type = 'url')
    {
        if (! $invitation) {
-            $invitation = $this->invitations->where('client_contact_id', $this->client->primary_contact()->first()->id)->first();
+            $invitation = $this->invitations->first();
        }

        $storage_path = Storage::$type($this->client->quote_filepath().$this->number.'.pdf');

-        if (Storage::exists($this->client->quote_filepath().$this->number.'.pdf')) {
-            return $storage_path;
+        nlog($storage_path);
+
+        if (! Storage::exists($this->client->quote_filepath().$this->number.'.pdf')) {
+            event(new QuoteWasUpdated($this, $this->company, Ninja::eventVars()));
+            CreateEntityPdf::dispatchNow($invitation);
        }

-        event(new QuoteWasUpdated($this, $this->company, Ninja::eventVars()));
-
-        CreateEntityPdf::dispatchNow($invitation);
-
        return $storage_path;
    }

+
+
    /**
     * @param int $status
     * @return string
--- a/app/Observers/CreditObserver.php
+++ b/app/Observers/CreditObserver.php
@ -37,7 +37,7 @@ class CreditObserver
     */
    public function updated(Credit $credit)
    {
-        UnlinkFile::dispatchNow(config('filesystems.default'), $credit->client->credit_filepath() . $credit->number.'.pdf');
+
    }

    /**
--- a/app/Observers/QuoteObserver.php
+++ b/app/Observers/QuoteObserver.php
@ -51,8 +51,6 @@ class QuoteObserver
            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_QUOTE, $quote, $quote->company);
        }

-        UnlinkFile::dispatchNow(config('filesystems.default'), $quote->client->quote_filepath() . $quote->number.'.pdf');
-
    }

    /**
--- a/app/Services/Credit/CreditService.php
+++ b/app/Services/Credit/CreditService.php
@ -11,6 +11,7 @@

 namespace App\Services\Credit;

+use App\Jobs\Util\UnlinkFile;
 use App\Models\Credit;
 use App\Utils\Traits\MakesHash;

@ -134,7 +135,14 @@ class CreditService
        
        return $this;
    }
-    
+
+    public function deletePdf()
+    {
+        UnlinkFile::dispatchNow(config('filesystems.default'), $this->credit->client->credit_filepath() . $this->credit->number.'.pdf');
+
+        return $this;
+    }
+
    /**
     * Saves the credit.
     * @return Credit object
--- a/app/Services/Quote/QuoteService.php
+++ b/app/Services/Quote/QuoteService.php
@ -12,6 +12,7 @@
 namespace App\Services\Quote;

 use App\Events\Quote\QuoteWasApproved;
+use App\Jobs\Util\UnlinkFile;
 use App\Models\Invoice;
 use App\Models\Quote;
 use App\Repositories\QuoteRepository;
@ -189,6 +190,13 @@ class QuoteService
        return $this;
    }

+    public function deletePdf()
+    {
+        UnlinkFile::dispatchNow(config('filesystems.default'), $this->quote->client->quote_filepath() . $this->quote->number.'.pdf');
+
+        return $this;
+    }
+
    /**
     * Saves the quote.
     * @return Quote|null
--- a/app/Services/Recurring/RecurringService.php
+++ b/app/Services/Recurring/RecurringService.php
@ -11,6 +11,7 @@

 namespace App\Services\Recurring;

+use App\Jobs\Util\UnlinkFile;
 use App\Models\RecurringInvoice;
 use App\Services\Recurring\GetInvoicePdf;
 use Illuminate\Support\Carbon;
@ -84,6 +85,13 @@ class RecurringService
        return (new GetInvoicePdf($this->recurring_entity, $contact))->run();
    }

+    public function deletePdf()
+    {
+        UnlinkFile::dispatchNow(config('filesystems.default'), $this->recurring_entity->client->recurring_invoice_filepath() . $this->recurring_entity->number.'.pdf');
+
+        return $this;
+    }
+    
    public function save()
    {
        $this->recurring_entity->save();
--- a/config/ninja.php
+++ b/config/ninja.php
@ -13,7 +13,7 @@ return [
    'require_https' => env('REQUIRE_HTTPS', true),
    'app_url' => rtrim(env('APP_URL', ''), '/'),
    'app_domain' => env('APP_DOMAIN', ''),
-    'app_version' => '5.1.11',
+    'app_version' => '5.1.12',
    'minimum_client_version' => '5.0.16',
    'terms_version' => '1.0.1',
    'api_secret' => env('API_SECRET', false),
--- a/database/migrations/2021_02_27_091713_add_invoice_task_datelog_property.php
+++ b/database/migrations/2021_02_27_091713_add_invoice_task_datelog_property.php
@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddInvoiceTaskDatelogProperty extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('companies', function(Blueprint $table){
+            $table->boolean('invoice_task_datelog')->default(0);
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
--- a/tests/Unit/RangeDetectionTest.php
+++ b/tests/Unit/RangeDetectionTest.php
@ -0,0 +1,55 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+namespace Tests\Unit;
+
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+/**
+ * @test
+ */
+class RangeDetectionTest extends TestCase
+{
+
+    public function setUp() :void
+    {
+        parent::setUp();
+    }
+
+    public function test_range_detection()
+    {
+        $ranges = [];
+        $ranges[] = [100, 105];
+        $ranges[] = [106, 110];
+        $ranges[] = [110, 115];
+
+        $expanded_ranges = [];
+
+        foreach($ranges as $range)
+        {
+            $expanded_ranges = array_merge(array_values($expanded_ranges),array_values($this->makeRanges($range)));
+        }
+
+        $value_count_array = array_count_values($expanded_ranges);
+
+        $value_count_array = array_diff($value_count_array, [1]);
+
+        $this->assertEquals(count($value_count_array), 1);
+    }
+
+
+    private function makeRanges(array $range)
+    {
+        return range($range[0], $range[1]);
+
+    }
+
+}
 @ -1 +1 @@
 .1.11
 .1.12