diff --git a/VERSION.txt b/VERSION.txt
index 60d25114c0fb..9e661130c30e 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.0.39
\ No newline at end of file
+5.0.40
\ No newline at end of file
diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index d82edd304b26..4a1f43fb2c36 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -628,7 +628,7 @@ class CompanySettings extends BaseSettings
'$credit.total',
],
'product_columns' => [
- '$product.product_key',
+ '$product.item',
'$product.description',
'$product.unit_cost',
'$product.quantity',
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 4e2473bd2054..eb6e5aa7c9bb 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -32,7 +32,6 @@ use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Storage;
-use Spatie\Browsershot\Browsershot;
/**
* Class SetupController.
diff --git a/app/Jobs/Import/CSVImport.php b/app/Jobs/Import/CSVImport.php
index f54016ac8532..391d160549ab 100644
--- a/app/Jobs/Import/CSVImport.php
+++ b/app/Jobs/Import/CSVImport.php
@@ -110,10 +110,9 @@ class CSVImport implements ShouldQueue
'settings' => $this->company->settings
];
-info(print_r($data,1));
+ info(print_r($data, 1));
MailRouter::dispatch(new ImportCompleted($data), $this->company, auth()->user());
-
}
public function failed($exception)
@@ -179,20 +178,20 @@ info(print_r($data,1));
$invoice['line_items'] = $this->cleanItems($items);
- $validator = Validator::make($invoice, (new StoreInvoiceRequest())->rules());
-
- if ($validator->fails()) {
- $this->error_array['invoices'] = ['invoice' => $invoice, 'error' => json_encode($validator->errors())];
- } else {
+ $validator = Validator::make($invoice, (new StoreInvoiceRequest())->rules());
if ($validator->fails()) {
- $this->error_array[] = ['invoice' => $invoice, 'error' => json_encode($validator->errors())];
+ $this->error_array['invoices'] = ['invoice' => $invoice, 'error' => json_encode($validator->errors())];
} else {
- $invoice = $invoice_repository->save($invoice, InvoiceFactory::create($this->company->id, $this->setUser($record)));
+ if ($validator->fails()) {
+ $this->error_array[] = ['invoice' => $invoice, 'error' => json_encode($validator->errors())];
+ } else {
+ $invoice = $invoice_repository->save($invoice, InvoiceFactory::create($this->company->id, $this->setUser($record)));
- $this->maps['invoices'][] = $invoice->id;
+ $this->maps['invoices'][] = $invoice->id;
- $this->performInvoiceActions($invoice, $record, $invoice_repository);
+ $this->performInvoiceActions($invoice, $record, $invoice_repository);
+ }
}
}
diff --git a/app/Jobs/Mail/BaseMailerJob.php b/app/Jobs/Mail/BaseMailerJob.php
index c337e939ce90..ae3fb9711c73 100644
--- a/app/Jobs/Mail/BaseMailerJob.php
+++ b/app/Jobs/Mail/BaseMailerJob.php
@@ -96,7 +96,6 @@ class BaseMailerJob implements ShouldQueue
public function failed($exception = null)
{
-
info('the job failed');
info($exception->getMessage());
diff --git a/app/Jobs/Mail/MailRouter.php b/app/Jobs/Mail/MailRouter.php
index dabb8a456f28..14510e0d8b82 100644
--- a/app/Jobs/Mail/MailRouter.php
+++ b/app/Jobs/Mail/MailRouter.php
@@ -12,7 +12,6 @@
namespace App\Jobs\Mail;
use App\Libraries\MultiDB;
-use App\Models\Client;
use App\Models\ClientContact;
use App\Models\Company;
use App\Models\User;
@@ -76,8 +75,9 @@ class MailRouter extends BaseMailerJob implements ShouldQueue
} catch (\Exception $e) {
$this->failed($e);
- if($this->to_user instanceof ClientContact)
+ if ($this->to_user instanceof ClientContact) {
$this->logMailError($e->getMessage(), $this->to_user->client);
+ }
}
}
}
diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index 14c872a34447..a539ad4365e1 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -298,11 +298,14 @@ class Design extends BaseDesign
public function buildTableHeader(string $type): array
{
$this->processTaxColumns($type);
+ $this->processCustomColumns($type);
$elements = [];
// Some of column can be aliased. This is simple workaround for these.
- $aliases = [];
+ $aliases = [
+ '$product.product_key' => '$product.item',
+ ];
foreach ($this->context['pdf_variables']["{$type}_columns"] as $column) {
if (array_key_exists($column, $aliases)) {
diff --git a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
index d80c6c4b1a4d..2ce308e25ccc 100644
--- a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
+++ b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
@@ -266,4 +266,23 @@ trait DesignHelpers
return $logs;
}
+
+ public function processCustomColumns(string $type): void
+ {
+ $custom_columns = [];
+
+ foreach ((array) $this->client->company->custom_fields as $field => $value) {
+ info($field);
+
+ if (\Illuminate\Support\Str::startsWith($field, $type)) {
+ $custom_columns[] = '$' . $type . '.' . $field;
+ }
+ }
+
+ $key = array_search(sprintf('%s%s.description', '$', $type), $this->context['pdf_variables']["{$type}_columns"], true);
+
+ if ($key) {
+ array_splice($this->context['pdf_variables']["{$type}_columns"], $key + 1, 0, $custom_columns);
+ }
+ }
}
diff --git a/app/Services/PdfMaker/PdfMakerUtilities.php b/app/Services/PdfMaker/PdfMakerUtilities.php
index a4e9d506e36a..e5f3b1154328 100644
--- a/app/Services/PdfMaker/PdfMakerUtilities.php
+++ b/app/Services/PdfMaker/PdfMakerUtilities.php
@@ -111,6 +111,10 @@ trait PdfMakerUtilities
{
foreach ($children as $child) {
$contains_html = false;
+
+ if (isset($child['content'])) {
+ $child['content'] = nl2br($child['content']);
+ }
// "/\/[a-z]*>/i" -> checks for HTML-like tags:
// => true
diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index 5245d109c890..889d75e29f3f 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -13,10 +13,13 @@
namespace App\Utils;
use App\Models\Client;
+use App\Utils\Traits\MakesDates;
use stdClass;
class Helpers
{
+ use MakesDates;
+
public static function sharedEmailVariables(?Client $client, array $settings = null): array
{
if (!$client) {
@@ -35,4 +38,42 @@ class Helpers
return $elements;
}
+
+ /**
+ * A centralised way to format the custom fields content.
+ *
+ * @param mixed $custom_fields
+ * @param mixed $field
+ * @param mixed $value
+ * @param null|\App\Models\Client $client
+ *
+ * @return null|string
+ */
+ public function formatCustomFieldValue($custom_fields, $field, $value, ?Client $client): ?string
+ {
+ $custom_field = '';
+
+ if ($custom_fields && property_exists($custom_fields, $field)) {
+ $custom_field = $custom_fields->{$field};
+ $custom_field_parts = explode('|', $custom_field);
+
+ if (count($custom_field_parts) >= 2) {
+ $custom_field = $custom_field_parts[1];
+ }
+ }
+
+ switch ($custom_field) {
+ case 'date':
+ return $this->formatDate($value, $client->date_format());
+ break;
+
+ case 'switch':
+ return trim($value) == 'yes' ? ctrans('texts.yes') : ctrans('texts.no');
+ break;
+
+ default:
+ return is_null($value) ? '' : $value;
+ break;
+ }
+ }
}
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 6dd82e753438..955e41936fc4 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -294,6 +294,7 @@ class HtmlEngine
$data['$custom_surcharge3'] = ['value' => $this->entity->custom_surcharge3 ?: ' ', 'label' => $this->makeCustomField('custom_surcharge3')];
$data['$custom_surcharge4'] = ['value' => $this->entity->custom_surcharge4 ?: ' ', 'label' => $this->makeCustomField('custom_surcharge4')];
+ $data['$product.item'] = ['value' => '', 'label' => ctrans('texts.item')];
$data['$product.date'] = ['value' => '', 'label' => ctrans('texts.date')];
$data['$product.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
$data['$product.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
@@ -307,6 +308,10 @@ class HtmlEngine
$data['$product.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')];
$data['$product.description'] = ['value' => '', 'label' => ctrans('texts.description')];
$data['$product.unit_cost'] = ['value' => '', 'label' => ctrans('texts.unit_cost')];
+ $data['$product.product1'] = ['value' => '', 'label' => $this->makeCustomField('product1')];
+ $data['$product.product2'] = ['value' => '', 'label' => $this->makeCustomField('product2')];
+ $data['$product.product3'] = ['value' => '', 'label' => $this->makeCustomField('product3')];
+ $data['$product.product4'] = ['value' => '', 'label' => $this->makeCustomField('product4')];
$data['$task.date'] = ['value' => '', 'label' => ctrans('texts.date')];
$data['$task.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index b02e847fe281..44144d8ad422 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -74,8 +74,6 @@ class SystemHealth
'env_writable' => self::checkEnvWritable(),
//'mail' => self::testMailServer(),
'simple_db_check' => (bool) self::simpleDbCheck(),
- // 'npm_status' => self::checkNpm(),
- // 'node_status' => self::checkNode(),
'cache_enabled' => self::checkConfigCache(),
'phantom_enabled' => (bool) config('ninja.phantomjs_pdf_generation'),
'exec' => (bool) self::checkExecWorks(),
@@ -110,36 +108,6 @@ class SystemHealth
return true;
}
- public static function checkNode()
- {
- try {
- exec('node -v', $foo, $exitCode);
-
- if ($exitCode === 0) {
- return empty($foo[0]) ? 'Found node, but no version information' : $foo[0];
- }
-
- return 'Node not found.';
- } catch (Exception $e) {
- return 'Node not found.';
- }
- }
-
- public static function checkNpm()
- {
- try {
- exec('npm -v', $foo, $exitCode);
-
- if ($exitCode === 0) {
- return empty($foo[0]) ? 'Found npm, but no version information' : $foo[0];
- }
-
- return 'NPM not found';
- } catch (Exception $e) {
- return 'NPM not found';
- }
- }
-
private static function simpleDbCheck() :bool
{
$result = true;
diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php
index a10a4783c228..08356c076822 100644
--- a/app/Utils/Traits/MakesInvoiceValues.php
+++ b/app/Utils/Traits/MakesInvoiceValues.php
@@ -15,6 +15,7 @@ use App\Models\Country;
use App\Models\Credit;
use App\Models\Invoice;
use App\Models\Quote;
+use App\Utils\Helpers;
use App\Utils\Number;
/**
@@ -591,9 +592,12 @@ trait MakesInvoiceValues
/**
* Formats the line items for display.
- * @param array $items The array of invoice items
+ *
+ * @param mixed $items
* @param string $table_type
- * @return array The formatted array of invoice items
+ * @param mixed|null $custom_fields
+ *
+ * @return array
*/
public function transformLineItems($items, $table_type = '$product') :array
{
@@ -616,14 +620,22 @@ trait MakesInvoiceValues
}
}
- $data[$key][$table_type.'.product_key'] = $item->product_key;
+ $helpers = new Helpers();
+ $_table_type = ltrim($table_type, '$'); // From $product -> product.
+
+
+ $data[$key][$table_type.'.product_key'] = is_null(optional($item)->product_key) ? $item->item : $item->product_key;
+ $data[$key][$table_type.'.item'] = is_null(optional($item)->item) ? $item->product_key : $item->item;
$data[$key][$table_type.'.service'] = is_null(optional($item)->service) ? $item->product_key : $item->service;
$data[$key][$table_type.'.notes'] = $item->notes;
$data[$key][$table_type.'.description'] = $item->notes;
- $data[$key][$table_type.'.custom_value1'] = $item->custom_value1;
- $data[$key][$table_type.'.custom_value2'] = $item->custom_value2;
- $data[$key][$table_type.'.custom_value3'] = $item->custom_value3;
- $data[$key][$table_type.'.custom_value4'] = $item->custom_value4;
+
+
+ $data[$key][$table_type . ".{$_table_type}1"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}1", $item->custom_value1, $this->client);
+ $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);
+
$data[$key][$table_type.'.quantity'] = $item->quantity;
$data[$key][$table_type.'.unit_cost'] = Number::formatMoney($item->cost, $this->client);
diff --git a/composer.json b/composer.json
index e172357745de..2688ba426c6e 100644
--- a/composer.json
+++ b/composer.json
@@ -62,7 +62,6 @@
"omnipay/paypal": "^3.0",
"predis/predis": "^1.1",
"sentry/sentry-laravel": "^2",
- "spatie/browsershot": "3.40.2",
"stripe/stripe-php": "^7.50",
"turbo124/beacon": "^1",
"turbo124/laravel-gmail": "^5.0",
diff --git a/composer.lock b/composer.lock
index 6dec3eeb0716..305a63058120 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "669af9e67b79e872aa671420cfb14ddd",
+ "content-hash": "304401db428800e3f176f946f22ee2f6",
"packages": [
{
"name": "asgrim/ofxparser",
@@ -3594,71 +3594,6 @@
},
"time": "2017-06-12T11:04:56+00:00"
},
- {
- "name": "league/glide",
- "version": "1.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/glide.git",
- "reference": "ae5e26700573cb678919d28e425a8b87bc71c546"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/glide/zipball/ae5e26700573cb678919d28e425a8b87bc71c546",
- "reference": "ae5e26700573cb678919d28e425a8b87bc71c546",
- "shasum": ""
- },
- "require": {
- "intervention/image": "^2.4",
- "league/flysystem": "^1.0",
- "php": "^7.2|^8.0",
- "psr/http-message": "^1.0"
- },
- "require-dev": {
- "mockery/mockery": "^1.3.3",
- "phpunit/php-token-stream": "^3.1|^4.0",
- "phpunit/phpunit": "^8.5|^9.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "League\\Glide\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jonathan Reinink",
- "email": "jonathan@reinink.ca",
- "homepage": "http://reinink.ca"
- }
- ],
- "description": "Wonderfully easy on-demand image manipulation library with an HTTP based API.",
- "homepage": "http://glide.thephpleague.com",
- "keywords": [
- "ImageMagick",
- "editing",
- "gd",
- "image",
- "imagick",
- "league",
- "manipulation",
- "processing"
- ],
- "support": {
- "issues": "https://github.com/thephpleague/glide/issues",
- "source": "https://github.com/thephpleague/glide/tree/1.7.0"
- },
- "time": "2020-11-05T17:34:03+00:00"
- },
{
"name": "league/mime-type-detection",
"version": "1.5.1",
@@ -6672,244 +6607,6 @@
],
"time": "2020-12-07T09:19:29+00:00"
},
- {
- "name": "spatie/browsershot",
- "version": "3.40.2",
- "source": {
- "type": "git",
- "url": "https://github.com/spatie/browsershot.git",
- "reference": "3e55eaf5ab8cee65d1661a567e89b3374afb9116"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/spatie/browsershot/zipball/3e55eaf5ab8cee65d1661a567e89b3374afb9116",
- "reference": "3e55eaf5ab8cee65d1661a567e89b3374afb9116",
- "shasum": ""
- },
- "require": {
- "php": "^7.1",
- "spatie/image": "^1.5.3",
- "spatie/temporary-directory": "^1.1",
- "symfony/process": "^4.2|^5.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.1|^7.5",
- "spatie/phpunit-snapshot-assertions": "^1.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Spatie\\Browsershot\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Freek Van der Herten",
- "email": "freek@spatie.be",
- "homepage": "https://github.com/freekmurze",
- "role": "Developer"
- }
- ],
- "description": "Convert a webpage to an image or pdf using headless Chrome",
- "homepage": "https://github.com/spatie/browsershot",
- "keywords": [
- "chrome",
- "convert",
- "headless",
- "image",
- "pdf",
- "puppeteer",
- "screenshot",
- "webpage"
- ],
- "support": {
- "issues": "https://github.com/spatie/browsershot/issues",
- "source": "https://github.com/spatie/browsershot/tree/3.40.2"
- },
- "funding": [
- {
- "url": "https://github.com/spatie",
- "type": "github"
- }
- ],
- "time": "2020-11-11T22:18:15+00:00"
- },
- {
- "name": "spatie/image",
- "version": "1.10.1",
- "source": {
- "type": "git",
- "url": "https://github.com/spatie/image.git",
- "reference": "6eaf45d61832c2396dd4b10cc81d9fce93a59e2d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/spatie/image/zipball/6eaf45d61832c2396dd4b10cc81d9fce93a59e2d",
- "reference": "6eaf45d61832c2396dd4b10cc81d9fce93a59e2d",
- "shasum": ""
- },
- "require": {
- "ext-exif": "*",
- "ext-mbstring": "*",
- "league/glide": "^1.6",
- "php": "^7.2|^8.0",
- "spatie/image-optimizer": "^1.1",
- "spatie/temporary-directory": "^1.0",
- "symfony/process": "^3.0|^4.0|^5.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^8.0|^9.0",
- "symfony/var-dumper": "^4.0|^5.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Spatie\\Image\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Freek Van der Herten",
- "email": "freek@spatie.be",
- "homepage": "https://spatie.be",
- "role": "Developer"
- }
- ],
- "description": "Manipulate images with an expressive API",
- "homepage": "https://github.com/spatie/image",
- "keywords": [
- "image",
- "spatie"
- ],
- "support": {
- "issues": "https://github.com/spatie/image/issues",
- "source": "https://github.com/spatie/image/tree/1.10.1"
- },
- "funding": [
- {
- "url": "https://spatie.be/open-source/support-us",
- "type": "custom"
- },
- {
- "url": "https://github.com/spatie",
- "type": "github"
- }
- ],
- "time": "2020-12-01T20:42:11+00:00"
- },
- {
- "name": "spatie/image-optimizer",
- "version": "1.3.2",
- "source": {
- "type": "git",
- "url": "https://github.com/spatie/image-optimizer.git",
- "reference": "6aa170eb292758553d332efee5e0c3977341080c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/spatie/image-optimizer/zipball/6aa170eb292758553d332efee5e0c3977341080c",
- "reference": "6aa170eb292758553d332efee5e0c3977341080c",
- "shasum": ""
- },
- "require": {
- "ext-fileinfo": "*",
- "php": "^7.2|^8.0",
- "psr/log": "^1.0",
- "symfony/process": "^4.2|^5.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^8.0|^9.0",
- "symfony/var-dumper": "^4.2|^5.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Spatie\\ImageOptimizer\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Freek Van der Herten",
- "email": "freek@spatie.be",
- "homepage": "https://spatie.be",
- "role": "Developer"
- }
- ],
- "description": "Easily optimize images using PHP",
- "homepage": "https://github.com/spatie/image-optimizer",
- "keywords": [
- "image-optimizer",
- "spatie"
- ],
- "support": {
- "issues": "https://github.com/spatie/image-optimizer/issues",
- "source": "https://github.com/spatie/image-optimizer/tree/1.3.2"
- },
- "time": "2020-11-28T12:37:58+00:00"
- },
- {
- "name": "spatie/temporary-directory",
- "version": "1.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/spatie/temporary-directory.git",
- "reference": "f517729b3793bca58f847c5fd383ec16f03ffec6"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/f517729b3793bca58f847c5fd383ec16f03ffec6",
- "reference": "f517729b3793bca58f847c5fd383ec16f03ffec6",
- "shasum": ""
- },
- "require": {
- "php": "^7.2|^8.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^8.0|^9.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Spatie\\TemporaryDirectory\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Alex Vanderbist",
- "email": "alex@spatie.be",
- "homepage": "https://spatie.be",
- "role": "Developer"
- }
- ],
- "description": "Easily create, use and destroy temporary directories",
- "homepage": "https://github.com/spatie/temporary-directory",
- "keywords": [
- "php",
- "spatie",
- "temporary-directory"
- ],
- "support": {
- "issues": "https://github.com/spatie/temporary-directory/issues",
- "source": "https://github.com/spatie/temporary-directory/tree/1.3.0"
- },
- "time": "2020-11-09T15:54:21+00:00"
- },
{
"name": "stripe/stripe-php",
"version": "v7.67.0",
diff --git a/config/ninja.php b/config/ninja.php
index 464694198161..a20026e81eaf 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -12,7 +12,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''),
- 'app_version' => '5.0.39',
+ 'app_version' => '5.0.40',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),
@@ -135,7 +135,5 @@ return [
'designs' => [
'base_path' => resource_path('views/pdf-designs/'),
],
- 'experimental_pdf_engine' => env('EXPERIMENTAL_PDF_ENGINE', false),
- 'experimental_pdf_engine_chromium_path' => env('EXPERIMENTAL_PDF_ENGINE_CHROMIUM_PATH', null),
'log_pdf_html' => env('LOG_PDF_HTML', false),
];
diff --git a/database/migrations/2020_12_23_220648_remove_null_values_in_countries_table.php b/database/migrations/2020_12_23_220648_remove_null_values_in_countries_table.php
new file mode 100644
index 000000000000..02c1e9ed7502
--- /dev/null
+++ b/database/migrations/2020_12_23_220648_remove_null_values_in_countries_table.php
@@ -0,0 +1,32 @@
+update(['thousand_separator' => '']);
+ $countries = Country::whereNull('decimal_separator')->update(['decimal_separator' => '']);
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('countries', function (Blueprint $table) {
+ //
+ });
+ }
+}
diff --git a/package-lock.json b/package-lock.json
index 2980963b1b3f..ae011cc47f31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1257,16 +1257,6 @@
"integrity": "sha1-qBG4wY4rq6t9VCszZYh64uTZ3kc=",
"dev": true
},
- "@types/yauzl": {
- "version": "2.9.1",
- "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
- "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
- "dev": true,
- "optional": true,
- "requires": {
- "@types/node": "*"
- }
- },
"@vue/component-compiler-utils": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz",
@@ -1528,12 +1518,6 @@
}
}
},
- "agent-base": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
- "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
- "dev": true
- },
"aggregate-error": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -2022,40 +2006,6 @@
"file-uri-to-path": "1.0.0"
}
},
- "bl": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
- "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
- "dev": true,
- "requires": {
- "buffer": "^5.5.0",
- "inherits": "^2.0.4",
- "readable-stream": "^3.4.0"
- },
- "dependencies": {
- "buffer": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
- "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
- "dev": true,
- "requires": {
- "base64-js": "^1.0.2",
- "ieee754": "^1.1.4"
- }
- },
- "readable-stream": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
- "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
- "dev": true,
- "requires": {
- "inherits": "^2.0.3",
- "string_decoder": "^1.1.1",
- "util-deprecate": "^1.0.1"
- }
- }
- }
- },
"bluebird": {
"version": "3.7.2",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -3549,12 +3499,6 @@
"minimist": "^1.1.1"
}
},
- "devtools-protocol": {
- "version": "0.0.799653",
- "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.799653.tgz",
- "integrity": "sha512-t1CcaZbvm8pOlikqrsIM9GOa7Ipp07+4h/q9u0JXBWjPCjHdBl9KkddX87Vv9vBHoBGtwV79sYQNGnQM6iS5gg==",
- "dev": true
- },
"diffie-hellman": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
@@ -4549,12 +4493,6 @@
"readable-stream": "^2.0.0"
}
},
- "fs-constants": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
- "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
- "dev": true
- },
"fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -5071,33 +5009,6 @@
"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
},
- "https-proxy-agent": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
- "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
- "dev": true,
- "requires": {
- "agent-base": "5",
- "debug": "4"
- },
- "dependencies": {
- "debug": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
- "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
- "dev": true,
- "requires": {
- "ms": "2.1.2"
- }
- },
- "ms": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
- "dev": true
- }
- }
- },
"iconv-lite": {
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -5264,9 +5175,9 @@
"integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w="
},
"ini": {
- "version": "1.3.5",
- "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
- "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc="
+ "version": "1.3.8",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
},
"internal-ip": {
"version": "4.3.0",
@@ -6356,12 +6267,6 @@
"minimist": "^1.2.5"
}
},
- "mkdirp-classic": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
- "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
- "dev": true
- },
"moment": {
"version": "2.27.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
@@ -7756,12 +7661,6 @@
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
"integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I="
},
- "progress": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
- "integrity": "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg=",
- "dev": true
- },
"promise-inflight": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
@@ -7776,12 +7675,6 @@
"ipaddr.js": "1.9.1"
}
},
- "proxy-from-env": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
- "integrity": "sha1-4QLxbKNVQkhldV0sno6k8k1Yw+I=",
- "dev": true
- },
"prr": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -7853,121 +7746,6 @@
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
"integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
},
- "puppeteer": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-5.3.1.tgz",
- "integrity": "sha512-YTM1RaBeYrj6n7IlRXRYLqJHF+GM7tasbvrNFx6w1S16G76NrPq7oYFKLDO+BQsXNtS8kW2GxWCXjIMPvfDyaQ==",
- "dev": true,
- "requires": {
- "debug": "^4.1.0",
- "devtools-protocol": "0.0.799653",
- "extract-zip": "^2.0.0",
- "https-proxy-agent": "^4.0.0",
- "pkg-dir": "^4.2.0",
- "progress": "^2.0.1",
- "proxy-from-env": "^1.0.0",
- "rimraf": "^3.0.2",
- "tar-fs": "^2.0.0",
- "unbzip2-stream": "^1.3.3",
- "ws": "^7.2.3"
- },
- "dependencies": {
- "debug": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
- "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
- "dev": true,
- "requires": {
- "ms": "2.1.2"
- }
- },
- "extract-zip": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
- "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
- "dev": true,
- "requires": {
- "@types/yauzl": "^2.9.1",
- "debug": "^4.1.1",
- "get-stream": "^5.1.0",
- "yauzl": "^2.10.0"
- }
- },
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dev": true,
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- }
- },
- "get-stream": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
- "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
- "dev": true,
- "requires": {
- "pump": "^3.0.0"
- }
- },
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "dev": true,
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
- "ms": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
- "dev": true
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "dev": true,
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "dev": true
- },
- "pkg-dir": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
- "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
- "dev": true,
- "requires": {
- "find-up": "^4.0.0"
- }
- },
- "rimraf": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
- "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
- "dev": true,
- "requires": {
- "glob": "^7.1.3"
- }
- },
- "ws": {
- "version": "7.3.1",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
- "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
- "dev": true
- }
- }
- },
"purgecss": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/purgecss/-/purgecss-2.3.0.tgz",
@@ -9405,44 +9183,6 @@
"resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
"integrity": "sha1-ofzMBrWNth/XpF2i2kT186Pme6I="
},
- "tar-fs": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz",
- "integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==",
- "dev": true,
- "requires": {
- "chownr": "^1.1.1",
- "mkdirp-classic": "^0.5.2",
- "pump": "^3.0.0",
- "tar-stream": "^2.0.0"
- }
- },
- "tar-stream": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
- "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
- "dev": true,
- "requires": {
- "bl": "^4.0.3",
- "end-of-stream": "^1.4.1",
- "fs-constants": "^1.0.0",
- "inherits": "^2.0.3",
- "readable-stream": "^3.1.1"
- },
- "dependencies": {
- "readable-stream": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
- "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
- "dev": true,
- "requires": {
- "inherits": "^2.0.3",
- "string_decoder": "^1.1.1",
- "util-deprecate": "^1.0.1"
- }
- }
- }
- },
"terser": {
"version": "3.17.0",
"resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
@@ -9744,28 +9484,6 @@
}
}
},
- "unbzip2-stream": {
- "version": "1.4.3",
- "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
- "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
- "dev": true,
- "requires": {
- "buffer": "^5.2.1",
- "through": "^2.3.8"
- },
- "dependencies": {
- "buffer": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
- "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
- "dev": true,
- "requires": {
- "base64-js": "^1.0.2",
- "ieee754": "^1.1.4"
- }
- }
- }
- },
"unicode-canonical-property-names-ecmascript": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
diff --git a/package.json b/package.json
index d8033b3dff1a..04bbb6a03eac 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
"@babel/plugin-proposal-class-properties": "^7.10.4",
"cypress": "^4.12.1",
"laravel-mix-purgecss": "^5.0.0",
- "puppeteer": "^5.3.1",
"vue-template-compiler": "^2.6.11"
},
"dependencies": {
diff --git a/public/flutter_service_worker.js b/public/flutter_service_worker.js
index 365284871d1d..f8577f4e73bf 100755
--- a/public/flutter_service_worker.js
+++ b/public/flutter_service_worker.js
@@ -30,8 +30,8 @@ const RESOURCES = {
"assets/FontManifest.json": "cf3c681641169319e61b61bd0277378f",
"assets/fonts/MaterialIcons-Regular.otf": "1288c9e28052e028aba623321f7826ac",
"/": "23224b5e03519aaa87594403d54412cf",
-"version.json": "9dd2fd2348d37545c57e88fbd387e6b8",
-"main.dart.js": "891e3734a9497025a639574649c5afa1",
+"version.json": "2337a2140fc2ea8baeb10b0e5a200f59",
+"main.dart.js": "cb45263da95ac53b92a95e621c5880a8",
"favicon.png": "dca91c54388f52eded692718d5a98b8b"
};
diff --git a/public/main.dart.js b/public/main.dart.js
index d085927dbfd3..3f986bdcc58b 100755
--- a/public/main.dart.js
+++ b/public/main.dart.js
@@ -79,7 +79,7 @@ s.a=!1
$.dbR=new H.cNo(s)
if($.cYe==null)$.cYe=H.doZ()
if($.cYq==null)$.cYq=new H.bjF()},
-dvR:function(){self._flutter_web_set_location_strategy=P.agO(new H.cjM())
+dvR:function(){self._flutter_web_set_location_strategy=P.agP(new H.cjM())
$.t_.push(new H.cjN())},
cVn:function(a){var s=new Float32Array(16)
s[15]=a[15]
@@ -101,7 +101,7 @@ s[0]=a[0]
return s},
dlL:function(a,b,c){var s=W.pJ("flt-canvas",null),r=H.a([],t.lX),q=H.pe(),p=a.a,o=a.c-p,n=H.aRG(o),m=a.b,l=a.d-m,k=H.aRF(l)
l=new H.bPz(H.aRG(o),H.aRF(l),c,H.a([],t.Yw),H.kV())
-q=new H.wd(a,s,l,r,n,k,q,c,b)
+q=new H.we(a,s,l,r,n,k,q,c,b)
k=s.style
k.position="absolute"
q.Q=C.m.fh(p)-1
@@ -112,8 +112,8 @@ q.a5V()
return q},
aRG:function(a){return C.m.hM((a+1)*H.pe())+2},
aRF:function(a){return C.m.hM((a+1)*H.pe())+2},
-dlM:function(a){(a&&C.a4V).h_(a)},
-aNM:function(a){if(a==null)return null
+dlM:function(a){(a&&C.a4W).h_(a)},
+aNN:function(a){if(a==null)return null
switch(a){case C.nS:return"source-over"
case C.wC:return"source-in"
case C.wE:return"source-out"
@@ -153,10 +153,10 @@ o=document
n=o.createElement("div")
m=n.style
m.position=a0
-if(!$.nt){m=H.aNA()
+if(!$.nt){m=H.aNB()
if($.nt)H.b(H.n_("_browserEngine"))
-$.zj=m
-$.nt=!0}m=$.zj
+$.zk=m
+$.nt=!0}m=$.zk
if(m===C.bF){m=n.style
m.zIndex="0"}if(s==null)s=n
else{m=$.fY()
@@ -217,7 +217,7 @@ m=C.y.c6(e,a2)
e.setProperty(m,d,"")
m=C.y.c6(e,a1)
e.setProperty(m,"0 0 0","")
-a5.push(W.a1E(H.daI(n,f),new H.Qi(),null))}}}a=o.createElement("div")
+a5.push(W.a1F(H.daI(n,f),new H.Qi(),null))}}}a=o.createElement("div")
o=a.style
o.position=a0
o=new Float32Array(16)
@@ -252,16 +252,16 @@ da0:function(a){var s,r
if(a!=null){s=a.b
r=$.e5()
return"blur("+H.f(s*r.gfu(r))+"px)"}else return"none"},
-hJ:function(){if(!$.nt){var s=H.aNA()
+hK:function(){if(!$.nt){var s=H.aNB()
if($.nt)throw H.e(H.n_("_browserEngine"))
-$.zj=s
-$.nt=!0}return $.zj},
-cEz:function(){if(!$.nt){var s=H.aNA()
+$.zk=s
+$.nt=!0}return $.zk},
+cEz:function(){if(!$.nt){var s=H.aNB()
if($.nt)H.b(H.n_("_browserEngine"))
-$.zj=s
-$.nt=!0}s=$.zj
+$.zk=s
+$.nt=!0}s=$.zk
return s},
-aNA:function(){var s=window.navigator.vendor,r=window.navigator.userAgent.toLowerCase()
+aNB:function(){var s=window.navigator.vendor,r=window.navigator.userAgent.toLowerCase()
if(s==="Google Inc.")return C.fJ
else if(s==="Apple Computer, Inc.")return C.bF
else if(C.d.H(r,"edge/"))return C.Ei
@@ -270,14 +270,14 @@ else if(C.d.H(r,"trident/7.0"))return C.nX
else if(s===""&&C.d.H(r,"firefox"))return C.fK
P.at("WARNING: failed to detect current browser engine.")
return C.Ej},
-my:function(){if(!$.agC){var s=H.d9D()
-if($.agC)throw H.e(H.n_("_operatingSystem"))
+my:function(){if(!$.agD){var s=H.d9D()
+if($.agD)throw H.e(H.n_("_operatingSystem"))
$.ciR=s
-$.agC=!0}return $.ciR},
-dbv:function(){if(!$.agC){var s=H.d9D()
-if($.agC)H.b(H.n_("_operatingSystem"))
+$.agD=!0}return $.ciR},
+dbv:function(){if(!$.agD){var s=H.d9D()
+if($.agD)H.b(H.n_("_operatingSystem"))
$.ciR=s
-$.agC=!0}s=$.ciR
+$.agD=!0}s=$.ciR
return s},
d9D:function(){var s,r=window.navigator.platform
r.toString
@@ -287,16 +287,16 @@ else if(C.d.H(r.toLowerCase(),"iphone")||C.d.H(r.toLowerCase(),"ipad")||C.d.H(r.
else if(J.iz(s,"Android"))return C.AD
else if(C.d.eg(r,"Linux"))return C.Qj
else if(C.d.eg(r,"Win"))return C.Qk
-else return C.aof},
+else return C.aog},
d09:function(){var s=$.d9n
return s==null?$.d9n=H.dyX():s},
dyX:function(){var s=W.aT8(1,1)
if(C.o3.Ly(s,"webgl2")!=null)return 2
if(C.o3.Ly(s,"webgl")!=null)return 1
return-1},
-d58:function(){var s=H.hJ()
+d58:function(){var s=H.hK()
return s===C.fK||window.navigator.clipboard==null?new H.b3w():new H.aVK()},
-agD:function(a,b,c,d){var s,r,q,p,o,n,m,l,k,j,i=t.py.a($.fY().tR(0,c)),h=b.b===C.bD,g=b.c
+agE:function(a,b,c,d){var s,r,q,p,o,n,m,l,k,j,i=t.py.a($.fY().tR(0,c)),h=b.b===C.bD,g=b.c
if(g==null)g=0
s=a.a
r=a.c
@@ -328,7 +328,7 @@ if(h){s=H.f(s-g)+"px"
k.width=s
s=H.f(n-o-g)+"px"
k.height=s
-s=H.zk(g)+" solid "+j
+s=H.zl(g)+" solid "+j
k.border=s}else{s=H.f(s)+"px"
k.width=s
s=H.f(n-o)+"px"
@@ -338,28 +338,28 @@ d9k:function(a,b){var s,r,q=b.e,p=b.r
if(q==p){s=b.Q
if(q==s){r=b.y
s=q==r&&q==b.f&&p==b.x&&s==b.ch&&r==b.z}else s=!1}else s=!1
-if(s){q=H.zk(b.Q)
+if(s){q=H.zl(b.Q)
a.toString
C.y.cZ(a,C.y.c6(a,"border-radius"),q,"")
-return}q=H.zk(q)+" "+H.zk(b.f)
+return}q=H.zl(q)+" "+H.zl(b.f)
a.toString
C.y.cZ(a,C.y.c6(a,"border-top-left-radius"),q,"")
-p=H.zk(p)+" "+H.zk(b.x)
+p=H.zl(p)+" "+H.zl(b.x)
C.y.cZ(a,C.y.c6(a,"border-top-right-radius"),p,"")
-p=H.zk(b.Q)+" "+H.zk(b.ch)
+p=H.zl(b.Q)+" "+H.zl(b.ch)
C.y.cZ(a,C.y.c6(a,"border-bottom-left-radius"),p,"")
-p=H.zk(b.y)+" "+H.zk(b.z)
+p=H.zl(b.y)+" "+H.zl(b.z)
C.y.cZ(a,C.y.c6(a,"border-bottom-right-radius"),p,"")},
-zk:function(a){return J.d9(a===0?1:a,3)+"px"},
+zl:function(a){return J.d9(a===0?1:a,3)+"px"},
dnl:function(){var s,r,q,p=document,o=p.body
o.toString
-o=new H.amC(o)
+o=new H.amD(o)
o.kt(0)
s=$.XP
if(s!=null)J.hc(s.b)
$.XP=null
s=W.pJ("flt-ruler-host",null)
-r=new H.aw_(10,s,P.ac(t.UY,t.R3))
+r=new H.aw0(10,s,P.ac(t.UY,t.R3))
q=s.style
q.position="fixed"
q.visibility="hidden"
@@ -377,7 +377,7 @@ if(c==null)a.style.removeProperty(b)
else{s=a.style
s.toString
C.y.cZ(s,C.y.c6(s,b),c,null)}},
-amD:function(a,b,c,d,e,f,g,h,i){var s=$.d3q
+amE:function(a,b,c,d,e,f,g,h,i){var s=$.d3q
if(s==null?$.d3q=a.ellipse!=null:s)a.ellipse(b,c,d,e,f,g,h,i)
else{a.save()
a.translate(b,c)
@@ -413,8 +413,8 @@ r.width=q
if(c!=null)H.d_Y(p,H.aOb(c,b).a)
return p},
daI:function(a,b){var s,r=b.ln(0),q=r.c,p=r.d,o=H.da5(b,0,0,1/q,1/p)
-H.fP(a,"clip-path","url(#svgClip"+$.agE+")")
-H.fP(a,"-webkit-clip-path","url(#svgClip"+$.agE+")")
+H.fP(a,"clip-path","url(#svgClip"+$.agF+")")
+H.fP(a,"-webkit-clip-path","url(#svgClip"+$.agF+")")
s=a.style
q=H.f(q)+"px"
s.width=q
@@ -428,7 +428,7 @@ return s+(c?'':'0.0000152587890625)
return(s+r)/2},
d9H:function(a,b,c,d,e){return(((d+3*(b-c)-a)*e+3*(c-b-b+a))*e+3*(b-a))*e+a},
-cYP:function(){var s=new H.Of(H.d5b(),C.iY)
+cYP:function(){var s=new H.Of(H.d5b(),C.iX)
s.a57()
return s},
dvY:function(a,b,c){var s
@@ -586,7 +586,7 @@ drt:function(a){var s
if(a<0)s=-1
else s=a>0?1:0
return s},
-aNO:function(a,b){var s
+aNP:function(a,b){var s
if(a<0){a=-a
b=-b}if(b===0||a===0||a>=b)return null
s=a/b
@@ -602,7 +602,7 @@ if(q!==a.Q||p!==a.y||s!==a.ch||r!==a.z)return!1
return!0},
blm:function(a,b,c,d,e,f){if(d==f)return H.jx(c,a,e)&&a!=e
else return a==c&&b==d},
-dq7:function(a){var s,r,q,p,o=a[0],n=a[1],m=a[2],l=a[3],k=a[4],j=a[5],i=n-l,h=H.aNO(i,i-l+j)
+dq7:function(a){var s,r,q,p,o=a[0],n=a[1],m=a[2],l=a[3],k=a[4],j=a[5],i=n-l,h=H.aNP(i,i-l+j)
if(h!=null){s=o+h*(m-o)
r=n+h*(l-n)
q=m+h*(k-m)
@@ -640,7 +640,7 @@ s=a[0]
r=a[2]
q=a[4]
if(!H.jx(s,b,r)&&!H.jx(r,b,q))return
-p=new H.zf()
+p=new H.zg()
o=p.tZ(i-2*h+g,2*(h-i),i-c)
for(n=q-2*r+s,m=2*(r-s),l=0;l30)C.a.fa($.FW,0).d.B(0)}else a.d.B(0)}},
bnd:function(a,b){if(a<=0)return b*0.1
@@ -750,11 +750,11 @@ if(s*a6*a6>4194304&&a6>2)a6=3355443.2/s}else a6=Math.max(2/C.O.fh(2/a6),0.0001)
return a6},
QC:function(a,b){var s=a<0?0:a,r=b<0?0:b
return s*s+r*r},
-agH:function(a){var s=a.a.y,r=s!=null?0+s.b*2:0
+agI:function(a){var s=a.a.y,r=s!=null?0+s.b*2:0
return a.gjl()!==0?r+a.gjl()*0.70710678118:r},
d8x:function(){return $.cZp?$.cZo:H.b(H.a5("_programCache"))},
dq0:function(a1,a2){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a,a0
-if(a2==null)a2=C.a5M
+if(a2==null)a2=C.a5N
s=a1.length
r=!J.j(a2[0],0)
q=!J.j(C.a.gaV(a2),1)
@@ -777,7 +777,7 @@ h=1}else{i=0
h=0}for(l=a1.length,g=0;g>>16&255)/255
i=f+1
n[f]=(e.gv(j)>>>8&255)/255
@@ -834,12 +834,12 @@ b.m_("vec4 bias;")
b.m_("vec4 scale;")
for(s=c.d,r=s-1,q=C.e.dh(r,4)+1,p=0;p1)s.push(new P.n5(C.a.ga4(o),C.a.gaV(o)))
else s.push(new P.n5(p,null))}return s},
dBM:function(a,b){var s=a.oQ(b),r=P.cG2(s.b)
switch(s.a){case"setDevicePixelRatio":$.e5().r=r
-$.fn().f.$0()
+$.fo().f.$0()
return!0}return!1},
-aNY:function(a,b){if(a==null)return
-if(b===$.aL)a.$0()
+aNZ:function(a,b){if(a==null)return
+if(b===$.aM)a.$0()
else b.uu(a)},
-aNZ:function(a,b,c,d){if(a==null)return
-if(b===$.aL)a.$1(c)
+aO_:function(a,b,c,d){if(a==null)return
+if(b===$.aM)a.$1(c)
else b.wC(a,c,d)},
-zp:function(a,b,c,d,e){if(a==null)return
-if(b===$.aL)a.$3(c,d,e)
+zq:function(a,b,c,d,e){if(a==null)return
+if(b===$.aM)a.$3(c,d,e)
else b.uu(new H.cNB(a,c,d,e))},
dKL:function(a){switch(a){case 0:return 1
case 1:return 4
@@ -910,22 +910,22 @@ Fx:function(a){var s=J.iA(a)
return P.c_(0,0,C.m.eq((a-s)*1000),s,0,0)},
dbU:function(a,b){var s=b.$0()
return s},
-dBy:function(){if($.fn().cy==null)return
+dBy:function(){if($.fo().cy==null)return
$.d_b=C.m.eq(window.performance.now()*1000)},
-dBv:function(){if($.fn().cy==null)return
+dBv:function(){if($.fo().cy==null)return
$.cZN=C.m.eq(window.performance.now()*1000)},
-dBu:function(){if($.fn().cy==null)return
+dBu:function(){if($.fo().cy==null)return
$.cZM=C.m.eq(window.performance.now()*1000)},
-dBx:function(){if($.fn().cy==null)return
+dBx:function(){if($.fo().cy==null)return
$.d_7=C.m.eq(window.performance.now()*1000)},
-dBw:function(){var s,r,q=$.fn()
+dBw:function(){var s,r,q=$.fo()
if(q.cy==null)return
s=$.da6=C.m.eq(window.performance.now()*1000)
-$.cZW.push(new P.x_(H.a([$.d_b,$.cZN,$.cZM,$.d_7,s],t.wb)))
+$.cZW.push(new P.x0(H.a([$.d_b,$.cZN,$.cZM,$.d_7,s],t.wb)))
$.da6=$.d_7=$.cZM=$.cZN=$.d_b=-1
if(s-$.dgd()>1e5){$.dBt=s
r=$.cZW
-H.aNZ(q.cy,q.db,r,t.Px)
+H.aO_(q.cy,q.db,r,t.Px)
$.cZW=H.a([],t.no)}},
dD8:function(){return C.m.eq(window.performance.now()*1000)},
dlu:function(){var s=new H.aOI()
@@ -936,7 +936,7 @@ s.toString
if((s&256)!==0)return C.Df
else if((s&65536)!==0)return C.Dg
else return C.De},
-dox:function(a){var s=new H.TN(W.aoy(null),a)
+dox:function(a){var s=new H.TN(W.aoz(null),a)
s.apx(a)
return s},
dnF:function(){var s=t.bo,r=H.a([],t.eE),q=H.a([],t.qj),p=H.my()
@@ -958,7 +958,7 @@ l=h[s]
for(r=s-1;r>=0;--r){m[r]=l
l=i[l]}return m},
cZ7:function(){var s=new Uint8Array(0),r=new DataView(new ArrayBuffer(8))
-return new H.bK9(new H.ayE(s,0),r,H.UA(r.buffer,0,null))},
+return new H.bK9(new H.ayF(s,0),r,H.UA(r.buffer,0,null))},
daB:function(a){if(a===0)return C.z
return new P.Y(200*a/600,400*a/600)},
dKJ:function(a,b){var s,r,q,p,o,n
@@ -975,8 +975,8 @@ return new H.bBG(Math.min(b*((800+(a.c-a.a)*0.5)/600),b*((800+(a.d-a.b)*0.5)/600
dbX:function(a){var s=a.a
return new P.a4(((C.O.aY(0.3*(s>>>24&255))&255)<<24|s&16777215)>>>0)},
dob:function(){var s=t.mo
-if($.d1V())return new H.ao0(H.a([],s))
-else return new H.aIG(H.a([],s))},
+if($.d1V())return new H.ao1(H.a([],s))
+else return new H.aIH(H.a([],s))},
dPN:function(a,b){var s,r,q,p,o,n,m,l,k,j,i,h,g,f=H.cL1(a,b),e=$.aOw().CO(f),d=e===C.rH?C.rC:null,c=e===C.zc
if(e===C.z8||c)e=C.en
for(s=a.length,r=b,q=r,p=null,o=0;b=a.length)return null
s=J.dS(a).d7(a,b)
if((s&63488)===55296&&b>>6&31)+1<<16|(s&63)<<10|C.d.d7(a,b+1)&1023
return s},
-d6q:function(a,b,c,d,e){return new H.ayH(H.dHm(a,b,c,e),d,P.ac(t.S,e),e.h("ayH<0>"))},
-dHm:function(a,b,c,d){var s,r,q,p,o,n=H.a([],d.h("Z>")),m=a.length
-for(s=d.h("a7I<0>"),r=0;r"))},
+dHm:function(a,b,c,d){var s,r,q,p,o,n=H.a([],d.h("Z>")),m=a.length
+for(s=d.h("a7J<0>"),r=0;r=a.length)return!0
s=b-1
if((C.d.d7(a,s)&63488)===55296)return!1
-r=$.ah8().Jc(0,a,b)
-q=$.ah8().Jc(0,a,s)
+r=$.ah9().Jc(0,a,b)
+q=$.ah9().Jc(0,a,s)
if(q===C.vL&&r===C.vM)return!1
if(H.k6(q,C.Dd,C.vL,C.vM,j,j))return!0
if(H.k6(r,C.Dd,C.vL,C.vM,j,j))return!0
@@ -1230,15 +1230,15 @@ if(H.k6(r,C.pS,C.pT,C.pR,j,j))return!1
for(p=0;H.k6(q,C.pS,C.pT,C.pR,j,j);){++p
s=b-p-1
if(s<0)return!0
-o=$.ah8()
+o=$.ah9()
o.toString
n=H.cL1(a,s)
q=n==null?o.b:o.CO(n)}if(H.k6(q,C.e6,C.cJ,j,j,j)&&H.k6(r,C.e6,C.cJ,j,j,j))return!1
m=0
do{++m
-l=$.ah8().Jc(0,a,b+m)}while(H.k6(l,C.pS,C.pT,C.pR,j,j))
+l=$.ah9().Jc(0,a,b+m)}while(H.k6(l,C.pS,C.pT,C.pR,j,j))
do{++p
-k=$.ah8().Jc(0,a,b-p-1)}while(H.k6(k,C.pS,C.pT,C.pR,j,j))
+k=$.ah9().Jc(0,a,b-p-1)}while(H.k6(k,C.pS,C.pT,C.pR,j,j))
if(H.k6(q,C.e6,C.cJ,j,j,j)&&H.k6(r,C.Da,C.pQ,C.nH,j,j)&&H.k6(l,C.e6,C.cJ,j,j,j))return!1
if(H.k6(k,C.e6,C.cJ,j,j,j)&&H.k6(q,C.Da,C.pQ,C.nH,j,j)&&H.k6(r,C.e6,C.cJ,j,j,j))return!1
s=q===C.cJ
@@ -1271,9 +1271,9 @@ dsi:function(a){var s
if(a==="TextCapitalization.words")s=C.CD
else if(a==="TextCapitalization.characters")s=C.CF
else s=a==="TextCapitalization.sentences"?C.CE:C.vA
-return new H.a7g(s)},
+return new H.a7h(s)},
dzq:function(a){},
-aND:function(a,b){var s,r="transparent",q="none",p=a.style
+aNE:function(a,b){var s,r="transparent",q="none",p=a.style
p.whiteSpace="pre-wrap"
C.y.cZ(p,C.y.c6(p,"align-content"),"center","")
p.padding="0"
@@ -1289,8 +1289,8 @@ p.height="0"
C.y.cZ(p,C.y.c6(p,"text-shadow"),r,"")
C.y.cZ(p,C.y.c6(p,"transform-origin"),"0 0 0","")
if(b){p.top="-9999px"
-p.left="-9999px"}s=H.hJ()
-if(s!==C.fJ){s=H.hJ()
+p.left="-9999px"}s=H.hK()
+if(s!==C.fJ){s=H.hK()
s=s===C.bF}else s=!0
if(s)a.classList.add("transparentTextEditing")
C.y.cZ(p,C.y.c6(p,"caret-color"),r,null)},
@@ -1304,23 +1304,23 @@ p.noValidate=!0
p.method="post"
p.action="#"
C.Hb.qU(p,"submit",new H.b2F())
-H.aND(p,!1)
+H.aNE(p,!1)
o=J.TT(0,s)
n=H.cX9(a,C.Tm)
-if(a0!=null)for(s=J.w0(a0,t.lB),s=s.gaH(s),m=n.b;s.u();){l=s.gC(s)
+if(a0!=null)for(s=J.w1(a0,t.lB),s=s.gaH(s),m=n.b;s.u();){l=s.gC(s)
k=J.am(l)
j=k.i(l,"autofill")
i=k.i(l,"textCapitalization")
if(i==="TextCapitalization.words")i=C.CD
else if(i==="TextCapitalization.characters")i=C.CF
else i=i==="TextCapitalization.sentences"?C.CE:C.vA
-h=H.cX9(j,new H.a7g(i))
+h=H.cX9(j,new H.a7h(i))
i=h.b
o.push(i)
if(i!=m){g=H.d3B(J.d(k.i(l,"inputType"),"name"),!1).Su()
h.a.l9(g)
h.l9(g)
-H.aND(g,!1)
+H.aNE(g,!1)
q.E(0,i,h)
r.E(0,i,g)
p.appendChild(g)}}else o.push(n.b)
@@ -1328,10 +1328,10 @@ C.a.lq(o)
for(s=o.length,f=0,m="";f0)m+="*"
m+=H.f(e)}d=m.charCodeAt(0)==0?m:m
-c=$.ah5().i(0,d)
+c=$.ah6().i(0,d)
if(c!=null)C.Hb.h_(c)
-b=W.aoy(null)
-H.aND(b,!0)
+b=W.aoz(null)
+H.aNE(b,!0)
b.className="submitBtn"
b.type="submit"
p.appendChild(b)
@@ -1343,11 +1343,11 @@ r=H.d3x(p.i(a,"editingValue"))
p=$.dc5()
q=J.d(s,0)
p=p.a.i(0,q)
-return new H.aih(r,o,b,p==null?q:p)},
+return new H.aii(r,o,b,p==null?q:p)},
d3x:function(a){var s=J.am(a),r=s.i(a,"selectionBase"),q=s.i(a,"selectionExtent")
-return new H.AR(s.i(a,"text"),Math.max(0,H.an(r)),Math.max(0,H.an(q)))},
-d3w:function(a,b){if(t.Zb.b(a))return new H.AR(a.value,a.selectionStart,a.selectionEnd)
-else if(t.S0.b(a))return new H.AR(a.value,a.selectionStart,a.selectionEnd)
+return new H.AS(s.i(a,"text"),Math.max(0,H.an(r)),Math.max(0,H.an(q)))},
+d3w:function(a,b){if(t.Zb.b(a))return new H.AS(a.value,a.selectionStart,a.selectionEnd)
+else if(t.S0.b(a))return new H.AS(a.value,a.selectionStart,a.selectionEnd)
else throw H.e(P.z("Initialized with unsupported input type"))},
d46:function(a){var s,r,q,p,o,n="inputType",m="autofill",l=J.am(a),k=J.d(l.i(a,n),"name"),j=J.d(l.i(a,n),"decimal")
k=H.d3B(k,j==null?!1:j)
@@ -1362,7 +1362,7 @@ if(q==null)q=!0
p=H.dsi(l.i(a,"textCapitalization"))
o=l.aQ(a,m)?H.cX9(l.i(a,m),C.Tm):null
return new H.baH(k,j,r,s,q,o,H.dnD(l.i(a,m),l.i(a,"fields")),p)},
-doh:function(a){return new H.aoc(a,H.a([],t.Iu))},
+doh:function(a){return new H.aod(a,H.a([],t.Iu))},
d_Y:function(a,b){var s,r=a.style
r.toString
C.y.cZ(r,C.y.c6(r,"transform-origin"),"0 0 0","")
@@ -1442,13 +1442,13 @@ a1[1]=Math.min(Math.min(Math.min(a[4],a[5]),a[6]),a[7])
a1[2]=Math.max(Math.max(Math.max(a[0],a[1]),a[2]),a[3])
a1[3]=Math.max(Math.max(Math.max(a[4],a[5]),a[6]),a[7])},
dbO:function(a,b){return a.a<=b.a&&a.b<=b.b&&a.c>=b.c&&a.d>=b.d},
-da5:function(a,b,c,d,e){var s,r,q='