Merge pull request #5112 from turbo124/v5-stable

5.1.22

VERSION.txt

@@ -1 +1 @@
-5.1.21
+5.1.22

app/Http/Requests/Setup/StoreSetupRequest.php

@@ -27,31 +27,38 @@ class StoreSetupRequest extends Request
 
     public function rules()
     {
-        return [
+        $rules = [
-          /*System*/
+			/*System*/
-          'url' => 'required',
+			'url'              => 'required',
-          /*Database*/
+			/*Mail driver*/
-          'db_host' => 'required',
+			'mail_driver'      => 'required',
-          'db_database' => 'required',
+			'encryption'       => 'required_unless:mail_driver,log',
-          'db_username' => 'required',
+			'mail_host'        => 'required_unless:mail_driver,log',
-          'db_password' => '',
+			'mail_username'    => 'required_unless:mail_driver,log',
-          /*Mail driver*/
+			'mail_name'        => 'required_unless:mail_driver,log',
-          'mail_driver' => 'required',
+			'mail_address'     => 'required_unless:mail_driver,log',
-          'encryption' => 'required_unless:mail_driver,log',
+			'mail_password'    => 'required_unless:mail_driver,log',
-          'mail_host' => 'required_unless:mail_driver,log',
+			/*user registration*/
-          'mail_username' => 'required_unless:mail_driver,log',
+			'privacy_policy'   => 'required',
-          'mail_name' => 'required_unless:mail_driver,log',
+			'terms_of_service' => 'required',
-          'mail_address' => 'required_unless:mail_driver,log',
+			'first_name'       => 'required',
-          'mail_password' => 'required_unless:mail_driver,log',
+			'last_name'        => 'required',
-          /*user registration*/
+			'email'            => 'required|email:rfc,dns',
-          'privacy_policy'    => 'required',
+			'password'         => 'required',
-          'terms_of_service'  => 'required',
+		];
-          'first_name' => 'required',
+
-          'last_name' => 'required',
+		if ( ! config( 'ninja.preconfigured_install' ) ) {
-          'email' => 'required|email:rfc,dns',
+			$rules = array_merge( $rules, [
-          'password' => 'required',
+				/*Database*/
-        ];
+				'db_host'     => 'required',
-    }
+				'db_database' => 'required',
+				'db_username' => 'required',
+				'db_password' => '',
+			] );
+		}
+
+		return $rules;
+	}
 
     protected function prepareForValidation()
     {

app/Services/PdfMaker/Design.php

@@ -137,6 +137,10 @@ class Design extends BaseDesign
             $elements[] = ['element' => 'p', 'content' => $variable, 'show_empty' => false, 'properties' => ['data-ref' => 'company_details-' . substr($variable, 1)]];
         }
 
+        foreach (['company1', 'company2', 'company3', 'company4'] as $field) {
+            $elements[] = ['element' => 'p', 'content' => $this->getCustomFieldValue($field), 'show_empty' => false, 'properties' => ['data-ref' => 'company_details-' . $field]];
+        }
+
         return $elements;
     }
 

app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php

@@ -12,9 +12,7 @@
 
 namespace App\Services\PdfMaker\Designs\Utilities;
 
-use App\Models\Task;
 use App\Utils\Traits\MakesHash;
-use Carbon\Carbon;
 use DOMDocument;
 use DOMXPath;
 use Exception;
@@ -273,4 +271,35 @@ trait DesignHelpers
             array_splice($this->context['pdf_variables']["{$type}_columns"], $key + 1, 0, $custom_columns);
         }
     }
+
+    public function getCustomFieldValue(string $field): string
+    {
+        // In custom_fields column we store fields like: company1-4,
+        // while in settings, they're stored in custom_value1-4 format.
+        // That's why we need this mapping.
+
+        $fields = [
+            'company1' => 'custom_value1',
+            'company2' => 'custom_value2',
+            'company3' => 'custom_value3',
+            'company4' => 'custom_value4',
+        ];
+
+        if (!array_key_exists($field, $fields)) {
+            return '';
+        }
+
+        if (!property_exists($this->client->company->custom_fields, $field)) {
+            return '';
+        }
+
+        $value = $this->client->company->getSetting($fields[$field]);
+
+        return (new \App\Utils\Helpers)->formatCustomFieldValue(
+            $this->client->company->custom_fields,
+            $field,
+            $value,
+            $this->client
+        );
+    }
 }

app/Utils/Traits/MakesDates.php

@@ -99,10 +99,13 @@ trait MakesDates
 
     public function translateDate($date, $format, $locale)
     {
-        
         Carbon::setLocale($locale);
-        return Carbon::parse($date)->translatedFormat($format);
 
+        try {
+            return Carbon::parse($date)->translatedFormat($format);
+        } catch(\Exception $e) {
+            return 'Invalid date!';
+        }
     }
 
 }

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

resources/views/pdf-designs/plain.html

@@ -154,8 +154,7 @@
 
 <div id="body">
     <div class="header-wrapper">
-        <p>$company.name</p>
+        <div id="company-details"></div>
-
         <div id="company-address"></div>
 
         <div>