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

VERSION.txt

@@ -1 +1 @@
-5.1.27
+5.1.28

app/Console/Kernel.php

@@ -57,24 +57,17 @@ class Kernel extends ConsoleKernel
         $schedule->job(new BillingSubscriptionCron)->daily()->withoutOverlapping();
 
         $schedule->job(new RecurringInvoicesCron)->hourly()->withoutOverlapping();
+        
+        $schedule->job(new SchedulerCheck)->everyFiveMinutes();
 
         /* Run hosted specific jobs */
         if (Ninja::isHosted()) {
 
-            $schedule->job(new AdjustEmailQuota())->daily()->withoutOverlapping();
-            $schedule->job(new SendFailedEmails())->daily()->withoutOverlapping();
+            $schedule->job(new AdjustEmailQuota)->daily()->withoutOverlapping();
+            $schedule->job(new SendFailedEmails)->daily()->withoutOverlapping();
 
         }
-        /* Run queue's with this*/
-        if (Ninja::isSelfHost()) {
 
-            $schedule->command('queue:work --daemon')->everyMinute()->withoutOverlapping();
-            
-            //we need to add this as we are seeing cached queues mess up the system on first load.
-            $schedule->command('queue:restart')->everyFiveMinutes()->withoutOverlapping();
-            $schedule->job(new SchedulerCheck)->everyFiveMinutes()->withoutOverlapping();
-        
-        }
     }
 
     /**

app/Factory/CompanyFactory.php

@@ -35,7 +35,7 @@ class CompanyFactory
         $company->custom_fields = (object) [];
         $company->subdomain = '';
         $company->enabled_modules = config('ninja.enabled_modules'); //32767;//8191; //4095
-        $company->default_password_timeout = 30;
+        $company->default_password_timeout = 30 * 60000;
 
         return $company;
     }

app/Http/Middleware/PasswordProtection.php

@@ -42,7 +42,7 @@ class PasswordProtection
         if($timeout == 0)
             $timeout = null;
         else
-            $timeout = now()->addMinutes($timeout);
+            $timeout = now()->addMinutes($timeout/60000);
 
         if (Cache::get(auth()->user()->hashed_id.'_logged_in')) {
 
@@ -67,7 +67,7 @@ class PasswordProtection
                 ];
 
                 //If OAuth and user also has a password set  - check both
-                if ($existing_user = MultiDB::hasUser($query)  && auth()->user()->has_password && Hash::check(auth()->user()->password, $request->header('X-API-PASSWORD'))) {
+                if ($existing_user = MultiDB::hasUser($query) && auth()->user()->has_password && Hash::check(auth()->user()->password, $request->header('X-API-PASSWORD'))) {
 
                     Cache::add(auth()->user()->hashed_id.'_logged_in', Str::random(64), $timeout);
                     return $next($request);

app/Services/PdfMaker/Design.php

@@ -302,7 +302,7 @@ class Design extends BaseDesign
     public function buildTableHeader(string $type): array
     {
         $this->processTaxColumns($type);
-        $this->processCustomColumns($type);
+        // $this->processCustomColumns($type);
 
         $elements = [];
 

app/Services/PdfMaker/PdfMakerUtilities.php

@@ -213,6 +213,7 @@ trait PdfMakerUtilities
         $css = <<<'EOT'
         table.page-container {
             page-break-after: always;
+            min-width: 100%;
         }
 
         thead.page-header {

app/Utils/SystemHealth.php

@@ -78,9 +78,15 @@ class SystemHealth
             'phantom_enabled' => (bool)config('ninja.phantomjs_pdf_generation'),
             'exec' => (bool)self::checkExecWorks(),
             'open_basedir' => (bool)self::checkOpenBaseDir(),
+            'mail_mailer' => (string)self::checkMailMailer(),
         ];
     }
 
+    public static function checkMailMailer()
+    {
+        return config('mail.default');
+    }
+
     public static function checkOpenBaseDir()
     {
         if (strlen(ini_get('open_basedir') == 0)) {

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.27',
+    'app_version' => '5.1.28',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

public/flutter_service_worker.js

@@ -30,7 +30,7 @@ const RESOURCES = {
 "assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "3e722fd57a6db80ee119f0e2c230ccff",
 "assets/FontManifest.json": "cf3c681641169319e61b61bd0277378f",
 "/": "23224b5e03519aaa87594403d54412cf",
-"main.dart.js": "1edd6ac83b22ed1c401a76cefe7eaa7d",
+"main.dart.js": "114d8affe0f4b7576170753cf9fb4c0a",
 "version.json": "b7c8971e1ab5b627fd2a4317c52b843e",
 "favicon.png": "dca91c54388f52eded692718d5a98b8b"
 };

resources/views/pdf-designs/playful.html

@@ -262,7 +262,7 @@
 
     <div class="contacts-wrapper">
         <div class="contact-wrapper-left-side">
-            <p class="contact-label">$to_label:</p>
+            <p class="contact-label">$from_label:</p>
             <div class="company-info">
                 <div id="company-details"></div>
                 <div id="company-address"></div>
@@ -270,7 +270,7 @@
         </div>
 
         <div class="contact-wrapper-right-side">
-            <p class="contact-label">$from_label:</p>
+            <p class="contact-label">$to_label:</p>
             <div id="client-details"></div>
         </div>
     </div>